From: Christoph Hellwig <hch@lst.de>
Date: Thu, 21 Nov 2019 17:13:03 +0000 (+0100)
Subject: Merge branch 'for-next/zone-dma' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.5-rc1~125^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7293f79caea45c50c0ab4294847e7af96501ced;p=thirdparty%2Fkernel%2Flinux.git

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

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.
---

d7293f79caea45c50c0ab4294847e7af96501ced
diff --cc include/linux/dma-direct.h
index 99b77dd5f79b9,d03af3605460f..452f5280cde33
--- a/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