Re: linux-next: manual merge of the pidfd tree with the m68k, vfs and keys trees

[Stephen Rothwell]

Hi all,

On Fri, 31 Jan 2020 11:34:22 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
> 
> On Mon, 13 Jan 2020 16:02:52 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > Today's linux-next merge of the pidfd tree got conflicts in:
> > 
> >   arch/alpha/kernel/syscalls/syscall.tbl
> >   arch/arm/tools/syscall.tbl
> >   arch/arm64/include/asm/unistd.h
> >   arch/arm64/include/asm/unistd32.h
> >   arch/ia64/kernel/syscalls/syscall.tbl
> >   arch/m68k/kernel/syscalls/syscall.tbl
> >   arch/microblaze/kernel/syscalls/syscall.tbl
> >   arch/mips/kernel/syscalls/syscall_n32.tbl
> >   arch/mips/kernel/syscalls/syscall_n64.tbl
> >   arch/mips/kernel/syscalls/syscall_o32.tbl
> >   arch/parisc/kernel/syscalls/syscall.tbl
> >   arch/powerpc/kernel/syscalls/syscall.tbl
> >   arch/s390/kernel/syscalls/syscall.tbl
> >   arch/sh/kernel/syscalls/syscall.tbl
> >   arch/sparc/kernel/syscalls/syscall.tbl
> >   arch/x86/entry/syscalls/syscall_32.tbl
> >   arch/x86/entry/syscalls/syscall_64.tbl
> >   arch/xtensa/kernel/syscalls/syscall.tbl
> >   include/linux/syscalls.h
> >   include/uapi/asm-generic/unistd.h
> > 
> > between commits:
> > 
> >   e8bb2a2a1d51 ("m68k: Wire up clone3() syscall")
> >   0a51692d49ec ("open: introduce openat2(2) syscall")
> >   3a92c6e49c47 ("Add a general, global device notification watch list")
> > 
> > from the m68k, vfs and keys trees and commit:
> > 
> >   27063d9f5fbf ("arch: wire up pidfd_getfd syscall")
> > 
> > from the pidfd tree.
> > 
> 
> This is now a conflict between the vfs, keys and Linus' tree.

Actually, this is just a conflict between the keys tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpZu3WA_ABvt.pgp
Description: OpenPGP digital signature