diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-16 22:14:56 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-16 22:14:56 +0100 |
commit | 673fdfe3f0630b03f3854d0361b1232f2e5ef7fb (patch) | |
tree | 5f1c1374f786c9a9d47bde36387dea8757725238 /drivers/net/wireless/iwlwifi/iwl-csr.h | |
parent | Merge tag 'sound-fix-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
parent | nfs: fix pnfs Kconfig defaults (diff) | |
download | linux-673fdfe3f0630b03f3854d0361b1232f2e5ef7fb.tar.xz linux-673fdfe3f0630b03f3854d0361b1232f2e5ef7fb.zip |
Merge tag 'nfs-for-3.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client bugfixes:
- Stable fix for data corruption when retransmitting O_DIRECT writes
- Stable fix for a deep recursion/stack overflow bug in rpc_release_client
- Stable fix for infinite looping when mounting a NFSv4.x volume
- Fix a typo in the nfs mount option parser
- Allow pNFS layouts to be compiled into the kernel when NFSv4.1 is
* tag 'nfs-for-3.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
nfs: fix pnfs Kconfig defaults
NFS: correctly report misuse of "migration" mount option.
nfs: don't retry detect_trunking with RPC_AUTH_UNIX more than once
SUNRPC: Avoid deep recursion in rpc_release_client
SUNRPC: Fix a data corruption issue when retransmitting RPC calls
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-csr.h')
0 files changed, 0 insertions, 0 deletions