Re: linux-next: manual merge of the fsinfo tree with the vfs tree

Hi all, On Mon, 3 Aug 2020 19:05:32 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the fsinfo tree got a conflict in: > > fs/internal.h > > between commits: > > c60166f04283 ("init: add an init_mount helper") > 09267defa36a ("init: add an init_umount helper") > > from t

linux-next: manual merge of the fsinfo tree with the vfs tree

Hi all, Today's linux-next merge of the fsinfo tree got a conflict in: fs/internal.h between commits: c60166f04283 ("init: add an init_mount helper") 09267defa36a ("init: add an init_umount helper") from the vfs tree and commits: 8c62d62ddd1f ("fsinfo: Allow retrieval of superblock de

linux-next: manual merge of the fsinfo tree with the vfs tree

Hi all, Today's linux-next merge of the fsinfo tree got conflicts in: arch/alpha/kernel/syscalls/syscall.tbl arch/arm/tools/syscall.tbl arch/ia64/kernel/syscalls/syscall.tbl arch/m68k/kernel/syscalls/syscall.tbl arch/microblaze/kernel/syscalls/syscall.tbl arch/mips/kernel/syscalls/sys