linux-next: manual merge of the akpm-current tree with the dma-mapping tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  arch/sh/Kconfig

between commits:

  86596f0a2833 ("scatterlist: move the NEED_SG_DMA_LENGTH config symbol to lib/Kconfig")
  f616ab59c294 ("dma-mapping: move the NEED_DMA_MAP_STATE config symbol to lib/Kconfig")

from the dma-mapping tree and commit:

  1099dc900e93 ("mm: introduce ARCH_HAS_PTE_SPECIAL")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/sh/Kconfig
index 7d521926041e,a6c75b6806d2..000000000000
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@ -49,9 -50,7 +49,10 @@@ config SUPER
  	select HAVE_ARCH_AUDITSYSCALL
  	select HAVE_FUTEX_CMPXCHG if FUTEX
  	select HAVE_NMI
 +	select NEED_DMA_MAP_STATE
 +	select NEED_SG_DMA_LENGTH
+ 	select ARCH_HAS_PTE_SPECIAL
 +
  	help
  	  The SuperH is a RISC processor targeted for use in embedded systems
  	  and consumer electronics; it was also used in the Sega Dreamcast

Attachment: pgpXYd_0tawVB.pgp
Description: OpenPGP digital signature