aboutsummaryrefslogtreecommitdiffstats
path: root/driver
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-11-28 10:10:41 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2005-11-28 10:10:41 -0800
commited087c4bc638c8606bc06a35154016e3fa07752f (patch)
treefdcb135f9694620b980f8035f28d549dc76b5928 /driver
parentd97856649e5cfcbb402b85bc09b39f3972236407 (diff)
downloadpatches-ed087c4bc638c8606bc06a35154016e3fa07752f.tar.gz
removed patches added to 2.6.15-rc2-git4
Diffstat (limited to 'driver')
-rw-r--r--driver/add-more-scm-trees-to-maintainers.patch157
-rw-r--r--driver/clarify-t-field-in-maintainers.patch31
-rw-r--r--driver/mtd-git-tree-location-added-to-maintainers.patch30
-rw-r--r--driver/small-fixups-to-driver-core.patch114
4 files changed, 0 insertions, 332 deletions
diff --git a/driver/add-more-scm-trees-to-maintainers.patch b/driver/add-more-scm-trees-to-maintainers.patch
deleted file mode 100644
index ae8b25b9808ff..0000000000000
--- a/driver/add-more-scm-trees-to-maintainers.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From jwboyer@gmail.com Mon Nov 21 20:46:43 2005
-Message-ID: <625fc13d0511211911j10f8e87dha9be0b71a298c60d@mail.gmail.com>
-Date: Mon, 21 Nov 2005 21:11:49 -0600
-From: Josh Boyer <jwboyer@gmail.com>
-To: scjody@steamballoon.com, gregkh@suse.de, torvalds@osdl.org, akpm@osdl.org
-Subject: Add more SCM trees to MAINTAINERS
-Cc: linux-kernel@vger.kernel.org
-Content-Disposition: inline
-
-Greg requested a patch to update MAINTAINERS with more SCM entries.
-The patch below is what I've found so far.
-
-Signed-off-by: Josh Boyer <jwboyer@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- MAINTAINERS | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
---- gregkh-2.6.orig/MAINTAINERS
-+++ gregkh-2.6/MAINTAINERS
-@@ -227,6 +227,7 @@ AGPGART DRIVER
- P: Dave Jones
- M: davej@codemonkey.org.uk
- W: http://www.codemonkey.org.uk/projects/agp/
-+T: git kernel.org:/pub/scm/linux/kernel/git/davej/agpgart.git
- S: Maintained
-
- AHA152X SCSI DRIVER
-@@ -384,6 +385,7 @@ P: David Woodhouse
- M: dwmw2@infradead.org
- L: linux-audit@redhat.com
- W: http://people.redhat.com/sgrubb/audit/
-+T: git kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6.git
- S: Maintained
-
- AX.25 NETWORK LAYER
-@@ -432,6 +434,7 @@ L: bluez-devel@lists.sf.net
- W: http://bluez.sf.net
- W: http://www.bluez.org
- W: http://www.holtmann.org/linux/bluetooth/
-+T: git kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git
- S: Maintained
-
- BLUETOOTH RFCOMM LAYER
-@@ -547,6 +550,7 @@ P: Steve French
- M: sfrench@samba.org
- L: samba-technical@lists.samba.org
- W: http://us1.samba.org/samba/Linux_CIFS_client.html
-+T: git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
- S: Supported
-
- CIRRUS LOGIC GENERIC FBDEV DRIVER
-@@ -608,6 +612,7 @@ P: Dave Jones
- M: davej@codemonkey.org.uk
- L: cpufreq@lists.linux.org.uk
- W: http://www.codemonkey.org.uk/projects/cpufreq/
-+T: git kernel.org/pub/scm/linux/kernel/davej/cpufreq.git
- S: Maintained
-
- CPUID/MSR DRIVER
-@@ -641,6 +646,7 @@ M: herbert@gondor.apana.org.au
- P: David S. Miller
- M: davem@davemloft.net
- L: linux-crypto@vger.kernel.org
-+T: git kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
- S: Maintained
-
- CYBERPRO FB DRIVER
-@@ -1185,6 +1191,7 @@ P: Bartlomiej Zolnierkiewicz
- M: B.Zolnierkiewicz@elka.pw.edu.pl
- L: linux-kernel@vger.kernel.org
- L: linux-ide@vger.kernel.org
-+T: git kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git
- S: Maintained
-
- IDE/ATAPI CDROM DRIVER
-@@ -1279,6 +1286,7 @@ P: Vojtech Pavlik
- M: vojtech@suse.cz
- L: linux-input@atrey.karlin.mff.cuni.cz
- L: linux-joystick@atrey.karlin.mff.cuni.cz
-+T: git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
- S: Maintained
-
- INOTIFY
-@@ -1392,6 +1400,7 @@ P: Kai Germaschewski
- M: kai.germaschewski@gmx.de
- L: isdn4linux@listserv.isdn4linux.de
- W: http://www.isdn4linux.de
-+T: git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git
- S: Maintained
-
- ISDN SUBSYSTEM (Eicon active card driver)
-@@ -1420,6 +1429,7 @@ P: Dave Kleikamp
- M: shaggy@austin.ibm.com
- L: jfs-discussion@lists.sourceforge.net
- W: http://jfs.sourceforge.net/
-+T: git kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
- S: Supported
-
- KCONFIG
-@@ -1534,6 +1544,7 @@ P: Paul Mackerras
- M: paulus@samba.org
- W: http://www.penguinppc.org/
- L: linuxppc-dev@ozlabs.org
-+T: git kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git
- S: Supported
-
- LINUX FOR POWER MACINTOSH
-@@ -1601,6 +1612,7 @@ P: Chris Wright
- M: chrisw@osdl.org
- L: linux-security-module@wirex.com
- W: http://lsm.immunix.org
-+T: git kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
- S: Supported
-
- LM83 HARDWARE MONITOR DRIVER
-@@ -1816,6 +1828,7 @@ M: yoshfuji@linux-ipv6.org
- P: Patrick McHardy
- M: kaber@coreworks.de
- L: netdev@vger.kernel.org
-+T: git kernel.org:/pub/scm/linux/kernel/davem/net-2.6.git
- S: Maintained
-
- IPVS
-@@ -1867,6 +1880,7 @@ M: aia21@cantab.net
- L: linux-ntfs-dev@lists.sourceforge.net
- L: linux-kernel@vger.kernel.org
- W: http://linux-ntfs.sf.net/
-+T: git kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git
- S: Maintained
-
- NVIDIA (RIVA) FRAMEBUFFER DRIVER
-@@ -2390,6 +2404,7 @@ P: Anton Blanchard
- M: anton@samba.org
- L: sparclinux@vger.kernel.org
- L: ultralinux@vger.kernel.org
-+T: git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
- S: Maintained
-
- SHARP LH SUPPORT (LH7952X & LH7A40X)
-@@ -2528,6 +2543,7 @@ P: Adrian Bunk
- M: trivial@kernel.org
- L: linux-kernel@vger.kernel.org
- W: http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/
-+T: git kernel.org:/pub/scm/linux/kernel/git/bunk/trivial.git
- S: Maintained
-
- TMS380 TOKEN-RING NETWORK DRIVER
-@@ -2861,6 +2877,7 @@ P: Latchesar Ionkov
- M: lucho@ionkov.net
- L: v9fs-developer@lists.sourceforge.net
- W: http://v9fs.sf.net
-+T: git kernel.org:/pub/scm/linux/kernel/ericvh/v9fs-devel.git
- S: Maintained
-
- VIDEO FOR LINUX
diff --git a/driver/clarify-t-field-in-maintainers.patch b/driver/clarify-t-field-in-maintainers.patch
deleted file mode 100644
index 2371d88ec2a35..0000000000000
--- a/driver/clarify-t-field-in-maintainers.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From scjody@conscoop.ottawa.on.ca Mon Nov 21 13:14:15 2005
-Date: Mon, 21 Nov 2005 15:30:23 -0500
-From: Jody McIntyre <scjody@steamballoon.com>
-To: Pavel Machek <pavel@suse.cz>
-Cc: Greg Kroah-Hartman <gregkh@suse.de>, Linus Torvalds <torvalds@osdl.org>, Andrew Morton <akpm@osdl.org>
-Subject: Clarify T: field in MAINTAINERS
-Message-ID: <20051121203023.GG20781@conscoop.ottawa.on.ca>
-Content-Disposition: inline
-
-Pavel Machek points out that for git repos, what we include is not
-actually a URL. It is undesirable to use a URL since git repos can be
-accessed in many different ways.
-
-Signed-off-by: Jody McIntyre <scjody@steamballoon.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- MAINTAINERS | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- gregkh-2.6.orig/MAINTAINERS
-+++ gregkh-2.6/MAINTAINERS
-@@ -58,7 +58,7 @@ P: Person
- M: Mail patches to
- L: Mailing list that is relevant to this area
- W: Web-page with status/info
--T: SCM tree type and URL. Type is one of: git, hg, quilt.
-+T: SCM tree type and location. Type is one of: git, hg, quilt.
- S: Status, one of the following:
-
- Supported: Someone is actually paid to look after this.
diff --git a/driver/mtd-git-tree-location-added-to-maintainers.patch b/driver/mtd-git-tree-location-added-to-maintainers.patch
deleted file mode 100644
index 6c0f4a7451a8b..0000000000000
--- a/driver/mtd-git-tree-location-added-to-maintainers.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From jwboyer@gmail.com Mon Nov 21 05:52:34 2005
-Message-ID: <625fc13d0511210612m7c659b9agb7f9a5e1a1de117f@mail.gmail.com>
-Date: Mon, 21 Nov 2005 08:12:56 -0600
-From: Josh Boyer <jwboyer@gmail.com>
-To: Greg KH <greg@kroah.com>
-Subject: MTD git tree location added to MAINTAINERS
-Cc: Greg Kroah-Hartman <gregkh@suse.de>, Linus Torvalds <torvalds@osdl.org>, Andrew Morton <akpm@osdl.org>, scjody@steamballoon.com
-Content-Disposition: inline
-
-Here's the MTD one. More later as I find them.
-
-Signed-off-by: Josh Boyer <jwboyer@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
-diff --git a/MAINTAINERS b/MAINTAINERS
-index c5cf7d7..1e84be3 100644
----
- MAINTAINERS | 1 +
- 1 file changed, 1 insertion(+)
-
---- gregkh-2.6.orig/MAINTAINERS
-+++ gregkh-2.6/MAINTAINERS
-@@ -1695,6 +1695,7 @@ P: David Woodhouse
- M: dwmw2@infradead.org
- W: http://www.linux-mtd.infradead.org/
- L: linux-mtd@lists.infradead.org
-+T: git kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6.git
- S: Maintained
-
- MICROTEK X6 SCANNER
diff --git a/driver/small-fixups-to-driver-core.patch b/driver/small-fixups-to-driver-core.patch
deleted file mode 100644
index e618742b2bfde..0000000000000
--- a/driver/small-fixups-to-driver-core.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From stern@rowland.harvard.edu Thu Nov 17 11:50:20 2005
-Date: Thu, 17 Nov 2005 15:04:42 -0500 (EST)
-From: Alan Stern <stern@rowland.harvard.edu>
-To: Greg KH <greg@kroah.com>
-cc: Patrick Mochel <mochel@digitalimplant.org>
-Subject: [PATCH] Small fixups to driver core
-Message-ID: <Pine.LNX.4.44L0.0511171444400.4452-100000@iolanthe.rowland.org>
-
-
-This patch (as603) makes a few small fixes to the driver core:
-
-Change spin_lock_irq for a klist lock to spin_lock;
-
-Fix reference count leaks;
-
-Minor spelling and formatting changes.
-
-Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
-Acked-by Patrick Mochel <mochel@digitalimplant.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/base/bus.c | 21 +++++++++------------
- drivers/base/dd.c | 8 +++-----
- 2 files changed, 12 insertions(+), 17 deletions(-)
-
---- gregkh-2.6.orig/drivers/base/bus.c
-+++ gregkh-2.6/drivers/base/bus.c
-@@ -133,7 +133,7 @@ static struct kobj_type ktype_bus = {
- decl_subsys(bus, &ktype_bus, NULL);
-
-
--/* Manually detach a device from it's associated driver. */
-+/* Manually detach a device from its associated driver. */
- static int driver_helper(struct device *dev, void *data)
- {
- const char *name = data;
-@@ -151,14 +151,13 @@ static ssize_t driver_unbind(struct devi
- int err = -ENODEV;
-
- dev = bus_find_device(bus, NULL, (void *)buf, driver_helper);
-- if ((dev) &&
-- (dev->driver == drv)) {
-+ if (dev && dev->driver == drv) {
- device_release_driver(dev);
- err = count;
- }
-- if (err)
-- return err;
-- return count;
-+ put_device(dev);
-+ put_bus(bus);
-+ return err;
- }
- static DRIVER_ATTR(unbind, S_IWUSR, NULL, driver_unbind);
-
-@@ -175,16 +174,14 @@ static ssize_t driver_bind(struct device
- int err = -ENODEV;
-
- dev = bus_find_device(bus, NULL, (void *)buf, driver_helper);
-- if ((dev) &&
-- (dev->driver == NULL)) {
-+ if (dev && dev->driver == NULL) {
- down(&dev->sem);
- err = driver_probe_device(drv, dev);
- up(&dev->sem);
-- put_device(dev);
- }
-- if (err)
-- return err;
-- return count;
-+ put_device(dev);
-+ put_bus(bus);
-+ return err;
- }
- static DRIVER_ATTR(bind, S_IWUSR, NULL, driver_bind);
-
---- gregkh-2.6.orig/drivers/base/dd.c
-+++ gregkh-2.6/drivers/base/dd.c
-@@ -62,7 +62,6 @@ void device_bind_driver(struct device *
- * because we don't know the format of the ID structures, nor what
- * is to be considered a match and what is not.
- *
-- *
- * This function returns 1 if a match is found, an error if one
- * occurs (that is not -ENODEV or -ENXIO), and 0 otherwise.
- *
-@@ -158,7 +157,6 @@ static int __driver_attach(struct device
- driver_probe_device(drv, dev);
- up(&dev->sem);
-
--
- return 0;
- }
-
-@@ -225,15 +223,15 @@ void driver_detach(struct device_driver
- struct device * dev;
-
- for (;;) {
-- spin_lock_irq(&drv->klist_devices.k_lock);
-+ spin_lock(&drv->klist_devices.k_lock);
- if (list_empty(&drv->klist_devices.k_list)) {
-- spin_unlock_irq(&drv->klist_devices.k_lock);
-+ spin_unlock(&drv->klist_devices.k_lock);
- break;
- }
- dev = list_entry(drv->klist_devices.k_list.prev,
- struct device, knode_driver.n_node);
- get_device(dev);
-- spin_unlock_irq(&drv->klist_devices.k_lock);
-+ spin_unlock(&drv->klist_devices.k_lock);
-
- down(&dev->sem);
- if (dev->driver == drv)