Hi Linus,
Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v5.9-3
It fixes a regression at the CEC adapter core:
media: cec-adap.c: don't use flush_scheduled_work()
While not too late, it also contains two uAPI patches for the
changes already merged for Kernel 5.9:
media: dt-bindings: media: imx274: Convert to json-schema
media: media/v4l2: remove V4L2_FLAG_MEMORY_NON_CONSISTENT flag
The first one has a change to lowercase on one of the DT new
additions for Kernel 5.9. The second one actually reverts one
uAPI change that was nacked by mm people, because the changeset
has problems.
Thanks!
Mauro
---
The following changes since commit ddecfc76979d5585847c76c4c489dcac389f86dd:
media: mceusb: Avoid GFP_ATOMIC where it is not needed (2020-08-28 14:06:36 +0200)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v5.9-3
for you to fetch changes up to d0254f82d702a1d0d92e42f87676111de88846cf:
media: dt-bindings: media: imx274: Convert to json-schema (2020-09-22 11:13:46 +0200)
----------------------------------------------------------------
media fixes for v5.9-rc7
----------------------------------------------------------------
Hans Verkuil (1):
media: cec-adap.c: don't use flush_scheduled_work()
Jacopo Mondi (1):
media: dt-bindings: media: imx274: Convert to json-schema
Sergey Senozhatsky (1):
media: media/v4l2: remove V4L2_FLAG_MEMORY_NON_CONSISTENT flag
.../devicetree/bindings/media/i2c/imx274.txt | 38 -----------
.../devicetree/bindings/media/i2c/sony,imx274.yaml | 76 ++++++++++++++++++++++
Documentation/userspace-api/media/v4l/buffer.rst | 17 -----
.../userspace-api/media/v4l/vidioc-create-bufs.rst | 6 +-
.../userspace-api/media/v4l/vidioc-reqbufs.rst | 12 +---
MAINTAINERS | 2 +-
drivers/media/cec/core/cec-adap.c | 2 +-
drivers/media/common/videobuf2/videobuf2-core.c | 46 ++-----------
.../media/common/videobuf2/videobuf2-dma-contig.c | 19 ------
drivers/media/common/videobuf2/videobuf2-dma-sg.c | 3 +-
drivers/media/common/videobuf2/videobuf2-v4l2.c | 18 +----
drivers/media/dvb-core/dvb_vb2.c | 2 +-
drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 10 +--
drivers/media/v4l2-core/v4l2-ioctl.c | 5 +-
include/media/videobuf2-core.h | 7 +-
include/uapi/linux/videodev2.h | 13 +---
16 files changed, 101 insertions(+), 175 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/media/i2c/imx274.txt
create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx274.yaml
