| 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: <20100504110725.0b44d877.sfr@canb.auug.org.au>
Date: Tue, 4 May 2010 11:07:25 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Daniel Walker <dwalker@...o99.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Daniel Walker <c_dwalke@...cinc.com>,
Russell King <rmk@....linux.org.uk>,
Daniel Walker <dwalker@...eaurora.org>
Subject: linux-next: manual merge of the msm tree with the arm tree
Hi Daniel,
Today's linux-next merge of the msm tree got a conflict in
arch/arm/mach-msm/Kconfig between commit
4b53eb4f5d78416456bb969ce30e3bed2731d744 ("arm: msm: allow ARCH_MSM to
have v7 cpus") from the arm tree and commit
e17047ea51cc2eac3e920e5a669f99efd44f446f ("arm: msm: smd: use either
package v3 or v4 not both") from the msm tree.
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/mach-msm/Kconfig
index b9fd5c5,69cc693..0000000
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@@ -28,15 -45,14 +45,16 @@@ choic
endchoice
config MACH_HALIBUT
- depends on ARCH_MSM
+ depends on ARCH_MSM7X00A
+ select CPU_V6
default y
bool "Halibut Board (QCT SURF7201A)"
help
Support for the Qualcomm SURF7201A eval board.
config MACH_TROUT
+ depends on ARCH_MSM7X00A
+ select CPU_V6
default y
bool "HTC Dream (aka trout)"
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