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 /scripts/objdiff | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff) | |
| parent | pnfs: fix filelayout_retry_commit when idx > 0 (diff) | |
| download | linux-602b5366292b5c04926c6042a400d1907413b010.tar.gz linux-602b5366292b5c04926c6042a400d1907413b010.zip | |
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 'scripts/objdiff')
0 files changed, 0 insertions, 0 deletions