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

2018-04-04 Thread Mauro Carvalho Chehab
Em Wed, 4 Apr 2018 09:09:00 +1000 Stephen Rothwell escreveu: > Hi all, > > On Thu, 15 Mar 2018 12:29:21 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the v4l-dvb tree got a conflict in: > > > > drivers/media/platform/blackfin/bfin_capture.c > > > > between commit: > >

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

2018-04-03 Thread Stephen Rothwell
Hi all, On Thu, 15 Mar 2018 12:29:21 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the v4l-dvb tree got a conflict in: > > drivers/media/platform/blackfin/bfin_capture.c > > between commit: > > b9ec40bf7d29 ("media: platform: remove blackfin capture driver") > > from the

linux-next: manual merge of the v4l-dvb tree with the asm-generic tree

2018-03-14 Thread Stephen Rothwell
Hi Mauro, Today's linux-next merge of the v4l-dvb tree got a conflict in: drivers/media/platform/blackfin/bfin_capture.c between commit: b9ec40bf7d29 ("media: platform: remove blackfin capture driver") from the asm-generic tree and commit: 4471109e3894 ("media: convert g/s_parm to g/s_f