Merge branch 'linux-2.6'

1 files changed, 27 insertions, 18 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 5c88ba1ea262..5f96cb33743e 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -117,13 +117,6 @@ Who:   Adrian Bunk <bunk@stusta.de>
 
 ---------------------------
 
-What:   pci_module_init(driver)
-When:   January 2007
-Why:    Is replaced by pci_register_driver(pci_driver).
-Who:    Richard Knutsson <ricknu-0@student.ltu.se> and Greg Kroah-Hartman <gregkh@suse.de>
-
----------------------------
-
 What:   Usage of invalid timevals in setitimer
 When:   March 2007
 Why:    POSIX requires to validate timevals in the setitimer call. This
@@ -190,18 +183,10 @@ Who:	Jean Delvare <khali@linux-fr.org>
 
 ---------------------------
 
-What:   i2c_adapter.dev
-        i2c_adapter.list
+What:   i2c_adapter.list
 When:   July 2007
-Why:    Superfluous, given i2c_adapter.class_dev:
-          * The "dev" was a stand-in for the physical device node that legacy
-            drivers would not have; but now it's almost always present.  Any
-            remaining legacy drivers must upgrade (they now trigger warnings).
-          * The "list" duplicates class device children.
-        The delay in removing this is so upgraded lm_sensors and libsensors
-        can get deployed.  (Removal causes minor changes in the sysfs layout,
-        notably the location of the adapter type name and parenting the i2c
-        client hardware directly from their controller.)
+Why:    Superfluous, this list duplicates the one maintained by the driver
+        core.
 Who:    Jean Delvare <khali@linux-fr.org>,
         David Brownell <dbrownell@users.sourceforge.net>
 
@@ -314,3 +299,27 @@ Why:	Code was merged, then submitter immediately disappeared leaving
 Who:    David S. Miller <davem@davemloft.net>
 
 ---------------------------
+
+What:   read_dev_chars(), read_conf_data{,_lpm}() (s390 common I/O layer)
+When:   December 2007
+Why:    These functions are a leftover from 2.4 times. They have several
+        problems:
+        - Duplication of checks that are done in the device driver's
+          interrupt handler
+        - common I/O layer can't do device specific error recovery
+        - device driver can't be notified for conditions happening during
+          execution of the function
+        Device drivers should issue the read device characteristics and read
+        configuration data ccws and do the appropriate error handling
+        themselves.
+Who:    Cornelia Huck <cornelia.huck@de.ibm.com>
+
+---------------------------
+
+What:   i2c-ixp2000, i2c-ixp4xx and scx200_i2c drivers
+When:   September 2007
+Why:    Obsolete. The new i2c-gpio driver replaces all hardware-specific
+        I2C-over-GPIO drivers.
+Who:    Jean Delvare <khali@linux-fr.org>
+
+---------------------------