linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Message-ID: <CACRpkdadH_Ju=Nvpem=1nvMBROwjS-ipJcmKTnU9-Hz8SAOBkw@mail.gmail.com>
Date:	Wed, 2 May 2012 00:56:24 +0200
From:	Linus Walleij <linus.walleij@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	linux-arm-kernel@...ts.infradead.org, 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>
Subject: Re: linux-next: manual merge of the arm-soc tree with the mfd tree

On Tue, May 1, 2012 at 7:34 AM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> 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.

That's correct, thanks!

Linus Walleij
--
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/