Suggested-by: Antonin Bas <[email protected]>
Signed-off-by: Ben Pfaff <[email protected]>
---
lib/meta-flow.xml | 2 ++
manpages.mk | 3 ---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/lib/meta-flow.xml b/lib/meta-flow.xml
index d4495552b3c2..1546758744b4 100644
--- a/lib/meta-flow.xml
+++ b/lib/meta-flow.xml
@@ -1240,6 +1240,8 @@ tcp,tp_src=0x07c0/0xfff0
priority, that is, any given packet must be able to match at most one
conjunctive flow at a given priority. Overlapping conjunctive flows
yield unpredictable results.
+ (The flows that constitute a conjunctive flow may overlap with those
+ that constitute the same or another conjunctive flow.)
</li>
<li>
Following a conjunctive flow match, the search for the flow with
diff --git a/manpages.mk b/manpages.mk
index dc201484c637..54a3a82ad963 100644
--- a/manpages.mk
+++ b/manpages.mk
@@ -104,7 +104,6 @@ utilities/bugtool/ovs-bugtool.8: \
utilities/bugtool/ovs-bugtool.8.in:
lib/ovs.tmac:
-
utilities/ovs-dpctl-top.8: \
utilities/ovs-dpctl-top.8.in \
lib/ovs.tmac
@@ -155,8 +154,6 @@ lib/common-syn.man:
lib/common.man:
lib/ovs.tmac:
-lib/ovs.tmac:
-
utilities/ovs-testcontroller.8: \
utilities/ovs-testcontroller.8.in \
lib/common.man \
--
2.25.3
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
