Merge branch 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Mar 2019 17:31:02 +0000 (10:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Mar 2019 17:31:02 +0000 (10:31 -0700)
commit924973508bf15f2cabbbef7b5c428131fbbd812b
treead7a0893b8b2cf43941a6aa3a0b15e9bca533004
parent9c7dc824d9a48f98b4ee20041e865d97bc73a626
parentab81dabda1d4edc1728173be6c6a279455f220e3
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