Messages in this thread | | | Date | Tue, 13 Mar 2018 08:45:16 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the qcom tree with the amlogic tree |
| |
Hi Andy,
Today's linux-next merge of the qcom tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
266c157de3b2 ("arm64: defconfig: enable MESON EFUSE")
from the amlogic tree and commit:
52fe48c2b9bb ("arm64: defconfig: enable thermal sensor on QCOM platforms")
from the qcom 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 df2b08b1554f,a37130b54fae..000000000000 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -565,7 -572,7 +575,8 @@@ CONFIG_PHY_XGENE= CONFIG_PHY_TEGRA_XUSB=y CONFIG_QCOM_L2_PMU=y CONFIG_QCOM_L3_PMU=y +CONFIG_MESON_EFUSE=m + CONFIG_QCOM_QFPROM=y CONFIG_UNIPHIER_EFUSE=y CONFIG_TEE=y CONFIG_OPTEE=y [unhandled content-type:application/pgp-signature] | |