linux-next: manual merge of the vhost tree with the hexagon tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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

Attachment: pgp00000.pgp
Description: PGP signature