1 files changed, 43 insertions, 133 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 1571c0c83dba..842aa9de84a6 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -93,7 +93,7 @@ Why:	Broken design for runtime control over driver power states, confusing
         inputs.  This framework was never widely used, and most attempts to
         use it were broken.  Drivers should instead be exposing domain-specific
         interfaces either to kernel or to userspace.
-Who:    Pavel Machek <pavel@suse.cz>
+Who:    Pavel Machek <pavel@ucw.cz>
 
 ---------------------------
 
@@ -116,29 +116,6 @@ Who:	Mauro Carvalho Chehab <mchehab@infradead.org>
 
 ---------------------------
 
-What:   PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl])
-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 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/
-
-        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>
-
----------------------------
-
 What:   sys_sysctl
 When:   September 2010
 Option: CONFIG_SYSCTL_SYSCALL
@@ -174,6 +151,31 @@ Who:	Eric Biederman <ebiederm@xmission.com>
 
 ---------------------------
 
+What:   /proc/<pid>/oom_adj
+When:   August 2012
+Why:    /proc/<pid>/oom_adj allows userspace to influence the oom killer's
+        badness heuristic used to determine which task to kill when the kernel
+        is out of memory.
+
+        The badness heuristic has since been rewritten since the introduction of
+        this tunable such that its meaning is deprecated.  The value was
+        implemented as a bitshift on a score generated by the badness()
+        function that did not have any precise units of measure.  With the
+        rewrite, the score is given as a proportion of available memory to the
+        task allocating pages, so using a bitshift which grows the score
+        exponentially is, thus, impossible to tune with fine granularity.
+
+        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
+        /proc/<pid>/oom_adj.
+
+        A warning will be emitted to the kernel log if an application uses this
+        deprecated interface.  After it is printed once, future warnings will be
+        suppressed until the kernel is rebooted.
+
+---------------------------
+
 What:   remove EXPORT_SYMBOL(kernel_thread)
 When:   August 2006
 Files:  arch/*/kernel/*_ksyms.c
@@ -303,15 +305,6 @@ Who:	Johannes Berg <johannes@sipsolutions.net>
 
 ---------------------------
 
-What: CONFIG_NF_CT_ACCT
-When: 2.6.29
-Why:  Accounting can now be enabled/disabled without kernel recompilation.
-      Currently used only to set a default value for a feature that is also
-      controlled by a kernel/module/sysfs/sysctl parameter.
-Who:  Krzysztof Piotr Oledzki <ole@ans.pl>
-
----------------------------
-
 What:   sysfs ui for changing p4-clockmod parameters
 When:   September 2009
 Why:    See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and
@@ -367,24 +360,6 @@ When:	2.6.33
 Why:    Should be implemented in userspace, policy daemon.
 Who:    Johannes Berg <johannes@sipsolutions.net>
 
----------------------------
-
-What:   CONFIG_INOTIFY
-When:   2.6.33
-Why:    last user (audit) will be converted to the newer more generic
-        and more easily maintained fsnotify subsystem
-Who:    Eric Paris <eparis@redhat.com>
-
-----------------------------
-
-What:   lock_policy_rwsem_* and unlock_policy_rwsem_* will not be
-        exported interface anymore.
-When:   2.6.33
-Why:    cpu_policy_rwsem has a new cleaner definition making it local to
-        cpufreq core and contained inside cpufreq.c. Other dependent
-        drivers should not use it in order to safely avoid lockdep issues.
-Who:    Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
-
 ----------------------------
 
 What:   sound-slot/service-* module aliases and related clutters in
@@ -459,57 +434,6 @@ Who:	Corentin Chary <corentin.chary@gmail.com>
 
 ----------------------------
 
-What:   usbvideo quickcam_messenger driver
-When:   2.6.35
-Files:  drivers/media/video/usbvideo/quickcam_messenger.[ch]
-Why:    obsolete v4l1 driver replaced by gspca_stv06xx
-Who:    Hans de Goede <hdegoede@redhat.com>
-
-----------------------------
-
-What:   ov511 v4l1 driver
-When:   2.6.35
-Files:  drivers/media/video/ov511.[ch]
-Why:    obsolete v4l1 driver replaced by gspca_ov519
-Who:    Hans de Goede <hdegoede@redhat.com>
-
-----------------------------
-
-What:   w9968cf v4l1 driver
-When:   2.6.35
-Files:  drivers/media/video/w9968cf*.[ch]
-Why:    obsolete v4l1 driver replaced by gspca_ov519
-Who:    Hans de Goede <hdegoede@redhat.com>
-
-----------------------------
-
-What:   ovcamchip sensor framework
-When:   2.6.35
-Files:  drivers/media/video/ovcamchip/*
-Why:    Only used by obsoleted v4l1 drivers
-Who:    Hans de Goede <hdegoede@redhat.com>
-
-----------------------------
-
-What:   stv680 v4l1 driver
-When:   2.6.35
-Files:  drivers/media/video/stv680.[ch]
-Why:    obsolete v4l1 driver replaced by gspca_stv0680
-Who:    Hans de Goede <hdegoede@redhat.com>
-
-----------------------------
-
-What:   zc0301 v4l driver
-When:   2.6.35
-Files:  drivers/media/video/zc0301/*
-Why:    Duplicate functionality with the gspca_zc3xx driver, zc0301 only
-        supports 2 USB-ID's (because it only supports a limited set of
-        sensors) wich are also supported by the gspca_zc3xx driver
-        (which supports 53 USB-ID's in total)
-Who:    Hans de Goede <hdegoede@redhat.com>
-
-----------------------------
-
 What:   sysfs-class-rfkill state file
 When:   Feb 2014
 Files:  net/rfkill/core.c
@@ -538,37 +462,6 @@ 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
@@ -654,3 +547,20 @@ Why:	superseded by acpi_sleep=nonvs
 Who:    Rafael J. Wysocki <rjw@sisk.pl>
 
 ----------------------------
+
+What:   PCI DMA unmap state API
+When:   August 2012
+Why:    PCI DMA unmap state API (include/linux/pci-dma.h) was replaced
+        with DMA unmap state API (DMA unmap state API can be used for
+        any bus).
+Who:    FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
+
+----------------------------
+
+What:   DMA_xxBIT_MASK macros
+When:   Jun 2011
+Why:    DMA_xxBIT_MASK macros were replaced with DMA_BIT_MASK() macros.
+Who:    FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
+
+----------------------------
+