lkml.org 
[lkml]   [2015]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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 sfr@canb.auug.org.au
>
> Looks good, thanks.

Likewise.



\
 
 \ /
  Last update: 2015-11-18 17:21    [W:0.050 / U:3.464 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site