linux-next: manual merge of the tip tree with the kbuild tree

Stephen Rothwell
2018-08-06T04:47:36Z

[-- 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 --]