On Thu, Oct 17, 2013 at 10:42:44AM -0700, Dan Williams wrote: > On Wed, Oct 16, 2013 at 3:58 PM, Sarah Sharp > <sarah.a.sh...@linux.intel.com> wrote: > > Hi Dan, > > > > I'm attempting to put my queue together for usb-next, and this patch > > doesn't apply, due to conflicts in the USB core. Can you rebase this > > patchset on top of my for-usb-next-queue branch, and resend the last two > > patches? The first three applied fine. > > Hooray for whitespace fix collisions. git am is very strict by > default. We collided with:
[snip] > ...to spare the list I just attached the updated set. I didn't get this email in time for it to make it into my queue for 3.13, and they no longer apply. Can you resend these two patches, based against my for-usb-next-queue branch? Sorry for the churn. Sarah Sharp -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
