From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Howells <dhowells@redhat•com>
Cc: Christian Brauner <christian@brauner•io>,
Al Viro <viro@ZenIV•linux.org.uk>,
Geert Uytterhoeven <geert@linux-m68k•org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Sargun Dhillon <sargun@sargun•me>,
Aleksa Sarai <cyphar@cyphar•com>,
Kars de Jong <jongk@linux-m68k•org>
Subject: Re: linux-next: manual merge of the pidfd tree with the m68k, vfs and keys trees
Date: Fri, 31 Jan 2020 11:53:05 +1100 [thread overview]
Message-ID: <20200131115305.2e3bf8b1@canb.auug.org.au> (raw)
In-Reply-To: <20200131113422.12e4aabd@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1726 bytes --]
Hi all,
On Fri, 31 Jan 2020 11:34:22 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Hi all,
>
> On Mon, 13 Jan 2020 16:02:52 +1100 Stephen Rothwell <sfr@canb•auug.org.au> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2020-01-31 0:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-13 5:02 linux-next: manual merge of the pidfd tree with the m68k, vfs and keys trees Stephen Rothwell
2020-01-31 0:34 ` Stephen Rothwell
2020-01-31 0:53 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200131115305.2e3bf8b1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=christian@brauner$(echo .)io \
--cc=cyphar@cyphar$(echo .)com \
--cc=dhowells@redhat$(echo .)com \
--cc=geert@linux-m68k$(echo .)org \
--cc=jongk@linux-m68k$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sargun@sargun$(echo .)me \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox