On Thu, Feb 17, 2011 at 01:19:58PM +0200, Felipe Balbi wrote: > Hi, > > On Thu, Feb 17, 2011 at 10:26:21AM +0200, Felipe Balbi wrote: > > Hi Greg, > > > > Do you have plans to merge v2.6.38-rc5 into usb-next ? > > > > There are few musb patches that went in on -rc5 and without > > them my pull request will conflict like the last one. > > > > Let me know if you're planning to merge -rc5 on your usb-next branch so > > that I can make a clean pull request. > > Here's what I get when merging greg/usb-next + my three musb patches > with v2.6.38-rc5: > > $ git merge v2.6.38-rc5 > Auto-merging Documentation/devicetree/booting-without-of.txt > Removing arch/arm/plat-s5p/include/plat/sysmmu.h > Removing arch/x86/include/asm/system_64.h > Auto-merging drivers/char/virtio_console.c > Removing drivers/staging/vme/bridges/Module.symvers > Auto-merging drivers/usb/core/hcd.c > Auto-merging drivers/usb/gadget/Kconfig > Auto-merging drivers/usb/host/ehci-hcd.c > Auto-merging drivers/usb/host/ehci-hub.c > Auto-merging drivers/usb/host/ehci-pci.c > CONFLICT (content): Merge conflict in drivers/usb/host/ehci-pci.c This one I know about, I'll fix it up. > Auto-merging drivers/usb/musb/musb_core.c > Auto-merging drivers/usb/musb/musb_core.h > Auto-merging drivers/usb/musb/musb_gadget.c > Auto-merging drivers/usb/musb/musb_gadget.h > CONFLICT (content): Merge conflict in drivers/usb/musb/musb_gadget.h Let me look at this one and get back to you later today... thanks, 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
