mbox series

[GIT,PULL,FOR,v5.8] Various fixes/enhancements

Message ID 6a56ccf7-4c26-b3ad-eb3a-0647944c2f95@xs4all.nl (mailing list archive)
State New, archived
Headers show
Series [GIT,PULL,FOR,v5.8] Various fixes/enhancements | expand

Pull-request

git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.8c

Message

Hans Verkuil April 17, 2020, 8:18 a.m. UTC
The following changes since commit ceab3ac1e60d70afb4e25147d60817c513f235f7:

  media: dvb-frontends: DUMMY_FE should depends on DVB_CORE (2020-04-17 09:21:47 +0200)

are available in the Git repository at:

  git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.8c

for you to fetch changes up to 0f72df4db95844184f49bbdfeaae013919c12c1b:

  dt-bindings: media: rockchip-rga: add power-domains property (2020-04-17 10:05:10 +0200)

----------------------------------------------------------------
Tag branch

----------------------------------------------------------------
Dafna Hirschfeld (8):
      media: staging: rkisp1: remove mbus field from rkisp1_sensor_async
      media: staging: rkisp1: replace the call to v4l2_async_notifier_parse_fwnode_endpoints_by_port
      media: staging: rkisp1: cap: cleanup in mainpath config for uv swap format
      media: staging: rkisp1: cap: fix value written to uv swap register in selfpath
      media: staging: rkisp1: cap: change the logic for writing to uv swap register
      media: staging: rkisp1: cap: support uv swap only for semiplanar formats
      media: staging: rkisp1: cap: support uv swapped planar formats
      media: staging: rkisp1: cap: remove unsupported formats

Hans Verkuil (2):
      v4l2-ctrls: v4l2_ctrl_g/s_ctrl*(): don't continue when WARN_ON
      v4l2-ctrls: add __v4l2_ctrl_s_ctrl_compound()

Helen Koike (2):
      media: staging: rkisp1: cap: fix return values from pm functions
      media: staging: rkisp1: cap: serialize start/stop stream

Johan Jonker (2):
      dt-bindings: media: convert rockchip rga bindings to yaml
      dt-bindings: media: rockchip-rga: add power-domains property

Marco Felsch (1):
      media: v4l2-image-sizes: add HD and Full-HD definitions

Philipp Zabel (1):
      media: coda: add RC enable controls

 Documentation/devicetree/bindings/media/rockchip-rga.txt  |  34 --------------
 Documentation/devicetree/bindings/media/rockchip-rga.yaml |  83 +++++++++++++++++++++++++++++++++
 MAINTAINERS                                               |   1 +
 drivers/media/platform/coda/coda-bit.c                    |   9 +++-
 drivers/media/platform/coda/coda-common.c                 |  10 ++++
 drivers/media/platform/coda/coda.h                        |   2 +
 drivers/media/v4l2-core/v4l2-ctrls.c                      |  26 +++++++----
 drivers/staging/media/rkisp1/TODO                         |   3 --
 drivers/staging/media/rkisp1/rkisp1-capture.c             |  67 ++++++++++++++-------------
 drivers/staging/media/rkisp1/rkisp1-common.h              |   5 +-
 drivers/staging/media/rkisp1/rkisp1-dev.c                 | 106 ++++++++++++++++++++++---------------------
 drivers/staging/media/rkisp1/rkisp1-isp.c                 |  52 +++++++--------------
 include/media/v4l2-ctrls.h                                |  49 ++++++++++++--------
 include/media/v4l2-image-sizes.h                          |   6 +++
 14 files changed, 265 insertions(+), 188 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/media/rockchip-rga.txt
 create mode 100644 Documentation/devicetree/bindings/media/rockchip-rga.yaml

Comments

Jenkins April 17, 2020, 8:47 a.m. UTC | #1
From: builder@linuxtv.org

