* linux-next: manual merge of the tegra tree with the rockchip tree
@ 2019-04-23 23:43 Stephen Rothwell
2019-04-24 14:59 ` Tony Lindgren
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2019-04-23 23:43 UTC (permalink / raw)
To: Colin Cross, Olof Johansson, Thierry Reding, Heiko Stuebner
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Tony Lindgren, Enric Balletbo i Serra
[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]
Hi all,
Today's linux-next merge of the tegra tree got a conflict in:
arch/arm/configs/multi_v7_defconfig
between commit:
366391f04177 ("ARM: multi_v7_defconfig: Enable missing drivers for supported Chromebooks")
from the rockchip tree and commit:
35f8e2e29e74 ("ARM: multi_v7_defconfig: Update for moved options")
from the tegra 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 7a288d18e257,88d4da77ae9b..000000000000
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -511,9 -501,6 +509,7 @@@ CONFIG_MFD_AC100=
CONFIG_MFD_AXP20X_I2C=y
CONFIG_MFD_AXP20X_RSB=y
CONFIG_MFD_CROS_EC=m
- CONFIG_CROS_EC_I2C=m
- CONFIG_CROS_EC_SPI=m
+CONFIG_MFD_CROS_EC_CHARDEV=m
CONFIG_MFD_DA9063=m
CONFIG_MFD_MAX14577=y
CONFIG_MFD_MAX77686=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 tegra tree with the rockchip tree
2019-04-23 23:43 linux-next: manual merge of the tegra tree with the rockchip tree Stephen Rothwell
@ 2019-04-24 14:59 ` Tony Lindgren
0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2019-04-24 14:59 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Colin Cross, Olof Johansson, Thierry Reding, Heiko Stuebner,
Linux Next Mailing List, Linux Kernel Mailing List,
Enric Balletbo i Serra
* Stephen Rothwell <sfr@canb.auug.org.au> [190423 23:43]:
> Hi all,
>
> Today's linux-next merge of the tegra tree got a conflict in:
>
> arch/arm/configs/multi_v7_defconfig
>
> between commit:
>
> 366391f04177 ("ARM: multi_v7_defconfig: Enable missing drivers for supported Chromebooks")
>
> from the rockchip tree and commit:
>
> 35f8e2e29e74 ("ARM: multi_v7_defconfig: Update for moved options")
>
> from the tegra 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.
OK thank you!
Tony
> diff --cc arch/arm/configs/multi_v7_defconfig
> index 7a288d18e257,88d4da77ae9b..000000000000
> --- a/arch/arm/configs/multi_v7_defconfig
> +++ b/arch/arm/configs/multi_v7_defconfig
> @@@ -511,9 -501,6 +509,7 @@@ CONFIG_MFD_AC100=
> CONFIG_MFD_AXP20X_I2C=y
> CONFIG_MFD_AXP20X_RSB=y
> CONFIG_MFD_CROS_EC=m
> - CONFIG_CROS_EC_I2C=m
> - CONFIG_CROS_EC_SPI=m
> +CONFIG_MFD_CROS_EC_CHARDEV=m
> CONFIG_MFD_DA9063=m
> CONFIG_MFD_MAX14577=y
> CONFIG_MFD_MAX77686=y
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-04-24 14:59 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:43 linux-next: manual merge of the tegra tree with the rockchip tree Stephen Rothwell
2019-04-24 14:59 ` Tony Lindgren
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.