1 files changed, 157 insertions, 55 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 88a216d18092..1571c0c83dba 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -6,21 +6,6 @@ be removed from this file.
 
 ---------------------------
 
-What:   USER_SCHED
-When:   2.6.34
-
-Why:    USER_SCHED was implemented as a proof of concept for group scheduling.
-        The effect of USER_SCHED can already be achieved from userspace with
-        the help of libcgroup. The removal of USER_SCHED will also simplify
-        the scheduler code with the removal of one major ifdef. There are also
-        issues USER_SCHED has with USER_NS. A decision was taken not to fix
-        those and instead remove USER_SCHED. Also new group scheduling
-        features will not be implemented for USER_SCHED.
-
-Who:    Dhaval Giani <dhaval@linux.vnet.ibm.com>
-
----------------------------
-
 What:   PRISM54
 When:   2.6.34
 
@@ -64,6 +49,17 @@ Who:	Robin Getz <rgetz@blackfin.uclinux.org> & Matt Mackall <mpm@selenic.com>
 
 ---------------------------
 
+What:   Deprecated snapshot ioctls
+When:   2.6.36
+
+Why:    The ioctls in kernel/power/user.c were marked as deprecated long time
+        ago. Now they notify users about that so that they need to replace
+        their userspace. After some more time, remove them completely.
+
+Who:    Jiri Slaby <jirislaby@gmail.com>
+
+---------------------------
+
 What:   The ieee80211_regdom module parameter
 When:   March 2010 / desktop catchup
 
@@ -88,27 +84,6 @@ Who:	Luis R. Rodriguez <lrodriguez@atheros.com>
 
 ---------------------------
 
-What:   CONFIG_WIRELESS_OLD_REGULATORY - old static regulatory information
-When:   March 2010 / desktop catchup
-
-Why:    The old regulatory infrastructure has been replaced with a new one
-        which does not require statically defined regulatory domains. We do
-        not want to keep static regulatory domains in the kernel due to the
-        the dynamic nature of regulatory law and localization. We kept around
-        the old static definitions for the regulatory domains of:
-
-                * US
-                * JP
-                * EU
-
-        and used by default the US when CONFIG_WIRELESS_OLD_REGULATORY was
-        set. We will remove this option once the standard Linux desktop catches
-        up with the new userspace APIs we have implemented.
-
-Who:    Luis R. Rodriguez <lrodriguez@atheros.com>
-
----------------------------
-
 What:   dev->power.power_state
 When:   July 2007
 Why:    Broken design for runtime control over driver power states, confusing
@@ -142,19 +117,25 @@ Who:	Mauro Carvalho Chehab <mchehab@infradead.org>
 ---------------------------
 
 What:   PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl])
-When:   November 2005
+When:   2.6.35/2.6.36
 Files:  drivers/pcmcia/: pcmcia_ioctl.c
 Why:    With the 16-bit PCMCIA subsystem now behaving (almost) like a
         normal hotpluggable bus, and with it using the default kernel
         infrastructure (hotplug, driver core, sysfs) keeping the PCMCIA
         control ioctl needed by cardmgr and cardctl from pcmcia-cs is
-        unnecessary, and makes further cleanups and integration of the
+        unnecessary and potentially harmful (it does not provide for
+        proper locking), and makes further cleanups and integration of the
         PCMCIA subsystem into the Linux kernel device driver model more
         difficult. The features provided by cardmgr and cardctl are either
         handled by the kernel itself now or are available in the new
         pcmciautils package available at
         http://kernel.org/pub/linux/utils/kernel/pcmcia/
-Who:    Dominik Brodowski <linux@brodo.de>
+
+        For all architectures except ARM, the associated config symbol
+        has been removed from kernel 2.6.34; for ARM, it will be likely
+        be removed from kernel 2.6.35. The actual code will then likely
+        be removed from kernel 2.6.36.
+Who:    Dominik Brodowski <linux@dominikbrodowski.net>
 
 ---------------------------
 
@@ -260,16 +241,6 @@ Who:	Thomas Gleixner <tglx@linutronix.de>
 
 ---------------------------
 
-What (Why):
-        - xt_recent: the old ipt_recent proc dir
-          (superseded by /proc/net/xt_recent)
-
-When:   January 2009 or Linux 2.7.0, whichever comes first
-Why:    Superseded by newer revisions or modules
-Who:    Jan Engelhardt <jengelh@computergmbh.de>
-
----------------------------
-
 What:   GPIO autorequest on gpio_direction_{input,output}() in gpiolib
 When:   February 2010
 Why:    All callers should use explicit gpio_request()/gpio_free().
@@ -468,12 +439,6 @@ Who:	Alok N Kataria <akataria@vmware.com>
 
 ----------------------------
 
-What:   adt7473 hardware monitoring driver
-When:   February 2010
-Why:    Obsoleted by the adt7475 driver.
-Who:    Jean Delvare <khali@linux-fr.org>
-
----------------------------
 What:   Support for lcd_switch and display_get in asus-laptop driver
 When:   March 2010
 Why:    These two features use non-standard interfaces. There are the
@@ -545,6 +510,133 @@ Who:	Hans de Goede <hdegoede@redhat.com>
 
 ----------------------------
 
