---

yaml
---
r: 226341
b: refs/heads/master
c: 439105b
h: refs/heads/master
i:
  226339: b1bd329
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39c3d488452ae206cfc8afda0db041ee55d01c3c
+refs/heads/master: 439105b122dfa21fbce7201d0f30b5eeac95c918

trunk/Documentation/feature-removal-schedule.txt

@@ -98,35 +98,33 @@ Who:	Pavel Machek <pavel@ucw.cz>
 ---------------------------
 
 What:	Video4Linux API 1 ioctls and from Video devices.
-When:	kernel 2.6.38
+When:	kernel 2.6.39
 Files:	include/linux/videodev.h
 Check:	include/linux/videodev.h
 Why:	V4L1 AP1 was replaced by V4L2 API during migration from 2.4 to 2.6
 	series. The old API have lots of drawbacks and don't provide enough
 	means to work with all video and audio standards. The newer API is
 	already available on the main drivers and should be used instead.
-	Newer drivers should use v4l_compat_translate_ioctl function to handle
-	old calls, replacing to newer ones.
-	Decoder iocts are using internally to allow video drivers to
-	communicate with video decoders. This should also be improved to allow
-	V4L2 calls being translated into compatible internal ioctls.
-	Compatibility ioctls will be provided, for a while, via 
-	v4l1-compat module. 
+
+	The userspace libv4l1 library can convert V4L1 calls to V4L2. This
+	replaces the kernel V4L1 compatibility module which was removed in
+	2.6.38. The last V4L1 drivers will either be converted to V4L2 or
+	removed for 2.6.39 at which point the V4L1 API will cease to exist.
 Who:	Mauro Carvalho Chehab <mchehab@infradead.org>
 
 ---------------------------
 
 What:	Video4Linux obsolete drivers using V4L1 API
-When:	kernel 2.6.38
-Files:	drivers/staging/cpia/* drivers/staging/stradis/*
-Check:	drivers/staging/cpia/cpia.c drivers/staging/stradis/stradis.c
+When:	kernel 2.6.39
+Files:	drivers/staging/se401/* drivers/staging/usbvideo/*
+Check:	drivers/staging/se401/se401.c drivers/staging/usbvideo/usbvideo.c
 Why:	There are some drivers still using V4L1 API, despite all efforts we've done
 	to migrate. Those drivers are for obsolete hardware that the old maintainer
 	didn't care (or not have the hardware anymore), and that no other developer
 	could find any hardware to buy. They probably have no practical usage today,
 	and people with such old hardware could probably keep using an older version
-	of the kernel. Those drivers will be moved to staging on 2.6.37 and, if nobody
-	care enough to port and test them with V4L2 API, they'll be removed on 2.6.38.
+	of the kernel. Those drivers will be moved to staging on 2.6.38 and, if nobody
+	cares enough to port and test them with V4L2 API, they'll be removed on 2.6.39.
 Who:	Mauro Carvalho Chehab <mchehab@infradead.org>
 
 ---------------------------