* linux-next: manual merge of the voltage tree with the mfd tree
@ 2009-11-25 6:56 Stephen Rothwell
2009-11-25 11:56 ` Liam Girdwood
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2009-11-25 6:56 UTC (permalink / raw)
To: Liam Girdwood; +Cc: linux-next, linux-kernel, Haojian Zhuang, Samuel Ortiz
[-- Attachment #1: Type: text/plain, Size: 521 bytes --]
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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the voltage tree with the mfd tree
2009-11-25 6:56 linux-next: manual merge of the voltage tree with the mfd tree Stephen Rothwell
@ 2009-11-25 11:56 ` Liam Girdwood
2009-11-25 13:23 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Liam Girdwood @ 2009-11-25 11:56 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Haojian Zhuang, Samuel Ortiz
Hi Stephen,
On Wed, 2009-11-25 at 17:56 +1100, Stephen Rothwell wrote:
> 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").
Thanks for letting me know and the fixup. Will you be carrying the fix ?
Thanks
Liam
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the voltage tree with the mfd tree
2009-11-25 11:56 ` Liam Girdwood
@ 2009-11-25 13:23 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2009-11-25 13:23 UTC (permalink / raw)
To: Liam Girdwood; +Cc: linux-next, linux-kernel, Haojian Zhuang, Samuel Ortiz
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
Hi Liam,
On Wed, 25 Nov 2009 11:56:32 +0000 Liam Girdwood <lrg@slimlogic.co.uk> wrote:
>
> Thanks for letting me know and the fixup. Will you be carrying the fix ?
Yes, sorry I forgot to say.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-11-25 13:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-25 6:56 linux-next: manual merge of the voltage tree with the mfd tree Stephen Rothwell
2009-11-25 11:56 ` Liam Girdwood
2009-11-25 13:23 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).