]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0d064a7 6343a21)
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)
commit2728c57fda2c10cb290f1516cab5b170ea2e3f22
tree7bdfc18c062501d5fe3b56d35e2660028af4cc5etree
parent0d064a7b9c43e79c97cb2372850e12971de23b22commit | diff
parent6343a2120862f7023006c8091ad95c1f16a32077commit | 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
Ubuntu combined Linux kernel mirror