summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'trace-ipi-tracepoints' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2014-08-105-88/+214
|\
| * ARM64: add IPI tracepointsNicolas Pitre2014-08-081-26/+39
| * ARM: add IPI tracepointsNicolas Pitre2014-08-081-28/+42
| * tracepoint: add generic tracepoint definitions for IPI tracingNicolas Pitre2014-08-081-0/+89
| * tracing: Do not do anything special with tracepoint_string when tracing is di...Steven Rostedt2014-08-082-34/+44
* | Merge tag 'trace-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2014-08-101-17/+14
|\ \
| * | ring-buffer: Always reset iterator to reader pageSteven Rostedt (Red Hat)2014-08-061-11/+6
| * | ring-buffer: Up rb_iter_peek() loop count to 3Steven Rostedt (Red Hat)2014-08-061-6/+8
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebi...Linus Torvalds2014-08-1023-97/+537
|\ \
| * | proc: Point /proc/mounts at /proc/thread-self/mounts instead of /proc/self/mo...Eric W. Biederman2014-08-041-1/+1
| * | proc: Point /proc/net at /proc/thread-self/net instead of /proc/self/netEric W. Biederman2014-08-041-1/+1
| * | proc: Implement /proc/thread-self to point at the directory of the current th...Eric W. Biederman2014-08-047-6/+112
| * | proc: Have net show up under /proc/<tgid>/task/<tid>Eric W. Biederman2014-08-041-0/+3
| * | NFS: Fix /proc/fs/nfsfs/servers and /proc/fs/nfsfs/volumesEric W. Biederman2014-08-044-41/+69
| * | mnt: Add tests for unprivileged remount cases that have found to be faultyEric W. Biederman2014-08-013-0/+260
| * | mnt: Change the default remount atime from relatime to the existing valueEric W. Biederman2014-08-011-0/+8
| * | mnt: Correct permission checks in do_remountEric W. Biederman2014-08-012-3/+38
| * | mnt: Move the test for MNT_LOCK_READONLY from change_mount_flags into do_remountEric W. Biederman2014-08-011-3/+10
| * | mnt: Only change user settable mount flags in remountEric W. Biederman2014-08-012-2/+4
| * | namespaces: Use task_lock and not rcu to protect nsproxyEric W. Biederman2014-07-308-40/+31
* | | Merge branch 'stable-3.17' of git://git.infradead.org/users/pcmoore/selinuxLinus Torvalds2014-08-104-10/+8
|\ \ \
| * | | selinux: remove unused variabled in the netport, netnode, and netif cachesPaul Moore2014-08-083-6/+4
| * | | netlabel: fix the netlbl_catmap_setlong() dummy functionPaul Moore2014-08-081-4/+4
* | | | Merge branch 'for-3.17' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2014-08-0939-1466/+2749
|\ \ \ \
| * | | | svcrdma: remove rdma_create_qp() failure recovery logicSteve Wise2014-08-051-17/+2
| * | | | nfsd: add some comments to the nfsd4 object definitionsJeff Layton2014-08-052-7/+101
| * | | | nfsd: remove the client_mutex and the nfs4_lock/unlock_state wrappersJeff Layton2014-08-052-17/+0
| * | | | nfsd: remove nfs4_lock_state: nfs4_state_shutdown_netJeff Layton2014-08-051-2/+0
| * | | | nfsd: remove nfs4_lock_state: nfs4_laundromatJeff Layton2014-08-051-3/+0
| * | | | nfsd: Remove nfs4_lock_state(): reclaim_complete()Trond Myklebust2014-08-051-2/+0
| * | | | nfsd: Remove nfs4_lock_state(): setclientid, setclientid_confirm, renewTrond Myklebust2014-08-051-6/+0
| * | | | nfsd: Remove nfs4_lock_state(): exchange_id, create/destroy_session()Trond Myklebust2014-08-051-11/+0
| * | | | nfsd: Remove nfs4_lock_state(): nfsd4_open and nfsd4_open_confirmTrond Myklebust2014-08-052-9/+0
| * | | | nfsd: Remove nfs4_lock_state(): nfsd4_delegreturn()Trond Myklebust2014-08-051-3/+0
| * | | | nfsd: Remove nfs4_lock_state(): nfsd4_open_downgrade + nfsd4_closeTrond Myklebust2014-08-051-4/+0
| * | | | nfsd: Remove nfs4_lock_state(): nfsd4_lock/locku/lockt()Trond Myklebust2014-08-051-9/+0
| * | | | nfsd: Remove nfs4_lock_state(): nfsd4_release_lockownerTrond Myklebust2014-08-051-6/+2
| * | | | nfsd: Remove nfs4_lock_state(): nfsd4_test_stateid/nfsd4_free_stateidTrond Myklebust2014-08-051-4/+0
| * | | | nfsd: Remove nfs4_lock_state(): nfs4_preprocess_stateid_op()Trond Myklebust2014-08-051-5/+1
| * | | | nfsd: remove old fault injection infrastructureJeff Layton2014-08-053-126/+57
| * | | | nfsd: add more granular locking to *_delegations fault injectorsJeff Layton2014-08-053-40/+162
| * | | | nfsd: add more granular locking to forget_openowners fault injectorJeff Layton2014-08-053-15/+122
| * | | | nfsd: add more granular locking to forget_locks fault injectorJeff Layton2014-08-053-16/+131
| * | | | nfsd: add a list_head arg to nfsd_foreach_client_lockJeff Layton2014-08-051-3/+8
| * | | | nfsd: add nfsd_inject_forget_clientsJeff Layton2014-08-053-17/+30
| * | | | nfsd: add a forget_client set_clnt routineJeff Layton2014-08-053-1/+32
| * | | | nfsd: add a forget_clients "get" routine with proper lockingJeff Layton2014-08-053-11/+26
| * | | | nfsd: abstract out the get and set routines into the fault injection opsJeff Layton2014-08-051-51/+78
| * | | | nfsd: protect clid and verifier generation with client_lockJeff Layton2014-08-052-15/+12
| * | | | nfsd: don't destroy clients that are busyJeff Layton2014-08-051-2/+8