From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Anton Vorontsov <avorontsov@ru•mvista.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Marek Vasut <marek.vasut@gmail•com>,
Eric Miao <eric.y.miao@gmail•com>,
Russell King <rmk@arm•linux.org.uk>,
Huang Weiyi <weiyi.huang@gmail•com>
Subject: linux-next: manual merge of the battery tree with the arm-current tree
Date: Tue, 15 Jun 2010 12:55:12 +1000 [thread overview]
Message-ID: <20100615125512.09c79d9b.sfr@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2010-06-15 2:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-15 2:55 Stephen Rothwell [this message]
2010-06-15 6:54 ` linux-next: manual merge of the battery tree with the arm-current tree Eric Miao
2010-06-16 12:26 ` Anton Vorontsov
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=20100615125512.09c79d9b.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=avorontsov@ru$(echo .)mvista.com \
--cc=eric.y.miao@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marek.vasut@gmail$(echo .)com \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=weiyi.huang@gmail$(echo .)com \
/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