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

From: Anton Vorontsov <[email-masked]>
Date: Wed, 16 Jun 2010 16:26:19 +0400

On Tue, Jun 15, 2010 at 02:54:58PM +0800, Eric Miao wrote:
> On Tue, Jun 15, 2010 at 10:55 AM, Stephen Rothwell <[email-masked]> 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.
> 
> Anton,
> 
> Any suggestion? Or if you feel OK for this to go through the -pxa tree, I'd
> like to have your Ack.

Sure thing,

Acked-by: Anton Vorontsov <[email-masked]>

Meanwhile, I dropped the "z2_battery: Remove duplicated #include"
patch from battery-2.6.git.

-- 
Anton Vorontsov
email: [email-masked]
irc://irc.freenode.net/bd2