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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 8 Nov 2019 08:11:09 +1100

Hi all,

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

  include/linux/dma-direct.h

between commit:

  b0817901ba21 ("dma-direct: check for overflows on 32 bit DMA addresses")

from the dma-mapping tree and commit:

  8b5369ea5809 ("dma/direct: turn ARCH_ZONE_DMA_BITS into a variable")

from the arm64 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 include/linux/dma-direct.h
index 6db863c3eb93,d03af3605460..000000000000
--- a/include/linux/dma-direct.h
+++ b/include/linux/dma-direct.h
@@@ -3,11 -3,10 +3,13 @@@
  #define _LINUX_DMA_DIRECT_H 1
  
  #include <linux/dma-mapping.h>
 +#include <linux/memblock.h> /* for min_low_pfn */
  #include <linux/mem_encrypt.h>
  
+ extern unsigned int zone_dma_bits;
+ 
 +static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);
 +
  #ifdef CONFIG_ARCH_HAS_PHYS_TO_DMA
  #include <asm/dma-direct.h>
  #else