From: Linus Torvalds Date: Thu, 23 Jul 2015 20:16:21 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm... X-Git-Tag: firefly_0821_release~176^2~1380 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=45b4b782e8489bcf45a4331ee32f0f3037c5c3aa;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git./linux/kernel/git/ebiederm/user-namespace Pull namespace fixes from Eric Biederman: "While reading through the code of detach_mounts I realized the code was slightly off. Testing it revealed two buggy corner cases that can send the code of detach_mounts into an infinite loop. Fixing the code to do the right thing removes the possibility of these user triggered infinite loops in the code" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: mnt: In detach_mounts detach the appropriate unmounted mount mnt: Clarify and correct the disconnect logic in umount_tree --- 45b4b782e8489bcf45a4331ee32f0f3037c5c3aa