linux-next: manual merge of the usb tree with the v4l-dvb tree
in [Kernel]
|
Prev: linux-next: manual merge of the staging-next tree with the v4l-dvb tree
Next: hp-wmi: add return value checking for input_allocate_device()
From: Mauro Carvalho Chehab on 26 Jul 2010 10:10 Em 26-07-2010 05:24, Laurent Pinchart escreveu: > 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. Likely. I've just applied it to my trees. This time, it applied fine. Cheers, Mauro. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Greg KH on 26 Jul 2010 17:50
On Mon, Jul 26, 2010 at 11:01:35AM -0300, Mauro Carvalho Chehab wrote: > Em 26-07-2010 05:24, Laurent Pinchart escreveu: > > 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. > > Likely. I've just applied it to my trees. This time, it applied fine. Ok, I've dropped the patch from my usb tree right now. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |