From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Christian Brauner <christian@brauner.io>,
Jens Axboe <axboe@kernel.dk>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux-Arch <linux-arch@vger.kernel.org>
Subject: New syscalls (was: Re: linux-next: manual merge of the pidfd tree with the y2038 tree (now block and tip trees))
Date: Mon, 11 Mar 2019 09:36:40 +0100 [thread overview]
Message-ID: <CAMuHMdUmPBeQ=jcDufVBDEGiO1Yk4bWWBSg488Jm_wwAuySHBQ@mail.gmail.com> (raw)
In-Reply-To: <CAK8P3a1hw03ik+tZSG8PnP7Rd=Pzwbo7n59HLJW04ncndyqzsg@mail.gmail.com>
Hi Arnd,
On Wed, Feb 13, 2019 at 3:22 PM Arnd Bergmann <arnd@arndb.de> wrote:
> On Wed, Feb 13, 2019 at 6:22 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > On Tue, 22 Jan 2019 14:10:27 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > Today's linux-next merge of the pidfd tree got conflicts in:
> > >
> > > arch/x86/entry/syscalls/syscall_32.tbl
> > > arch/x86/entry/syscalls/syscall_64.tbl
> > > include/uapi/asm-generic/unistd.h
> > >
> > > between commits:
> > >
> > > 63a96220ad45 ("arch: add split IPC system calls where needed")
> > > 0bd4bb9c5612 ("y2038: add 64-bit time_t syscalls to all 32-bit architectures")
> > >
> > > from the y2038 tree and commit:
> > >
> > > 3d2991bc7a67 ("signal: add pidfd_send_signal() syscall")
> > >
> > > from the pidfd tree.
> >
> > This is now a conflict between the block, tip and pidfd trees. The
> > resolution now looks like below.
>
> Checked it again, still looks good. Thanks,
What's the plan with adding new syscalls to all architectures?
+ <stdin>: warning: #warning syscall io_uring_enter not implemented
[-Wcpp]: => 1481:2
+ <stdin>: warning: #warning syscall io_uring_register not
implemented [-Wcpp]: => 1484:2
+ <stdin>: warning: #warning syscall io_uring_setup not implemented
[-Wcpp]: => 1478:2
and more seem to be planned for this merge window.
Shall each architcture maintainer take care of this hxxself, or will
this be done in
a coordinated way?
Thanks!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
next prev parent reply other threads:[~2019-03-11 8:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-22 3:10 linux-next: manual merge of the pidfd tree with the y2038 tree Stephen Rothwell
2019-02-13 5:22 ` linux-next: manual merge of the pidfd tree with the y2038 tree (now block and tip trees) Stephen Rothwell
2019-02-13 12:57 ` Arnd Bergmann
2019-03-11 8:36 ` Geert Uytterhoeven [this message]
2019-03-11 21:38 ` New syscalls (was: Re: linux-next: manual merge of the pidfd tree with the y2038 tree (now block and tip trees)) Arnd Bergmann
2019-03-11 21:43 ` Christian Brauner
2019-03-12 8:31 ` Arnd Bergmann
2019-03-12 8:48 ` Christian Brauner
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='CAMuHMdUmPBeQ=jcDufVBDEGiO1Yk4bWWBSg488Jm_wwAuySHBQ@mail.gmail.com' \
--to=geert@linux-m68k.org \
--cc=arnd@arndb.de \
--cc=axboe@kernel.dk \
--cc=christian@brauner.io \
--cc=hpa@zytor.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).