Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1272211

Re: linux-next: manual merge of the tegra tree with the renesas tree

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the tegra tree with the renesas tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-11-18 00:20 +0100
  Re: linux-next: manual merge of the tegra tree with the renesas tree Thierry Reding <treding@nvidia.com> - 2015-11-18 15:30 +0100
    Re: linux-next: manual merge of the tegra tree with the renesas tree Simon Horman <horms@verge.net.au> - 2015-11-18 17:10 +0100

csiph-web