On Mon, Nov 14, 2011 at 11:05:50PM +0200, Felipe Balbi wrote: > On Mon, Nov 14, 2011 at 11:48:59AM -0800, Greg KH wrote: > > 20 files changed, 155 insertions(+), 147 deletions(-) > > > > Which looks like f_midi.c is different here. > > > > Hm, I'll just take the raw patches and use those, that way I can fix up > > the email issue noted above, please check my tree to ensure I got > > everything and try to figure out why I got a different diffstat than you > > did. > > that's very odd indeed. A diff between your current tree and my pull > request shows that everything is fine wrt to gadgets: > > $ git dif --stat greg/usb-linus..for-greg > drivers/usb/core/hub.c | 6 ------ > drivers/usb/host/xhci-mem.c | 5 +++++ > drivers/usb/host/xhci-ring.c | 13 ++++++------- > drivers/usb/host/xhci.c | 5 +---- > 4 files changed, 12 insertions(+), 17 deletions(-) > > I also listed all commits in greg/usb-linus which are not on fixes and > it only shows this pull request (because you commited patches, the > commit hashes are different) and a few xhci patches: > > $ git log --oneline greg/usb-linus ^fixes > ab570da usb: musb: fix compilation breakage introduced by de47725 > 12d36c1 usb: dwc3: gadget: initialize max_streams > d7a00ec usb: gadget: renesas_usbhs: bugfix: set DATA0 when usbhsh_endpoint_alloc() > 146ee50 usb: gadget: renesas_usbhs: bugfix: disable irq when device stop > 73ef635 usb: gadget: renesas_usbhs: bugfix: care pipe direction > 4703d2e USB: ci13xxx_msm: add module license > 194fa47 USB: ci13xxx_udc: fix debug trace code > fd537c0 USB: ci13xxx_udc: fix deadlock during rmmod > 954aad8 USB: ci13xxx_udc: fix logic to mark request dma addresses as invalid > 001428e USB: gadgetfs: gadgetfs_disconnect: fix inconsistent lock state > 74203de usb: gadget: fix MIDI gadget jack allocation > ce7b612 usb: gadget: storage: check for valid USB_BULK_RESET_REQUEST wLength > db332bc usb: gadget: storage: check for valid USB_BULK_GET_MAX_LUN_REQUEST > b7a8d17 usb: gadget: renesas_usbhs: fixup section mismatch warning > c9ae0c9 usb: gadget: renesas_usbhs: fixup bogus conversion > 7fccd48 usb: gadget: renesas_usbhs: fixup struct completion usage > 0e042be usb: gadget: fsl_udc_core: fix compile error. > 05bb701 usb: gadget: r8a66597-udc: fix flush fifo handling > b8cbbf8 usb: gadget: r8a66597-udc: fix for udc-newstyle > 0de174b usb: musb: hdrc: fix dependency on USB_GADGET_DUALSPEED in Kconfig > d067859 usb: musb: remove incorrectly added ARCH_U5500 define > 59d81f8 usb: gadget: core: allow everybody to read sysfs attributes > 6f39504 usb: gadget: core: fix bug when removing gadget drivers > 3c2d636 usb: musb: gadget: don't call ->disconnect() on exit > 1d91a96 usb: gadget: udc-core: fix bug on soft_connect and srp interfaces > 47c6a04 Merge branch 'for-usb-linus' of git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus > 79c3dd8 usb, xhci: Clear warm reset change event during init > d31c285 xhci: Set slot and ep0 flags for address command. > f43d623 usb, xhci: fix lockdep warning on endpoint timeout > > the only explanation is that you had another patch on f_midi.c already > applied to your usb-linus branch, which was applied after I had created > the pull request, other than that, I don't know what could be wrong. Perhaps, my tree was based on 3.2-rc1 at the time. Anyway, no biggie, I'd recommend throwing away your tree now and rebasing on mine so we are all in sync. 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
