Skip to contentSkip to conversation

media fixes

GIT PULL Merged Mauro Carvalho Chehab 3 participants 3 messages Sep 24, 2020 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

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
#1 lore raw

Re: [GIT PULL for v5.9-rc7] media fixes (#67321)

From: [email protected]

Pull request: https://patchwork.linuxtv.org/project/linux-media/patch/[email protected]/
Build log: https://builder.linuxtv.org/job/patchwork/69718/
Build time: 00:31:31

gpg: Signature made Thu 24 Sep 2020 12:21:43 PM UTC
gpg:                using RSA key F909AE68FC11DF09C1755C00085F3EBD8EE4E115
gpg: Good signature from "Mauro Carvalho Chehab <[email protected]>" [unknown]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "[jpeg image of size 3594]" [ultimate]

Summary: got 3/3 patches with issues, being 2 at build time, plus one error when buinding PDF document

Error/warnings:

patches/0001-media-cec-adap.c-don-t-use-flush_scheduled_work.patch:

allyesconfig: return code #0:
../drivers/media/test-drivers/vivid/vivid-core.c: ../drivers/media/test-drivers/vivid/vivid-core.c:1909 vivid_create_instance() parse error: turning off implications after 60 seconds ../drivers/media/usb/em28xx/em28xx-video.c: ../drivers/media/usb/em28xx/em28xx-video.c:2841 em28xx_v4l2_init() parse error: turning off implications after 60 seconds

patches/0002-media-media-v4l2-remove-V4L2_FLAG_MEMORY_NON_CONSIST.patch:

allyesconfig: return code #0:
../drivers/media/test-drivers/vivid/vivid-core.c: ../drivers/media/test-drivers/vivid/vivid-core.c:1909 vivid_create_instance() parse error: turning off implications after 60 seconds ../drivers/media/usb/em28xx/em28xx-video.c: ../drivers/media/usb/em28xx/em28xx-video.c:2856 em28xx_v4l2_init() parse error: turning off implications after 60 seconds

patches/0003-media-dt-bindings-media-imx274-Convert-to-json-schem.patch:

checkpatch.pl:

	$ cat patches/0003-media-dt-bindings-media-imx274-Convert-to-json-schem.patch | formail -c | ./scripts/checkpatch.pl --terse --mailback --no-summary --strict
	-:27: WARNING: DT binding docs and includes should be a separate patch. See: Documentation/devicetree/bindings/submitting-patches.rst
	-:67: WARNING: DT binding docs and includes should be a separate patch. See: Documentation/devicetree/bindings/submitting-patches.rst

Error #512 when building PDF docs

merge bot Merged
#2 lore raw
In reply to Mauro Carvalho Chehab
The pull request you sent on Thu, 24 Sep 2020 14:38:34 +0200:

The pull request you sent on Thu, 24 Sep 2020 14:38:34 +0200:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v5.9-3

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/8fa5960f575995bc8f3beb6b36c5aa6c61e7cdc0

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html