From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Brauner <christian@brauner•io>,
Michael Ellerman <mpe@ellerman•id.au>,
PowerPC <linuxppc-dev@lists•ozlabs.org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: manual merge of the pidfd tree with the powerpc-fixes tree
Date: Thu, 18 Jun 2020 12:11:31 +1000 [thread overview]
Message-ID: <20200618121131.4ad29150@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1280 bytes --]
Hi all,
Today's linux-next merge of the pidfd tree got a conflict in:
arch/powerpc/kernel/syscalls/syscall.tbl
between commit:
35e32a6cb5f6 ("powerpc/syscalls: Split SPU-ness out of ABI")
from the powerpc-fixes tree and commit:
9b4feb630e8e ("arch: wire-up close_range()")
from the pidfd tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/powerpc/kernel/syscalls/syscall.tbl
index c0cdaacd770e,dd87a782d80e..000000000000
--- a/arch/powerpc/kernel/syscalls/syscall.tbl
+++ b/arch/powerpc/kernel/syscalls/syscall.tbl
@@@ -480,6 -524,8 +480,7 @@@
434 common pidfd_open sys_pidfd_open
435 32 clone3 ppc_clone3 sys_clone3
435 64 clone3 sys_clone3
-435 spu clone3 sys_ni_syscall
+ 436 common close_range sys_close_range
437 common openat2 sys_openat2
438 common pidfd_getfd sys_pidfd_getfd
439 common faccessat2 sys_faccessat2
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-06-18 2:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-18 2:11 Stephen Rothwell [this message]
2020-06-19 11:17 ` linux-next: manual merge of the pidfd tree with the powerpc-fixes tree Michael Ellerman
2020-06-19 14:01 ` Christian Brauner
2020-06-23 11:42 ` Michael Ellerman
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=20200618121131.4ad29150@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=christian@brauner$(echo .)io \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mpe@ellerman$(echo .)id.au \
/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