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

diff --cc drivers/media/v4l2-core/v4l2-compat-ioctl32.c
Simple merge

diff --cc drivers/of/Kconfig
index 3c808e2,5e13159..7c906e2
--- 1/drivers/of/Kconfig
--- 2/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

diff --cc mm/page_alloc.c
Simple merge