| 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: <20101215105435.3ce83f21.sfr@canb.auug.org.au>
Date: Wed, 15 Dec 2010 10:54:35 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Russell King <rmk@....linux.org.uk>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Dave Martin <dave.martin@...aro.org>
Subject: linux-next: manual merge of the arm tree with the arm-current tree
Hi Russell,
Today's linux-next merge of the arm tree got a conflict in
arch/arm/Kconfig between commit 6e6fc998b8c127fe06b9350a1f16e41bfe4f109d
("ARM: 6533/1: Thumb-2: Make CONFIG_THUMB2_KERNEL depend on !CPU_V6")
from the arm-current tree and commit
4a50bfe365a977f634311504484342fbfffe855c ("ARM: Ensure experimental
options are so marked") from the arm tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc arch/arm/Kconfig
index d56d21c0,e77fe0f..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1310,8 -1319,8 +1319,8 @@@ config H
default 100
config THUMB2_KERNEL
- bool "Compile the kernel in Thumb-2 mode"
+ bool "Compile the kernel in Thumb-2 mode (EXPERIMENTAL)"
- depends on CPU_V7 && EXPERIMENTAL
+ depends on CPU_V7 && !CPU_V6 && EXPERIMENTAL
select AEABI
select ARM_ASM_UNIFIED
help
--
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/
Powered by blists - more mailing lists