[ovs-dev] [PATCH V2 1/2] doc: Deprecate the Linux Out of Tree module
Gregory Rose
gvrose8192 at gmail.com
Thu Jan 7 19:03:08 UTC 2021
On 1/7/2021 10:56 AM, 0-day Robot wrote:
> Bleep bloop. Greetings Greg Rose, I am a robot and I have tried out your patch.
> Thanks for your contribution.
>
> I encountered some error that I wasn't expecting. See the details below.
>
>
> git-am:
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch' to see the failed patch
> Patch failed at 0001 doc: Deprecate the Linux Out of Tree module
> 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".
>
>
> Please check this out. If you feel there has been an error, please email aconole at redhat.com
Hmm... I did not rebase to master since yesterday so I guess something
changed and caused a conflict. I'll rebase to master and post V3.
- Greg
>
> Thanks,
> 0-day Robot
>
More information about the dev
mailing list