Re: [GIT PULL] USB patches for 3.1 merge window

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sat, Jul 09, 2011 at 01:13:55AM +0300, Felipe Balbi wrote:
> 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

Much better, thanks for fixing this.  Now pulled and pushed out.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux