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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20151118142257.GA32301@ulmo.nvidia.com>
Date:	Wed, 18 Nov 2015 15:22:58 +0100
From:	Thierry Reding <treding@...dia.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Stephen Warren <swarren@...dia.com>,
	Colin Cross <ccross@...roid.com>,
	Olof Johansson <olof@...om.net>,
	Simon Horman <horms@...ge.net.au>,
	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>,
	Magnus Damm <damm+renesas@...nsource.se>
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                    sfr@...b.auug.org.au

Looks good, thanks.

Thierry

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)