From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Jun 2017 17:22:59 +0000 (-0700)
Subject: Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer... 
X-Git-Tag: v4.12~14
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=86c3e00afd64a507aef954cd581547f28807e51a;p=users%2Fdwmw2%2Flinux.git

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

Pull overlayfs fixes from Miklos Szeredi:
 "Fix two bugs in copy-up code. One introduced in 4.11 and one in
  4.12-rc"

* 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  ovl: don't set origin on broken lower hardlink
  ovl: copy-up: don't unlock between lookup and link
---

86c3e00afd64a507aef954cd581547f28807e51a