Pull request: https://patchwork.linuxtv.org/patch/63140/
Build log: https://builder.linuxtv.org/job/patchwork/47130/
Build time: 00:17:38
Link: https://lore.kernel.org/linux-media/6a56ccf7-4c26-b3ad-eb3a-0647944c2f95@xs4all.nl

gpg: Signature made Fri 17 Apr 2020 08:17:16 AM UTC
gpg:                using RSA key AAA7FFBA4D2D77EF4CAEA1421326E0CD23ABDCE5
gpg: Good signature from "Hans Verkuil <hverkuil-cisco@xs4all.nl>" [unknown]
gpg:                 aka "Hans Verkuil <hverkuil@xs4all.nl>" [full]

Summary: 33 patches and/or PDF generation with issues, being 16 at build time

Error/warnings:


Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make SPHINXDIRS=media htmldocs:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make SPHINXDIRS=media htmldocs:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make SPHINXDIRS=media htmldocs:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make SPHINXDIRS=media htmldocs:

Error #256 when running ./scripts/checkpatch.pl --terse --mailback --no-summary --strict patches/0004-media-staging-rkisp1-cap-serialize-start-stop-stream.patch:
$ ./scripts/checkpatch.pl --terse --mailback --no-summary --strict patches/0004-media-staging-rkisp1-cap-serialize-start-stop-stream.patch
patches/0004-media-staging-rkisp1-cap-serialize-start-stop-stream.patch:82: CHECK: struct mutex definition without comment

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make SPHINXDIRS=media htmldocs:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make SPHINXDIRS=media htmldocs:

Error #256 when running ./scripts/checkpatch.pl --terse --mailback --no-summary --strict patches/0006-media-staging-rkisp1-replace-the-call-to-v4l2_async_.patch:
$ ./scripts/checkpatch.pl --terse --mailback --no-summary --strict patches/0006-media-staging-rkisp1-replace-the-call-to-v4l2_async_.patch
patches/0006-media-staging-rkisp1-replace-the-call-to-v4l2_async_.patch:97: CHECK: Alignment should match open parenthesis
patches/0006-media-staging-rkisp1-replace-the-call-to-v4l2_async_.patch:118: WARNING: line over 80 characters

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make SPHINXDIRS=media htmldocs:

Error #256 when running ./scripts/checkpatch.pl --terse --mailback --no-summary --strict patches/0007-media-coda-add-RC-enable-controls.patch:
$ ./scripts/checkpatch.pl --terse --mailback --no-summary --strict patches/0007-media-coda-add-RC-enable-controls.patch
patches/0007-media-coda-add-RC-enable-controls.patch:70: CHECK: Alignment should match open parenthesis
patches/0007-media-coda-add-RC-enable-controls.patch:72: CHECK: Alignment should match open parenthesis

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make SPHINXDIRS=media htmldocs:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make SPHINXDIRS=media htmldocs:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make SPHINXDIRS=media htmldocs:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make SPHINXDIRS=media htmldocs:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make SPHINXDIRS=media htmldocs:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make SPHINXDIRS=media htmldocs:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make SPHINXDIRS=media htmldocs:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make SPHINXDIRS=media htmldocs:

Error #256 when running ./scripts/checkpatch.pl --terse --mailback --no-summary --strict patches/0015-dt-bindings-media-convert-rockchip-rga-bindings-to-y.patch:
$ ./scripts/checkpatch.pl --terse --mailback --no-summary --strict patches/0015-dt-bindings-media-convert-rockchip-rga-bindings-to-y.patch
patches/0015-dt-bindings-media-convert-rockchip-rga-bindings-to-y.patch:28: WARNING: DT binding docs and includes should be a separate patch. See: Documentation/devicetree/bindings/submitting-patches.txt
patches/0015-dt-bindings-media-convert-rockchip-rga-bindings-to-y.patch:64: WARNING: DT binding docs and includes should be a separate patch. See: Documentation/devicetree/bindings/submitting-patches.txt
patches/0015-dt-bindings-media-convert-rockchip-rga-bindings-to-y.patch:70: WARNING: DT binding documents should be licensed (GPL-2.0-only OR BSD-2-Clause)

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/staging/media:

