aboutsummaryrefslogtreecommitdiffstats
diff options
Diffstat
-rw-r--r--series7
-rw-r--r--staging/staging-correct-dubious-use-of-x-y.patch2
-rw-r--r--staging/staging-make-usbip-depend-on-config_net.patch24
-rw-r--r--staging/staging-only-build-the-tree-if-we-really-want-to.patch53
-rw-r--r--usb/hso-fix-hso_serial_close-refcounting.patch39
-rw-r--r--usb/hso-put-linefeeds-on-printk-s-in-hso.c.patch112
-rw-r--r--version2
7 files changed, 2 insertions, 237 deletions
diff --git a/series b/series
index 791ba18d113592..7bfc35764474e7 100644
--- a/series
+++ b/series
@@ -62,13 +62,8 @@ usb/usb-protect-hcd.h-from-multiple-inclusions.patch
usb/usb-avoid-needless-address-taking-of-function-parameters.patch
usb/usb-straighten-out-inline-code-in-sysfs.c.patch
-# HSO - goes through jeff
-usb/hso-fix-hso_serial_close-refcounting.patch
-usb/hso-put-linefeeds-on-printk-s-in-hso.c.patch
-
usb/usb-add-new-opticon-serial-driver.patch
-
# stuff I want in my tree, but not to go into -next
gregkh.post/usb-remove-warn-macro-from-usb.h.patch
gregkh.post/usb-remove-info-macro-from-usb.h.patch
@@ -77,8 +72,6 @@ gregkh.post/usb-gotemp.patch
#################################
# Staging stuff
#################################
-staging/staging-only-build-the-tree-if-we-really-want-to.patch
-staging/staging-make-usbip-depend-on-config_net.patch
staging/staging-correct-dubious-use-of-x-y.patch
staging/staging-w35und-make-wb35_probe-and-wb35_disconnect-funtions-static.patch
diff --git a/staging/staging-correct-dubious-use-of-x-y.patch b/staging/staging-correct-dubious-use-of-x-y.patch
index 4ee725c94d8708..4200584ee1fedf 100644
--- a/staging/staging-correct-dubious-use-of-x-y.patch
+++ b/staging/staging-correct-dubious-use-of-x-y.patch
@@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/staging/me4000/me4000.c
+++ b/drivers/staging/me4000/me4000.c
-@@ -1181,7 +1181,7 @@ static int me4000_xilinx_download(struct
+@@ -1180,7 +1180,7 @@ static int me4000_xilinx_download(struct
/* Wait until /INIT pin is set */
udelay(20);
diff --git a/staging/staging-make-usbip-depend-on-config_net.patch b/staging/staging-make-usbip-depend-on-config_net.patch
deleted file mode 100644
index 5a92ad2b96e441..00000000000000
--- a/staging/staging-make-usbip-depend-on-config_net.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From foo@baz Wed Oct 29 10:44:55 PDT 2008
-Date: Wed, 29 Oct 2008 10:44:55 -0700
-To: Greg KH <greg@kroah.com>
-From: Greg Kroah-Hartman <gregkh@suse.de>
-Subject: Staging: make usbip depend on CONFIG_NET
-
-Thanks to Randy Dunlap for finding this problem.
-
-Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
- drivers/staging/usbip/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/staging/usbip/Kconfig
-+++ b/drivers/staging/usbip/Kconfig
-@@ -1,6 +1,6 @@
- config USB_IP_COMMON
- tristate "USB IP support (EXPERIMENTAL)"
-- depends on USB && EXPERIMENTAL
-+ depends on USB && NET && EXPERIMENTAL
- default N
- ---help---
- This enables pushing USB packets over IP to allow remote
diff --git a/staging/staging-only-build-the-tree-if-we-really-want-to.patch b/staging/staging-only-build-the-tree-if-we-really-want-to.patch
deleted file mode 100644
index ffb394712c97fc..00000000000000
--- a/staging/staging-only-build-the-tree-if-we-really-want-to.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From foo@baz Fri Nov 7 21:12:17 PST 2008
-Date: Fri, 07 Nov 2008 21:12:17 -0800
-To: Greg KH <greg@kroah.com>
-From: Greg Kroah-Hartman <gregkh@suse.de>
-Subject: Staging: only build the tree if we really want to
-
-This Kconfig change allows the common 'make allmodconfig' and
-'make allyesconfig' build options to skip the staging tree, which is
-probably what you want to have happen anyway.
-
-This makes the linux-next developer's life a lot easier so he doesn't
-have to worry about changes that break the staging tree, that's for me
-to worry about...
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/staging/Kconfig | 20 ++++++++++++++++++--
- 1 file changed, 18 insertions(+), 2 deletions(-)
-
---- a/drivers/staging/Kconfig
-+++ b/drivers/staging/Kconfig
-@@ -21,7 +21,23 @@ menuconfig STAGING
-
- If in doubt, say N here.
-
--if STAGING
-+
-+config STAGING_EXCLUDE_BUILD
-+ bool "Exclude Staging drivers from being built"
-+ default y
-+ ---help---
-+ Are you sure you really want to build the staging drivers?
-+ They taint your kernel, don't live up to the normal Linux
-+ kernel quality standards, are a bit crufty around the edges,
-+ and might go off and kick your dog when you aren't paying
-+ attention.
-+
-+ Say N here to be able to select and build the Staging drivers.
-+ This option is primarily here to prevent them from being built
-+ when selecting 'make allyesconfg' and 'make allmodconfig' so
-+ don't be all that put off, your dog will be just fine.
-+
-+if !STAGING_EXCLUDE_BUILD
-
- source "drivers/staging/et131x/Kconfig"
-
-@@ -45,4 +61,4 @@ source "drivers/staging/at76_usb/Kconfig
-
- source "drivers/staging/poch/Kconfig"
-
--endif # STAGING
-+endif # !STAGING_EXCLUDE_BUILD
diff --git a/usb/hso-fix-hso_serial_close-refcounting.patch b/usb/hso-fix-hso_serial_close-refcounting.patch
deleted file mode 100644
index 06991f4f5b25b0..00000000000000
--- a/usb/hso-fix-hso_serial_close-refcounting.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From D.Barow@option.com Wed Aug 20 13:26:56 2008
-From: Denis Joseph Barrow <D.Barow@option.com>
-Date: Wed, 20 Aug 2008 16:34:01 +0200
-Subject: HSO: fix hso_serial_close refcounting
-To: Linux USB kernel mailing list <linux-usb@vger.kernel.org>, Greg Kroah-Hartman <gregkh@suse.de>
-Message-ID: <48AC2B59.1090101@option.com>
-
-
-The hso: fix refcounting on the ttyHSx devices signed off by Olivier
-Blin was better than what was there but not completely correct. The
-kref_put has to be moved below the mutex_unlock otherwise the memory
-used by the mutex could be freed before it is used.
-
-Signed-off-by: Denis Joseph Barrow <D.Barow@option.com>
-Cc: Olivier Blin <blino@mandriva.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/net/usb/hso.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/usb/hso.c
-+++ b/drivers/net/usb/hso.c
-@@ -1290,7 +1290,6 @@ static void hso_serial_close(struct tty_
- /* reset the rts and dtr */
- /* do the actual close */
- serial->open_count--;
-- kref_put(&serial->parent->ref, hso_serial_ref_free);
- if (serial->open_count <= 0) {
- serial->open_count = 0;
- if (serial->tty) {
-@@ -1307,6 +1306,7 @@ static void hso_serial_close(struct tty_
- usb_autopm_put_interface(serial->parent->interface);
-
- mutex_unlock(&serial->parent->mutex);
-+ kref_put(&serial->parent->ref, hso_serial_ref_free);
- }
-
- /* close the requested serial port */
diff --git a/usb/hso-put-linefeeds-on-printk-s-in-hso.c.patch b/usb/hso-put-linefeeds-on-printk-s-in-hso.c.patch
deleted file mode 100644
index cd104605207760..00000000000000
--- a/usb/hso-put-linefeeds-on-printk-s-in-hso.c.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From D.Barow@option.com Wed Aug 20 13:25:50 2008
-From: Denis Joseph Barrow <D.Barow@option.com>
-Date: Wed, 20 Aug 2008 17:04:52 +0200
-Subject: HSO: put linefeeds on printk's in hso.c
-To: Linux USB kernel mailing list <linux-usb@vger.kernel.org>, Greg Kroah-Hartman <gregkh@suse.de>
-Message-ID: <48AC3294.7040506@option.com>
-
-
-Just putting linefeeds on dev_warn & dev_err
-
-Signed-off-by: Denis Joseph Barrow <D.Barow@option.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
-
----
- drivers/net/usb/hso.c | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
---- a/drivers/net/usb/hso.c
-+++ b/drivers/net/usb/hso.c
-@@ -750,7 +750,7 @@ static int hso_net_start_xmit(struct sk_
- result = usb_submit_urb(odev->mux_bulk_tx_urb, GFP_ATOMIC);
- if (result) {
- dev_warn(&odev->parent->interface->dev,
-- "failed mux_bulk_tx_urb %d", result);
-+ "failed mux_bulk_tx_urb %d\n", result);
- net->stats.tx_errors++;
- netif_start_queue(net);
- } else {
-@@ -999,7 +999,7 @@ static void read_bulk_callback(struct ur
- result = usb_submit_urb(urb, GFP_ATOMIC);
- if (result)
- dev_warn(&odev->parent->interface->dev,
-- "%s failed submit mux_bulk_rx_urb %d", __func__,
-+ "%s failed submit mux_bulk_rx_urb %d\n", __func__,
- result);
- }
-
-@@ -1542,7 +1542,7 @@ static int mux_device_request(struct hso
- result = usb_submit_urb(ctrl_urb, GFP_ATOMIC);
- if (result) {
- dev_err(&ctrl_urb->dev->dev,
-- "%s failed submit ctrl_urb %d type %d", __func__,
-+ "%s failed submit ctrl_urb %d type %d\n", __func__,
- result, type);
- return result;
- }
-@@ -2037,12 +2037,12 @@ static int hso_serial_common_create(stru
- serial->tx_data_length = tx_size;
- serial->tx_data = kzalloc(serial->tx_data_length, GFP_KERNEL);
- if (!serial->tx_data) {
-- dev_err(dev, "%s - Out of memory", __func__);
-+ dev_err(dev, "%s - Out of memory\n", __func__);
- goto exit;
- }
- serial->tx_buffer = kzalloc(serial->tx_data_length, GFP_KERNEL);
- if (!serial->tx_buffer) {
-- dev_err(dev, "%s - Out of memory", __func__);
-+ dev_err(dev, "%s - Out of memory\n", __func__);
- goto exit;
- }
-
-@@ -2190,13 +2190,13 @@ static void hso_create_rfkill(struct hso
- hso_net->rfkill = rfkill_allocate(&interface_to_usbdev(interface)->dev,
- RFKILL_TYPE_WLAN);
- if (!hso_net->rfkill) {
-- dev_err(dev, "%s - Out of memory", __func__);
-+ dev_err(dev, "%s - Out of memory\n", __func__);
- return;
- }
- rfkn = kzalloc(20, GFP_KERNEL);
- if (!rfkn) {
- rfkill_free(hso_net->rfkill);
-- dev_err(dev, "%s - Out of memory", __func__);
-+ dev_err(dev, "%s - Out of memory\n", __func__);
- return;
- }
- snprintf(rfkn, 20, "hso-%d",
-@@ -2209,7 +2209,7 @@ static void hso_create_rfkill(struct hso
- kfree(rfkn);
- hso_net->rfkill->name = NULL;
- rfkill_free(hso_net->rfkill);
-- dev_err(dev, "%s - Failed to register rfkill", __func__);
-+ dev_err(dev, "%s - Failed to register rfkill\n", __func__);
- return;
- }
- }
-@@ -2466,13 +2466,13 @@ struct hso_shared_int *hso_create_shared
-
- mux->shared_intr_urb = usb_alloc_urb(0, GFP_KERNEL);
- if (!mux->shared_intr_urb) {
-- dev_err(&interface->dev, "Could not allocate intr urb?");
-+ dev_err(&interface->dev, "Could not allocate intr urb?\n");
- goto exit;
- }
- mux->shared_intr_buf = kzalloc(mux->intr_endp->wMaxPacketSize,
- GFP_KERNEL);
- if (!mux->shared_intr_buf) {
-- dev_err(&interface->dev, "Could not allocate intr buf?");
-+ dev_err(&interface->dev, "Could not allocate intr buf?\n");
- goto exit;
- }
-
-@@ -2866,7 +2866,7 @@ static int hso_mux_submit_intr_urb(struc
-
- result = usb_submit_urb(shared_int->shared_intr_urb, gfp);
- if (result)
-- dev_warn(&usb->dev, "%s failed mux_intr_urb %d", __func__,
-+ dev_warn(&usb->dev, "%s failed mux_intr_urb %d\n", __func__,
- result);
-
- return result;
diff --git a/version b/version
index 33f26cea3bf69a..179bb4694190ea 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.28-rc3
+2.6.28-rc4-git2
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 20:59:23 +0000