diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-12 11:54:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-12 11:54:54 -0700 |
| commit | 602b5366292b5c04926c6042a400d1907413b010 (patch) | |
| tree | 7bc5a1336d203514201c51db772cd7bfe63bfdf1 /fs/cifs/dir.c | |
| parent | 7ed641be750d365df4329764a504e22fbd30cd80 (diff) | |
| parent | 224ecbf5a674ec7da3a3b3ea21ca62e2853653fa (diff) | |
Merge tag 'nfs-for-3.17-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client fixes from Trond Myklebust:
"Highlights:
- fix a kernel warning when removing /proc/net/nfsfs
- revert commit 49a4bda22e18 due to Oopses
- fix a typo in the pNFS file layout commit code"
* tag 'nfs-for-3.17-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
pnfs: fix filelayout_retry_commit when idx > 0
nfs: revert "nfs4: queue free_lock_state job submission to nfsiod"
nfs: fix kernel warning when removing proc entry
Diffstat (limited to 'fs/cifs/dir.c')
0 files changed, 0 insertions, 0 deletions