diff options
| author | Linus Torvalds <[email protected]> | 2014-11-26 03:05:41 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2014-11-26 03:05:41 +0000 |
| commit | b914c5b2130239fd378d1a719ab3c53f0c782be9 (patch) | |
| tree | b3852bd4c4a1d040432e42666e8c8825e26d9cea /drivers/tty/serial/sccnxp.c | |
| parent | Merge git://git.kvack.org/~bcrl/aio-fixes (diff) | |
| parent | nfsd: Fix slot wake up race in the nfsv4.1 callback code (diff) | |
| download | kernel-b914c5b2130239fd378d1a719ab3c53f0c782be9.tar.gz kernel-b914c5b2130239fd378d1a719ab3c53f0c782be9.zip | |
Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux
Pull nfsd bugfixes from Bruce Fields:
"These fix one mishandling of the case when security labels are
configured out, and two races in the 4.1 backchannel code"
* 'for-3.18' of git://linux-nfs.org/~bfields/linux:
nfsd: Fix slot wake up race in the nfsv4.1 callback code
SUNRPC: Fix locking around callback channel reply receive
nfsd: correctly define v4.2 support attributes
Diffstat (limited to 'drivers/tty/serial/sccnxp.c')
0 files changed, 0 insertions, 0 deletions