linux-kernel - Re: linux-next: manual merge of the renesas tree with the arm-soc 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] [day] [month] [year] [list]

Date:	Wed, 02 Dec 2015 12:35:15 +0100
From:	Arnd Bergmann <arnd@...db.de>
To:	Mark Brown <broonie@...nel.org>
Cc:	Simon Horman <horms@...ge.net.au>,
	Masahiro Yamada <yamada.masahiro@...ionext.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	linux-arm-kernel@...ts.infradead.org
Subject: Re: linux-next: manual merge of the renesas tree with the arm-soc tree

On Wednesday 02 December 2015 11:21:09 Mark Brown wrote:
> 
> Today's linux-next merge of the renesas tree got a conflict in
> arch/arm/mach-shmobile/Kconfig between commit e32465429490 ("ARM: use "depends
> on" for SoC configs instead of "if" after prompt") from the arm-soc tree and
> commit 9b5ba0df4ea4f94 ("ARM: shmobile: Introduce ARCH_RENESAS") from the
> renesas tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

(as predicted by Simon ;-) )

I plan to put the cross-platform changes I have in next/cleanup into a separate
branch that can be pulled into other branches to resolve those issues.

	Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/