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

Date:	Wed, 25 Nov 2009 17:56:02 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Liam Girdwood <lrg@...mlogic.co.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Haojian Zhuang <haojian.zhuang@...vell.com>,
	Samuel Ortiz <sameo@...ux.intel.com>
Subject: linux-next: manual merge of the voltage tree with the mfd tree

Hi Liam,

Today's linux-next merge of the voltage tree got a conflict in
drivers/mfd/Kconfig between commit
b60463644b8baea3c649faeb9d7c44c104f14588 ("mfd: Fix 88PM8607 I2C
dependency") from the mfd tree and commit
258e3427f83a573d738344c2f5499da5e026e1df ("regulator: add 88PM8607 PMIC
driver") from the voltage tree.

I fixed it up using the mfd tree version. ("depends on I2C=y" v "depends
on I2C").
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped