Merge branch 'for-next/zone-dma' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull in a stable branch from the arm64 tree that adds the zone_dma_bits
variable to avoid creating hard to resolve conflicts with that addition.

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc include/linux/dma-direct.h
index 99b77dd5f79b9f8de57e9ef40840cc01caf4fd03,d03af3605460fef629801df5f91df0e6d4d8b242..452f5280cde33cc29149d6019d1ebaec8c2421d7
--- 1/include/linux/dma-direct.h
--- 2/include/linux/dma-direct.h
+++ b/include/linux/dma-direct.h
@@@ -3,9 -3,10 +3,11 @@@
  #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;
+ 
  #ifdef CONFIG_ARCH_HAS_PHYS_TO_DMA
  #include <asm/dma-direct.h>
  #else

diff --cc kernel/dma/direct.c
Simple merge