linux-kernel - Re: linux-next: manual merge of the arm-soc tree with the regulator 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]

Message-ID: <20120309122358.GM3273@opensource.wolfsonmicro.com>
Date:	Fri, 9 Mar 2012 12:23:59 +0000
From:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	linux-arm-kernel@...ts.infradead.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	"Heiko Stübner" <heiko@...ech.de>,
	Haojian Zhuang <haojian.zhuang@...il.com>,
	Axel Lin <axel.lin@...il.com>, Liam Girdwood <lrg@...com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the regulator
 tree

On Fri, Mar 09, 2012 at 06:17:55PM +1100, Stephen Rothwell wrote:

> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/regulator/Makefile between commit 8aa1ab9219e7 ("regulator: Sort
> Kconfig and Makefile entries") from the regulator tree and commit
> 8a16a701ad78 ("regulator: Remove bq24022 regulator driver") from the
> arm-soc tree.

Both fixups look good, thanks.

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