From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 Dec 2015 21:51:49 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Flinux.git;a=commitdiff_plain;h=d8cd93ea67af2391f8718cf06b4b8084d38a3428

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

Pull vfs fixes from Al Viro:
 "A couple of fixes (-stable fodder) + dead code removal after the
  overlayfs fix.

  I agree that it's better to separate from the fix part to make
  backporting easier, but IMO it's not worth delaying said dead code
  removal until the next window"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  Don't reset ->total_link_count on nested calls of vfs_path_lookup()
  ovl: get rid of the dead code left from broken (and disabled) optimizations
  ovl: fix permission checking for setattr
---

d8cd93ea67af2391f8718cf06b4b8084d38a3428