From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Howells <dhowells@redhat•com>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Heiko Carstens <hca@linux•ibm.com>,
Linus Torvalds <torvalds@linux-foundation•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Minchan Kim <minchan@kernel•org>,
Willem de Bruijn <willemb@google•com>,
YueHaibing <yuehaibing@huawei•com>
Subject: Re: linux-next: manual merge of the notifications tree with Linus' tree
Date: Wed, 20 Jan 2021 17:19:21 +1100 [thread overview]
Message-ID: <20210120171921.11d9d463@canb.auug.org.au> (raw)
In-Reply-To: <20201221120209.5c5cb5d8@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2084 bytes --]
Hi David,
On Mon, 21 Dec 2020 12:02:09 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the notifications 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/uapi/asm-generic/unistd.h
>
> between commits:
>
> b0a0c2615f6f ("epoll: wire up syscall epoll_pwait2")
> 450f68e2425e ("epoll: fix compat syscall wire up of epoll_pwait2")
> ecb8ac8b1f14 ("mm/madvise: introduce process_madvise() syscall: an external memory hinting API")
>
> from Linus' tree and commit:
>
> 4cd92d064cb0 ("watch_queue: Implement mount topology and attribute change notifications")
>
> from the notifications 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.
>
> If this is not submitted to Linus during this merge window, please
> either drop it from your linux-next included branch, or at least fix it
> up wrt to the sate of Linus' tree.
How are you going with this?
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-01-20 6:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-21 1:02 linux-next: manual merge of the notifications tree with Linus' tree Stephen Rothwell
2021-01-20 6:19 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-10-21 1:47 Stephen Rothwell
2020-10-21 7:02 ` Stephen Rothwell
2020-10-21 7:06 ` Stephen Rothwell
2020-11-11 6:24 ` Stephen Rothwell
2020-12-04 10:01 ` David Howells
2020-12-14 20:24 ` 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=20210120171921.11d9d463@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dhowells@redhat$(echo .)com \
--cc=hca@linux$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=minchan@kernel$(echo .)org \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=willemb@google$(echo .)com \
--cc=yuehaibing@huawei$(echo .)com \
/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