From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Mar 2018 17:46:14 +0000 (-0800)
Subject: Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer... 
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=719ea86151f31f9d30dc854e028d05dc4afb3224;p=people%2Fpauldu%2Flinux.git

Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs

Pull overlayfs fixes from Miklos Szeredi:
 "This fixes a corner case for NFS exporting (introduced in this cycle)
  as well as fixing miscellaneous bugs"

* 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  ovl: update Kconfig texts
  ovl: redirect_dir=nofollow should not follow redirect for opaque lower
  ovl: fix ptr_ret.cocci warnings
  ovl: check ERR_PTR() return value from ovl_lookup_real()
  ovl: check lower ancestry on encode of lower dir file handle
  ovl: hash non-dir by lower inode for fsnotify
---

719ea86151f31f9d30dc854e028d05dc4afb3224