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-next>] [day] [month] [year] [list]
Message-Id: <20100615125512.09c79d9b.sfr@canb.auug.org.au>
Date:	Tue, 15 Jun 2010 12:55:12 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Anton Vorontsov <avorontsov@...mvista.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Marek Vasut <marek.vasut@...il.com>,
	Eric Miao <eric.y.miao@...il.com>,
	Russell King <rmk@....linux.org.uk>,
	Huang Weiyi <weiyi.huang@...il.com>
Subject: linux-next: manual merge of the battery tree with the arm-current
 tree

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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