* linux-next: manual merge of the battery tree with the arm-current tree
@ 2010-06-15 2:55 Stephen Rothwell
2010-06-15 6:54 ` Eric Miao
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2010-06-15 2:55 UTC (permalink / raw)
To: Anton Vorontsov
Cc: linux-next, linux-kernel, Marek Vasut, Eric Miao, Russell King,
Huang Weiyi
[-- Attachment #1: Type: text/plain, Size: 515 bytes --]
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.
--
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 battery tree with the arm-current tree
2010-06-15 2:55 linux-next: manual merge of the battery tree with the arm-current tree Stephen Rothwell
@ 2010-06-15 6:54 ` Eric Miao
2010-06-16 12:26 ` Anton Vorontsov
0 siblings, 1 reply; 3+ messages in thread
From: Eric Miao @ 2010-06-15 6:54 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Anton Vorontsov, linux-next, linux-kernel, Marek Vasut,
Russell King, Huang Weiyi
On Tue, Jun 15, 2010 at 10:55 AM, Stephen Rothwell <sfr@canb•auug.org.au> 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.
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the battery tree with the arm-current tree
2010-06-15 6:54 ` Eric Miao
@ 2010-06-16 12:26 ` Anton Vorontsov
0 siblings, 0 replies; 3+ messages in thread
From: Anton Vorontsov @ 2010-06-16 12:26 UTC (permalink / raw)
To: Eric Miao
Cc: Stephen Rothwell, linux-next, linux-kernel, Marek Vasut,
Russell King, Huang Weiyi
On Tue, Jun 15, 2010 at 02:54:58PM +0800, Eric Miao wrote:
> On Tue, Jun 15, 2010 at 10:55 AM, Stephen Rothwell <sfr@canb•auug.org.au> 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 <cbouatmailru@gmail•com>
Meanwhile, I dropped the "z2_battery: Remove duplicated #include"
patch from battery-2.6.git.
--
Anton Vorontsov
email: cbouatmailru@gmail•com
irc://irc.freenode.net/bd2
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-06-16 12:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-15 2:55 linux-next: manual merge of the battery tree with the arm-current tree Stephen Rothwell
2010-06-15 6:54 ` Eric Miao
2010-06-16 12:26 ` Anton Vorontsov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox