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

2019-01-31 Thread Stephen Rothwell
Hi all, On Fri, 1 Feb 2019 10:22:33 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the v4l-dvb tree got a conflict in: > > drivers/media/platform/vim2m.c > > between commit: > > 240809ef6630 ("media: vim2m: only cancel work if it is for right context") > > from Linus' tree

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

2015-04-21 Thread Philipp Zabel
Am Dienstag, den 21.04.2015, 10:12 -0300 schrieb Mauro Carvalho Chehab: > Em Tue, 21 Apr 2015 15:38:02 +0300 > Laurent Pinchart escreveu: > > > Hi Mauro, > > > > On Tuesday 21 April 2015 06:56:40 Mauro Carvalho Chehab wrote: > > > Em Tue, 21 Apr 2015 18:02:43 +1000 Stephen Rothwell escreveu: > >

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

2015-04-21 Thread Mauro Carvalho Chehab
Em Tue, 21 Apr 2015 15:38:02 +0300 Laurent Pinchart escreveu: > Hi Mauro, > > On Tuesday 21 April 2015 06:56:40 Mauro Carvalho Chehab wrote: > > Em Tue, 21 Apr 2015 18:02:43 +1000 Stephen Rothwell escreveu: > > > On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart wrote: > > > > > +#define MEDI

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

2015-04-21 Thread Laurent Pinchart
Hi Mauro, On Tuesday 21 April 2015 06:56:40 Mauro Carvalho Chehab wrote: > Em Tue, 21 Apr 2015 18:02:43 +1000 Stephen Rothwell escreveu: > > On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart wrote: > > > > +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 > > > > +#define MEDIA_BUS_FMT_AYU

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

2015-04-21 Thread Mauro Carvalho Chehab
Em Tue, 21 Apr 2015 18:02:43 +1000 Stephen Rothwell escreveu: > Hi Laurent, > > On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart > wrote: > > > > > +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 > > > +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 > > > +#define MEDIA_BUS_

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

2015-04-21 Thread Stephen Rothwell
Hi Laurent, On Tue, 21 Apr 2015 10:49:52 +0300 Laurent Pinchart wrote: > > > +#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 > > +#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 > > +#define MEDIA_BUS_FMT_UYVY12_2X12 0x201c > > +#define MEDIA_BUS_FMT_VYUY12_2X12

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

2015-04-21 Thread Laurent Pinchart
Hi Stephen, On Tuesday 21 April 2015 11:54:09 Stephen Rothwell wrote: > Hi Mauro, > > Today's linux-next merge of the v4l-dvb tree got a conflict in > include/uapi/linux/media-bus-format.h between various commits from > Linus' tree and various commits from the v4l-dvb tree. > > I reported this p