刘畅 <liuch...@cmss.chinamobile.com> writes: > Hi Aaron: > I have encountered this rebot error but have no idea what should do. can > you offer some advice? > Many thanks ! > > Re: [ovs-dev] [PATCH v3] netdev-offload-dpdk : add ipv6 rte flow item support > > Bleep bloop. Greetings Timo_Liu, 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.
This usually happens for two reasons (there could be others): 1. Changes occurred to the upstream tree between the time the series was formatted / submitted and the time the robot got to it. Rarely occurs, but it could happen. This could be resolved from a rebase. 2. The series depends on a patch that isn't accepted into the tree yet. Is it possible that case 2 applies in this instance? > git-am: > error: patch failed: lib/netdev-offload-dpdk.c:503 > error: lib/netdev-offload-dpdk.c: patch does not apply > Did you hand edit your patch? > It does not apply to blobs recorded in its index. > Cannot fall back to three-way merge. > Patch failed at 0001 netdev-offload-dpdk : add ipv6 rte flow item support > The copy of the patch that failed is found in: > /var/lib/jenkins/jobs/upstream_build_from_pw/workspace/.git/rebase-apply/patch > When you have resolved this problem, run "git am --resolved". > 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 > acon...@redhat.com > > Thanks, > 0-day Robot _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
