From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
David Howells <dhowells@redhat.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Minchan Kim <minchan@kernel.org>
Subject: linux-next: manual merge of the akpm tree with the notificiations and fsinfo trees
Date: Tue, 12 May 2020 21:47:29 +1000 [thread overview]
Message-ID: <20200512214729.2c8a255a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1676 bytes --]
Hi all,
Today's linux-next merge of the akpm tree got conflicts in:
include/uapi/asm-generic/unistd.h
arch/xtensa/kernel/syscalls/syscall.tbl
arch/x86/entry/syscalls/syscall_64.tbl
arch/x86/entry/syscalls/syscall_32.tbl
arch/sparc/kernel/syscalls/syscall.tbl
arch/sh/kernel/syscalls/syscall.tbl
arch/s390/kernel/syscalls/syscall.tbl
arch/powerpc/kernel/syscalls/syscall.tbl
arch/parisc/kernel/syscalls/syscall.tbl
arch/mips/kernel/syscalls/syscall_n64.tbl
arch/mips/kernel/syscalls/syscall_n32.tbl
arch/microblaze/kernel/syscalls/syscall.tbl
arch/m68k/kernel/syscalls/syscall.tbl
arch/ia64/kernel/syscalls/syscall.tbl
arch/arm64/include/asm/unistd32.h
arch/arm64/include/asm/unistd.h
arch/arm/tools/syscall.tbl
arch/alpha/kernel/syscalls/syscall.tbl
between commits:
42036137fa9b ("watch_queue: Implement mount topology and attribute change notifications")
9321bb26ce55 ("watch_queue: Add superblock notifications")
51d01aee410b ("fsinfo: Add fsinfo() syscall to query filesystem information")
from the notifications and fsinfo trees and patch:
"mm/madvise: introduce process_madvise() syscall: an external memory hinting API"
(and a few followup patches)
from the akpm tree.
I fixed it up (see the tree) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2020-05-12 11:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20200512214729.2c8a255a@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 \
/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).