Hi,
On Fri, Jul 08, 2011 at 02:50:14PM -0700, Greg KH wrote:
> On Fri, Jul 08, 2011 at 02:42:43PM +0300, Felipe Balbi wrote:
> > Hi Greg,
> >
> > I have re-created the pull request to add a fix that missed
> > 3.0-final and while at that, I also add a few more missing
> > patches.
> >
> > Hope we still have time to get these in 3.1 merge window.
> >
> > Thanks
> >
> > The following changes since commit e931830bb877e2aad9a1be83506f9bdb26c91e4e:
> >
> > Realtek cr: Add autosuspend function. (2011-07-01 14:53:42 -0700)
> >
> > are available in the git repository at:
> > master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb.git for-next
>
> I pulled and got the following build error:
> In file included from drivers/usb/gadget/r8a66597-udc.c:35:0:
> drivers/usb/gadget/r8a66597-udc.h: In function ‘r8a66597_write_fifo’:
> drivers/usb/gadget/r8a66597-udc.h:233:21: error: ‘struct r8a66597_platdata’ has no member named ‘wr0_shorted_to_wr1’
> drivers/usb/gadget/r8a66597-udc.h:237:21: error: ‘struct r8a66597_platdata’ has no member named ‘wr0_shorted_to_wr1’
>
> Care to fix this up so there's no build breakage in the tree?
Done. I dropped commit 0cc8887 (usb: gadget: r8a66597-udc: add function
for external controller) which was introducing the breakage. That will
have to go on 3.2 merge window. Thanks for noticing it, I though I had
that driver enabled. Updated my defconfig now.
Here's an updated pull request too:
The following changes since commit e931830bb877e2aad9a1be83506f9bdb26c91e4e:
Realtek cr: Add autosuspend function. (2011-07-01 14:53:42 -0700)
are available in the git repository at:
master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb.git for-next
Ajay Kumar Gupta (1):
usb: musb: restore INDEX register in resume path
Amit Blay (1):
usb: gadget: zero: add superspeed support
Felipe Balbi (4):
usb: gadget: fusb300_udc: drop dead code
usb: gadget: langwell_udc: fix compile warnings
usb: gadget: net2272: fix compile warnings
Merge branch 'gadget' into for-next
Paul Zimmerman (1):
usb: gadget: add SS descriptors to Ethernet gadget
Sebastian Andrzej Siewior (3):
usb: gadget: ci13xx_udc.c: fix compile warning
usb: gadget: fusb300_udc: fix compile warnings
usb: gadget: fix up depencies
Yoshihiro Shimoda (8):
usb: update email address in r8a66597-udc and m66592-udc
usb: gadget: r8a66597-udc: fix cannot connect after rmmod gadget driver
usb: gadget: r8a66597-udc: Make BUSWAIT configurable through platform data
usb: gadget: m66592-udc: add support for TEST_MODE
usb: gadget: r8a66597-udc: add support for TEST_MODE
usb: gadget: r8a66597-udc: add pullup function
usb: gadget: m66592-udc: add function for external controller
usb: gadget: m66592-udc: add pullup function
drivers/usb/gadget/Kconfig | 2 +
drivers/usb/gadget/ci13xxx_udc.c | 12 ++++-
drivers/usb/gadget/ether.c | 2 +-
drivers/usb/gadget/f_ecm.c | 100 +++++++++++++++++++++++++++++++++++-
drivers/usb/gadget/f_eem.c | 56 ++++++++++++++++++++
drivers/usb/gadget/f_loopback.c | 55 ++++++++++++++++++++-
drivers/usb/gadget/f_rndis.c | 101 +++++++++++++++++++++++++++++++++++-
drivers/usb/gadget/f_sourcesink.c | 55 ++++++++++++++++++++-
drivers/usb/gadget/f_subset.c | 64 +++++++++++++++++++++++
drivers/usb/gadget/fusb300_udc.c | 91 +++------------------------------
drivers/usb/gadget/langwell_udc.c | 12 ++--
drivers/usb/gadget/m66592-udc.c | 45 +++++++++++++++--
drivers/usb/gadget/m66592-udc.h | 40 ++++++++-------
drivers/usb/gadget/net2272.c | 8 ++--
drivers/usb/gadget/r8a66597-udc.c | 57 +++++++++++++++++----
drivers/usb/gadget/r8a66597-udc.h | 2 +-
drivers/usb/gadget/u_ether.c | 12 +++--
drivers/usb/gadget/zero.c | 2 +-
drivers/usb/musb/musb_core.c | 1 +
include/linux/usb/m66592.h | 2 +
include/linux/usb/r8a66597.h | 3 +
21 files changed, 580 insertions(+), 142 deletions(-)
--
balbi
Attachment:
signature.asc
Description: Digital signature
