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: Tue, 13 Jul 2010 19:23:31 +0200 [thread overview]
Message-ID: <201007131923.31877.laurent.pinchart@ideasonboard.com> (raw)
In-Reply-To: <4C3C876A.5090005@infradead.org>
Hi Mauro,
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? :-)
[snip]
> >>> Patch
> >>> patches/lmml_111238_for_2_6_36_uvc_move_constants_and_structures_defin
> >>> itions_to_linux_usb_video_h.patch doesn't apply
>
> It seems that the files you're patching at include/linux/usb & cia are not
> upstream yet. So, just adding this patch won't solve it.
>
> >> If Greg is ok, that's fine for me.
> >
> > That's fine with me. Let me know when you have them and then I'll drop
> > them from my tree.
>
> I'll be out for vacations for some days. Greg/Laurent, it seems that the
> better is to keep Stephen workaround for now, eventually applying it at
> Greg's tree.
If it's not too late, can you retry with the right -p option ?
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2010-07-13 17:23 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 [this message]
2010-07-24 15:32 ` Mauro Carvalho Chehab
2010-07-26 8:24 ` Laurent Pinchart
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=201007131923.31877.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