Christoph's "getting rid of ksys_...() uses under KERNEL_DS" stuff.
One trivial conflict (drivers/md/md.c).
The following changes since commit f8456690ba8eb18ea4714e68554e242a04f65cff:
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux into master (2020-07-15 19:00:12 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git hch.init_path
for you to fetch changes up to f073531070d24bbb82cb2658952d949f4851024b:
init: add an init_dup helper (2020-08-04 21:02:38 -0400)
----------------------------------------------------------------
Christoph Hellwig (50):
fs: add a vfs_fchown helper
fs: add a vfs_fchmod helper
init: remove the bstat helper
md: move the early init autodetect code to drivers/md/
md: replace the RAID_AUTORUN ioctl with a direct function call
md: remove the autoscan partition re-read
md: remove the kernel version of md_u.h
md: simplify md_setup_drive
md: rewrite md_setup_drive to avoid ioctls
initrd: remove support for multiple floppies
initrd: remove the BLKFLSBUF call in handle_initrd
initrd: switch initrd loading to struct file based APIs
initrd: mark init_linuxrc as __init
initrd: mark initrd support as deprecated
initramfs: remove the populate_initrd_image and clean_rootfs stubs
initramfs: remove clean_rootfs
initramfs: switch initramfs unpacking to struct file based APIs
init: open code setting up stdin/stdout/stderr
fs: remove ksys_getdents64
fs: remove ksys_open
fs: remove ksys_dup
fs: remove ksys_fchmod
fs: remove ksys_ioctl
fs: refactor do_utimes
fs: move timespec validation into utimes_common
fs: expose utimes_common
initramfs: use vfs_utimes in do_copy
fs: refactor do_mount
fs: refactor ksys_umount
fs: push the getname from do_rmdir into the callers
devtmpfs: refactor devtmpfsd()
init: initialize ramdisk_execute_command at compile time
init: mark console_on_rootfs as __init
init: mark create_dev as __init
init: add an init_mount helper
init: add an init_umount helper
init: add an init_unlink helper
init: add an init_rmdir helper
init: add an init_chdir helper
init: add an init_chroot helper
init: add an init_chown helper
init: add an init_chmod helper
init: add an init_eaccess helper
init: add an init_link helper
init: add an init_symlink helper
init: add an init_mkdir helper
init: add an init_mknod helper
init: add an init_stat helper
init: add an init_utimes helper
init: add an init_dup helper
arch/arm/kernel/atags_parse.c | 2 -
arch/sh/kernel/setup.c | 2 -
arch/sparc/kernel/setup_32.c | 2 -
arch/sparc/kernel/setup_64.c | 2 -
arch/x86/kernel/setup.c | 2 -
drivers/base/devtmpfs.c | 59 +++--
drivers/md/Makefile | 3 +
init/do_mounts_md.c => drivers/md/md-autodetect.c | 247 ++++++++++----------
drivers/md/md.c | 38 +---
drivers/md/md.h | 12 +
fs/Makefile | 2 +-
fs/file.c | 7 +-
fs/init.c | 265 ++++++++++++++++++++++
fs/internal.h | 19 +-
fs/ioctl.c | 7 +-
fs/namei.c | 20 +-
fs/namespace.c | 107 +++++----
fs/open.c | 78 +++----
fs/read_write.c | 2 +-
fs/readdir.c | 11 +-
fs/utimes.c | 109 ++++-----
include/linux/fs.h | 4 +
include/linux/init_syscalls.h | 19 ++
include/linux/initrd.h | 6 -
include/linux/raid/detect.h | 8 +
include/linux/raid/md_u.h | 13 --
include/linux/syscalls.h | 83 -------
init/Makefile | 1 -
init/do_mounts.c | 82 ++-----
init/do_mounts.h | 28 +--
init/do_mounts_initrd.c | 39 ++--
init/do_mounts_rd.c | 101 ++++-----
init/initramfs.c | 148 +++++-------
init/main.c | 28 +--
init/noinitramfs.c | 8 +-
35 files changed, 796 insertions(+), 768 deletions(-)
rename init/do_mounts_md.c => drivers/md/md-autodetect.c (59%)
create mode 100644 fs/init.c
create mode 100644 include/linux/init_syscalls.h
delete mode 100644 include/linux/raid/md_u.h
