summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'ecryptfs-3.11-rc1-cleanup' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2013-07-114-269/+85Star
|\
| * Use ecryptfs_dentry_to_lower_path in a couple of placesMatthew Wilcox2013-07-102-8/+6Star
| * eCryptfs: Make extent and scatterlist crypt function parameters similarTyler Hicks2013-06-081-8/+8
| * eCryptfs: Collapse crypt_page_offset() into crypt_extent()Tyler Hicks2013-06-081-36/+14Star
| * eCryptfs: Merge ecryptfs_encrypt_extent() and ecryptfs_decrypt_extent()Tyler Hicks2013-06-081-54/+20Star
| * eCryptfs: Combine page_offset crypto functionsTyler Hicks2013-06-081-51/+18Star
| * eCryptfs: Combine encrypt_scatterlist() and decrypt_scatterlist()Tyler Hicks2013-06-081-86/+20Star
| * eCryptfs: Decrypt pages in-placeTyler Hicks2013-06-081-16/+5Star
| * eCryptfs: Accept one offset parameter in page offset crypto functionsTyler Hicks2013-06-081-26/+16Star
| * eCryptfs: Simplify lower file offset calculationTyler Hicks2013-06-081-11/+7Star
| * eCryptfs: Read/write entire page during page IOTyler Hicks2013-06-081-35/+31Star
| * eCryptfs: Use entire helper page during page crypto operationsTyler Hicks2013-06-081-13/+16
| * eCryptfs: Cocci spatch "memdup.spatch"Thomas Meyer2013-06-081-2/+1Star
* | Merge tag 'jfs-3.11' of git://github.com/kleikamp/linux-shaggyLinus Torvalds2013-07-1112-154/+128Star
|\ \
| * | jfs: Update jfs_errorJoe Perches2013-06-0512-152/+126Star
| * | jfs: fix sparse warning in fs/jfs/xattr.cDave Kleikamp2013-06-051-2/+2
* | | Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2013-07-1120-182/+512
|\ \ \
| * | | nfsd4: support minorversion 1 by defaultJ. Bruce Fields2013-07-091-1/+1
| * | | nfsd4: allow destroy_session over destroyed sessionJ. Bruce Fields2013-07-092-10/+19
| * | | svcrpc: fix failures to handle -1 uid'sJ. Bruce Fields2013-07-081-2/+0Star
| * | | sunrpc: Don't schedule an upcall on a replaced cache entry.NeilBrown2013-07-011-1/+2
| * | | net/sunrpc: xpt_auth_cache should be ignored when expired.NeilBrown2013-07-013-35/+23Star
| * | | sunrpc/cache: ensure items removed from cache do not have pending upcalls.NeilBrown2013-07-012-1/+6
| * | | sunrpc/cache: use cache_fresh_unlocked consistently and correctly.NeilBrown2013-07-011-13/+7Star
| * | | sunrpc/cache: remove races with queuing an upcall.NeilBrown2013-07-011-11/+29
| * | | nfsd4: return delegation immediately if lease failsJ. Bruce Fields2013-07-011-1/+3
| * | | nfsd4: do not throw away 4.1 lock state on last unlockJ. Bruce Fields2013-07-011-8/+1Star
| * | | nfsd4: delegation-based open reclaims should bypass permissionsJ. Bruce Fields2013-07-011-1/+2
| * | | svcrpc: don't error out on small tcp fragmentJ. Bruce Fields2013-07-011-1/+1
| * | | svcrpc: fix handling of too-short rpc'sJ. Bruce Fields2013-07-011-2/+7
| * | | nfsd4: minor read_buf cleanupJ. Bruce Fields2013-07-011-10/+14
| * | | nfsd4: fix decoding of compounds across page boundariesJ. Bruce Fields2013-07-011-1/+1
| * | | nfsd4: clean up nfs4_open_delegationJ. Bruce Fields2013-07-011-44/+34Star
| * | | NFSD: Don't give out read delegations on createsSteve Dickson2013-07-011-0/+9
| * | | nfsd4: allow client to send no cb_sec flavorsJ. Bruce Fields2013-07-011-1/+5
| * | | nfsd4: fail attempts to request gss on the backchannelJ. Bruce Fields2013-07-011-0/+25
| * | | nfsd4: implement minimal SP4_MACH_CREDJ. Bruce Fields2013-07-013-12/+87
| * | | svcrpc: store gss mech in svc_credJ. Bruce Fields2013-07-015-4/+14
| * | | svcrpc: introduce init_svc_credJ. Bruce Fields2013-07-012-4/+9
| * | | Merge branch 'for-3.10' into 'for-3.11'J. Bruce Fields2013-07-012-8/+12
| |\ \ \
| * | | | nfsd: avoid undefined signed overflowJim Rees2013-05-211-1/+1
| * | | | sunrpc: the cache_detail in cache_is_valid is unused any morechaoting fan2013-05-211-4/+4
| * | | | nfsd4: fix compile in !CONFIG_NFSD_V4_SECURITY_LABEL caseJ. Bruce Fields2013-05-151-1/+3
| * | | | sunrpc: server back channel needs no rpcbind methodJ. Bruce Fields2013-05-151-1/+0Star
| * | | | NFSD: Server implementation of MAC LabelingDavid Quigley2013-05-157-10/+207
| * | | | NFSDv4.2: Add NFS v4.2 support to the NFS serverSteve Dickson2013-05-132-1/+2
| * | | | security: cap_inode_getsecctx returning garbageJ. Bruce Fields2013-05-131-1/+1
| * | | | nfsd4: store correct client minorversion for >=4.2J. Bruce Fields2013-05-131-1/+1
| * | | | nfsd: get rid of the unused functions in vfsZhao Hongjiang2013-05-131-5/+0Star
* | | | | Merge tag 'trace-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...Linus Torvalds2013-07-1118-272/+694
|\ \ \ \ \