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>,
Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Palmer Dabbelt <palmer@sifive.com>,
Christoph Hellwig <hch@lst.de>
Subject: linux-next: manual merge of the tip tree with the kbuild tree
Date: Mon, 6 Aug 2018 14:47:36 +1000 [thread overview]
Message-ID: <20180806144736.4fbe1e51@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]
Hi all,
Today's linux-next merge of the tip tree got conflicts in:
arch/arm64/Kconfig
arch/openrisc/Kconfig
between commit:
1572497cb0e6 ("kconfig: include common Kconfig files from top-level Kconfig")
from the kbuild tree and commits:
78ae2e1cd845 ("arm64: Use the new GENERIC_IRQ_MULTI_HANDLER")
c5ca4560de0f ("openrisc: Use the new GENERIC_IRQ_MULTI_HANDLER")
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/arm64/Kconfig
index a3de6ad666d4,3d1011957823..000000000000
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -278,9 -265,10 +279,6 @@@ config ARCH_SUPPORTS_UPROBE
config ARCH_PROC_KCORE_TEXT
def_bool y
- config MULTI_IRQ_HANDLER
- def_bool y
-source "init/Kconfig"
-
-source "kernel/Kconfig.freezer"
--
source "arch/arm64/Kconfig.platforms"
menu "Bus support"
diff --cc arch/openrisc/Kconfig
index fee9d91a66e6,dfb6a79ba7ff..000000000000
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@@ -71,9 -69,10 +71,6 @@@ config STACKTRACE_SUPPOR
config LOCKDEP_SUPPORT
def_bool y
- config MULTI_IRQ_HANDLER
- def_bool y
-source "init/Kconfig"
-
-source "kernel/Kconfig.freezer"
--
menu "Processor type and features"
choice
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-08-06 4:47 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-06 4:47 Stephen Rothwell [this message]
2018-08-14 23:26 ` linux-next: manual merge of the tip tree with the kbuild tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-05-17 1:30 Stephen Rothwell
2022-05-23 4:24 Stephen Rothwell
2022-05-23 5:37 ` Masahiro Yamada
2022-05-23 5:46 ` Stephen Rothwell
2022-05-23 5:47 ` Stephen Rothwell
2022-05-23 16:23 ` Josh Poimboeuf
2022-05-27 2:19 ` Masahiro Yamada
2022-05-27 4:47 ` Josh Poimboeuf
2022-05-27 6:04 ` Masahiro Yamada
2022-05-27 12:18 ` Masahiro Yamada
2022-05-27 14:59 ` Josh Poimboeuf
2020-09-25 5:25 Stephen Rothwell
2020-10-15 1:57 ` Stephen Rothwell
2019-02-26 2:48 Stephen Rothwell
2018-12-20 4:57 Stephen Rothwell
2017-06-23 3:50 Stephen Rothwell
2017-07-03 1:08 ` Stephen Rothwell
2016-09-06 3:43 Stephen Rothwell
2013-02-18 3:35 Stephen Rothwell
2013-02-18 6:31 ` H. Peter Anvin
2012-05-07 5:10 Stephen Rothwell
2012-05-07 19:25 ` Michal Marek
2012-05-07 20:24 ` Sam Ravnborg
2011-05-20 3:36 Stephen Rothwell
2011-05-20 3:54 ` Steven Rostedt
2010-07-01 4:05 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=20180806144736.4fbe1e51@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hch@lst.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=palmer@sifive.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=yamada.masahiro@socionext.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.