From: Linus Torvalds Date: Sat, 16 Mar 2019 17:31:02 +0000 (-0700) Subject: Merge branch 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=924973508bf15f2cabbbef7b5c428131fbbd812b;p=android-x86%2Fkernel.git Merge branch 'work.mount' of git://git./linux/kernel/git/viro/vfs Pull vfs mount infrastructure fix from Al Viro: "Fixup for sysfs braino. Capabilities checks for sysfs mount do include those on netns, but only if CONFIG_NET_NS is enabled. Sorry, should've caught that earlier..." * 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fix sysfs_init_fs_context() in !CONFIG_NET_NS case --- 924973508bf15f2cabbbef7b5c428131fbbd812b