| Message ID | 1312040850-21475-1-git-send-email-Gregory.Dietsche@cuw.edu (mailing list archive) |
|---|---|
| State | Rejected |
| Headers | show |
Hi Greg, Thanks for the patch. On Saturday 30 July 2011 17:47:30 Greg Dietsche wrote: > change from v2.6.42 to v3.2 This patch would be queued for v3.2. As the code it fixes will go away at the same time, it would be pretty pointless to apply it :-) Thanks for warning me though. > Reported-by: Justin Piszcz <jpiszcz@lucidpixels.com> > Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> > --- > drivers/media/video/uvc/uvc_v4l2.c | 2 +- > drivers/media/video/uvc/uvcvideo.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/video/uvc/uvc_v4l2.c > b/drivers/media/video/uvc/uvc_v4l2.c index ea71d5f..6d6e3f9 100644 > --- a/drivers/media/video/uvc/uvc_v4l2.c > +++ b/drivers/media/video/uvc/uvc_v4l2.c > @@ -546,7 +546,7 @@ static void uvc_v4l2_ioctl_warn(void) > return; > > uvc_printk(KERN_INFO, "Deprecated UVCIOC_CTRL_{ADD,MAP_OLD,GET,SET} " > - "ioctls will be removed in 2.6.42.\n"); > + "ioctls will be removed in 3.2.\n"); > uvc_printk(KERN_INFO, "See http://www.ideasonboard.org/uvc/upgrade/ " > "for upgrade instructions.\n"); > warned = 1; > diff --git a/drivers/media/video/uvc/uvcvideo.h > b/drivers/media/video/uvc/uvcvideo.h index df32a43..4419c34 100644 > --- a/drivers/media/video/uvc/uvcvideo.h > +++ b/drivers/media/video/uvc/uvcvideo.h > @@ -7,7 +7,7 @@ > #ifndef __KERNEL__ > /* > * This header provides binary compatibility with applications using the > private - * uvcvideo API. This API is deprecated and will be removed in > 2.6.42. + * uvcvideo API. This API is deprecated and will be removed in > 3.2. * Applications should be recompiled against the public > linux/uvcvideo.h header. */ > #warn "The uvcvideo.h header is deprecated, use linux/uvcvideo.h instead."
On 07/30/2011 03:36 PM, Laurent Pinchart wrote: > Hi Greg, > > Thanks for the patch. > > On Saturday 30 July 2011 17:47:30 Greg Dietsche wrote: > >> change from v2.6.42 to v3.2 >> > This patch would be queued for v3.2. As the code it fixes will go away at the > same time, it would be pretty pointless to apply it :-) Thanks for warning me > though. > > you're welcome - I thought the merge window was still open for 3.1 ... so that's why I sent it in. Greg -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Greg, On Saturday 30 July 2011 23:31:16 Greg Dietsche wrote: > On 07/30/2011 03:36 PM, Laurent Pinchart wrote: > > Hi Greg, > > > > Thanks for the patch. > > > > On Saturday 30 July 2011 17:47:30 Greg Dietsche wrote: > >> change from v2.6.42 to v3.2 > > > > This patch would be queued for v3.2. As the code it fixes will go away at > > the same time, it would be pretty pointless to apply it :-) Thanks for > > warning me though. > > you're welcome - I thought the merge window was still open for 3.1 ... > so that's why I sent it in. Linus' merge window is still open, but this will have to go through Mauro's tree, and it won't make it on time.
On 07/30/2011 04:34 PM, Laurent Pinchart wrote: > Hi Greg, > > On Saturday 30 July 2011 23:31:16 Greg Dietsche wrote: > >> On 07/30/2011 03:36 PM, Laurent Pinchart wrote: >> >>> Hi Greg, >>> >>> Thanks for the patch. >>> >>> On Saturday 30 July 2011 17:47:30 Greg Dietsche wrote: >>> >>>> change from v2.6.42 to v3.2 >>>> >>> This patch would be queued for v3.2. As the code it fixes will go away at >>> the same time, it would be pretty pointless to apply it :-) Thanks for >>> warning me though. >>> >> you're welcome - I thought the merge window was still open for 3.1 ... >> so that's why I sent it in. >> > Linus' merge window is still open, but this will have to go through Mauro's > tree, and it won't make it on time. > > Ah, that makes sense :) Anyway it is very trivial... thanks for the explanation! Greg -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c index ea71d5f..6d6e3f9 100644 --- a/drivers/media/video/uvc/uvc_v4l2.c +++ b/drivers/media/video/uvc/uvc_v4l2.c @@ -546,7 +546,7 @@ static void uvc_v4l2_ioctl_warn(void) return; uvc_printk(KERN_INFO, "Deprecated UVCIOC_CTRL_{ADD,MAP_OLD,GET,SET} " - "ioctls will be removed in 2.6.42.\n"); + "ioctls will be removed in 3.2.\n"); uvc_printk(KERN_INFO, "See http://www.ideasonboard.org/uvc/upgrade/ " "for upgrade instructions.\n"); warned = 1; diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h index df32a43..4419c34 100644 --- a/drivers/media/video/uvc/uvcvideo.h +++ b/drivers/media/video/uvc/uvcvideo.h @@ -7,7 +7,7 @@ #ifndef __KERNEL__ /* * This header provides binary compatibility with applications using the private - * uvcvideo API. This API is deprecated and will be removed in 2.6.42. + * uvcvideo API. This API is deprecated and will be removed in 3.2. * Applications should be recompiled against the public linux/uvcvideo.h header. */ #warn "The uvcvideo.h header is deprecated, use linux/uvcvideo.h instead."
change from v2.6.42 to v3.2 Reported-by: Justin Piszcz <jpiszcz@lucidpixels.com> Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> --- drivers/media/video/uvc/uvc_v4l2.c | 2 +- drivers/media/video/uvc/uvcvideo.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)