linux-next: manual merge of the staging tree with Linus' tree
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/fsl-mc/bus/Kconfig
between commit:
02b7b2844c2f ("staging: fsl-mc: fix build testing on x86")
from Linus' tree and commit:
6bd067c48efe ("staging: fsl-mc: Move core bus out of staging")
from the staging tree.
I fixed it up (I used the latter version of that file and applied the followinf merge fix patch) 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.
From: Stephen Rothwell <[email protected]>
Date: Fri, 23 Feb 2018 13:25:34 +1100
Subject: [PATCH] staging: fsl-mc: merge fix for CONFIG_FSL_MC_BUS moving
--- drivers/bus/fsl-mc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bus/fsl-mc/Kconfig +1 -1
@@ -7,7 +7,7 @@ config FSL_MC_BUS bool "QorIQ DPAA2 fsl-mc bus driver" - depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || X86 || PPC))) + depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || X86_LOCAL_APIC || PPC))) select GENERIC_MSI_IRQ_DOMAIN help Driver to enable the bus infrastructure for the QorIQ DPAA2
Signature · 5 lines
2.16.1 -- Cheers, Stephen Rothwell
Quoted 48 lines · Stephen Rothwell
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/fsl-mc/bus/Kconfigbetween commit:
02b7b2844c2f("staging: fsl-mc: fix build testing on x86")from Linus' tree and commit:
6bd067c48efe("staging: fsl-mc: Move core bus out of staging")from the staging tree.
I fixed it up (I used the latter version of that file and applied the followinf merge fix patch) 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.
From: Stephen Rothwell <[email protected]>
Date: Fri, 23 Feb 2018 13:25:34 +1100
Subject: [PATCH] staging: fsl-mc: merge fix forCONFIG_FSL_MC_BUSmovingSigned-off-by Stephen Rothwell <[email protected]>--- drivers/bus/fsl-mc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/bus/fsl-mc/Kconfig +1
-1@@ -7,7 +7,7 @@ config FSL_MC_BUS bool "QorIQ DPAA2 fsl-mc bus driver" - depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || X86 || PPC))) + depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || X86_LOCAL_APIC || PPC))) select GENERIC_MSI_IRQ_DOMAIN help Driver to enable the bus infrastructure for the QorIQ DPAA2Signature · 1 line
2.16.1
Thanks for this, I'll fix it up after 4.16-rc3 is out.
greg k-h