| 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
| ||
|
Message-ID: <20140623105741.70094961@canb.auug.org.au>
Date: Mon, 23 Jun 2014 10:57:41 +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,
Rob Herring <robh@...nel.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/mach-mvebu/Kconfig between commit 21278aeafbfa ("ARM: use
menuconfig for sub-arch menus") from Linus' tree and commit
55fc83023212 ("ARM: Kirkwood: Add setup file for netxbig LEDs") from
the mvebu tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc arch/arm/mach-mvebu/Kconfig
index 4a7c250c9a30,8e3b5f12cd7c..000000000000
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@@ -94,4 -99,13 +96,11 @@@ config MACH_KIRKWOO
Say 'Y' here if you want your kernel to support boards based
on the Marvell Kirkwood device tree.
+ config MACH_NETXBIG
+ bool "LaCie 2Big and 5Big Network v2"
+ depends on MACH_KIRKWOOD
+ help
+ Say 'Y' here if you want your kernel to support the
+ LaCie 2Big and 5Big Network v2
+
-endmenu
-
endif
Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)
Powered by blists - more mailing lists