Merge branch 'for-3.1' of git://linux-nfs.org/~bfields/linux

[pandora-kernel.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index d43900c..aca4f82 100644 (file)
--- 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
@@ -199,7 +199,7 @@ Files:      drivers/staging/cs5535_gpio/*
 Check: drivers/staging/cs5535_gpio/cs5535_gpio.c
 Why:   A newer driver replaces this; it is drivers/gpio/cs5535-gpio.c, and
        integrates with the Linux GPIO subsystem.  The old driver has been
-       moved to staging, and will be removed altogether around 2.6.40.
+       moved to staging, and will be removed altogether around 3.0.
        Please test the new driver, and ensure that the functionality you
        need and any bugfixes from the old driver are available in the new
        one.
@@ -294,7 +294,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>
 
 ---------------------------
 
@@ -430,7 +430,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
@@ -441,7 +441,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.
@@ -482,7 +482,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.
@@ -491,16 +491,6 @@ Who:       Wey-Yi Guy <wey-yi.w.guy@intel.com>
 
 ----------------------------
 
-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
@@ -518,22 +508,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
@@ -552,7 +526,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>
@@ -560,7 +534,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>
@@ -568,7 +542,7 @@ 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>