1 files changed, 37 insertions, 44 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 6257186b5869..f10014fa1d14 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -184,7 +184,7 @@ Why:	/proc/<pid>/oom_adj allows userspace to influence the oom killer's
 
         A much more powerful interface, /proc/<pid>/oom_score_adj, was
         introduced with the oom killer rewrite that allows users to increase or
-        decrease the badness() score linearly.  This interface will replace
+        decrease the badness score linearly.  This interface will replace
         /proc/<pid>/oom_adj.
 
         A warning will be emitted to the kernel log if an application uses this
@@ -280,7 +280,7 @@ When:	The schedule was July 2008, but it was decided that we are going to keep t
 Why:    The support code for the old firmware hurts code readability/maintainability
         and slightly hurts runtime performance. Bugfixes for the old firmware
         are not provided by Broadcom anymore.
-Who:    Michael Buesch <mb@bu3sch.de>
+Who:    Michael Buesch <m@bues.ch>
 
 ---------------------------
 
@@ -416,7 +416,7 @@ Who:	Avi Kivity <avi@redhat.com>
 ----------------------------
 
 What:   iwlwifi 50XX module parameters
-When:   2.6.40
+When:   3.0
 Why:    The "..50" modules parameters were used to configure 5000 series and
         up devices; different set of module parameters also available for 4965
         with same functionalities. Consolidate both set into single place
@@ -427,7 +427,7 @@ Who:	Wey-Yi Guy <wey-yi.w.guy@intel.com>
 ----------------------------
 
 What:   iwl4965 alias support
-When:   2.6.40
+When:   3.0
 Why:    Internal alias support has been present in module-init-tools for some
         time, the MODULE_ALIAS("iwl4965") boilerplate aliases can be removed
         with no impact.
@@ -468,7 +468,7 @@ Who:	FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 ----------------------------
 
 What:   iwlwifi disable_hw_scan module parameters
-When:   2.6.40
+When:   3.0
 Why:    Hareware scan is the prefer method for iwlwifi devices for
         scanning operation. Remove software scan support for all the
         iwlwifi devices.
@@ -477,26 +477,6 @@ Who:	Wey-Yi Guy <wey-yi.w.guy@intel.com>
 
 ----------------------------
 
-What:   access to nfsd auth cache through sys_nfsservctl or '.' files
-        in the 'nfsd' filesystem.
-When:   2.6.40
-Why:    This is a legacy interface which have been replaced by a more
-        dynamic cache.  Continuing to maintain this interface is an
-        unnecessary burden.
-Who:    NeilBrown <neilb@suse.de>
-
-----------------------------
-
-What:   cancel_rearming_delayed_work[queue]()
-When:   2.6.39
-
-Why:    The functions have been superceded by cancel_delayed_work_sync()
-        quite some time ago.  The conversion is trivial and there is no
-        in-kernel user left.
-Who:    Tejun Heo <tj@kernel.org>
-
-----------------------------
-
 What:   Legacy, non-standard chassis intrusion detection interface.
 When:   June 2011
 Why:    The adm9240, w83792d and w83793 hardware monitoring drivers have
@@ -514,22 +494,6 @@ Files:	net/netfilter/xt_connlimit.c
 
 ----------------------------
 
-What:   noswapaccount kernel command line parameter
-When:   2.6.40
-Why:    The original implementation of memsw feature enabled by
-        CONFIG_CGROUP_MEM_RES_CTLR_SWAP could be disabled by the noswapaccount
-        kernel parameter (introduced in 2.6.29-rc1). Later on, this decision
-        turned out to be not ideal because we cannot have the feature compiled
-        in and disabled by default and let only interested to enable it
-        (e.g. general distribution kernels might need it). Therefore we have
-        added swapaccount[=0|1] parameter (introduced in 2.6.37) which provides
-        the both possibilities. If we remove noswapaccount we will have
-        less command line parameters with the same functionality and we
-        can also cleanup the parameter handling a bit ().
-Who:    Michal Hocko <mhocko@suse.cz>
-
-----------------------------
-
 What:   ipt_addrtype match include file
 When:   2012
 Why:    superseded by xt_addrtype
@@ -548,7 +512,7 @@ Who:	Jean Delvare <khali@linux-fr.org>
 ----------------------------
 
 What:   Support for UVCIOC_CTRL_ADD in the uvcvideo driver
-When:   2.6.42
+When:   3.2
 Why:    The information passed to the driver by this ioctl is now queried
         dynamically from the device.
 Who:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -556,7 +520,7 @@ Who:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 ----------------------------
 
 What:   Support for UVCIOC_CTRL_MAP_OLD in the uvcvideo driver
-When:   2.6.42
+When:   3.2
 Why:    Used only by applications compiled against older driver versions.
         Superseded by UVCIOC_CTRL_MAP which supports V4L2 menu controls.
 Who:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -564,8 +528,37 @@ Who:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 ----------------------------
 
 What:   Support for UVCIOC_CTRL_GET and UVCIOC_CTRL_SET in the uvcvideo driver
-When:   2.6.42
+When:   3.2
 Why:    Superseded by the UVCIOC_CTRL_QUERY ioctl.
 Who:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 
 ----------------------------
+
+What:   For VIDIOC_S_FREQUENCY the type field must match the device node's type.
+        If not, return -EINVAL.
+When:   3.2
+Why:    It makes no sense to switch the tuner to radio mode by calling
+        VIDIOC_S_FREQUENCY on a video node, or to switch the tuner to tv mode by
+        calling VIDIOC_S_FREQUENCY on a radio node. This is the first step of a
+        move to more consistent handling of tv and radio tuners.
+Who:    Hans Verkuil <hans.verkuil@cisco.com>
+
+----------------------------
+
+What:   Opening a radio device node will no longer automatically switch the
+        tuner mode from tv to radio.
+When:   3.3
+Why:    Just opening a V4L device should not change the state of the hardware
+        like that. It's very unexpected and against the V4L spec. Instead, you
+        switch to radio mode by calling VIDIOC_S_FREQUENCY. This is the second
+        and last step of the move to consistent handling of tv and radio tuners.
+Who:    Hans Verkuil <hans.verkuil@cisco.com>
+
+----------------------------
+
+What:   g_file_storage driver
+When:   3.8
+Why:    This driver has been superseded by g_mass_storage.
+Who:    Alan Stern <stern@rowland.harvard.edu>
+
+----------------------------