Re: linux-next: manual merge of the battery tree with the arm-current tree

From: Eric Miao
Date: Tue Jun 15 2010 - 03:02:59 EST

On Tue, Jun 15, 2010 at 10:55 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Anton,
> Today's linux-next merge of the battery tree got a conflict in
> drivers/power/z2_battery.c between commit
> 56b925fccc58cd43fc553a8302dbbdd440aef288 ("[ARM] pxa/z2: fix missing
> include in battery driver") from the arm-current tree and commit
> 5d111107b7994349feb681466f873b1a4f8a09d6 ("z2_battery: Remove duplicated
> #include") from the battery tree.
> The former is a superset of the latter.

Marek has submitted a revised patch which goes into the -pxa tree
due to dependency of z2_battery and some of the pxa machine files.


Any suggestion? Or if you feel OK for this to go through the -pxa tree, I'd
like to have your Ack.

> --
> Cheers,
> Stephen Rothwell          Âsfr@xxxxxxxxxxxxxxxx
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at