On 2016-10-20 01:25, Russell Bryant wrote:
On Tue, Oct 18, 2016 at 4:03 PM, Stephen Finucane <step...@that.guru>
wrote:
Signed-off-by: Stephen Finucane <step...@that.guru>
---
CONTRIBUTING.md | 4 +-
CodingStyle.md | 578
-------------------------------------------------
CodingStyle.rst | 642
+++++++++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 4 +-
OPENFLOW-1.1+.md | 6 +-
5 files changed, 649 insertions(+), 585 deletions(-)
delete mode 100644 CodingStyle.md
create mode 100644 CodingStyle.rst
Unfortunately this patch needs a rebase. Can you take a look?
The issue seems to be a merge conflict on Makefile.am owing to the
changes introduced with 'c4977b6'. There are similar merge conflicts
with later patches. I can resubmit or you could use a three-way merge
which auto-resolves conflicts for all but two of these patches.
curl https://patchwork.ozlabs.org/patch/683845/mbox/ | git am -3
The two unresolved conflicts are trivial to resolve (keep the '.rst'
suffixes)
Stephen
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
