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

2020-06-02 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the v4l-dvb-next tree got a conflict in: drivers/staging/media/atomisp/pci/sh_css.c between commit: 27333dadef57 ("media: atomisp: adjust some code at sh_css that could be broken") from the v4l-dvb tree and commits: 815618c139d7 ("media: atomisp: fix

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

2019-04-25 Thread Mauro Carvalho Chehab
Em Tue, 23 Apr 2019 10:12:42 +0200 Arnd Bergmann escreveu: > On Tue, Apr 23, 2019 at 2:51 AM Stephen Rothwell > wrote: > > > > Hi all, > > > > Today's linux-next merge of the v4l-dvb-next tree got a conflict in: > > > > drivers/media/platform/Kconfig > > > > between commit: > > > > 63604a14

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

2019-04-23 Thread Arnd Bergmann
On Tue, Apr 23, 2019 at 2:51 AM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the v4l-dvb-next tree got a conflict in: > > drivers/media/platform/Kconfig > > between commit: > > 63604a143fe1 ("media: seco-cec: fix building with RC_CORE=m") > > from the v4l-dvb tree and co

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

2019-04-22 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the v4l-dvb-next tree got a conflict in: drivers/media/platform/Kconfig between commit: 63604a143fe1 ("media: seco-cec: fix building with RC_CORE=m") from the v4l-dvb tree and commit: 81527254e151 ("media: seco: depend on CONFIG_RC_CORE=y when not a m