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

Em Fri, 2 Dec 2016 10:31:07 +1100 Stephen Rothwell escreveu: > Hi Mauro, > > Today's linux-next merge of the v4l-dvb tree got conflicts in: > > > Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg > >

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

Em Fri, 2 Dec 2016 10:31:07 +1100 Stephen Rothwell escreveu: > Hi Mauro, > > Today's linux-next merge of the v4l-dvb tree got conflicts in: > > > Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg > >