Em Wed, 20 Feb 2019 10:57:03 +1100
Stephen Rothwell <s...@canb.auug.org.au> 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

Reply via email to