+What:   sysfs-class-rfkill state file
+When:   Feb 2014
+Files:  net/rfkill/core.c
+Why:    Documented as obsolete since Feb 2010. This file is limited to 3
+        states while the rfkill drivers can have 4 states.
+Who:    anybody or Florian Mickler <florian@mickler.org>
+
+----------------------------
+
+What:   sysfs-class-rfkill claim file
+When:   Feb 2012
+Files:  net/rfkill/core.c
+Why:    It is not possible to claim an rfkill driver since 2007. This is
+        Documented as obsolete since Feb 2010.
+Who:    anybody or Florian Mickler <florian@mickler.org>
+
+----------------------------
+
+What:   capifs
+When:   February 2011
+Files:  drivers/isdn/capi/capifs.*
+Why:    udev fully replaces this special file system that only contains CAPI
+        NCCI TTY device nodes. User space (pppdcapiplugin) works without
+        noticing the difference.
+Who:    Jan Kiszka <jan.kiszka@web.de>
+
+----------------------------
+
+What:   KVM memory aliases support
+When:   July 2010
+Why:    Memory aliasing support is used for speeding up guest vga access
+        through the vga windows.
+
+        Modern userspace no longer uses this feature, so it's just bitrotted
+        code and can be removed with no impact.
+Who:    Avi Kivity <avi@redhat.com>
+
+----------------------------
+
+What:   xtime, wall_to_monotonic
+When:   2.6.36+
+Files:  kernel/time/timekeeping.c include/linux/time.h
+Why:    Cleaning up timekeeping internal values. Please use
+        existing timekeeping accessor functions to access
+        the equivalent functionality.
+Who:    John Stultz <johnstul@us.ibm.com>
+
+----------------------------
+
+What:   KVM kernel-allocated memory slots
+When:   July 2010
+Why:    Since 2.6.25, kvm supports user-allocated memory slots, which are
+        much more flexible than kernel-allocated slots.  All current userspace
+        supports the newer interface and this code can be removed with no
+        impact.
+Who:    Avi Kivity <avi@redhat.com>
+
+----------------------------
+
+What:   KVM paravirt mmu host support
+When:   January 2011
+Why:    The paravirt mmu host support is slower than non-paravirt mmu, both
+        on newer and older hardware.  It is already not exposed to the guest,
+        and kept only for live migration purposes.
+Who:    Avi Kivity <avi@redhat.com>
+
+----------------------------
+
+What:   iwlwifi 50XX module parameters
+When:   2.6.40
+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
+        in drivers/net/wireless/iwlwifi/iwl-agn.c
+
+Who:    Wey-Yi Guy <wey-yi.w.guy@intel.com>
+
+----------------------------
+
+What:   iwl4965 alias support
+When:   2.6.40
+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.
+
+Who:    Wey-Yi Guy <wey-yi.w.guy@intel.com>
+
+---------------------------
+
+What:   xt_NOTRACK
+Files:  net/netfilter/xt_NOTRACK.c
+When:   April 2011
+Why:    Superseded by xt_CT
+Who:    Netfilter developer team <netfilter-devel@vger.kernel.org>
+
+---------------------------
+
+What:   video4linux /dev/vtx teletext API support
+When:   2.6.35
+Files:  drivers/media/video/saa5246a.c drivers/media/video/saa5249.c
+        include/linux/videotext.h
+Why:    The vtx device nodes have been superseded by vbi device nodes
+        for many years. No applications exist that use the vtx support.
+        Of the two i2c drivers that actually support this API the saa5249
+        has been impossible to use for a year now and no known hardware
+        that supports this device exists. The saa5246a is theoretically
+        supported by the old mxb boards, but it never actually worked.
+
+        In summary: there is no hardware that can use this API and there
+        are no applications actually implementing this API.
+
+        The vtx support still reserves minors 192-223 and we would really
+        like to reuse those for upcoming new functionality. In the unlikely
+        event that new hardware appears that wants to use the functionality
+        provided by the vtx API, then that functionality should be build
+        around the sliced VBI API instead.
+Who:    Hans Verkuil <hverkuil@xs4all.nl>
+
+----------------------------
+
+What:   IRQF_DISABLED
+When:   2.6.36
+Why:    The flag is a NOOP as we run interrupt handlers with interrupts disabled
+Who:    Thomas Gleixner <tglx@linutronix.de>
+
+----------------------------
+
 What:   old ieee1394 subsystem (CONFIG_IEEE1394)
 When:   2.6.37
 Files:  drivers/ieee1394/ except init_ohci1394_dma.c
@@ -552,3 +644,13 @@ Why:	superseded by drivers/firewire/ (CONFIG_FIREWIRE) which offers more
         features, better performance, and better security, all with smaller
         and more modern code base
 Who:    Stefan Richter <stefanr@s5r6.in-berlin.de>
+
+----------------------------
+
+What:   The acpi_sleep=s4_nonvs command line option
+When:   2.6.37
+Files:  arch/x86/kernel/acpi/sleep.c
+Why:    superseded by acpi_sleep=nonvs
+Who:    Rafael J. Wysocki <rjw@sisk.pl>
+
+----------------------------