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

Pull media updates from Mauro Carvalho Chehab:
 "Media updates for v4.12-rc1:

   - new driver to support mediatek jpeg in hardware codec

   - rc-lirc, s5p-cec and st-cec staging drivers got promoted

   - hardware histogram support for vsp1 driver

   - added Virtual Media Controller driver, to make easier to test the
     media controller

   - added a new CEC driver (rainshadow-cec)

   - removed two staging LIRC drivers for obscure hardware that are too
     obsolete

   - added support for Intel SR300 Depth camera

   - some improvements at CEC and RC core

   - lots of driver cleanups, improvements all over the tree

  With this series, we're finally getting rid of the LIRC staging
  driver. There's just one left (lirc_zilog), with require more care,
  as part of its functionality (IR RX) is already provided by another
  driver. Work in progress to convert it on the proper way"

* tag 'media/v4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (304 commits)
  [media] ov2640: print error if devm_*_optional*() fails
  [media] atmel-isc: Fix the static checker warning
  [media] ov2640: add support for MEDIA_BUS_FMT_YVYU8_2X8 and MEDIA_BUS_FMT_VYUY8_2X8
  [media] ov2640: fix vflip control
  [media] ov2640: fix duplicate width+height returning from ov2640_select_win()
  [media] ov2640: add missing write to size change preamble
  [media] ov2640: add information about DSP register 0xc7
  [media] ov2640: improve banding filter register definitions/documentation
  [media] ov2640: fix init sequence alignment
  [media] ov2640: make GPIOLIB an optional dependency
  [media] xc5000: fix spelling mistake: "calibration"
  [media] vidioc-queryctrl.rst: fix menu/int menu references
  [media] media-entity: only call dev_dbg_obj if mdev is not NULL
  [media] pixfmt-meta-vsp1-hgo.rst: remove spurious '-'
  [media] mtk-vcodec: avoid warnings because of empty macros
  [media] coda: bump maximum number of internal framebuffers to 17
  [media] media: mtk-vcodec: remove informative log
  [media] subdev-formats.rst: remove spurious '-'
  [media] dw2102: limit messages to buffer size
  [media] ttusb2: limit messages to buffer size
  ...

diff --cc Documentation/media/uapi/v4l/subdev-formats.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_hdmi.c
index 52438404c8c9720722bd92fcafc122e74d369bd9,bc4c8d0a66f41748964d2ab95244d0d472d94d71..1ff6ab6371e8e7aaa6bce6b1fe1dee64c9e08390
--- 1/drivers/gpu/drm/exynos/exynos_hdmi.c
--- 2/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@@ -43,6 -43,9 +43,8 @@@
  
  #include <drm/exynos_drm.h>
  
 -#include "exynos_drm_drv.h"
+ #include <media/cec-notifier.h>
+ 
  #include "exynos_drm_crtc.h"
  
  #define HOTPLUG_DEBOUNCE_MS           1100

diff --cc drivers/media/cec/cec-core.c
Simple merge

diff --cc drivers/media/usb/cx231xx/cx231xx-i2c.c
Simple merge

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

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

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