On Tue, Dec 13, 2011 at 01:14:21PM +0200, Felipe Balbi wrote: > Hi, > > On Mon, Dec 12, 2011 at 04:32:11PM -0800, Greg KH wrote: > > On Mon, Dec 12, 2011 at 04:27:06PM -0800, Kuninori Morimoto wrote: > > > > > > Hi Greg, Felipe > > > > > > > On Mon, Dec 12, 2011 at 12:59:30PM +0200, Felipe Balbi wrote: > > > > > Hi Greg, > > > > > > > > > > Here are the pending gadget patches for the next merge window. All have > > > > > been pending for quite a long time and they should all be fine. > > > > > > > > > > There is a small conflict on mod_host.c and the resolution is to remove > > > > > the pipe_info line. > > > > > > > > > > The following changes since commit dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50: > > > > > > > > > > Linux 3.2-rc5 (2011-12-09 15:09:32 -0800) > > > > > > > > > > are available in the git repository at: > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git for-next/gadget > > > > > > > > With this tree, I get the following build error: > > > > > > > > CC [M] drivers/usb/renesas_usbhs/mod_host.o > > > > drivers/usb/renesas_usbhs/mod_host.c: In function ‘usbhsh_irq_common’: > > > > drivers/usb/renesas_usbhs/mod_host.c:1401:10: error: ‘HCD_FLAG_SAW_IRQ’ undeclared (first use in this function) > > > > drivers/usb/renesas_usbhs/mod_host.c:1401:10: note: each undeclared identifier is reported only once for each function it appears in > > > > make[3]: *** [drivers/usb/renesas_usbhs/mod_host.o] Error 1 > > > > make[2]: *** [drivers/usb/renesas_usbhs] Error 2 > > > > make[1]: *** [drivers/usb] Error 2 > > > > make: *** [drivers] Error 2 > > > > > > > > So I can't take it. > > > > > > > > Please be more careful. > > > > > > I didn't know that HCD_FLAG_SAW_IRQ was removed in Greg's tree. > > > Then, please revert below commit from felipe's tree. > > > it is no longer needed > > > I hope it solve this issue > > > > > > -------------------- > > > commit b7d9a738ac1065fe24a8a36519d5a29013361ff1 > > > Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx> > > > Date: Thu Dec 8 18:26:53 2011 -0800 > > > > > > usb: renesas_usbhs: care HCD_FLAG_SAW_IRQ bit on mod_host > > > -------------------- > > > > Felipe, care to redo this branch so that this never happens at any place > > in the build? > > Sure, I just dropped that patch. New pull request below if you need it: > > The following changes since commit dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50: > > Linux 3.2-rc5 (2011-12-09 15:09:32 -0800) > > are available in the git repository at: > git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git for-next/gadget Thanks, that worked, 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
