Messages in this thread | | | Date | Thu, 12 Mar 2020 10:18:54 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the imx-mxs tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the imx-mxs tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
4a453ccf87d5 ("arm64: defconfig: Enable CONFIG_SUN8I_THERMAL")
from Linus' tree and commit:
34e46ed80df6 ("arm64: defconfig: add i.MX system controller thermal support")
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 4db223dbc549,31d098438a43..000000000000 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -452,7 -454,7 +454,8 @@@ CONFIG_THERMAL_GOV_POWER_ALLOCATOR= CONFIG_CPU_THERMAL=y CONFIG_THERMAL_EMULATION=y CONFIG_QORIQ_THERMAL=m +CONFIG_SUN8I_THERMAL=y + CONFIG_IMX_SC_THERMAL=m CONFIG_ROCKCHIP_THERMAL=m CONFIG_RCAR_THERMAL=y CONFIG_RCAR_GEN3_THERMAL=y [unhandled content-type:application/pgp-signature] | |