linux-next: manual merge of the dma-mapping tree with Linus' tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1297 bytes --]

Hi Christoph,

Today's linux-next merge of the dma-mapping tree got a conflict in:

  arch/nds32/Kconfig

between commit:

  aeaa7af744fa ("nds32: lib: To use generic lib instead of libgcc to prevent the symbol undefined issue.")

from Linus' tree and commit:

  267d2e18a281 ("nds32: use generic dma_noncoherent_ops")

from the dma-mapping 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/nds32/Kconfig
index b7404f2dcf5b,67d0ac0a989c..000000000000
--- a/arch/nds32/Kconfig
+++ b/arch/nds32/Kconfig
@@@ -9,12 -11,7 +11,13 @@@ config NDS3
  	select CLKSRC_MMIO
  	select CLONE_BACKWARDS
  	select COMMON_CLK
+ 	select DMA_NONCOHERENT_OPS
 +	select GENERIC_ASHLDI3
 +	select GENERIC_ASHRDI3
 +	select GENERIC_LSHRDI3
 +	select GENERIC_CMPDI2
 +	select GENERIC_MULDI3
 +	select GENERIC_UCMPDI2
  	select GENERIC_ATOMIC64
  	select GENERIC_CPU_DEVICES
  	select GENERIC_CLOCKEVENTS

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]