From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Kees Cook <keescook@chromium•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mike Rapoport <rppt@kernel•org>,
Mike Rapoport <rppt@linux•ibm.com>,
Nathan Chancellor <natechancellor@gmail•com>
Subject: linux-next: manual merge of the akpm-current tree with the kspp tree
Date: Wed, 25 Nov 2020 21:05:38 +1100 [thread overview]
Message-ID: <20201125210538.03e789ff@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1622 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/Kconfig
between commit:
5a3a47bf8367 ("orphans: Hoist '--orphan-handling' into Kconfig")
from the kspp tree and commits:
84d8b3661cc9 ("arm, arm64: move free_unused_memmap() to generic mm")
46b9b00649f6 ("arch, mm: restore dependency of __kernel_map_pages() on DEBUG_PAGEALLOC")
from the akpm-current 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 313b2bc0c475,9ebdab3d0ca2..000000000000
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@@ -1062,15 -1035,12 +1069,21 @@@ config HAVE_STATIC_CALL_INLIN
bool
depends on HAVE_STATIC_CALL
+config ARCH_WANT_LD_ORPHAN_WARN
+ bool
+ help
+ An arch should select this symbol once all linker sections are explicitly
+ included, size-asserted, or discarded in the linker scripts. This is
+ important because we never want expected sections to be placed heuristically
+ by the linker, since the locations of such sections can change between linker
+ versions.
+
+ config HAVE_ARCH_PFN_VALID
+ bool
+
+ config ARCH_SUPPORTS_DEBUG_PAGEALLOC
+ bool
+
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:[~2020-11-25 10:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-25 10:05 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-03 8:15 linux-next: manual merge of the akpm-current tree with the kspp tree Stephen Rothwell
2021-06-25 10:37 Stephen Rothwell
2019-02-13 6:03 Stephen Rothwell
2018-01-15 4:57 Stephen Rothwell
2018-01-15 12:41 ` Arnd Bergmann
2018-01-15 20:07 ` Kees Cook
2017-11-02 8:05 Stephen Rothwell
2017-06-20 5:18 Stephen Rothwell
2017-06-20 5:15 Stephen Rothwell
2017-07-03 1:31 ` Stephen Rothwell
2017-02-17 4:53 Stephen Rothwell
2016-07-27 6:23 Stephen Rothwell
2016-06-22 4:58 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=20201125210538.03e789ff@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=natechancellor@gmail$(echo .)com \
--cc=rppt@kernel$(echo .)org \
--cc=rppt@linux$(echo .)ibm.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