2009-11-25 06:56:05

by Stephen Rothwell

[permalink] [raw]

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 [email protected]
http://www.canb.auug.org.au/~sfr/

---

Attachments:

(No filename) (506.00 B)
(No filename) (198.00 B)
Download all attachments

2009-11-25 12:02:57

by Liam Girdwood

[permalink] [raw]

Subject: Re: linux-next: manual merge of the voltage tree with the mfd tree

---

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

2009-11-25 13:23:32

by Stephen Rothwell

[permalink] [raw]

Subject: Re: linux-next: manual merge of the voltage tree with the mfd tree

---

Hi Liam,

On Wed, 25 Nov 2009 11:56:32 +0000 Liam Girdwood <[email protected]> wrote:
>
> Thanks for letting me know and the fixup. Will you be carrying the fix ?

Yes, sorry I forgot to say.

--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/

---

Attachments:

(No filename) (298.00 B)
(No filename) (198.00 B)
Download all attachments