From: Laurent Pinchart <laurent.pinchart@ideasonboard•com>
To: Mauro Carvalho Chehab <mchehab@infradead•org>
Cc: Greg KH <greg@kroah•com>, Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: manual merge of the usb tree with the v4l-dvb tree
Date: Mon, 26 Jul 2010 10:24:05 +0200 [thread overview]
Message-ID: <201007261024.05863.laurent.pinchart@ideasonboard.com> (raw)
In-Reply-To: <4C4B07A6.4050009@infradead.org>
Hi Mauro,
On Saturday 24 July 2010 17:32:54 Mauro Carvalho Chehab wrote:
> Em 13-07-2010 14:23, Laurent Pinchart escreveu:
> > On Tuesday 13 July 2010 17:34:02 Mauro Carvalho Chehab wrote:
> >> Em 07-07-2010 12:13, Greg KH escreveu:
> >>> On Tue, Jul 06, 2010 at 09:34:51AM -0300, Mauro Carvalho Chehab wrote:
> >>>> Em 06-07-2010 08:10, Laurent Pinchart escreveu:
> > [snip]
> >
> >>>>> Mauro, can the uvc-gadget patches go through the linux-media tree ?
> >>
> >> It will not be simple to fix this conflict from my tree. I tried to
> >> apply
> >>
> >> them against a 2.6.35-rc5, but it failed:
> >> |diff --git a/drivers/media/video/uvc/uvcvideo.h
> >> |b/drivers/media/video/uvc/uvcvideo.h index 47b20e7..ac27245 100644
> >> |--- a/drivers/media/video/uvc/uvcvideo.h
> >> |+++ b/drivers/media/video/uvc/uvcvideo.h
> >>
> >> --------------------------
> >> No file to patch. Skipping patch.
> >> 1 out of 1 hunk ignored
> >> can't find file to patch at input line 73
> >> Perhaps you used the wrong -p or --strip option?
> >
> > drivers/media/video/uvc/uvcvideo.h has been there for years. Perhaps you
> > used the wrong -p or --strip option? :-)
>
> Doubtful. My scripts apply the patches using -p1. Not sure what happened.
[snip]
> Could you please re-send the patch, being sure that it will apply against a
> -rc kernel?
The patch I've sent you applies unmodified against 2.6.35-rc6. I'm pretty sure
you made a mistake somewhere.
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2010-07-26 8:24 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-06 7:53 linux-next: manual merge of the usb tree with the v4l-dvb tree Stephen Rothwell
2010-07-06 8:18 ` Laurent Pinchart
2010-07-06 8:51 ` Stephen Rothwell
2010-07-06 11:10 ` Laurent Pinchart
2010-07-06 12:34 ` Mauro Carvalho Chehab
2010-07-07 15:13 ` Greg KH
2010-07-13 15:34 ` Mauro Carvalho Chehab
2010-07-13 17:23 ` Laurent Pinchart
2010-07-24 15:32 ` Mauro Carvalho Chehab
2010-07-26 8:24 ` Laurent Pinchart [this message]
2010-07-26 14:01 ` Mauro Carvalho Chehab
2010-07-26 21:42 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2012-05-21 6:06 Stephen Rothwell
2012-05-23 6:22 ` Greg KH
2010-05-12 5:57 Stephen Rothwell
2010-05-12 19:49 ` Greg KH
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=201007261024.05863.laurent.pinchart@ideasonboard.com \
--to=laurent.pinchart@ideasonboard$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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