Error #512 when running make CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y C=1 W=1 CHECK=compile_checks M=drivers/media:

Error #512 when running make SPHINXDIRS=media htmldocs:
Jenkins April 21, 2020, 11:35 a.m. UTC | #2
From: builder@linuxtv.org

Pull request: https://patchwork.linuxtv.org/patch/63140/
Build log: https://builder.linuxtv.org/job/patchwork/47607/
Build time: 00:23:21
Link: https://lore.kernel.org/linux-media/6a56ccf7-4c26-b3ad-eb3a-0647944c2f95@xs4all.nl

gpg: Signature made Fri 17 Apr 2020 08:17:16 AM UTC
gpg:                using RSA key AAA7FFBA4D2D77EF4CAEA1421326E0CD23ABDCE5
gpg: Good signature from "Hans Verkuil <hverkuil-cisco@xs4all.nl>" [unknown]
gpg:                 aka "Hans Verkuil <hverkuil@xs4all.nl>" [full]

Summary: 4 patches and/or PDF generation with issues, being 0 at build time

Error/warnings:


Error #256 when running ./scripts/checkpatch.pl --terse --mailback --no-summary --strict patches/0004-media-staging-rkisp1-cap-serialize-start-stop-stream.patch:
$ ./scripts/checkpatch.pl --terse --mailback --no-summary --strict patches/0004-media-staging-rkisp1-cap-serialize-start-stop-stream.patch
patches/0004-media-staging-rkisp1-cap-serialize-start-stop-stream.patch:82: CHECK: struct mutex definition without comment

Error #256 when running ./scripts/checkpatch.pl --terse --mailback --no-summary --strict patches/0006-media-staging-rkisp1-replace-the-call-to-v4l2_async_.patch:
$ ./scripts/checkpatch.pl --terse --mailback --no-summary --strict patches/0006-media-staging-rkisp1-replace-the-call-to-v4l2_async_.patch
patches/0006-media-staging-rkisp1-replace-the-call-to-v4l2_async_.patch:97: CHECK: Alignment should match open parenthesis
patches/0006-media-staging-rkisp1-replace-the-call-to-v4l2_async_.patch:118: WARNING: line over 80 characters

Error #256 when running ./scripts/checkpatch.pl --terse --mailback --no-summary --strict patches/0007-media-coda-add-RC-enable-controls.patch:
$ ./scripts/checkpatch.pl --terse --mailback --no-summary --strict patches/0007-media-coda-add-RC-enable-controls.patch
patches/0007-media-coda-add-RC-enable-controls.patch:70: CHECK: Alignment should match open parenthesis
patches/0007-media-coda-add-RC-enable-controls.patch:72: CHECK: Alignment should match open parenthesis

Error #256 when running ./scripts/checkpatch.pl --terse --mailback --no-summary --strict patches/0015-dt-bindings-media-convert-rockchip-rga-bindings-to-y.patch:
$ ./scripts/checkpatch.pl --terse --mailback --no-summary --strict patches/0015-dt-bindings-media-convert-rockchip-rga-bindings-to-y.patch
patches/0015-dt-bindings-media-convert-rockchip-rga-bindings-to-y.patch:28: WARNING: DT binding docs and includes should be a separate patch. See: Documentation/devicetree/bindings/submitting-patches.txt
patches/0015-dt-bindings-media-convert-rockchip-rga-bindings-to-y.patch:64: WARNING: DT binding docs and includes should be a separate patch. See: Documentation/devicetree/bindings/submitting-patches.txt
patches/0015-dt-bindings-media-convert-rockchip-rga-bindings-to-y.patch:70: WARNING: DT binding documents should be licensed (GPL-2.0-only OR BSD-2-Clause)
Mauro Carvalho Chehab April 21, 2020, 3:31 p.m. UTC | #3
Em Fri, 17 Apr 2020 10:18:44 +0200
Hans Verkuil <hverkuil@xs4all.nl> escreveu:

