On Tue, Aug 13, 2013 at 03:42:11PM -0700, Sarah Sharp wrote: > On Mon, Aug 12, 2013 at 01:44:16PM -0700, Greg Kroah-Hartman wrote: > > I tried to "cherry pick" this patch from my usb-next branch to my > > usb-linus branch, but it fails :( > > > > So, could you "port" it, add a cc: stable line, and then resend these 3 > > for me to apply? Or pull, either is fine. > > Yes, I can do that. Ok, I've made a branch for usb-linus, and I'll send you a pull request shortly. The tag will be for-usb-2013-08-15-step-1. I'm not sure how you want to handle the resulting conflicts on the usb-next branch, so I've prepared a second pull request, where I've reverted Alan's patch, merged usb-linus into usb-next, and resolved the conflicts. That tag will be for-usb-2013-08-15-step-2. I've seen other people post diffs that describe how another maintainer could handle merge conflicts, but quite frankly I'm out of my league here and don't know how to do that. Let me know if you want to handle this differently, and please give me directions on how to do this. Thanks, Sarah Sharp -- 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
