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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <AANLkTilwnVs1970j0DkobtpyDKY8mOX9EX6iFP2uSvYR@mail.gmail.com>
Date:	Tue, 15 Jun 2010 14:54:58 +0800
From:	Eric Miao <eric.y.miao@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Anton Vorontsov <avorontsov@...mvista.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Marek Vasut <marek.vasut@...il.com>,
	Russell King <rmk@....linux.org.uk>,
	Huang Weiyi <weiyi.huang@...il.com>
Subject: Re: linux-next: manual merge of the battery tree with the arm-current 
	tree

On Tue, Jun 15, 2010 at 10:55 AM, Stephen Rothwell <sfr@...b.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@...b.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/