On 02/04/2020 12:37, Peter Chen wrote:
Hi Roger,
I use 5.6-rc4. Which conflict you have met? Do you have below patch?
8708a9fa2938 usb: roles: Provide the switch drivers handle to the
switch in the API
Applying: usb: cdns3: core: get role switch node from firmware
error: patch failed: drivers/usb/cdns3/core.c:528
error: drivers/usb/cdns3/core.c: patch does not apply Patch failed at 0001 usb:
cdns3: core: get role switch node from firmware Use 'git am --show-current-patch'
to see the failed patch When you have resolved this problem, run "git am --
continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
I just tried the latest Greg's usb-next, it could apply. Do you have the patch I mentioned?
What's the conflict in source file?
OK, it applies on usb-next. Thanks.
cheers,
-roger
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
