Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 16 Feb 2022 23:02:00 +0000 (10:02 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 16 Feb 2022 23:02:00 +0000 (10:02 +1100)
commit959457acfa5b9ed5cfe06802ea574b9964102edc
tree44a8ef23e1d747d3afc4db7c50cb5bf4b0076f46
parenta3c896c15dcc9b485a940ff8525e3927021bcae3
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