From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Jul 2016 22:18:49 +0000 (-0700)
Subject: Merge tag 'nfsd-4.7-3' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v4.7-rc6~12
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=2728c57fda2c10cb290f1516cab5b170ea2e3f22

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
---

2728c57fda2c10cb290f1516cab5b170ea2e3f22