| Message ID | ac74fda5-4160-1cd7-4ce1-bb8ad64aed51@xs4all.nl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [GIT,PULL,FOR,v6.2] Various fixes and enhancements | expand |
From: builder@linuxtv.org
Pull request: https://patchwork.linuxtv.org/project/linux-media/patch/ac74fda5-4160-1cd7-4ce1-bb8ad64aed51@xs4all.nl/
Build log: https://builder.linuxtv.org/job/patchwork/259856/
Build time: 00:00:00
Link: https://lore.kernel.org/linux-media/ac74fda5-4160-1cd7-4ce1-bb8ad64aed51@xs4all.nl
gpg: Signature made Mon 28 Nov 2022 09:16:31 AM UTC
gpg: using EDDSA key 52ADCAAE8A4F70B99ACD8D726B425DF79B1C1E76
gpg: Good signature from "Hans Verkuil <hverkuil-cisco@xs4all.nl>" [unknown]
gpg: aka "Hans Verkuil <hverkuil@xs4all.nl>" [full]
Build aborted due to a fatal error:
FAILED: patch patch patches/0001-media-s5p-mfc-Add-variant-data-for-MFC-v7-hardware-f.patch doesn't apply:
Applying patch patches/0001-media-s5p-mfc-Add-variant-data-for-MFC-v7-hardware-f.patch
patching file drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
Hunk #1 FAILED at 1590.
Hunk #2 succeeded at 1671 with fuzz 2 (offset 10 lines).
1 out of 2 hunks FAILED -- rejects in file drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
Patch patches/0001-media-s5p-mfc-Add-variant-data-for-MFC-v7-hardware-f.patch can be reverse-applied
On Mon, Nov 28, 2022 at 11:04:51AM +0100, Hans Verkuil wrote: > The following changes since commit 3ab848bea7790583674a0e08eb5f8c1553d07751: > > media: dt-bindings: s5p-mfc: Add new compatible string for Exynos3250 SoC (2022-11-25 11:33:17 +0000) > > are available in the Git repository at: > > git://linuxtv.org/hverkuil/media_tree.git tags/br-v6.2i > Jason A. Donenfeld (1): > media: stv0288: use explicitly signed char If this is for 6.2, rather than as a bug fix for 6.1, then please drop it from this pull, and I'll include it as part of the pull of all of these -funsigned-char fixes for 6.2, per Linus' request. Note that I sent this for 6.1 and followed up on it several times, but my emails went entirely ignored, and then today I found this in my inbox, not because I was CC'd but because my lore search matches on my last name. During that time, I regularly checked the linux-media tree to see if you had applied it silently, but that also wasn't the case. So I'm pretty sure the "confusion" here is entirely on you for ignoring emails and not communicating. So, anyway, please remove this patch from your pull. Thanks, Jason
Hi Jason, On 11/28/22 12:56, Jason A. Donenfeld wrote: > On Mon, Nov 28, 2022 at 11:04:51AM +0100, Hans Verkuil wrote: >> The following changes since commit 3ab848bea7790583674a0e08eb5f8c1553d07751: >> >> media: dt-bindings: s5p-mfc: Add new compatible string for Exynos3250 SoC (2022-11-25 11:33:17 +0000) >> >> are available in the Git repository at: >> >> git://linuxtv.org/hverkuil/media_tree.git tags/br-v6.2i > >> Jason A. Donenfeld (1): >> media: stv0288: use explicitly signed char > > If this is for 6.2, rather than as a bug fix for 6.1, then please drop > it from this pull, and I'll include it as part of the pull of all of > these -funsigned-char fixes for 6.2, per Linus' request. OK, it's dropped in v2 of my PR. > > Note that I sent this for 6.1 and followed up on it several times, but > my emails went entirely ignored, and then today I found this in my inbox, > not because I was CC'd but because my lore search matches on my last > name. During that time, I regularly checked the linux-media tree to see > if you had applied it silently, but that also wasn't the case. So I'm > pretty sure the "confusion" here is entirely on you for ignoring emails > and not communicating. Mauro is extremely busy, so last week I've been going through older patches and picked this one up. It would have gone in for v6.2 :-) Regards, Hans > > So, anyway, please remove this patch from your pull. > > Thanks, > Jason
The following changes since commit 3ab848bea7790583674a0e08eb5f8c1553d07751: media: dt-bindings: s5p-mfc: Add new compatible string for Exynos3250 SoC (2022-11-25 11:33:17 +0000) are available in the Git repository at: git://linuxtv.org/hverkuil/media_tree.git tags/br-v6.2i for you to fetch changes up to 44166bee71543021b407e8e5af99e8a4537bf894: media: s5c73m3: Switch to GPIO descriptors (2022-11-28 10:15:58 +0100) ---------------------------------------------------------------- Tag branch ---------------------------------------------------------------- Aakarsh Jain (1): media: s5p-mfc: Add variant data for MFC v7 hardware for Exynos 3250 SoC Adam Borowski (1): media: ipu3-cio2: make the bridge depend on i2c Chen-Yu Tsai (1): media: dt-bindings: allwinner: h6-vpu-g2: Add IOMMU reference property Christophe JAILLET (4): media: pt3: Use dma_set_mask_and_coherent() and simplify code media: ths7303: Fix the include guard headers: Remove some left-over license text in include/uapi/linux/dvb/ headers: Remove some left-over license text in include/uapi/linux/v4l2-* Colin Ian King (1): media: i2c: isl7998x: make const array isl7998x_video_in_chan_map static Dmitry Torokhov (2): media: i2c: s5k6a3: switch to using gpiod API media: i2c: s5k5baf: switch to using gpiod API Geert Uytterhoeven (1): media: staging: stkwebcam: Restore MEDIA_{USB,CAMERA}_SUPPORT dependencies Gustavo A. R. Silva (1): media: usb: pwc-uncompress: Use flex array destination for memcpy() Hans de Goede (1): media: MAINTAINERS: Add Hans de Goede as staging/atomisp maintainer Jason A. Donenfeld (1): media: stv0288: use explicitly signed char Jiasheng Jiang (2): media: coda: Add check for dcoda_iram_alloc media: coda: Add check for kmalloc Lecopzer Chen (1): media: Kconfig: Make DVB_CORE=m possible when MEDIA_SUPPORT=y Liang He (1): media: c8sectpfe: Add of_node_put() when breaking out of loop Linus Walleij (3): media: s5k4ecgx: Switch to GPIO descriptors media: s5k4ecgx: Delete driver media: s5c73m3: Switch to GPIO descriptors Lukas Bulwahn (1): media: imx: remove code for non-existing config IMX_GPT_ICAP Maíra Canal (1): dt-bindings: media: s5c73m3: Fix reset-gpio descriptor Michael Riesch (2): dt-bindings: media: video-interfaces: add support for dual edge sampling media: v4l2-mediabus: add support for dual edge sampling Moses Christopher Bollavarapu (1): drivers: staging: media: omap4iss: Use BIT macro instead of left shifting Philipp Zabel (1): media: imx: Use get_mbus_config instead of parsing upstream DT endpoints Shigeru Yoshida (1): media: si470x: Fix use-after-free in si470x_int_in_callback() Smitha T Murthy (3): media: s5p-mfc: Fix in register read and write for H264 media: s5p-mfc: Clear workbit to handle error condition media: s5p-mfc: Fix to handle reference queue during finishing Yang Yingliang (1): media: Switch to use dev_err_probe() helper wangjianli (1): platform/renesas: fix repeated words in comments Documentation/devicetree/bindings/media/allwinner,sun50i-h6-vpu-g2.yaml | 5 + Documentation/devicetree/bindings/media/samsung-s5c73m3.txt | 2 +- Documentation/devicetree/bindings/media/video-interfaces.yaml | 5 +- MAINTAINERS | 1 + drivers/media/Kconfig | 2 +- drivers/media/cec/platform/stm32/stm32-cec.c | 9 +- drivers/media/dvb-frontends/stv0288.c | 5 +- drivers/media/i2c/Kconfig | 10 - drivers/media/i2c/Makefile | 1 - drivers/media/i2c/ad5820.c | 18 +- drivers/media/i2c/imx274.c | 5 +- drivers/media/i2c/isl7998x.c | 2 +- drivers/media/i2c/s5c73m3/s5c73m3-core.c | 107 +--- drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c | 1 - drivers/media/i2c/s5c73m3/s5c73m3.h | 10 +- drivers/media/i2c/s5k4ecgx.c | 1031 ---------------------------------- drivers/media/i2c/s5k5baf.c | 64 +-- drivers/media/i2c/s5k6a3.c | 30 +- drivers/media/i2c/tc358743.c | 9 +- drivers/media/pci/intel/ipu3/Kconfig | 1 + drivers/media/pci/pt3/pt3.c | 16 +- drivers/media/platform/chips-media/coda-bit.c | 14 +- drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c | 5 +- drivers/media/platform/renesas/renesas-ceu.c | 2 +- drivers/media/platform/samsung/exynos4-is/media-dev.c | 4 +- drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c | 17 +- drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c | 4 +- drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c | 12 +- drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c | 14 +- drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.c | 1 + drivers/media/platform/st/stm32/stm32-dcmi.c | 27 +- drivers/media/platform/ti/omap3isp/isp.c | 3 +- drivers/media/platform/xilinx/xilinx-csi2rxss.c | 8 +- drivers/media/radio/si470x/radio-si470x-usb.c | 4 +- drivers/media/rc/gpio-ir-recv.c | 10 +- drivers/media/rc/gpio-ir-tx.c | 9 +- drivers/media/rc/ir-rx51.c | 9 +- drivers/media/usb/pwc/pwc-uncompress.c | 2 +- drivers/media/usb/uvc/uvc_driver.c | 9 +- drivers/media/v4l2-core/v4l2-fwnode.c | 23 +- drivers/staging/media/deprecated/stkwebcam/Kconfig | 2 +- drivers/staging/media/imx/TODO | 12 - drivers/staging/media/imx/imx-media-csi.c | 135 +++-- drivers/staging/media/imx/imx-media-fim.c | 57 +- drivers/staging/media/imx/imx-media-utils.c | 33 -- drivers/staging/media/imx/imx-media.h | 1 - drivers/staging/media/omap4iss/iss_video.h | 18 +- include/media/i2c/s5c73m3.h | 15 - include/media/i2c/s5k4ecgx.h | 33 -- include/media/i2c/ths7303.h | 4 +- include/media/v4l2-mediabus.h | 17 +- include/uapi/linux/dvb/audio.h | 15 - include/uapi/linux/dvb/ca.h | 15 - include/uapi/linux/dvb/dmx.h | 15 - include/uapi/linux/dvb/frontend.h | 15 - include/uapi/linux/dvb/net.h | 15 - include/uapi/linux/dvb/osd.h | 15 - include/uapi/linux/dvb/version.h | 15 - include/uapi/linux/dvb/video.h | 15 - include/uapi/linux/v4l2-common.h | 39 -- include/uapi/linux/v4l2-controls.h | 38 -- include/uapi/linux/v4l2-dv-timings.h | 9 - include/uapi/linux/v4l2-mediabus.h | 4 - include/uapi/linux/v4l2-subdev.h | 13 - 64 files changed, 267 insertions(+), 1794 deletions(-) delete mode 100644 drivers/media/i2c/s5k4ecgx.c delete mode 100644 include/media/i2c/s5k4ecgx.h