This patch removes the newly added NEWS entry and adds it as a leaf
under post 2.17.

Add OVS version instead of specifying that the feature is supported
for IPv6 connection tracking and Genenve IPv6 tunnels.

Signed-off-by: Alin-Gabriel Serdean <aserd...@ovn.org>

---
 Documentation/faq/releases.rst | 6 +++---
 NEWS                           | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst
index 232d19503..c12ffaf4a 100644
--- a/Documentation/faq/releases.rst
+++ b/Documentation/faq/releases.rst
@@ -132,12 +132,12 @@ Q: Are all features available with all datapaths?
     Feature                    Linux upstream Linux OVS tree Userspace Hyper-V
     ========================== ============== ============== ========= =======
     Connection tracking             4.3            2.5          2.6      YES
-    Connection tracking-IPv6        YES            YES          YES      YES
+    Connection tracking-IPv6        YES            YES          YES      2.18
     Conntrack Fragment Reass.       4.3            2.6          2.12     YES
     Conntrack Timeout Policies      5.2            2.12         2.14     NO
     Conntrack Zone Limit            4.18           2.10         2.13     YES
     Conntrack NAT                   4.6            2.6          2.8      YES
-    Conntrack NAT6                  4.6            2.6          2.8      YES
+    Conntrack NAT6                  4.6            2.6          2.8      2.18
     Tunnel - LISP                   NO             2.11         NO       NO
     Tunnel - STT                    NO             2.4          NO       YES
     Tunnel - GRE                    3.11           1.0          2.4      YES
@@ -145,7 +145,7 @@ Q: Are all features available with all datapaths?
     Tunnel - Geneve                 3.18           2.4          2.4      YES
     Tunnel - GRE-IPv6               4.18           2.6          2.6      NO
     Tunnel - VXLAN-IPv6             4.3            2.6          2.6      NO
-    Tunnel - Geneve-IPv6            4.4            2.6          2.6      YES
+    Tunnel - Geneve-IPv6            4.4            2.6          2.6      2.18
     Tunnel - ERSPAN                 4.18           2.10         2.10     NO
     Tunnel - ERSPAN-IPv6            4.18           2.10         2.10     NO
     Tunnel - GTP-U                  NO             NO           2.14     NO
diff --git a/NEWS b/NEWS
index b084b6133..1e107340f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,3 @@
-v2.17.0 - 27 Mar 2022
----------------------
-   - Tcp6, Udp6, Icmp6, ftp6 conntrack support on Windows ovs.
-     * In current OVS we could use ct related state and actions for
-       Ftp6, Udp6, Icmp6, Ftp6 connection.
 Post-v2.17.0
 ---------------------
    - libopenvswitch API change:
@@ -28,6 +23,9 @@ Post-v2.17.0
          OpenFlow versions 1.0-1.2 with Nicira Extensions
          OpenFlow versions 1.3 with Open Network Foundation extension
          OpenFlow versions 1.4+, as defined in the OpenFlow specification
+   - Windows:
+     * Conntrack support for TCPv6, UDPv6, ICMPv6, FTPv6.
+     * IPv6 Geneve tunnel support.
 
 
 v2.17.0 - 17 Feb 2022
-- 
2.32.0

_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to