Re: linux-next: manual merge of the imx-drm tree with the v4l-vdb tree

Hi all, On Mon, 17 Jun 2019 13:36:29 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the imx-drm tree got a conflict in: > > drivers/staging/media/imx/imx-ic-prpencvf.c > > between commits: > > 6d01b7ff5233 ("media: staging/imx: Switch to sync registration for IPU > subdevs

linux-next: manual merge of the imx-drm tree with the v4l-vdb tree

Hi all, Today's linux-next merge of the imx-drm tree got a conflict in: drivers/staging/media/imx/imx-ic-prpencvf.c between commits: 6d01b7ff5233 ("media: staging/imx: Switch to sync registration for IPU subdevs") 34ff38745b16 ("media: staging/imx: Pass device to alloc/free_dma_buf") fr