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

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

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

Hi all,

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

  arch/csky/mm/dma-mapping.c

between commit:

  8e3a68fb55e0 ("dma-mapping: make dma_atomic_pool_init self-contained")

from the dma-mapping tree and commit:

  4af9027d3f40 ("csky/dma: Fixup cache_op failed when cross memory ZONEs")

from the csky 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/csky/mm/dma-mapping.c
index 602a60d47a94,106ef02a8f89..000000000000
--- a/arch/csky/mm/dma-mapping.c
+++ b/arch/csky/mm/dma-mapping.c
@@@ -14,33 -14,12 +14,6 @@@
  #include <linux/version.h>
  #include <asm/cache.h>
  
- void arch_dma_prep_coherent(struct page *page, size_t size)
 -static int __init atomic_pool_init(void)
--{
- 	if (PageHighMem(page)) {
- 		unsigned int count = PAGE_ALIGN(size) >> PAGE_SHIFT;
- 
- 		do {
- 			void *ptr = kmap_atomic(page);
- 			size_t _size = (size < PAGE_SIZE) ? size : PAGE_SIZE;
- 
- 			memset(ptr, 0, _size);
- 			dma_wbinv_range((unsigned long)ptr,
- 					(unsigned long)ptr + _size);
- 
- 			kunmap_atomic(ptr);
- 
- 			page++;
- 			size -= PAGE_SIZE;
- 			count--;
- 		} while (count);
- 	} else {
- 		void *ptr = page_address(page);
- 
- 		memset(ptr, 0, size);
- 		dma_wbinv_range((unsigned long)ptr, (unsigned long)ptr + size);
- 	}
 -	return dma_atomic_pool_init(GFP_KERNEL, pgprot_noncached(PAGE_KERNEL));
--}
 -postcore_initcall(atomic_pool_init);
--
  static inline void cache_op(phys_addr_t paddr, size_t size,
  			    void (*fn)(unsigned long start, unsigned long end))
  {

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