On Wed, Sep 05, 2012 at 04:49:37PM -0700, Greg KH wrote: > On Thu, Aug 23, 2012 at 12:03:58PM +0300, Felipe Balbi wrote: > > Hi Greg, > > > > Here's my (hopefully) last set of fixes for v3.6-rc cycle. Let me know if > > you > > want me to change anything and I'll do so ASAP. > > > > cheers > > > > The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee: > > > > Linux 3.6-rc1 (2012-08-02 16:38:10 -0700) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git > > tags/fixes-for-v3.6-rc4 > > > > for you to fetch changes up to 07dc6cb73678e5a2bdaed74774b9064d27b8da0d: > > > > usb: renesas_usbhs: fixup DMA transport data alignment (2012-08-23 > > 11:05:40 +0300) > > > > ---------------------------------------------------------------- > > (from the branch description for fixes local branch) > > > > > > usb: fixes for v3.6-rc4 > > > > Here's a rather big set of fixes for v3.6-rc4. > > > > There are some fixes for bugs which have been pending for a long > > time and only now were uncovered, like the musb and dwc3 patches. > > > > We have some remaining fixes for the ep->desc patch series from > > Ido, and a very important fix to u_ether which would cause 100% > > cpu utilization in eth_stop. > > > > All patches have been pending on linux-usb for a long time and > > shouldn't cause any further regressions. > > > > ---------------------------------------------------------------- > > Ajay Kumar Gupta (3): > > usb: musb: Fix wrong config for am33xx and ti81xx > > usb: musb: am335x: fix pdev resource bug > > usb: musb: reorder runtime pm call > > > > Andrzej Pietrasiewicz (1): > > usb: gadget: add multiple definition guards > > > > Julia Lawall (1): > > usb: gadget: s3c-hsotg.c: fix error return code > > > > Kishon Vijay Abraham I (1): > > usb: dwc3: core: fix incorrect usage of resource pointer > > > > Kuninori Morimoto (3): > > usb: renesas_usbhs: mod_host: add missing .bus_suspend/resume > > usb: renesas_usbhs: fixup resume method for autonomy mode > > usb: renesas_usbhs: fixup DMA transport data alignment > > > > Michael Grzeschik (1): > > usb: gadget: u_ether: fix kworker 100% CPU issue with still used > > interfaces in eth_stop > > > > Pratyush Anand (1): > > usb: dwc3: ep0: correct cache sync issue in case of ep0_bounced > > > > Sebastian Andrzej Siewior (4): > > usb: gadget: dummy_hcd: fixup error probe path > > usb: gadget: dummy_hcd: add support for USB_DT_BOS on rh > > usb: gadget: at91udc: don't overwrite driver data > > usb: gadget: at91udc: Don't check for ep->ep.desc > > > > Sergei Shtylyov (2): > > usb: musb: tusb6010: fix error path in tusb_probe() > > usb: musb: musbhsdma: fix IRQ check > > > > yuzheng ma (1): > > usb: musb: host: fix for musb_start_urb Oops > > > > drivers/usb/dwc3/core.c | 9 ++++++-- > > drivers/usb/dwc3/ep0.c | 1 - > > drivers/usb/dwc3/gadget.c | 7 ++++-- > > drivers/usb/gadget/at91_udc.c | 6 +----- > > drivers/usb/gadget/dummy_hcd.c | 41 > > ++++++++++++++++++++++++++++++++---- > > drivers/usb/gadget/f_fs.c | 4 ++++ > > drivers/usb/gadget/s3c-hsotg.c | 3 +++ > > drivers/usb/gadget/u_ether.c | 6 ++++++ > > drivers/usb/gadget/u_serial.c | 4 ++++ > > drivers/usb/musb/Kconfig | 4 ++-- > > drivers/usb/musb/musb_dsps.c | 19 +++++++++-------- > > drivers/usb/musb/musb_host.c | 2 +- > > drivers/usb/musb/musbhsdma.c | 2 +- > > drivers/usb/musb/tusb6010.c | 2 +- > > drivers/usb/renesas_usbhs/common.c | 6 +++--- > > drivers/usb/renesas_usbhs/fifo.c | 4 ++-- > > drivers/usb/renesas_usbhs/mod_host.c | 8 +++++++ > > 17 files changed, 95 insertions(+), 33 deletions(-) > > Odd, my pull ended up with: > > Merge made by the 'recursive' strategy. > drivers/usb/dwc3/core.c | 9 +++++++-- > drivers/usb/dwc3/ep0.c | 1 - > drivers/usb/dwc3/gadget.c | 7 +++++-- > drivers/usb/gadget/at91_udc.c | 6 +----- > drivers/usb/gadget/dummy_hcd.c | 41 > +++++++++++++++++++++++++++++++++++++---- > drivers/usb/gadget/f_fs.c | 4 ++++ > drivers/usb/gadget/s3c-hsotg.c | 3 +++ > drivers/usb/gadget/u_serial.c | 4 ++++ > drivers/usb/musb/musb_host.c | 2 +- > drivers/usb/musb/musbhsdma.c | 2 +- > drivers/usb/musb/tusb6010.c | 2 +- > drivers/usb/renesas_usbhs/fifo.c | 4 ++-- > 12 files changed, 66 insertions(+), 19 deletions(-) > > So something is missing here, right? > > Because of this, I've not pulled this now, what went wrong?
Did you merge the branch or the tag ? Here's what I get as git
request-pull's output:
$ git request-pull v3.6-rc1 usb fixes-for-v3.6-rc4
The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee:
Linux 3.6-rc1 (2012-08-02 16:38:10 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
tags/fixes-for-v3.6-rc4
for you to fetch changes up to 07dc6cb73678e5a2bdaed74774b9064d27b8da0d:
usb: renesas_usbhs: fixup DMA transport data alignment (2012-08-23 11:05:40
+0300)
----------------------------------------------------------------
usb: fixes for v3.6-rc4
Here's a rather big set of fixes for v3.6-rc4.
There are some fixes for bugs which have been pending for a long
time and only now were uncovered, like the musb and dwc3 patches.
We have some remaining fixes for the ep->desc patch series from
Ido, and a very important fix to u_ether which would cause 100%
cpu utilization in eth_stop.
All patches have been pending on linux-usb for a long time and
shouldn't cause any further regressions.
----------------------------------------------------------------
Ajay Kumar Gupta (3):
usb: musb: Fix wrong config for am33xx and ti81xx
usb: musb: am335x: fix pdev resource bug
usb: musb: reorder runtime pm call
Andrzej Pietrasiewicz (1):
usb: gadget: add multiple definition guards
Julia Lawall (1):
usb: gadget: s3c-hsotg.c: fix error return code
Kishon Vijay Abraham I (1):
usb: dwc3: core: fix incorrect usage of resource pointer
Kuninori Morimoto (3):
usb: renesas_usbhs: mod_host: add missing .bus_suspend/resume
usb: renesas_usbhs: fixup resume method for autonomy mode
usb: renesas_usbhs: fixup DMA transport data alignment
Michael Grzeschik (1):
usb: gadget: u_ether: fix kworker 100% CPU issue with still used
interfaces in eth_stop
Pratyush Anand (1):
usb: dwc3: ep0: correct cache sync issue in case of ep0_bounced
Sebastian Andrzej Siewior (4):
usb: gadget: dummy_hcd: fixup error probe path
usb: gadget: dummy_hcd: add support for USB_DT_BOS on rh
usb: gadget: at91udc: don't overwrite driver data
usb: gadget: at91udc: Don't check for ep->ep.desc
Sergei Shtylyov (2):
usb: musb: tusb6010: fix error path in tusb_probe()
usb: musb: musbhsdma: fix IRQ check
yuzheng ma (1):
usb: musb: host: fix for musb_start_urb Oops
drivers/usb/dwc3/core.c | 9 ++++++--
drivers/usb/dwc3/ep0.c | 1 -
drivers/usb/dwc3/gadget.c | 7 ++++--
drivers/usb/gadget/at91_udc.c | 6 +-----
drivers/usb/gadget/dummy_hcd.c | 41 ++++++++++++++++++++++++++++++++----
drivers/usb/gadget/f_fs.c | 4 ++++
drivers/usb/gadget/s3c-hsotg.c | 3 +++
drivers/usb/gadget/u_ether.c | 6 ++++++
drivers/usb/gadget/u_serial.c | 4 ++++
drivers/usb/musb/Kconfig | 4 ++--
drivers/usb/musb/musb_dsps.c | 19 +++++++++--------
drivers/usb/musb/musb_host.c | 2 +-
drivers/usb/musb/musbhsdma.c | 2 +-
drivers/usb/musb/tusb6010.c | 2 +-
drivers/usb/renesas_usbhs/common.c | 6 +++---
drivers/usb/renesas_usbhs/fifo.c | 4 ++--
drivers/usb/renesas_usbhs/mod_host.c | 8 +++++++
17 files changed, 95 insertions(+), 33 deletions(-)
Maybe you already have some of the patches I have ? If I diff against
your branch I see:
$ git diff --stat greg/usb-linus..fixes-for-v3.6-rc4 -- drivers/usb/gadget/
drivers/usb/dwc3/ drivers/usb/musb/ drivers/usb/phy/ drivers/usb/otg/
include/linux/usb/otg.h include/linux/usb/gadget.h include/linux/usb/ch9.h
drivers/usb/dwc3/core.c | 9 +++++++--
drivers/usb/dwc3/ep0.c | 1 -
drivers/usb/dwc3/gadget.c | 7 +++++--
drivers/usb/gadget/at91_udc.c | 6 +-----
drivers/usb/gadget/dummy_hcd.c | 41 +++++++++++++++++++++++++++++++++++++----
drivers/usb/gadget/f_fs.c | 4 ++++
drivers/usb/gadget/s3c-hsotg.c | 3 +++
drivers/usb/gadget/u_serial.c | 4 ++++
drivers/usb/musb/musb_host.c | 2 +-
drivers/usb/musb/musbhsdma.c | 2 +-
drivers/usb/musb/tusb6010.c | 2 +-
11 files changed, 64 insertions(+), 17 deletions(-)
Looks like, indeed, you have patches I queued. And I can, certainly see
at least one there.
b1b552a usb: gadget: u_ether: fix kworker 100% CPU issue with still used
interfaces in eth_stop
And it looks like that's already in mainline. Do you want me to rebase
on top of v3.6-rc4 ?
--
balbi
signature.asc
Description: Digital signature
