* linux-next: manual merge of the tegra tree with the imx-mxs tree
@ 2019-02-06 22:51 Stephen Rothwell
2019-02-07 8:49 ` Thierry Reding
2019-02-07 9:01 ` Abel Vesa
0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2019-02-06 22:51 UTC (permalink / raw)
To: Stephen Warren, Colin Cross, Olof Johansson, Thierry Reding, Shawn Guo
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Abel Vesa
[-- Attachment #1: Type: text/plain, Size: 1201 bytes --]
Hi all,
Today's linux-next merge of the tegra tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
9bd01e74c715 ("arm64: defconfig: Add i.MX8MQ boot necessary configs")
from the imx-mxs tree and commit:
bc72bed682a9 ("arm64: defconfig: Enable Tegra TCU")
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/arm64/configs/defconfig
index e82bc8cf1253,ad8f3dea0a74..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -323,8 -319,7 +323,9 @@@ CONFIG_SERIAL_MESON_CONSOLE=
CONFIG_SERIAL_SAMSUNG=y
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
CONFIG_SERIAL_TEGRA=y
+ CONFIG_SERIAL_TEGRA_TCU=y
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
CONFIG_SERIAL_SH_SCI=y
CONFIG_SERIAL_MSM=y
CONFIG_SERIAL_MSM_CONSOLE=y
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the tegra tree with the imx-mxs tree
2019-02-06 22:51 linux-next: manual merge of the tegra tree with the imx-mxs tree Stephen Rothwell
@ 2019-02-07 8:49 ` Thierry Reding
2019-02-07 9:01 ` Abel Vesa
1 sibling, 0 replies; 4+ messages in thread
From: Thierry Reding @ 2019-02-07 8:49 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Stephen Warren, Colin Cross, Olof Johansson, Shawn Guo,
Linux Next Mailing List, Linux Kernel Mailing List, Abel Vesa
[-- Attachment #1: Type: text/plain, Size: 1382 bytes --]
On Thu, Feb 07, 2019 at 09:51:42AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tegra tree got a conflict in:
>
> arch/arm64/configs/defconfig
>
> between commit:
>
> 9bd01e74c715 ("arm64: defconfig: Add i.MX8MQ boot necessary configs")
>
> from the imx-mxs tree and commit:
>
> bc72bed682a9 ("arm64: defconfig: Enable Tegra TCU")
>
> 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/arm64/configs/defconfig
> index e82bc8cf1253,ad8f3dea0a74..000000000000
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@@ -323,8 -319,7 +323,9 @@@ CONFIG_SERIAL_MESON_CONSOLE=
> CONFIG_SERIAL_SAMSUNG=y
> CONFIG_SERIAL_SAMSUNG_CONSOLE=y
> CONFIG_SERIAL_TEGRA=y
> + CONFIG_SERIAL_TEGRA_TCU=y
> +CONFIG_SERIAL_IMX=y
> +CONFIG_SERIAL_IMX_CONSOLE=y
> CONFIG_SERIAL_SH_SCI=y
> CONFIG_SERIAL_MSM=y
> CONFIG_SERIAL_MSM_CONSOLE=y
Looks good to me.
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the tegra tree with the imx-mxs tree
2019-02-06 22:51 linux-next: manual merge of the tegra tree with the imx-mxs tree Stephen Rothwell
2019-02-07 8:49 ` Thierry Reding
@ 2019-02-07 9:01 ` Abel Vesa
1 sibling, 0 replies; 4+ messages in thread
From: Abel Vesa @ 2019-02-07 9:01 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Stephen Warren, Colin Cross, Olof Johansson, Thierry Reding,
Shawn Guo, Linux Next Mailing List, Linux Kernel Mailing List
On 19-02-07 09:51:42, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tegra tree got a conflict in:
>
> arch/arm64/configs/defconfig
>
> between commit:
>
> 9bd01e74c715 ("arm64: defconfig: Add i.MX8MQ boot necessary configs")
>
> from the imx-mxs tree and commit:
>
> bc72bed682a9 ("arm64: defconfig: Enable Tegra TCU")
>
> 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/arm64/configs/defconfig
> index e82bc8cf1253,ad8f3dea0a74..000000000000
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@@ -323,8 -319,7 +323,9 @@@ CONFIG_SERIAL_MESON_CONSOLE=
> CONFIG_SERIAL_SAMSUNG=y
> CONFIG_SERIAL_SAMSUNG_CONSOLE=y
> CONFIG_SERIAL_TEGRA=y
> + CONFIG_SERIAL_TEGRA_TCU=y
> +CONFIG_SERIAL_IMX=y
> +CONFIG_SERIAL_IMX_CONSOLE=y
> CONFIG_SERIAL_SH_SCI=y
> CONFIG_SERIAL_MSM=y
> CONFIG_SERIAL_MSM_CONSOLE=y
Looks fine to me.
Abel
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the tegra tree with the imx-mxs tree
@ 2019-02-11 22:01 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2019-02-11 22:01 UTC (permalink / raw)
To: Colin Cross, Olof Johansson, Thierry Reding, Shawn Guo
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Carlo Caione,
Joseph Lo
[-- Attachment #1: Type: text/plain, Size: 1500 bytes --]
Hi all,
Today's linux-next merge of the tegra tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
28cfe2434529 ("arm64: defconfig: Enable PFUZE100 regulator")
from the imx-mxs tree and commit:
2b5d2c92c29d ("arm64: defconfig: Enable MAX8973 regulator")
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/arm64/configs/defconfig
index 3317d85fa8a3,ad8f3dea0a74..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -323,8 -319,7 +323,9 @@@ CONFIG_SERIAL_MESON_CONSOLE=
CONFIG_SERIAL_SAMSUNG=y
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
CONFIG_SERIAL_TEGRA=y
+ CONFIG_SERIAL_TEGRA_TCU=y
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
CONFIG_SERIAL_SH_SCI=y
CONFIG_SERIAL_MSM=y
CONFIG_SERIAL_MSM_CONSOLE=y
@@@ -451,7 -438,7 +452,8 @@@ CONFIG_REGULATOR_GPIO=
CONFIG_REGULATOR_HI6421V530=y
CONFIG_REGULATOR_HI655X=y
CONFIG_REGULATOR_MAX77620=y
+ CONFIG_REGULATOR_MAX8973=y
+CONFIG_REGULATOR_PFUZE100=y
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_QCOM_RPMH=y
CONFIG_REGULATOR_QCOM_SMD_RPM=y
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-02-11 22:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-06 22:51 linux-next: manual merge of the tegra tree with the imx-mxs tree Stephen Rothwell
2019-02-07 8:49 ` Thierry Reding
2019-02-07 9:01 ` Abel Vesa
2019-02-11 22:01 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).