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

[Stephen Rothwell]

Hi all,

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

  arch/alpha/Kconfig

between commit:

  6630a8e50105 ("eisa: consolidate EISA Kconfig entry in drivers/eisa")

from the kbuild tree and commit:

  3731c3d4774e ("dma-mapping: always build the direct mapping code")

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/alpha/Kconfig
index 5e7a44e6110f,5da6ff54b3e7..000000000000
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@@ -5,10 -5,8 +5,11 @@@ config ALPH
  	select ARCH_MIGHT_HAVE_PC_PARPORT
  	select ARCH_MIGHT_HAVE_PC_SERIO
  	select ARCH_NO_PREEMPT
+ 	select ARCH_NO_SG_CHAIN
  	select ARCH_USE_CMPXCHG_LOCKREF
 +	select FORCE_PCI if !ALPHA_JENSEN
 +	select PCI_DOMAINS if PCI
 +	select PCI_SYSCALL if PCI
  	select HAVE_AOUT
  	select HAVE_IDE
  	select HAVE_OPROFILE
@@@ -208,8 -203,6 +209,7 @@@ config ALPHA_EIGE
  config ALPHA_JENSEN
  	bool "Jensen"
  	depends on BROKEN
- 	select DMA_DIRECT_OPS
 +	select HAVE_EISA
  	help
  	  DEC PC 150 AXP (aka Jensen): This is a very old Digital system - one
  	  of the first-generation Alpha systems. A number of these systems

Attachment: pgpwmTV99K3or.pgp
Description: OpenPGP digital signature