From: Greg Kroah-Hartman Date: Mon, 21 Aug 2006 18:45:19 +0000 (-0700) Subject: oops, delete a patch that should not be in the queue... X-Git-Tag: v2.6.17.10~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7867cdec8b86edeeee70f0d667b7a94d986332af;p=thirdparty%2Fkernel%2Fstable-queue.git oops, delete a patch that should not be in the queue... --- diff --git a/queue-2.6.17/deprecate-physdev-keys.patch b/queue-2.6.17/deprecate-physdev-keys.patch deleted file mode 100644 index f1263f529e9..00000000000 --- a/queue-2.6.17/deprecate-physdev-keys.patch +++ /dev/null @@ -1,81 +0,0 @@ -From kay.sievers@vrfy.org Sat Aug 12 21:17:16 2006 -Date: Sun, 13 Aug 2006 06:17:09 +0200 -From: Kay Sievers -To: Greg KH -Subject: deprecate PHYSDEV* keys -Message-ID: <20060813041709.GA2960@vrfy.org> -Content-Disposition: inline - -From: Kay Sievers - -deprecate PHYSDEV* values in the uevent environment - -These values are no longer needed and inconsistent with the -stacking of class devices. The event environment should not -carry properties of a parent device. The key PHYSDEVDRIVER is -available as DRIVER, PHYDEVBUS is indentical SUBSYSTEM. Class -devices should not carry any of these values. - -Signed-off-by: Kay Sievers -Signed-off-by: Greg Kroah-Hartman - ---- - Documentation/feature-removal-schedule.txt | 10 ++++++++++ - drivers/base/class.c | 2 +- - drivers/base/core.c | 10 +++++++--- - 3 files changed, 18 insertions(+), 4 deletions(-) - ---- linux-2.6.17.9.orig/Documentation/feature-removal-schedule.txt -+++ linux-2.6.17.9/Documentation/feature-removal-schedule.txt -@@ -248,3 +248,13 @@ Why: The interface no longer has any cal - Who: Nick Piggin - - --------------------------- -+ -+What: PHYSDEVPATH, PHYSDEVBUS, PHYSDEVDRIVER in the uevent environment -+When: Oktober 2008 -+Why: The stacking of class devices makes these values misleading and -+ inconsistent. -+ Class devices should not carry any of these properties, and bus -+ devices have SUBSYTEM and DRIVER as a replacement. -+Who: Kay Sievers -+ -+--------------------------- ---- linux-2.6.17.9.orig/drivers/base/class.c -+++ linux-2.6.17.9/drivers/base/class.c -@@ -361,7 +361,7 @@ static int class_uevent(struct kset *kse - pr_debug("%s - name = %s\n", __FUNCTION__, class_dev->class_id); - - if (class_dev->dev) { -- /* add physical device, backing this device */ -+ /* add device, backing this class device (deprecated) */ - struct device *dev = class_dev->dev; - char *path = kobject_get_path(&dev->kobj, GFP_KERNEL); - ---- linux-2.6.17.9.orig/drivers/base/core.c -+++ linux-2.6.17.9/drivers/base/core.c -@@ -117,17 +117,21 @@ static int dev_uevent(struct kset *kset, - int length = 0; - int retval = 0; - -- /* add bus name of physical device */ -+ /* add bus name (same as SUBSYSTEM, deprecated) */ - if (dev->bus) - add_uevent_var(envp, num_envp, &i, - buffer, buffer_size, &length, - "PHYSDEVBUS=%s", dev->bus->name); - -- /* add driver name of physical device */ -- if (dev->driver) -+ /* add driver name (PHYSDEV* values are deprecated)*/ -+ if (dev->driver) { -+ add_uevent_var(envp, num_envp, &i, -+ buffer, buffer_size, &length, -+ "DRIVER=%s", dev->driver->name); - add_uevent_var(envp, num_envp, &i, - buffer, buffer_size, &length, - "PHYSDEVDRIVER=%s", dev->driver->name); -+ } - - /* terminate, set to next free slot, shrink available space */ - envp[i] = NULL; diff --git a/queue-2.6.17/series b/queue-2.6.17/series index 48fa98f2a67..13ca5f5c884 100644 --- a/queue-2.6.17/series +++ b/queue-2.6.17/series @@ -1,4 +1,3 @@ -deprecate-physdev-keys.patch have-ext3-reject-file-handles-with-bad-inode-numbers-early.patch sky2-phy-power-problem-on-88e805x.patch kill-hash_highmem-from-route-cache-hash-sizing.patch