| commit | 2728c57fda2c10cb290f1516cab5b170ea2e3f22 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 01 15:18:49 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 01 15:18:49 2016 -0700 |
| tree | 7bdfc18c062501d5fe3b56d35e2660028af4cc5e | |
| parent | 0d064a7b9c43e79c97cb2372850e12971de23b22 [diff] | |
| parent | 6343a2120862f7023006c8091ad95c1f16a32077 [diff] |
Merge tag 'nfsd-4.7-3' of git://linux-nfs.org/~bfields/linux Pull lockd/locks fixes from Bruce Fields: "One fix for lockd soft lookups in an error path, and one fix for file leases on overlayfs" * tag 'nfsd-4.7-3' of git://linux-nfs.org/~bfields/linux: locks: use file_inode() lockd: unregister notifier blocks if the service fails to come up completely