Hello. On 27-12-2010 11:16, Mian Yousaf Kaukab wrote:
- } > - } else if (!req->buf) { > - return -ENODATA;
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...
Any suggestions on which tree I should rebase my patches to then?
Greg's usb-next perhaps, unless Felipe has updated his branch.
Thanks,
-- Mian Yousaf Kaukab
WBR, Sergei -- 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
