linux-kernel - linux-next: manual merge of the arm-soc tree with the arm 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>] [day] [month] [year] [list]

Message-Id: <20110912120518.617c67e4abb1a1e92b5c327d@canb.auug.org.au>
Date:	Mon, 12 Sep 2011 12:05:18 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Arnd Bergmann <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Russell King <rmk@....linux.org.uk>,
	Nico Erfurth <ne@...urth.eu>,
	"Jean-Christophe PLAGNIOL-VILLARD" <plagnioj@...osoft.com>,
	Nicolas Ferre <nicolas.ferre@...el.com>
Subject: linux-next: manual merge of the arm-soc tree with the arm tree

Hi Arnd,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-at91/board-usb-a9260.c between commit 2f8163baada3 ("ARM:
gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h")
from the arm tree and commit 6939fd49787e ("at91: merge board USB-A9260
and USB-A9263 together") from the arm-soc tree.

The latter removes this file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped