summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-04-24 16:46:05 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-24 16:46:05 +0200
commit860448cf76c0878b83d3cf343a0436188b396b8e (patch)
tree1f060525644c1f4405258cb9e3dd5c1d66c119f7 /crypto
parentMerge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentuapi: Remove kernel internal declaration (diff)
downloadlinux-860448cf76c0878b83d3cf343a0436188b396b8e.tar.xz
linux-860448cf76c0878b83d3cf343a0436188b396b8e.zip
Merge branch 'for-4.1' of git://linux-nfs.org/~bfields/linux
Pull nfsd updates from Bruce Fields: "A quiet cycle this time; this is basically entirely bugfixes. The few that aren't cc'd to stable are cleanup or seemed unlikely to affect anyone much" * 'for-4.1' of git://linux-nfs.org/~bfields/linux: uapi: Remove kernel internal declaration nfsd: fix nsfd startup race triggering BUG_ON nfsd: eliminate NFSD_DEBUG nfsd4: fix READ permission checking nfsd4: disallow SEEK with special stateids nfsd4: disallow ALLOCATE with special stateids nfsd: add NFSEXP_PNFS to the exflags array nfsd: Remove duplicate macro define for max sec label length nfsd: allow setting acls with unenforceable DENYs nfsd: NFSD_FAULT_INJECTION depends on DEBUG_FS nfsd: remove unused status arg to nfsd4_cleanup_open_state nfsd: remove bogus setting of status in nfsd4_process_open2 NFSD: Use correct reply size calculating function NFSD: Using path_equal() for checking two paths
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions