Hi all,
Today's linux-next merge of the drm tree got a conflict in:
Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
between commit:
6d0990e6e844 ("media: dt-binding: mediatek: Get rid of mediatek,larb for
multimedia HW")
from the v4l-dvb tree and commit:
Em Fri, 27 Jul 2018 14:36:40 +1000
Stephen Rothwell escreveu:
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/ipu-v3/ipu-cpmem.c
>
> between commit:
>
> 343b23a7c6b6 ("media: gpu: ipu-v3: Allow negative offsets for interlaced
> scanning")
>
>
On Fri, 2018-07-27 at 14:36 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/ipu-v3/ipu-cpmem.c
>
> between commit:
>
> 343b23a7c6b6 ("media: gpu: ipu-v3: Allow negative offsets for interlaced
> scanning")
>
> from
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/ipu-v3/ipu-cpmem.c
between commit:
343b23a7c6b6 ("media: gpu: ipu-v3: Allow negative offsets for interlaced
scanning")
from the v4l-dvb tree and commit:
4e3c5d7e05be ("gpu: ipu-v3: Allow negative offsets
