Messages in this thread | | | Date | Tue, 30 Apr 2019 09:49:23 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the imx-mxs tree with the arm-soc tree |
| |
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
7b0d021fbe41 ("arm64: defconfig: enable PCIE_ALTERA")
from the arm-soc tree and commit:
2b4fd225df89 ("arm64: defconfig: Enable CONFIG_SPI_IMX")
from the imx-mxs 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/configs/defconfig index 5392c12ef3b7,eb31c20e9914..000000000000 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -357,7 -365,7 +358,8 @@@ CONFIG_SPI= CONFIG_SPI_ARMADA_3700=y CONFIG_SPI_BCM2835=m CONFIG_SPI_BCM2835AUX=m +CONFIG_SPI_NXP_FLEXSPI=y + CONFIG_SPI_IMX=y CONFIG_SPI_MESON_SPICC=m CONFIG_SPI_MESON_SPIFC=m CONFIG_SPI_ORION=y [unhandled content-type:application/pgp-signature] | |