Hi all,

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

  kernel/dma/remap.c

between commit:

  4b4b077cbd0a ("dma-remap: Avoid de-referencing NULL atomic_pool")

from the dma-mapping tree and commit:

  14de8ba3fa2e ("lib/genalloc.c: rename addr_in_gen_pool to gen_pool_has_addr")

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 kernel/dma/remap.c
index 0207e3764d52,2b750f13bc8f..000000000000
--- a/kernel/dma/remap.c
+++ b/kernel/dma/remap.c
@@@ -158,10 -158,7 +158,10 @@@ out
  
  bool dma_in_atomic_pool(void *start, size_t size)
  {
 +	if (unlikely(!atomic_pool))
 +		return false;
 +
- 	return addr_in_gen_pool(atomic_pool, (unsigned long)start, size);
+ 	return gen_pool_has_addr(atomic_pool, (unsigned long)start, size);
  }
  
  void *dma_alloc_from_pool(size_t size, struct page **ret_page, gfp_t flags)