Em 15-10-2010 09:23, Hans Verkuil escreveu: > On Friday, October 15, 2010 14:05:39 Mauro Carvalho Chehab wrote: >> Em 15-10-2010 07:02, Hans Verkuil escreveu: >>> On Friday, October 15, 2010 11:05:26 Andrew Morton wrote: >>>> On Fri, 15 Oct 2010 10:45:45 +0200 Hans Verkuil <hverk...@xs4all.nl> wrote: >>>> >>>>> On Thursday, October 14, 2010 22:06:29 valdis.kletni...@vt.edu wrote: >>>>>> On Wed, 13 Oct 2010 17:13:25 PDT, a...@linux-foundation.org said: >>>>>>> The mm-of-the-moment snapshot 2010-10-13-17-13 has been uploaded to >>> >>> Mauro, is this something for you to fix? >> >> I have a patch fixing this conflict already: >> >> http://git.linuxtv.org/mchehab/sbtvd.git?a=commit;h=88164fbe701a0a16e9044b74443dddb6188b54cc >> >> The patch is currently on a separate tree, that I'm using to test some >> experimental >> drivers for Brazilian Digital TV system (SBTVD). I'm planning to merge this >> patch, among >> with other patches I received for .37 during this weekend. > > No, this patch isn't sufficient. It backs out the wrong code but doesn't put > in the 'video_is_registered()' if statements that were in my original patch. > > Those are really needed.
Ok, I've re-done the conflict fix patch: http://git.kernel.org/?p=linux/kernel/git/mchehab/linux-next.git;a=commitdiff;h=f9fccbad2a67668240edeaa6ada5aea2281d10b3 Cheers, Mauro. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
