2015-11-17 23:15:18

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: manual merge of the tegra tree with the renesas tree

Hi all,

Today's linux-next merge of the tegra tree got a conflict in:

arch/arm64/configs/defconfig

between commit:

727e8d0126e3 ("arm64: defconfig: renesas: Enable Renesas r8a7795 SoC")

from the renesas tree and commit:

0a31289369f8 ("arm64: defconfig: Enable serial-tegra driver")

from the tegra tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell [email protected]

diff --cc arch/arm64/configs/defconfig
index a260e3a46f01,3852c51330e2..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -118,9 -116,7 +118,10 @@@ CONFIG_SERIAL_SAMSUNG=
CONFIG_SERIAL_SAMSUNG_UARTS_4=y
CONFIG_SERIAL_SAMSUNG_UARTS=4
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_NR_UARTS=11
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+ CONFIG_SERIAL_TEGRA=y
CONFIG_SERIAL_MSM=y
CONFIG_SERIAL_MSM_CONSOLE=y
CONFIG_SERIAL_OF_PLATFORM=y


2015-11-18 14:23:12

by Thierry Reding

[permalink] [raw]
Subject: Re: linux-next: manual merge of the tegra tree with the renesas tree

On Wed, Nov 18, 2015 at 10:15:12AM +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:
>
> 727e8d0126e3 ("arm64: defconfig: renesas: Enable Renesas r8a7795 SoC")
>
> from the renesas tree and commit:
>
> 0a31289369f8 ("arm64: defconfig: Enable serial-tegra driver")
>
> from the tegra tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell [email protected]

Looks good, thanks.

Thierry

Attachments:
(No filename) (613.00 B)
 signature.asc (819.00 B)
 Download all attachments

2015-11-18 16:04:31

by Simon Horman

[permalink] [raw]
Subject: Re: linux-next: manual merge of the tegra tree with the renesas tree

On Wed, Nov 18, 2015 at 03:22:58PM +0100, Thierry Reding wrote:
> On Wed, Nov 18, 2015 at 10:15:12AM +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:
> >
> > 727e8d0126e3 ("arm64: defconfig: renesas: Enable Renesas r8a7795 SoC")
> >
> > from the renesas tree and commit:
> >
> > 0a31289369f8 ("arm64: defconfig: Enable serial-tegra driver")
> >
> > from the tegra tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
> >
> > --
> > Cheers,
> > Stephen Rothwell [email protected]
>
> Looks good, thanks.

Likewise.