* linux-next: manual merge of the tegra tree with the renesas tree
@ 2015-11-17 23:15 Stephen Rothwell
2015-11-18 14:22 ` Thierry Reding
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2015-11-17 23:15 UTC (permalink / raw)
To: Stephen Warren, Colin Cross, Olof Johansson, Thierry Reding,
Simon Horman
Cc: linux-next, linux-kernel, Kuninori Morimoto, Magnus Damm
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 sfr@canb.auug.org.au
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the tegra tree with the renesas tree
2015-11-17 23:15 linux-next: manual merge of the tegra tree with the renesas tree Stephen Rothwell
@ 2015-11-18 14:22 ` Thierry Reding
2015-11-18 16:04 ` Simon Horman
0 siblings, 1 reply; 3+ messages in thread
From: Thierry Reding @ 2015-11-18 14:22 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Stephen Warren, Colin Cross, Olof Johansson, Simon Horman,
linux-next, linux-kernel, Kuninori Morimoto, Magnus Damm
[-- Attachment #1: Type: text/plain, Size: 640 bytes --]
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 sfr@canb.auug.org.au
Looks good, thanks.
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the tegra tree with the renesas tree
2015-11-18 14:22 ` Thierry Reding
@ 2015-11-18 16:04 ` Simon Horman
0 siblings, 0 replies; 3+ messages in thread
From: Simon Horman @ 2015-11-18 16:04 UTC (permalink / raw)
To: Thierry Reding
Cc: Stephen Rothwell, Stephen Warren, Colin Cross, Olof Johansson,
linux-next, linux-kernel, Kuninori Morimoto, Magnus Damm
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 sfr@canb.auug.org.au
>
> Looks good, thanks.
Likewise.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-11-18 16:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-17 23:15 linux-next: manual merge of the tegra tree with the renesas tree Stephen Rothwell
2015-11-18 14:22 ` Thierry Reding
2015-11-18 16:04 ` Simon Horman
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).