* linux-next: manual merge of the imx-mxs tree with Linus' tree
@ 2020-03-11 23:18 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2020-03-11 23:18 UTC (permalink / raw)
To: Shawn Guo
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Yangtao Li,
Maxime Ripard, Anson Huang
[-- Attachment #1: Type: text/plain, Size: 1193 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the imx-mxs tree with Linus' tree
@ 2020-03-16 21:44 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2020-03-16 21:44 UTC (permalink / raw)
To: Shawn Guo
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Yangtao Li,
Maxime Ripard, Anson Huang, Geert Uytterhoeven, Li Yang
[-- Attachment #1: Type: text/plain, Size: 1452 bytes --]
Hi all,
Today's linux-next merge of the imx-mxs tree got a conflict in:
arch/arm64/configs/defconfig
between commits:
4a453ccf87d5 ("arm64: defconfig: Enable CONFIG_SUN8I_THERMAL")
d5888c8e5586 ("arm64: defconfig: Replace ARCH_R8A7796 by ARCH_R8A77960")
from Linus' tree and commits:
34e46ed80df6 ("arm64: defconfig: add i.MX system controller thermal support")
63cccc8401c2 ("arm64: defconfig: Enable CONFIG_IMX8MM_THERMAL as module")
3fbd82f9af29 ("arm64: defconfig: run through savedefconfig for ordering")
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,0c110182497a..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -452,7 -485,8 +485,9 @@@ 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_IMX8MM_THERMAL=m
CONFIG_ROCKCHIP_THERMAL=m
CONFIG_RCAR_THERMAL=y
CONFIG_RCAR_GEN3_THERMAL=y
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-16 21:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-11 23:18 linux-next: manual merge of the imx-mxs tree with Linus' tree Stephen Rothwell
2020-03-16 21:44 Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.