2 more .24 patches

diff --git a/queue-2.6.24/driver-core-revert-fix-firmware-class-name-collision.patch b/queue-2.6.24/driver-core-revert-fix-firmware-class-name-collision.patch
new file mode 100644 (file)
index 0000000..ac25c66
--- /dev/null
+++ b/queue-2.6.24/driver-core-revert-fix-firmware-class-name-collision.patch
@@ -0,0 +1,41 @@
+From michael_e_brown@humbolt.us.dell.com Tue Jan 29 13:34:58 2008
+From: Michael E Brown <Michael_E_Brown@dell.com>
+Date: Tue, 29 Jan 2008 15:35:01 -0600
+Subject: Driver core: Revert "Fix Firmware class name collision"
+To: Greg KH <gregkh@suse.de>
+Message-ID: <20080129213500.GA18423@humbolt.us.dell.com>
+Content-Disposition: inline
+
+From: Michael E Brown <Michael_E_Brown@dell.com>
+
+patch 7d640c4a5b36c4733460065db1554da924044511 in mainline.
+
+This reverts commit 109f0e93b6b728f03c1eb4af02bc25d71b646c59.
+
+The original patch breaks BIOS updates on all Dell machines. The path to
+the firmware file for the dell_rbu driver changes, which breaks all of
+the userspace tools which rely on it.
+
+Note that this patch re-introduces a problem with i2c name collision
+that was previously fixed by this patch.
+
+Signed-off-by: Michael E Brown <michael_e_brown@dell.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+---
+ drivers/base/firmware_class.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/base/firmware_class.c
++++ b/drivers/base/firmware_class.c
+@@ -292,7 +292,8 @@ firmware_class_timeout(u_long data)
+ 
+ static inline void fw_setup_device_id(struct device *f_dev, struct device *dev)
+ {
+-      snprintf(f_dev->bus_id, BUS_ID_SIZE, "firmware-%s", dev->bus_id);
++      /* XXX warning we should watch out for name collisions */
++      strlcpy(f_dev->bus_id, dev->bus_id, BUS_ID_SIZE);
+ }
+ 
+ static int fw_register_device(struct device **dev_p, const char *fw_name,

diff --git a/queue-2.6.24/drm-the-drm-really-should-call-pci_set_master.patch b/queue-2.6.24/drm-the-drm-really-should-call-pci_set_master.patch
new file mode 100644 (file)
index 0000000..cb03b9d
--- /dev/null
+++ b/queue-2.6.24/drm-the-drm-really-should-call-pci_set_master.patch
@@ -0,0 +1,32 @@
+From stable-bounces@linux.kernel.org Wed Feb  6 21:43:41 2008
+From: Dave Airlie <airlied@linux.ie>
+Date: Thu, 7 Feb 2008 05:43:11 +0000 (GMT)
+Subject: [stable] drm: the drm really should call pci_set_master..
+To: stable@kernel.org
+Message-ID: <alpine.DEB.0.82.0802070541260.26136@skynet.skynet.ie>
+
+From: Dave Airlie <airlied@linux.ie>
+
+
+(submitted upstream as 19a8f59ab8ceee751ea720085098355d53f727d6)
+
+perhaps bonghits could turn on my bus-mastering because the drm
+certainly never bothered doing it before.
+
+Signed-off-by: Dave Airlie <airlied@linux.ie>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/char/drm/drm_stub.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/char/drm/drm_stub.c
++++ b/drivers/char/drm/drm_stub.c
+@@ -218,6 +218,7 @@ int drm_get_dev(struct pci_dev *pdev, co
+       if (ret)
+               goto err_g1;
+ 
++      pci_set_master(pdev);
+       if ((ret = drm_fill_in_dev(dev, pdev, ent, driver))) {
+               printk(KERN_ERR "DRM: Fill_in_dev failed.\n");
+               goto err_g2;

diff --git a/queue-2.6.24/series b/queue-2.6.24/series
index 129237c4186e0c34c39ac964ae412fd8a0127984..356b46074de9df6a8ab13d9ca69f58874caefc78 100644 (file)
--- a/queue-2.6.24/series
+++ b/queue-2.6.24/series
@@ -41,3 +41,5 @@ sched-let-nice-tasks-have-smaller-impact.patch
 sched-fix-high-wake-up-latencies-with-fair_user_sched.patch
 fix-writev-regression-pan-hanging-unkillable-and-un-straceable.patch
 x86-replace-lock_prefix-in-futex.h.patch
+driver-core-revert-fix-firmware-class-name-collision.patch
+drm-the-drm-really-should-call-pci_set_master.patch