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

2020-12-14 Thread Mauro Carvalho Chehab
HI Stephen/Arnd/Olof, Em Tue, 15 Dec 2020 07:30:37 +1100 Stephen Rothwell escreveu: > Hi all, > > On Tue, 8 Dec 2020 11:04:13 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the v4l-dvb tree got a conflict in: > > > > drivers/staging/media/sunxi/cedrus/cedrus.c > > > >

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

2020-12-14 Thread Stephen Rothwell
Hi all, On Tue, 8 Dec 2020 11:04:13 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the v4l-dvb tree got a conflict in: > > drivers/staging/media/sunxi/cedrus/cedrus.c > > between commit: > > c6e95daab1cc ("media: cedrus: Remove the MBUS quirks") > > from the arm-soc tree a

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

2017-09-03 Thread Stephen Rothwell
Hi all, On Tue, 22 Aug 2017 10:55:34 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the v4l-dvb tree got a conflict in: > > arch/arm/configs/imx_v6_v7_defconfig > > between commit: > > b834bc1c52b8 ("ARM: imx_v6_v7_defconfig: Enable staging video4linux > drivers") > > fro

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

2014-11-24 Thread Tony Lindgren
* Stephen Rothwell [141123 18:24]: > Hi Mauro, > > Today's linux-next merge of the v4l-dvb tree got a conflict in > arch/arm/mach-omap2/devices.c between commit e7e42b9d2a7f ("ARM: > OMAP4+: Remove unused omap_l3_noc platform init") from the arm-soc tree > and commit 1b65729a186b ("[media] mach-o