diff options
| author | Linus Torvalds <[email protected]> | 2015-05-11 21:42:52 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2015-05-11 21:42:52 +0000 |
| commit | 4cfceaf0c087f47033f5e61a801f4136d6fb68c6 (patch) | |
| tree | 59e15849506b505daf2298ed333fd04cda38e22c /net/switchdev/switchdev.c | |
| parent | Merge tag 'spi-fix-v4.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | nfsd: skip CB_NULL probes for 4.1 or later (diff) | |
| download | kernel-4cfceaf0c087f47033f5e61a801f4136d6fb68c6.tar.gz kernel-4cfceaf0c087f47033f5e61a801f4136d6fb68c6.zip | |
Merge branch 'for-4.1' of git://linux-nfs.org/~bfields/linux
Pull nfsd bugfixes from Bruce Fields:
"Mainly pnfs fixes (and for problems with generic callback code made
more obvious by pnfs)"
* 'for-4.1' of git://linux-nfs.org/~bfields/linux:
nfsd: skip CB_NULL probes for 4.1 or later
nfsd: fix callback restarts
nfsd: split transport vs operation errors for callbacks
svcrpc: fix potential GSSX_ACCEPT_SEC_CONTEXT decoding failures
nfsd: fix pNFS return on close semantics
nfsd: fix the check for confirmed openowner in nfs4_preprocess_stateid_op
nfsd/blocklayout: pretend we can send deviceid notifications
Diffstat (limited to 'net/switchdev/switchdev.c')
0 files changed, 0 insertions, 0 deletions