linux-kernel - Re: linux-next: manual merge of the mvebu tree with the arm-soc 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 for Android: free password hash cracker in your pocket

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

Message-ID: <CAOesGMgLemvWtzN=eBwKerYxcVddx=Uc6O+5aLfL2Yg9GqPTBA@mail.gmail.com>
Date:	Mon, 5 May 2014 18:13:10 -0700
From:	Olof Johansson <olof@...om.net>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Jason Cooper <jason@...edaemon.net>, Andrew Lunn <andrew@...n.ch>,
	Gregory Clement <gregory.clement@...e-electrons.com>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	Arnd Bergmann <arnd@...db.de>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Rob Herring <robh@...nel.org>,
	Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>
Subject: Re: linux-next: manual merge of the mvebu tree with the arm-soc tree

On Mon, May 5, 2014 at 6:07 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the mvebu tree got a conflict in
> arch/arm/mach-mvebu/Kconfig between commit 55400f3a1f89 ("ARM: mvebu:
> clean-up unneeded kconfig selects") from the arm-soc tree and commit
> 8e6ac2033822 ("ARM: mvebu: enable the ARM SCU on Armada 375 and Armada
> 38x") from the mvebu tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks for the heads up. This will be resolved permanently once we
merge the mvebu contents into arm-soc (since that'll go on top of the
kconfig select cleanup).


-Olof
--
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/