Skip to contentSkip to conversation

media fixes

GIT PULL Merged Mauro Carvalho Chehab 3 participants 4 messages Feb 17, 2024 – Apr 9, 2024 Media (V4L/DVB)

lore
Share & tools
lore

Mauro Carvalho Chehab

author maintainer
#0 lore raw

Hi Linus,

Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v6.8-4

For:

- a regression fix at rkisp1 shared IRQ logic;
- a breakage fix on atomisp due to a kAPI change;
- a permission fix for remote controller BPF support;
- a memleak on ir_toy driver;
- a Kconfig dependency on pwm-ir-rx.

The following changes since commit b32431b753217d8d45b018443b1a7aac215921fb:

media: vb2: refactor setting flags and caps, fix missing cap (2024-01-24 17:27:51 +0100)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v6.8-4

for you to fetch changes up to 346c84e281a963437b9fe9dfcd92c531630289de:

media: pwm-ir-tx: Depend on CONFIG_HIGH_RES_TIMERS (2024-02-01 13:49:39 +0100)

----------------------------------------------------------------
media fixes for v6.8-rc5

----------------------------------------------------------------
Hans de Goede (1):
media: atomisp: Adjust for v4l2_subdev_state handling changes in 6.8

Sean Young (2):
media: rc: bpf attach/detach requires write permission
media: pwm-ir-tx: Depend on CONFIG_HIGH_RES_TIMERS

Tomi Valkeinen (2):
media: Revert "media: rkisp1: Drop IRQF_SHARED"
media: : Fix IRQ handling due to shared interrupts

Zhipeng Lu (1):
media: ir_toy: fix a memleak in irtoy_tx

 .../platform/rockchip/rkisp1/rkisp1-capture.c      |  3 ++
 .../media/platform/rockchip/rkisp1/rkisp1-common.h |  2 +
 .../media/platform/rockchip/rkisp1/rkisp1-csi.c    |  3 ++
 .../media/platform/rockchip/rkisp1/rkisp1-dev.c    | 24 ++++++++-
 .../media/platform/rockchip/rkisp1/rkisp1-isp.c    |  3 ++
 drivers/media/rc/Kconfig                           |  1 +
 drivers/media/rc/bpf-lirc.c                        |  6 +--
 drivers/media/rc/ir_toy.c                          |  2 +
 drivers/media/rc/lirc_dev.c                        |  5 +-
 drivers/media/rc/rc-core-priv.h                    |  2 +-
 drivers/staging/media/atomisp/pci/atomisp_cmd.c    | 58 ++++++++++++---------
 .../staging/media/atomisp/pci/atomisp_internal.h   |  4 +-
 drivers/staging/media/atomisp/pci/atomisp_ioctl.c  | 52 +++++++++++--------
 drivers/staging/media/atomisp/pci/atomisp_v4l2.c   | 59 ++++++++++++++++------
 14 files changed, 156 insertions(+), 68 deletions(-)
#1 lore raw

Re: [GIT PULL for v6.8-rc5] media fixes (#99205)

From: [email protected]

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

gpg: Signature made Sat 17 Feb 2024 09:04:32 AM UTC
gpg:                using RSA key F909AE68FC11DF09C1755C00085F3EBD8EE4E115
gpg: Good signature from "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 "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "[jpeg image of size 3594]" [never]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]

Build aborted due to a fatal error:
FAILED: patch patch patches/0003-media-atomisp-Adjust-for-v4l2_subdev_state-handling-.patch doesn't apply:
Applying patch patches/0003-media-atomisp-Adjust-for-v4l2_subdev_state-handling-.patch patching file drivers/staging/media/atomisp/pci/atomisp_cmd.c
Hunk #1 FAILED at 3723.
Hunk #2 FAILED at 3754.
Hunk #3 FAILED at 3770.
Hunk #4 FAILED at 3809.
Hunk #5 FAILED at 4238.
Hunk #6 FAILED at 4268.
Hunk #7 FAILED at 4291.
7 out of 7 hunks FAILED -- rejects in file drivers/staging/media/atomisp/pci/atomisp_cmd.c patching file drivers/staging/media/atomisp/pci/atomisp_internal.h
Hunk #1 FAILED at 132.
1 out of 1 hunk FAILED -- rejects in file drivers/staging/media/atomisp/pci/atomisp_internal.h patching file drivers/staging/media/atomisp/pci/atomisp_ioctl.c
Hunk #1 FAILED at 781.
Hunk #2 FAILED at 803.
Hunk #3 FAILED at 830.
3 out of 3 hunks FAILED -- rejects in file drivers/staging/media/atomisp/pci/atomisp_ioctl.c patching file drivers/staging/media/atomisp/pci/atomisp_v4l2.c
Hunk #1 FAILED at 862.
Hunk #2 FAILED at 933.
Hunk #3 FAILED at 973.
Hunk #4 FAILED at 989.
Hunk #5 FAILED at 1012.
5 out of 5 hunks FAILED -- rejects in file drivers/staging/media/atomisp/pci/atomisp_v4l2.c Patch patches/0003-media-atomisp-Adjust-for-v4l2_subdev_state-handling-.patch does not apply (enforce with -f)

merge bot Merged
#2 lore raw
In reply to Mauro Carvalho Chehab
The pull request you sent on Sat, 17 Feb 2024 10:08:08 +0100:

The pull request you sent on Sat, 17 Feb 2024 10:08:08 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v6.8-4

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

Thank you!

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

Re: [GIT PULL for v6.8-rc5] media fixes (#99205)

In reply to Mauro Carvalho Chehab

From: [email protected]

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

gpg: Signature made Sat 17 Feb 2024 09:04:32 AM UTC
gpg:                using RSA key F909AE68FC11DF09C1755C00085F3EBD8EE4E115
gpg: Good signature from "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 "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "[jpeg image of size 3594]" [never]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]
gpg:                 aka "Mauro Carvalho Chehab <[email protected]>" [ultimate]

Build aborted due to a fatal error:
FAILED: patch patch patches/0001-media-Revert-media-rkisp1-Drop-IRQF_SHARED.patch doesn't apply:
Applying patch patches/0001-media-Revert-media-rkisp1-Drop-IRQF_SHARED.patch patching file drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
Hunk #1 FAILED at 559.
1 out of 1 hunk FAILED -- rejects in file drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c Patch patches/0001-media-Revert-media-rkisp1-Drop-IRQF_SHARED.patch can be reverse-applied