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

2018-07-27 Thread Mauro Carvalho Chehab
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") > > fr

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

2018-07-27 Thread Philipp Zabel
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 th