]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'nfsd-4.7-3' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Jul 2016 22:18:49 +0000 (15:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Jul 2016 22:18:49 +0000 (15:18 -0700)
commitc0b40ccfe9fca029bff93f443be456d02a42f62b
tree7bdfc18c062501d5fe3b56d35e2660028af4cc5e
parent5258932f96b22543906071427a08816238842239
parenta9fef9ed925383b8bcf7610efdb5ac1d636d1768
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