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

Stephen Rothwell
2018-01-17T02:38:21Z

Hi Jens,

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

lib/Kconfig

between commit:

002e67454f61 ("dma-direct: rename dma_noop to dma_direct")

from the dma-mapping tree and commit:

e80a0af4759a ("lib/scatterlist: Introduce sgl_alloc() and sgl_free()")

from the block 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 lib/Kconfig
index 9d3d649c9dc9,4dd5c11366f9..000000000000
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@@ -409,7 -409,11 +409,11 @@@ config HAS_DM
depends on !NO_DMA
default y

+ config SGL_ALLOC
+ bool
+ default n
+
-config DMA_NOOP_OPS
+config DMA_DIRECT_OPS
bool
depends on HAS_DMA && (!64BIT || ARCH_DMA_ADDR_T_64BIT)
default n