Hi Mauro,
It seems most (if not all) of the commits in the v4l-dvb-next tree are
also in the v4l-dvb tree and are now causing lots of conflicts when I
merge them both. Please clean it up.
--
Cheers,
Stephen Rothwell
Em Wed, 20 Feb 2019 10:57:03 +1100
Stephen Rothwell <[email protected]> escreveu:
> Hi Mauro,
>
> It seems most (if not all) of the commits in the v4l-dvb-next tree are
> also in the v4l-dvb tree and are now causing lots of conflicts when I
> merge them both. Please clean it up.
>
Yeah, it had some branches that got already merged.
Just updated it to be in sync with v4l-dvb tree.
Sorry for the mess.
Thanks,
Mauro
Hi Mauro,
On Tue, 19 Feb 2019 21:10:33 -0300 Mauro Carvalho Chehab <[email protected]> wrote:
>
> Yeah, it had some branches that got already merged.
>
> Just updated it to be in sync with v4l-dvb tree.
>
> Sorry for the mess.
No worries and thanks.
--
Cheers,
Stephen Rothwell