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

Message-Id: <20120501153441.5e101139fb096ef262ff1d2b@canb.auug.org.au>
Date:	Tue, 1 May 2012 15:34:41 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Uwe Kleine-König" 
	<u.kleine-koenig@...gutronix.de>,
	Samuel Ortiz <sameo@...ux.intel.com>,
	Linus Walleij <linus.walleij@...aro.org>
Subject: linux-next: manual merge of the arm-soc tree with the mfd tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mfd/ab5500-core.c between commit 9ea969f0d79d ("mfd: Mark const
init data with __initconst instead of __initdata for ab5500") from the
mfd tree and commit f76facc2354b ("mfd/ab5500: delete AB5500 support")
from the arm-soc tree.

The latter removes the 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