* linux-next: manual merge of the rockchip tree with the amlogic tree
@ 2019-04-23 23:31 Stephen Rothwell
2019-04-26 19:25 ` Martin Blumenstingl
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2019-04-23 23:31 UTC (permalink / raw)
To: Heiko Stuebner, Kevin Hilman, Carlo Caione
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Martin Blumenstingl, Enric Balletbo i Serra
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
Hi all,
Today's linux-next merge of the rockchip tree got a conflict in:
arch/arm/configs/multi_v7_defconfig
between commit:
029da5e5266c ("ARM: multi_v7_defconfig: enable the Amlogic Meson ADC and eFuse drivers")
from the amlogic tree and commit:
366391f04177 ("ARM: multi_v7_defconfig: Enable missing drivers for supported Chromebooks")
from the rockchip 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/arm/configs/multi_v7_defconfig
index 1fd4b8fcce2e,d160ac4bad21..000000000000
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -984,7 -989,7 +994,8 @@@ CONFIG_PHY_UNIPHIER_USB2=
CONFIG_OMAP_USB2=y
CONFIG_TI_PIPE3=y
CONFIG_TWL4030_USB=m
+CONFIG_MESON_MX_EFUSE=m
+ CONFIG_ROCKCHIP_EFUSE=m
CONFIG_NVMEM_IMX_OCOTP=y
CONFIG_NVMEM_SUNXI_SID=y
CONFIG_NVMEM_VF610_OCOTP=y
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the rockchip tree with the amlogic tree
2019-04-23 23:31 linux-next: manual merge of the rockchip tree with the amlogic tree Stephen Rothwell
@ 2019-04-26 19:25 ` Martin Blumenstingl
0 siblings, 0 replies; 2+ messages in thread
From: Martin Blumenstingl @ 2019-04-26 19:25 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Heiko Stuebner, Kevin Hilman, Carlo Caione,
Linux Next Mailing List, Linux Kernel Mailing List,
Enric Balletbo i Serra
Hi Stephen,
On Wed, Apr 24, 2019 at 1:31 AM Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the rockchip tree got a conflict in:
>
> arch/arm/configs/multi_v7_defconfig
>
> between commit:
>
> 029da5e5266c ("ARM: multi_v7_defconfig: enable the Amlogic Meson ADC and eFuse drivers")
>
> from the amlogic tree and commit:
>
> 366391f04177 ("ARM: multi_v7_defconfig: Enable missing drivers for supported Chromebooks")
>
> from the rockchip 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.
I just checked the result in next-20190426 and it looks fine
thank you for taking care of this!
do you need anything from me (Acked-by, etc.) to avoid any issues
during the merge for Linus and/or the ARM maintainers?
Regards
Martin
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-04-26 19:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-23 23:31 linux-next: manual merge of the rockchip tree with the amlogic tree Stephen Rothwell
2019-04-26 19:25 ` Martin Blumenstingl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox