[ovs-dev] [ovs-dev, net-next, 01 of 22] net: micrel: fix return type of ndo_start_xmit function

0-day Robot robot at bytheb.org
Thu Sep 20 13:55:03 UTC 2018


Bleep bloop.  Greetings YueHaibing, 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:
fatal: sha1 information is lacking or useless (drivers/net/ethernet/micrel/ks8695net.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 net: micrel: fix return type of ndo_start_xmit function
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 aconole at bytheb.org

Thanks,
0-day Robot


More information about the dev mailing list