Hi all, Today's linux-next merge of the sunxi tree got a conflict in: arch/arm64/configs/defconfig between commit: 4aaa1c7a05db ("arm64: defconfig: NVMEM_IMX_OCOTP=y for imx8m") from the imx-mxs tree and commit: 296bcfa05640 ("arm64: defconfig: add allwinner sid support") from the sunxi 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 33fac4e62a16,f981a882c546..000000000000 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -762,7 -741,7 +762,8 @@@ CONFIG_PHY_TEGRA_XUSB= CONFIG_HISI_PMU=y CONFIG_QCOM_L2_PMU=y CONFIG_QCOM_L3_PMU=y +CONFIG_NVMEM_IMX_OCOTP=y + CONFIG_NVMEM_SUNXI_SID=y CONFIG_QCOM_QFPROM=y CONFIG_ROCKCHIP_EFUSE=y CONFIG_UNIPHIER_EFUSE=y
Attachment:
pgp8OAjAusCHD.pgp
Description: OpenPGP digital signature