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
> >
> >
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
Hi all,
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 and commits:
503dab0b8a56 ("media: cedrus: Register all codecs as capability")
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
Hi all,
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")
from the arm-soc tree and commit:
b9e1486e0e4b ("media: rc-core: do not depend on ME
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in
arch/arm/mach-pxa/palmz72.c, arch/arm/mach-pxa/palmtreo.c and
arch/arm/mach-pxa/mioa701.c between commit 4c25c5d2985c1 ("ARM:
pxa: make more mach/*.h files local") from the arm-soc tree and commit
a71daaa10ec2e325f ("[media]
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in
arch/arm/boot/dts/meson.dtsi between commit 8fba96fac1c4 ("ARM: dts:
meson: add I2C controller nodes") from the arm-soc tree and commit
ac61e3787315 ("[media] ARM: dts: meson: add IR receiver node") from the
v4l-dvb tree.
I
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in
arch/arm/mach-omap2/board-rx51-peripherals.c between commit
e639cd5bfc03 ("ARM: OMAP2+: Prepare to move GPMC to drivers by platform
data header") from the arm-soc tree and commit 68a3c0433077 ("[media]
ARM: OMAP2: RX-51: upda
* 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
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-omap2: remove deprecated
VIDEO_OMAP2 support") fr
10 matches
Mail list logo