Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Feb 2022 23:14:21 +0000 (10:14 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Feb 2022 23:14:21 +0000 (10:14 +1100)
commit61163db20575ef0eaffa3436b2e352502165c077
tree48c9f54afa2827ca7f74fc51be42f1af2f0df1a2
parentb7cb1c6e130a3f4e266a95ba416bdac622e20141
parent124f75f864f38327e3e7e182e6b6da5105e2bade
Merge branch 'for-next' of git://git./linux/kernel/git/viro/vfs.git

# Conflicts:
# arch/x86/um/Kconfig
arch/x86/um/Kconfig
fs/internal.h
fs/namespace.c
fs/read_write.c