| Message ID | 20221221112350.6b046362@sal.lan (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [GIT,PULL,for,v6.2-rc1] media fixes | expand |
From: builder@linuxtv.org
Pull request: https://patchwork.linuxtv.org/project/linux-media/patch/20221221112350.6b046362@sal.lan/
Build log: https://builder.linuxtv.org/job/patchwork/266441/
Build time: 00:00:00
Link: https://lore.kernel.org/linux-media/20221221112350.6b046362@sal.lan
gpg: Signature made Wed 21 Dec 2022 11:20:18 AM UTC
gpg: using RSA key F909AE68FC11DF09C1755C00085F3EBD8EE4E115
gpg: Good signature from "Mauro Carvalho Chehab <mchehab+huawei@kernel.org>" [ultimate]
gpg: aka "Mauro Carvalho Chehab <mchehab@kernel.org>" [ultimate]
gpg: aka "Mauro Carvalho Chehab <m.chehab@samsung.com>" [ultimate]
gpg: aka "Mauro Carvalho Chehab <mchehab@osg.samsung.com>" [ultimate]
gpg: aka "Mauro Carvalho Chehab <mchehab@s-opensource.com>" [ultimate]
gpg: aka "Mauro Carvalho Chehab <mchehab+samsung@kernel.org>" [ultimate]
gpg: aka "[jpeg image of size 3594]" [ultimate]
Build aborted due to a fatal error:
FAILED: patch patch patches/0002-media-sun6i-csi-bridge-Error-out-on-invalid-port-to-.patch doesn't apply:
Applying patch patches/0002-media-sun6i-csi-bridge-Error-out-on-invalid-port-to-.patch
patching file drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c
Hunk #1 FAILED at 663.
1 out of 1 hunk FAILED -- rejects in file drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c
Patch patches/0002-media-sun6i-csi-bridge-Error-out-on-invalid-port-to-.patch can be reverse-applied
The pull request you sent on Wed, 21 Dec 2022 11:23:50 +0000:
> git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v6.2-2
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/5461e079009ae2732c833281c4b50dfb58d15ba5
Thank you!
Hi Linus, Please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v6.2-2 For: - A regression at V4L2 core breaking string controls; - Compilation warning fixes on sun6i drivers when building with clang. Regards, Mauro The following changes since commit cdb9d3537711939e4d8fd0de2889c966f88346eb: Merge tag 'media/v6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media (2022-12-13 11:36:58 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media tags/media/v6.2-2 for you to fetch changes up to 542d3c03fd895eb8370992293498332ea383a3b9: media: sun6i-isp: params: Unregister pending buffer on cleanup (2022-12-14 18:12:32 +0000) ---------------------------------------------------------------- media updates for v6.2-rc1 ---------------------------------------------------------------- Hans Verkuil (1): media: v4l2-ctrls-api.c: add back dropped ctrl->is_new = 1 Paul Kocialkowski (10): media: sun6i-csi: bridge: Error out on invalid port to fix warning media: sun6i-csi: capture: Remove useless ret initialization media: sun6i-mipi-csi2: Clarify return code handling in stream off path media: sun8i-a83t-mipi-csi2: Clarify return code handling in stream off path media: sun6i-isp: proc: Fix return code handling in stream off path media: sun6i-isp: proc: Error out on invalid port to fix warning media: sun6i-isp: proc: Declare subdev ops as static media: sun6i-isp: capture: Fix uninitialized variable use media: sun6i-isp: params: Fix incorrect indentation media: sun6i-isp: params: Unregister pending buffer on cleanup drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c | 2 +- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c | 2 +- drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 5 ++--- .../platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c | 5 ++--- drivers/media/v4l2-core/v4l2-ctrls-api.c | 1 + drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c | 4 ++-- drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.c | 6 ++++-- drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_proc.c | 8 ++++---- 8 files changed, 17 insertions(+), 16 deletions(-)