Em Fri, 17 Apr 2020 10:18:44 +0200 Hans Verkuil <hverkuil@xxxxxxxxx> 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
