Merge tag 'media/v4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

Pull media updates from Mauro Carvalho Chehab:
 "A series of patches that move part of the code used to allocate memory
  from the media subsystem to the mm subsystem"

[ The mm parts have been acked by VM people, and the series was
  apparently in -mm for a while   - Linus ]

* tag 'media/v4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] drm/exynos: Convert g2d_userptr_get_dma_addr() to use get_vaddr_frames()
  [media] media: vb2: Remove unused functions
  [media] media: vb2: Convert vb2_dc_get_userptr() to use frame vector
  [media] media: vb2: Convert vb2_vmalloc_get_userptr() to use frame vector
  [media] media: vb2: Convert vb2_dma_sg_get_userptr() to use frame vector
  [media] vb2: Provide helpers for mapping virtual addresses
  [media] media: omap_vout: Convert omap_vout_uservirt_to_phys() to use get_vaddr_pfns()
  [media] mm: Provide new get_vaddr_frames() helper
  [media] vb2: Push mmap_sem down to memops

diff --cc drivers/gpu/drm/exynos/Kconfig
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_g2d.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_gem.c
Simple merge

diff --cc drivers/media/platform/omap/omap_vout.c
Simple merge

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

diff --cc include/linux/mm.h
Simple merge

diff --cc include/media/videobuf2-memops.h
index 9f36641a67810f80a4387b2a706d61318841e2af,830b5239fd8b1e5d300b3a19bad60ade4243f1e1..6513c7ec3116f1722f490fac8abf9d1f39d39ceb
--- 1/include/media/videobuf2-memops.h
--- 2/include/media/videobuf2-memops.h
+++ b/include/media/videobuf2-memops.h
@@@ -15,10 -15,10 +15,11 @@@
  #define _MEDIA_VIDEOBUF2_MEMOPS_H
  
  #include <media/videobuf2-core.h>
+ #include <linux/mm.h>
  
  /**
 - * vb2_vmarea_handler - common vma refcount tracking handler
 + * struct vb2_vmarea_handler - common vma refcount tracking handler
 + *
   * @refcount: pointer to refcount entry in the buffer
   * @put:      callback to function that decreases buffer refcount
   * @arg:      argument for @put callback

diff --cc mm/Kconfig
index 6413d027c0b2ea18acb3c9c1a35149ce7af4bd2c,7f146dd32fc5c77a090523c68dc782cd1dae0ae7..0d9fdcd01e479d87a45cb487db54e8c1fff27883
--- 1/mm/Kconfig
--- 2/mm/Kconfig
+++ b/mm/Kconfig
@@@ -649,31 -655,5 +649,34 @@@ config DEFERRED_STRUCT_PAGE_INI
          processes running early in the lifetime of the systemm until kswapd
          finishes the initialisation.
  
 +config IDLE_PAGE_TRACKING
 +      bool "Enable idle page tracking"
 +      depends on SYSFS && MMU
 +      select PAGE_EXTENSION if !64BIT
 +      help
 +        This feature allows to estimate the amount of user pages that have
 +        not been touched during a given period of time. This information can
 +        be useful to tune memory cgroup limits and/or for job placement
 +        within a compute cluster.
 +
 +        See Documentation/vm/idle_page_tracking.txt for more details.
 +
 +config ZONE_DEVICE
 +      bool "Device memory (pmem, etc...) hotplug support" if EXPERT
 +      default !ZONE_DMA
 +      depends on !ZONE_DMA
 +      depends on MEMORY_HOTPLUG
 +      depends on MEMORY_HOTREMOVE
 +      depends on X86_64 #arch_add_memory() comprehends device memory
 +
 +      help
 +        Device memory hotplug support allows for establishing pmem,
 +        or other device driver discovered memory regions, in the
 +        memmap. This allows pfn_to_page() lookups of otherwise
 +        "device-physical" addresses which is needed for using a DAX
 +        mapping in an O_DIRECT operation, among other things.
 +
 +        If FS_DAX is enabled, then say Y.
++
+ config FRAME_VECTOR
+       bool

diff --cc mm/Makefile
index 56f8eed73f1a6f658d90d156b5b4f2ddd0030eae,be5d5c866305170dffc105b36c7fdcd833bac87c..2ed43191fc3bf78f46f111e88fa9d5a01b8c661a
--- 1/mm/Makefile
--- 2/mm/Makefile
+++ b/mm/Makefile
@@@ -78,5 -78,4 +78,6 @@@ obj-$(CONFIG_CMA)     += cma.
  obj-$(CONFIG_MEMORY_BALLOON) += balloon_compaction.o
  obj-$(CONFIG_PAGE_EXTENSION) += page_ext.o
  obj-$(CONFIG_CMA_DEBUGFS) += cma_debug.o
 +obj-$(CONFIG_USERFAULTFD) += userfaultfd.o
 +obj-$(CONFIG_IDLE_PAGE_TRACKING) += page_idle.o
+ obj-$(CONFIG_FRAME_VECTOR) += frame_vector.o