From: Anton Vorontsov <avorontsov@ru•mvista.com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org,
"\"Marek Vašut\"" <marek.vasut@gmail•com>,
"Russell King" <rmk@arm•linux.org.uk>,
"Dmitry Baryshkov" <dbaryshkov@gmail•com>
Subject: Re: linux-next: manual merge of the battery tree
Date: Tue, 8 Jul 2008 22:57:21 +0400 [thread overview]
Message-ID: <20080708185721.GA11166@polina.dev.rtsoft.ru> (raw)
In-Reply-To: <20080708161317.20591f4d.sfr@canb.auug.org.au>
On Tue, Jul 08, 2008 at 04:13:17PM +1000, Stephen Rothwell wrote:
> Hi Anton,
>
> Today's linux-next merge of the battery tree got trivial conflicts in
> drivers/power/Makefile and drivers/power/Kconfig between commit
> 7bd66c73ec75711cec7446c6f6822494c1afd951 ("[ARM] 5155/1: PalmTX battery
> monitor") from the arm tree and commit
> fece418418f51e92dd7e67e17c5e3fe5a28d3279 ("power_supply: Sharp SL-6000
> (tosa) batteries support") from the battery tree.
Stephen, much thanks for the notice.
Russell, what should we do? I can either:
1. pick up the driver that ought to be applied through the battery-2.6.git,
thus you can drop it from the arm tree.
2. or, we leave the conflict as is. Then, when the merge window opens,
you'll push the arm tree to Linus, then I'll pull from Linus' tree
[will fix the conflict meanwhile] and then I'll ask Linus to pull
the fixed battery-2.6.git.
I don't have any preference, so I'll do whatever you prefer.
Thanks,
--
Anton Vorontsov
email: cbouatmailru@gmail•com
irc://irc.freenode.net/bd2
next prev parent reply other threads:[~2008-07-08 18:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-08 6:13 linux-next: manual merge of the battery tree Stephen Rothwell
2008-07-08 18:57 ` Anton Vorontsov [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-10-15 8:04 Stephen Rothwell
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=20080708185721.GA11166@polina.dev.rtsoft.ru \
--to=avorontsov@ru$(echo .)mvista.com \
--cc=dbaryshkov@gmail$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marek.vasut@gmail$(echo .)com \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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