Merge branch 'patchwork' into topic/docs-next

* patchwork: (1492 commits)
  [media] cec: always check all_device_types and features
  [media] cec: poll should check if there is room in the tx queue
  [media] vivid: support monitor all mode
  [media] cec: fix test for unconfigured adapter in main message loop
  [media] cec: limit the size of the transmit queue
  [media] cec: zero unused msg part after msg->len
  [media] cec: don't set fh to NULL in CEC_TRANSMIT
  [media] cec: clear all status fields before transmit and always fill in sequence
  [media] cec: CEC_RECEIVE overwrote the timeout field
  [media] cxd2841er: Reading SNR for DVB-C added
  [media] cxd2841er: Reading BER and UCB for DVB-C added
  [media] cxd2841er: fix switch-case for DVB-C
  [media] cxd2841er: fix signal strength scale for ISDB-T
  [media] cxd2841er: adjust the dB scale for DVB-C
  [media] cxd2841er: provide signal strength for DVB-C
  [media] cxd2841er: fix BER report via DVBv5 stats API
  [media] mb86a20s: apply mask to val after checking for read failure
  [media] airspy: fix error logic during device register
  [media] s5p-cec/TODO: add TODO item
  [media] cec/TODO: drop comment about sphinx documentation
  ...

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --cc Documentation/DocBook/device-drivers.tmpl
Simple merge

diff --cc Documentation/DocBook/media/v4l/lirc_device_interface.xml
Simple merge

diff --cc Documentation/media/kapi/v4l2-controls.rst
index 8ff9ee80604286ad9bca0f35e4b0fcb69eda7c02,f930b80e9111be77aa9ac8aaa01736743b31e582..916fd4366cdfba1eb4bb5ad6f2315b5e510f12aa
--- 1/Documentation/media/kapi/v4l2-controls.rst
--- 2/Documentation/video4linux/v4l2-controls.txt
+++ b/Documentation/media/kapi/v4l2-controls.rst
@@@ -105,29 -94,10 +105,12 @@@ Those are now no longer needed
  
        foo->sd.ctrl_handler = &foo->ctrl_handler;
  
 -  Where foo->sd is of type struct v4l2_subdev.
 +Where foo->sd is of type struct v4l2_subdev.
  
- And set all core control ops in your struct v4l2_subdev_core_ops to these
- helpers:
- 
- .. code-block:: none
- 
-       .queryctrl = v4l2_subdev_queryctrl,
-       .querymenu = v4l2_subdev_querymenu,
-       .g_ctrl = v4l2_subdev_g_ctrl,
-       .s_ctrl = v4l2_subdev_s_ctrl,
-       .g_ext_ctrls = v4l2_subdev_g_ext_ctrls,
-       .try_ext_ctrls = v4l2_subdev_try_ext_ctrls,
-       .s_ext_ctrls = v4l2_subdev_s_ext_ctrls,
- 
- Note: this is a temporary solution only. Once all V4L2 drivers that depend
- on subdev drivers are converted to the control framework these helpers will
- no longer be needed.
- 
  1.4) Clean up the handler at the end:
  
 +.. code-block:: none
 +
        v4l2_ctrl_handler_free(&foo->ctrl_handler);
  
  

diff --cc Makefile
Simple merge

diff --cc drivers/media/dvb-core/demux.h
Simple merge

diff --cc include/media/rc-core.h
Simple merge

diff --cc include/media/rc-map.h
Simple merge

diff --cc include/media/v4l2-subdev.h
Simple merge

diff --cc include/media/videobuf2-core.h
index 01cdd5bf90c853517c9717456591261f779905eb,bea81c9e37581c3318baabbbef5238974df7dae7..c346beaaeae68cc74ed4fe3ccd2c30ba868806e3
--- 1/include/media/videobuf2-core.h
--- 2/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@@ -86,21 -85,15 +85,21 @@@ struct vb2_threadio_data
   * @mmap:     setup a userspace mapping for a given memory buffer under
   *            the provided virtual memory region.
   *
 - * Required ops for USERPTR types: get_userptr, put_userptr.
 - * Required ops for MMAP types: alloc, put, num_users, mmap.
 - * Required ops for read/write access types: alloc, put, num_users, vaddr.
 - * Required ops for DMABUF types: attach_dmabuf, detach_dmabuf, map_dmabuf,
 - *                              unmap_dmabuf.
 + * Those operations are used by the videobuf2 core to implement the memory
 + * handling/memory allocators for each type of supported streaming I/O method.
 + *
 + * .. note::
 + *    #) Required ops for USERPTR types: get_userptr, put_userptr.
 + *
 + *    #) Required ops for MMAP types: alloc, put, num_users, mmap.
 + *
 + *    #) Required ops for read/write access types: alloc, put, num_users, vaddr.
 + *
 + *    #) Required ops for DMABUF types: attach_dmabuf, detach_dmabuf, map_dmabuf, unmap_dmabuf.
   */
  struct vb2_mem_ops {
-       void            *(*alloc)(void *alloc_ctx, unsigned long size,
-                                 enum dma_data_direction dma_dir,
+       void            *(*alloc)(struct device *dev, const struct dma_attrs *attrs,
+                                 unsigned long size, enum dma_data_direction dma_dir,
                                  gfp_t gfp_flags);
        void            (*put)(void *buf_priv);
        struct dma_buf *(*get_dmabuf)(void *buf_priv, unsigned long flags);
@@@ -285,19 -278,19 +284,19 @@@ struct vb2_buffer 
   *                    second time with the actually allocated number of
   *                    buffers to verify if that is OK.
   *                    The driver should return the required number of buffers
 - *                    in *num_buffers, the required number of planes per
 - *                    buffer in *num_planes, the size of each plane should be
 + *                    in \*num_buffers, the required number of planes per
 + *                    buffer in \*num_planes, the size of each plane should be
   *                    set in the sizes[] array and optional per-plane
-  *                    allocator specific context in the alloc_ctxs[] array.
-  *                    When called from VIDIOC_REQBUFS, \*num_planes == 0, the
+  *                    allocator specific device in the alloc_devs[] array.
+  *                    When called from VIDIOC_REQBUFS, *num_planes == 0, the
   *                    driver has to use the currently configured format to
 - *                    determine the plane sizes and *num_buffers is the total
 + *                    determine the plane sizes and \*num_buffers is the total
   *                    number of buffers that are being allocated. When called
 - *                    from VIDIOC_CREATE_BUFS, *num_planes != 0 and it
 + *                    from VIDIOC_CREATE_BUFS, \*num_planes != 0 and it
   *                    describes the requested number of planes and sizes[]
   *                    contains the requested plane sizes. If either
 - *                    *num_planes or the requested sizes are invalid callback
 - *                    must return -EINVAL. In this case *num_buffers are
 + *                    \*num_planes or the requested sizes are invalid callback
 + *                    must return -EINVAL. In this case \*num_buffers are
   *                    being allocated additionally to q->num_buffers.
   * @wait_prepare:     release any locks taken while calling vb2 functions;
   *                    it is called before an ioctl needs to wait for a new