From: Anton Vorontsov <cbouatmailru@gmail.com>
To: Eric Miao <eric.y.miao@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Marek Vasut <marek.vasut@gmail.com>,
Russell King <rmk@arm.linux.org.uk>,
Huang Weiyi <weiyi.huang@gmail.com>
Subject: Re: linux-next: manual merge of the battery tree with the arm-current tree
Date: Wed, 16 Jun 2010 16:26:19 +0400 [thread overview]
Message-ID: <20100616122619.GA22259@oksana.dev.rtsoft.ru> (raw)
In-Reply-To: <AANLkTilwnVs1970j0DkobtpyDKY8mOX9EX6iFP2uSvYR@mail.gmail.com>
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
prev parent reply other threads:[~2010-06-16 12:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100616122619.GA22259@oksana.dev.rtsoft.ru \
--to=cbouatmailru@gmail.com \
--cc=eric.y.miao@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marek.vasut@gmail.com \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
--cc=weiyi.huang@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).