public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@suse.de>
To: Linus Torvalds <torvalds@osdl.org>, Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org, zaitcev@redhat.com
Subject: [patch 3/5] USB: ub documentation update
Date: Thu, 4 Aug 2005 18:06:36 -0700	[thread overview]
Message-ID: <20050805010635.GD19625@kroah.com> (raw)
In-Reply-To: <20050805010533.GA19625@kroah.com>

[-- Attachment #1: usb-ub-documentation-update.patch --]
[-- Type: text/plain, Size: 2413 bytes --]

From: Pete Zaitcev <zaitcev@redhat.com>

The patch which went in was correct, but not quite what I had in mind.
Here is a patch to update that a little bit. Original patch is at:
 http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4749f32da939d4e4160541b2cadc22492bb507ec

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 Documentation/usb/usbmon.txt |    2 +-
 drivers/usb/mon/Kconfig      |    9 ++++-----
 drivers/usb/mon/Makefile     |    1 +
 3 files changed, 6 insertions(+), 6 deletions(-)

--- gregkh-2.6.orig/Documentation/usb/usbmon.txt	2005-08-04 17:37:11.000000000 -0700
+++ gregkh-2.6/Documentation/usb/usbmon.txt	2005-08-04 17:40:06.000000000 -0700
@@ -102,7 +102,7 @@
 - URB Status. This field makes no sense for submissions, but is present
   to help scripts with parsing. In error case, it contains the error code.
   In case of a setup packet, it contains a Setup Tag. If scripts read a number
-  in this field, the proceed to read Data Length. Otherwise, they read
+  in this field, they proceed to read Data Length. Otherwise, they read
   the setup packet before reading the Data Length.
 - Setup packet, if present, consists of 5 words: one of each for bmRequestType,
   bRequest, wValue, wIndex, wLength, as specified by the USB Specification 2.0.
--- gregkh-2.6.orig/drivers/usb/mon/Kconfig	2005-08-04 17:37:11.000000000 -0700
+++ gregkh-2.6/drivers/usb/mon/Kconfig	2005-08-04 17:40:06.000000000 -0700
@@ -9,9 +9,8 @@
 	help
 	  If you say Y here, a component which captures the USB traffic
 	  between peripheral-specific drivers and HC drivers will be built.
-	  The USB_MON is similar in spirit and may be compatible with Dave
-	  Harding's USBMon.
+	  For more information, see <file:Documentation/usb/usbmon.txt>.
 
-	  This is somewhat experimental at this time, but it should be safe,
-	  as long as you aren't using modular USB and try to remove this
-	  module.
+	  This is somewhat experimental at this time, but it should be safe.
+
+	  If unsure, say Y.
--- gregkh-2.6.orig/drivers/usb/mon/Makefile	2005-08-04 17:37:11.000000000 -0700
+++ gregkh-2.6/drivers/usb/mon/Makefile	2005-08-04 17:40:06.000000000 -0700
@@ -4,4 +4,5 @@
 
 usbmon-objs	:= mon_main.o mon_stat.o mon_text.o
 
+# This does not use CONFIG_USB_MON because we want this to use a tristate.
 obj-$(CONFIG_USB)	+= usbmon.o

--

  parent reply	other threads:[~2005-08-05  1:12 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20050805010206.711658000@press.kroah.org>
2005-08-05  1:05 ` [patch 0/5] fixes for 2.6.13-rc5 Greg KH
2005-08-05  1:06   ` [patch 1/5] PCI: restore BAR values after D3hot->D0 for devices that need it Greg KH
2005-08-05  1:06   ` [patch 2/5] pci and yenta: pcibios_bus_to_resource Greg KH
2005-08-05  1:06   ` Greg KH [this message]
2005-08-05  1:06   ` [patch 4/5] USB: ehci: microframe handling fix Greg KH
2005-08-05  1:06   ` [patch 5/5] USB: Fix setup packet initialization in isp116x-hcd Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20050805010635.GD19625@kroah.com \
    --to=gregkh@suse.de \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@osdl.org \
    --cc=zaitcev@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox