From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Al Viro <viro@zeniv.linux.org.uk>
Cc: Borislav Petkov <bp@suse.de>, Brian Gerst <brgerst@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the tip tree with the vfs tree
Date: Wed, 6 Jan 2021 11:15:33 +1100 [thread overview]
Message-ID: <20210106111533.2036c1d7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1269 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/Kconfig
between commit:
139d7deeea00 ("[elfcore-compat][amd64] clean PRSTATUS_SIZE/SET_PR_FPVALID up properly")
from the vfs tree and commit:
2ca408d9c749 ("fanotify: Fix sys_fanotify_mark() on native x86-32")
from the tip 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/Kconfig
index a17ced73b23c,24862d15f3a3..000000000000
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@@ -1105,9 -1105,12 +1105,15 @@@ config HAVE_ARCH_PFN_VALI
config ARCH_SUPPORTS_DEBUG_PAGEALLOC
bool
+config ARCH_HAS_ELFCORE_COMPAT
+ bool
+
+ config ARCH_SPLIT_ARG64
+ bool
+ help
+ If a 32-bit architecture requires 64-bit arguments to be split into
+ pairs of 32-bit arguments, select this option.
+
source "kernel/gcov/Kconfig"
source "scripts/gcc-plugins/Kconfig"
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-01-06 0:16 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-06 0:15 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-10-01 6:34 linux-next: manual merge of the tip tree with the vfs tree Stephen Rothwell
2020-09-25 5:30 Stephen Rothwell
2020-07-27 5:35 Stephen Rothwell
2020-08-05 1:03 ` Stephen Rothwell
2018-11-26 4:39 Stephen Rothwell
2019-01-02 1:56 ` Stephen Rothwell
2018-06-22 1:53 Stephen Rothwell
2018-06-22 1:56 ` Stephen Rothwell
2018-06-22 6:13 ` Reinette Chatre
2018-06-22 6:56 ` Thomas Gleixner
2018-06-22 12:45 ` David Howells
2018-06-22 13:06 ` Al Viro
2018-06-22 13:39 ` Thomas Gleixner
2018-06-22 15:09 ` Reinette Chatre
2018-06-22 15:44 ` Thomas Gleixner
2016-09-29 2:57 Stephen Rothwell
2012-07-05 5:00 Stephen Rothwell
2011-03-14 8:11 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=20210106111533.2036c1d7@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bp@suse.de \
--cc=brgerst@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=viro@zeniv.linux.org.uk \
/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).