Re: [PATCH v3 2/7] UDC: Rename amd5536udc driver file based on IP
From: Raviteja Garimella
Date: Fri Mar 31 2017 - 09:16:28 EST
Hi Felipe,
On Fri, Mar 31, 2017 at 3:19 PM, Felipe Balbi <balbi@xxxxxxxxxx> wrote:
>
> Hi,
>
> Raviteja Garimella <raviteja.garimella@xxxxxxxxxxxx> writes:
>
>> This patch renames the amd5536udc.c that has the core driver
>> functionality of Synopsys UDC to snps_udc_core.c
>>
>> The symbols exported here can be used by any UDC driver that uses
>> the same Synopsys IP.
>>
>> Signed-off-by: Raviteja Garimella <raviteja.garimella@xxxxxxxxxxxx>
>
> unfortunately, this patch doesn't apply:
>
> Applying: UDC: Rename amd5536udc driver file based on IP
> error: corrupt patch at line 235
> Patch failed at 0001 UDC: Rename amd5536udc driver file based on IP
> The copy of the patch that failed is found in: .git/rebase-apply/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".
>
> Can you rebase on testing/next and resend?
I rebased my patches against testing/next branch, resolved the merge conflicts.
Just resent the patches 2/7 to 7/7. Please use them. I verified they are getting
applied without issues now.
Thanks,
Ravi
>
> --
> balbi