Re: linux-next: manual merge of the tegra tree with the renesas tree
From: Simon Horman
Date: Wed Nov 18 2015 - 11:04:33 EST
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@xxxxxxxxxxxxxxxx
> Looks good, thanks.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/