From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 May 2016 15:41:57 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm... 
X-Git-Tag: v4.14-rc1~3347
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5e0666c5a3ccabdf16bb88451886cdf81849b66;p=platform%2Fkernel%2Flinux-rpi.git

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

c5e0666c5a3ccabdf16bb88451886cdf81849b66