From: Linus Torvalds 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-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c5e0666c5a3ccabdf16bb88451886cdf81849b66;p=openwrt%2Fstaging%2Fblogic.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