[ovs-dev] [PATCH v2 2/5] Use primary/secondary, not master/slave, as names for OpenFlow roles.

[0-day Robot]

Bleep bloop.  Greetings Ben Pfaff, 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:
.git/rebase-apply/patch:42: trailing whitespace.
                                              primary/ 
.git/rebase-apply/patch:90: trailing whitespace.
                                              primary/          
.git/rebase-apply/patch:93: trailing whitespace.
  ``OFPPR_ADD``                                 yes       ---   
.git/rebase-apply/patch:94: trailing whitespace.
  ``OFPPR_DELETE``                              yes       ---   
.git/rebase-apply/patch:95: trailing whitespace.
  ``OFPPR_MODIFY``                              yes       ---   
warning: squelched 9 whitespace errors
warning: 14 lines add whitespace errors.
error: Your local changes to the following files would be overwritten by merge:
	manpages.mk
Please commit your changes or stash them before you merge.
Aborting
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Use primary/secondary, not master/slave, as names for OpenFlow roles.
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

Thanks,
0-day Robot