| 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
| ||
|
Date: Tue, 29 Nov 2011 14:22:59 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: "Michael S. Tsirkin" <mst@...hat.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Richard Kuo <rkuo@...eaurora.org>
Subject: linux-next: manual merge of the vhost tree with the hexagon tree
Hi Michael,
Today's linux-next merge of the vhost tree got a conflict in
arch/hexagon/Kconfig between commit 5237bae0d8c9 ("various Kconfig
cleanup and old platform build code removal") from the hexagon tree and
commit4673ca8eb369 ("lib: move GENERIC_IOMAP to lib/Kconfig") from the
vhost 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/hexagon/Kconfig
index a35ec47,9059e39..0000000
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@@ -24,7 -26,8 +24,8 @@@ config HEXAGO
select HAVE_ARCH_KGDB
select HAVE_ARCH_TRACEHOOK
select NO_IOPORT
+ select STACKTRACE_SUPPORT
+ select GENERIC_IOMAP
- # mostly generic routines, with some accelerated ones
---help---
Qualcomm Hexagon is a processor architecture designed for high
performance and low power across a wide variety of applications.
@@@ -71,9 -74,15 +72,6 @@@ config GENERIC_CSU
config GENERIC_IRQ_PROBE
def_bool y
- config GENERIC_IOMAP
- def_bool y
-
-#config ZONE_DMA
-# bool
-# default y
-
-config HAS_DMA
- bool
- select HAVE_DMA_ATTRS
- default y
-
config NEED_SG_DMA_LENGTH
def_bool y
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists