Re: [v4l-dvb-maintainer] Re: [PATCH 00/23] V4L/DVB fixes

Mauro Carvalho Chehab
2006-07-30T11:54:01Z

Hi

Em Dom, 2006-07-30 às 00:11 -0700, Trent Piepho escreveu:
> On Sat, 29 Jul 2006, Linus Torvalds wrote:
> > On Sat, 29 Jul 2006, Mauro Carvalho Chehab wrote:
> > >
> > > Please pull these (and the other ones) from master branch at:
> > > kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
> >
> > I get a _huge_ diffstat with
> >
> > 135 files changed, 3056 insertions(+), 1562 deletions(-)
I suspect Linus tried to merge from branch "devel", instead of "master".
>
> There are mostly two things which did this.
>
> One is that Mauro translated almost all of the V4L1 radio card drivers to
> V4L2. The changes are all very repetitive, but it made a huge diffstat:
>
> 15 files changed, 1758 insertions(+), 918 deletions(-)
>
> The second source is the dvb_attach() system, which was not supposed to go
> in 2.6.18, it was for 2.6.19.
>
> 74 files changed, 827 insertions(+), 622 deletions(-)
>
> The dvb_attach() stuff isn't ready for 2.6.18, it hasn't been tested at all
> and it's a very significant change. The ISA radio card drivers.... I
> don't think they are used very much anymore.
No. The stuff to Linus is at branch "master" on my tree, with the bug
fixes. V4L1 conversion, dvb_attach and other neat stuff are on branch
"devel", and are meant to go to kernel 2.6.19 or upper.

Cheers,
Mauro.