From: Mark Brown <broonie@kernel.org>
To: Matt Fleming <matt@codeblueprint.co.uk>,
Tom Vaden <tom.vaden@hpe.com>, Christoph Hellwig <hch@lst.de>,
Tony Luck <tony.luck@intel.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the tip tree with the FIXME tree
Date: Mon, 16 Sep 2019 01:00:39 +0100 [thread overview]
Message-ID: <20190916000039.GR4352@sirena.co.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/ia64/Kconfig
between commits:
fc5bad03709f9 ("ia64: remove the hpsim platform")
cf07cb1ff4ea0 ("ia64: remove support for the SGI SN2 platform")
from the ia64 tree and commit:
a2cbfd46559e8 ("arch, ia64: Make NUMA select SMP")
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.
diff --cc arch/ia64/Kconfig
index 5dbd7fd7578f4,997baba02b70e..0000000000000
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@@ -311,7 -386,10 +311,9 @@@ config ARCH_DISCONTIGMEM_DEFAUL
config NUMA
bool "NUMA support"
- depends on !IA64_HP_SIM && !FLATMEM
- default y if IA64_SGI_SN2
+ depends on !FLATMEM
+ select ACPI_NUMA if ACPI
+ select SMP
help
Say Y to compile the kernel to support NUMA (Non-Uniform Memory
Access). This option is for configuring high-end multiprocessor
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-09-16 0:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-16 0:00 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-10-11 16:10 linux-next: manual merge of the tip tree with the FIXME tree Mark Brown
2017-10-11 17:23 ` Will Deacon
2017-10-12 8:36 ` Mark Brown
2017-11-13 5:32 ` 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=20190916000039.GR4352@sirena.co.uk \
--to=broonie@kernel.org \
--cc=hch@lst.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=matt@codeblueprint.co.uk \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=tom.vaden@hpe.com \
--cc=tony.luck@intel.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