From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Howells <dhowells@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Minchan Kim <minchan@kernel.org>,
YueHaibing <yuehaibing@huawei.com>
Subject: Re: linux-next: manual merge of the notifications tree with Linus' tree
Date: Wed, 21 Oct 2020 18:06:36 +1100 [thread overview]
Message-ID: <20201021180636.75f3c700@canb.auug.org.au> (raw)
In-Reply-To: <20201021180255.5673c548@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]
Hi all,
On Wed, 21 Oct 2020 18:02:55 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> On Wed, 21 Oct 2020 12:47:33 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > diff --cc include/uapi/asm-generic/unistd.h
> > index 2056318988f7,fcdca8c7d30a..000000000000
> > --- a/include/uapi/asm-generic/unistd.h
> > +++ b/include/uapi/asm-generic/unistd.h
> > @@@ -857,8 -857,8 +857,10 @@@ __SYSCALL(__NR_openat2, sys_openat2
> > __SYSCALL(__NR_pidfd_getfd, sys_pidfd_getfd)
> > #define __NR_faccessat2 439
> > __SYSCALL(__NR_faccessat2, sys_faccessat2)
> > -#define __NR_watch_mount 440
> > +#define __NR_process_madvise 440
> > +__SYSCALL(__NR_process_madvise, sys_process_madvise)
> > ++#define __NR_watch_mount 441
> > + __SYSCALL(__NR_watch_mount, sys_watch_mount)
> >
> > #undef __NR_syscalls
> > #define __NR_syscalls 441
>
> I missed updating __NR_syscalls to 442 which I will in tomorrow's merge
> resolution.
I presume I need to update __NR_compat_syscalls in
arch/arm64/include/asm/unistd.h as well :-(
I really don't like conflicts between new syscalls :-(
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-10-21 7:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-21 1:47 linux-next: manual merge of the notifications tree with Linus' tree Stephen Rothwell
2020-10-21 7:02 ` Stephen Rothwell
2020-10-21 7:06 ` Stephen Rothwell [this message]
2020-11-11 6:24 ` Stephen Rothwell
2020-12-04 10:01 ` David Howells
2020-12-14 20:24 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2020-12-21 1:02 Stephen Rothwell
2021-01-20 6:19 ` Stephen Rothwell
2020-05-12 8:34 Stephen Rothwell
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=20201021180636.75f3c700@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=minchan@kernel.org \
--cc=yuehaibing@huawei.com \
/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).