On Mon, 9 Jul 2012, Greg KH wrote: > > > > Ver. 2: Rebased on top of Russ Dill's changes to ehci-omap.c. > > > > Fixed several mistakes involving unused local variables and calls to > > > > ehci_setup(ehci) rather than ehci_setup(hcd). > > > > > > I'm getting a conflict when trying to apply this in that driver: > > > > > > patching file drivers/usb/host/ehci-omap.c > > > Hunk #3 FAILED at 329. > > > Hunk #4 FAILED at 356. > > > Hunk #5 succeeded at 560 (offset 14 lines). > > > 2 out of 5 hunks FAILED -- saving rejects to file drivers/usb/host/ehci-omap.c.rej > > > > > > Can you refresh this and resend it? > > > > That's because my patch was meant to go on top of Russ Dill's changes: > > > > http://marc.info/?l=linux-usb&m=134084901330725&w=2 > > > > which evidently hasn't been merged yet. Or if it has, it's in Felipe's > > tree instead of yours. > > It wasn't merged because I thought you objected to it in the review > comments in that thread. Oh. No, actually I didn't object to Russ's patch as such; it seemed to make some worthwhile fixes. My objection was that even after his patch there was still of bunch of other problems remaining. But never mind, the OMAP people can worry about them... > Your v1 version of this patch also didn't apply, and I thought that was > without Russ's patch. That's right, but the v1 patch had several mistakes that got fixed in v2. > So how about you just refresh your patch now, on my tree, and then Russ > can redo his patch as it looks like it is much more specific and there > were issues left to handle with it. Agreed. Alan Stern -- 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
