On 12/27/2010 10:27 AM, Felipe Balbi wrote:
Hm, you say the patch is against the musb-hw branch, but the above
>two lines are long removed upstream. Well, I've double checked and the
>lines are present in that branch. So it seems there'll be a conflict
>here when merging this patch to Greg's tree...
I don't see this hunk there and I'm using Greg's usb-next branch which
has my changes.
I see following patch in Greg's usb-next branch so I have to rebase on
top of
it anyway:
commit 92d2711f5dc15bf956546923a5718e74853f9912
Author: Hema Kalliguddi <hemahk@xxxxxx>
Date: Mon Nov 15 04:24:01 2010 -0600
usb: musb: unmap dma buffer when switching to PIO
...
Signed-off-by: Hema HK <hemahk@xxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
Thanks,
--
Mian Yousaf Kaukab
--
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
