From: popcornmix <popcornmix@gmail.com>
Date: Thu, 20 Feb 2020 15:51:12 +0000 (+0000)
Subject: Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y
X-Git-Tag: submit/tizen/20200402.094258~313
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e645cec69367ba4b6daf63933f48661ab4b59ee1;p=platform%2Fkernel%2Flinux-rpi.git

Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y
---

e645cec69367ba4b6daf63933f48661ab4b59ee1
diff --cc drivers/of/Kconfig
index 3c808e2,5e13159..7c906e2
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@@ -103,11 -103,8 +103,15 @@@ config OF_OVERLA
  config OF_NUMA
  	bool
  
+ config OF_DMA_DEFAULT_COHERENT
+ 	# arches should select this if DMA is coherent by default for OF devices
+ 	bool
+ 
 +config OF_CONFIGFS
 +	bool "Device Tree Overlay ConfigFS interface"
 +	select CONFIGFS_FS
 +	select OF_OVERLAY
 +	help
 +	  Enable a simple user-space driven DT overlay interface.
 +
  endif # OF