Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 May 2016 15:41:57 +0000 (08:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 May 2016 15:41:57 +0000 (08:41 -0700)
commitc5e0666c5a3ccabdf16bb88451886cdf81849b66
tree59ec83e4c2e448abce9a65e32e226ed39f9e40c9
parent3cedbec301015d8fb914e7e3af0fc0e034b87d34
parent5ec0811d30378ae104f250bfc9b3640242d81e3f
Merge branch 'for-linus' of git://git./linux/kernel/git/ebiederm/user-namespace

Pull userns fix from Eric Biederman:
 "This contains just a single fix for a nasty oops"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  propogate_mnt: Handle the first propogated copy being a slave