Re: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thursday 20 November 2008 21:39:41 Mauro Carvalho Chehab wrote:
> On Thu, 20 Nov 2008 18:44:42 +0100
>
> Jean-Francois Moine <moinejf@xxxxxxx> wrote:
> > On Thu, 2008-11-20 at 18:09 +0100, Hans Verkuil wrote:
> > > On Thursday 20 November 2008 16:52:09 Erik Andrén wrote:
> > > > 2008/11/20 Hans Verkuil <hverkuil@xxxxxxxxx>:
> > > > > Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
> > > > > for the following:
> > > > >
> > > > > - af9015: fix compilation error
> > > > > - compat.h: fix uninitialized_var macro
> > > > > - m5602: move static struct from header to source.
> > > >
> > > > Hi, did you pull my commit implementing this or did you patch
> > > > it yourself?
> > >
> > > I did it myself. I wasn't aware of a pull request from you.
> >
> > 	[snip]
> >
> > Hi,
> >
> > I got the changes from Erik, but I did not ask Mauro yet to pull
> > them. There will be a conflict on the associated files. Which is
> > the best way to simplify the Mauro's job?
>
> I prefer to merge from Jean-Francois tree, since m5602 is part of
> gspca driver, and this sub-driver is maintained by Erik.

Mauro, can you cherry-pick from my tree for the other patches, or do you 
want me to redo my tree without this m5602 patch?

Regards,

	Hans

_______________________________________________
v4l-dvb-maintainer mailing list
v4l-dvb-maintainer@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/v4l-dvb-maintainer


[Index of Archives]     [Linux Media]     [Older V4L]     [Linux DVB]     [Video Disk Recorder]     [Asterisk]     [Photo]     [DCCP]     [Netdev]     [Xorg]     [Util Linux NG]     [Xfree86]     [Free Photo Albums]     [Fedora Users]     [Fedora Women]     [ALSA Users]     [ALSA Devel]     [SSH]     [Linux USB]

  Powered by Linux