linux-kernel - linux-next: manual merge of the mvebu tree with Linus' 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: <20140714110605.045e5cf5@canb.auug.org.au>
Date:	Mon, 14 Jul 2014 11:06:05 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jason Cooper <jason@...edaemon.net>, <andrew@...n.ch>,
	<gregory.clement@...e-electrons.com>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Stephen Boyd <sboyd@...eaurora.org>,
	Arnd Bergmann <arnd@...db.de>
Subject: linux-next: manual merge of the mvebu tree with Linus' tree

Hi all,

Today's linux-next merge of the mvebu tree got a conflict in
arch/arm/Kconfig between commit 19682f72f5db ("ARM: Remove
ARCH_HAS_CPUFREQ config option") from Linus' tree and commit
ba364fc752da ("ARM: Kirkwood: Remove mach-kirkwood") from the mvebu
tree.

I fixed it up (The latter just removed the whole ARCH_KIRKWOOD entry,
so I did that) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)