> The following changes since commit ceab3ac1e60d70afb4e25147d60817c513f235f7:
> 
>   media: dvb-frontends: DUMMY_FE should depends on DVB_CORE (2020-04-17 09:21:47 +0200)
> 
> are available in the Git repository at:
> 
>   git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.8c
> 
> for you to fetch changes up to 0f72df4db95844184f49bbdfeaae013919c12c1b:
> 
>   dt-bindings: media: rockchip-rga: add power-domains property (2020-04-17 10:05:10 +0200)
> 
> ----------------------------------------------------------------
> Tag branch
> 
> ----------------------------------------------------------------
> Dafna Hirschfeld (8):
>       media: staging: rkisp1: remove mbus field from rkisp1_sensor_async
>       media: staging: rkisp1: replace the call to v4l2_async_notifier_parse_fwnode_endpoints_by_port
>       media: staging: rkisp1: cap: cleanup in mainpath config for uv swap format
>       media: staging: rkisp1: cap: fix value written to uv swap register in selfpath
>       media: staging: rkisp1: cap: change the logic for writing to uv swap register
>       media: staging: rkisp1: cap: support uv swap only for semiplanar formats
>       media: staging: rkisp1: cap: support uv swapped planar formats

There were two merge conflicts on rksip1 patches. The first one was
trivial, and I already addressed...

>       media: staging: rkisp1: cap: remove unsupported formats

But this one is not so trivial.

Dafna,

Please rebase this patch on the top of upstream and re-submit.


Thanks,
Mauro
Dafna Hirschfeld May 12, 2020, 1:16 p.m. UTC | #4
On 21.04.20 17:31, Mauro Carvalho Chehab wrote:
> Em Fri, 17 Apr 2020 10:18:44 +0200
> Hans Verkuil <hverkuil@xs4all.nl> escreveu:
> 
>> The following changes since commit ceab3ac1e60d70afb4e25147d60817c513f235f7:
>>
>>    media: dvb-frontends: DUMMY_FE should depends on DVB_CORE (2020-04-17 09:21:47 +0200)
>>
>> are available in the Git repository at:
>>
>>    git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.8c
>>
>> for you to fetch changes up to 0f72df4db95844184f49bbdfeaae013919c12c1b:
>>
>>    dt-bindings: media: rockchip-rga: add power-domains property (2020-04-17 10:05:10 +0200)
>>
>> ----------------------------------------------------------------
>> Tag branch
>>
>> ----------------------------------------------------------------
>> Dafna Hirschfeld (8):
>>        media: staging: rkisp1: remove mbus field from rkisp1_sensor_async
>>        media: staging: rkisp1: replace the call to v4l2_async_notifier_parse_fwnode_endpoints_by_port
>>        media: staging: rkisp1: cap: cleanup in mainpath config for uv swap format
>>        media: staging: rkisp1: cap: fix value written to uv swap register in selfpath
>>        media: staging: rkisp1: cap: change the logic for writing to uv swap register
>>        media: staging: rkisp1: cap: support uv swap only for semiplanar formats
>>        media: staging: rkisp1: cap: support uv swapped planar formats
> 
> There were two merge conflicts on rksip1 patches. The first one was
> trivial, and I already addressed...
> 
>>        media: staging: rkisp1: cap: remove unsupported formats
> 
> But this one is not so trivial.
> 
> Dafna,
> 
> Please rebase this patch on the top of upstream and re-submit.

Hi, I was able to rebase the patch from the latest version without conflicts: https://patchwork.kernel.org/patch/11484161/

Thanks,
Dafna

> 
> 
> Thanks,
> Mauro
>