From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Valdis.Kletnieks@vt.edu, linux-kernel@vger.kernel.org,
linux-media@vger.kernel.org
Subject: Re: mmotm 2010-10-13 - GSPCA SPCA561 webcam driver broken
Date: Mon, 18 Oct 2010 17:00:57 -0200 [thread overview]
Message-ID: <4CBC9969.30005@redhat.com> (raw)
In-Reply-To: <201010151423.52318.hverkuil@xs4all.nl>
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 <hverkuil@xs4all.nl> wrote:
>>>>
>>>>> On Thursday, October 14, 2010 22:06:29 Valdis.Kletnieks@vt.edu wrote:
>>>>>> On Wed, 13 Oct 2010 17:13:25 PDT, akpm@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.
next prev parent reply other threads:[~2010-10-18 19:01 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-14 0:13 mmotm 2010-10-13-17-13 uploaded akpm
2010-10-14 4:17 ` mmotm 2010-10-13-17-13 uploaded (staging/bcm) Randy Dunlap
2010-10-14 19:14 ` Greg KH
2010-10-14 20:38 ` Randy Dunlap
2010-10-14 4:29 ` mmotm 2010-10-13-17-13 uploaded (leds) Randy Dunlap
2010-10-14 11:38 ` Johannes Berg
2010-10-14 16:14 ` Randy Dunlap
2010-10-14 20:13 ` Johannes Berg
2010-10-14 20:32 ` Randy Dunlap
2010-10-26 10:14 ` Johannes Berg
2010-10-14 10:26 ` mmotm 2010-10-13-17-13 uploaded Zimny Lech
2010-10-14 19:16 ` Andrew Morton
2010-10-14 19:23 ` Zimny Lech
2010-10-14 20:06 ` mmotm 2010-10-13 - GSPCA SPCA561 webcam driver broken Valdis.Kletnieks
2010-10-15 8:45 ` Hans Verkuil
2010-10-15 9:05 ` Andrew Morton
2010-10-15 10:02 ` Hans Verkuil
2010-10-15 12:05 ` Mauro Carvalho Chehab
2010-10-15 12:23 ` Hans Verkuil
2010-10-18 19:00 ` Mauro Carvalho Chehab [this message]
2010-10-18 19:39 ` Hans Verkuil
2010-10-20 15:50 ` ptrace BUG [was: mmotm 2010-10-13-17-13 uploaded] Jiri Slaby
2010-10-20 15:52 ` Peter Zijlstra
2010-10-20 15:54 ` Frederic Weisbecker
2010-10-20 16:03 ` Jiri Slaby
2010-10-20 16:13 ` Peter Zijlstra
2010-10-20 17:29 ` Jiri Slaby
2010-10-21 7:34 ` Jiri Slaby
2010-10-21 7:40 ` Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CBC9969.30005@redhat.com \
--to=mchehab@redhat.com \
--cc=Valdis.Kletnieks@vt.edu \
--cc=akpm@linux-foundation.org \
--cc=hverkuil@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).