diff options
-rw-r--r-- | .travis.yml | 3 | ||||
-rw-r--r-- | Documentation/faq/releases.rst | 1 | ||||
-rw-r--r-- | NEWS | 3 | ||||
-rw-r--r-- | acinclude.m4 | 4 | ||||
-rw-r--r-- | tests/system-traffic.at | 12 |
5 files changed, 13 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 2f7746d1d..465876a67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,8 @@ env: - KERNEL=3.16.54 TESTSUITE=1 DPDK=1 - KERNEL=3.16.54 DPDK_SHARED=1 - KERNEL=3.16.54 DPDK_SHARED=1 OPTS="--enable-shared" - - KERNEL=4.17.14 + - KERNEL=4.18.20 + - KERNEL=4.17.19 - KERNEL=4.16.18 - KERNEL=4.15.18 - KERNEL=4.14.63 diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst index 96da23c20..86f09e6e2 100644 --- a/Documentation/faq/releases.rst +++ b/Documentation/faq/releases.rst @@ -68,6 +68,7 @@ Q: What Linux kernel versions does each Open vSwitch release work with? 2.8.x 3.10 to 4.12 2.9.x 3.10 to 4.13 2.10.x 3.10 to 4.17 + 2.11.x 3.10 to 4.18 ============ ============== Open vSwitch userspace should also work with the Linux kernel module built @@ -52,7 +52,8 @@ v2.11.0 - xx xxx xxxx - RHEL packaging: * OVN packages are split from OVS packages. A new spec file - ovn-fedora.spec.in is added to generate OVN packages. - + - Linux datapath: + * Support for the kernel versions 4.18.x v2.10.0 - 18 Aug 2018 --------------------- diff --git a/acinclude.m4 b/acinclude.m4 index f038fd457..95241b142 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -151,10 +151,10 @@ AC_DEFUN([OVS_CHECK_LINUX], [ AC_MSG_RESULT([$kversion]) if test "$version" -ge 4; then - if test "$version" = 4 && test "$patchlevel" -le 17; then + if test "$version" = 4 && test "$patchlevel" -le 18; then : # Linux 4.x else - AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 4.17.x is not supported (please refer to the FAQ for advice)]) + AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 4.18.x is not supported (please refer to the FAQ for advice)]) fi elif test "$version" = 3 && test "$patchlevel" -ge 10; then : # Linux 3.x diff --git a/tests/system-traffic.at b/tests/system-traffic.at index 43ca32034..e34f7a4fb 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -617,7 +617,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping over gre tunnel by simulated packets]) -OVS_CHECK_KERNEL(3, 10, 4, 17) +OVS_CHECK_KERNEL(3, 10, 4, 18) OVS_TRAFFIC_VSWITCHD_START() AT_CHECK([ovs-vsctl -- set bridge br0 other-config:hwaddr=\"f2:ff:00:00:00:01\"]) @@ -667,7 +667,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping over erspan v1 tunnel by simulated packets]) -OVS_CHECK_KERNEL(3, 10, 4, 17) +OVS_CHECK_KERNEL(3, 10, 4, 18) OVS_TRAFFIC_VSWITCHD_START() AT_CHECK([ovs-vsctl -- set bridge br0 other-config:hwaddr=\"f2:ff:00:00:00:01\"]) @@ -719,7 +719,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping over erspan v2 tunnel by simulated packets]) -OVS_CHECK_KERNEL(3, 10, 4, 17) +OVS_CHECK_KERNEL(3, 10, 4, 18) OVS_TRAFFIC_VSWITCHD_START() AT_CHECK([ovs-vsctl -- set bridge br0 other-config:hwaddr=\"f2:ff:00:00:00:01\"]) @@ -772,7 +772,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping over ip6erspan v1 tunnel by simulated packets]) -OVS_CHECK_KERNEL(3, 10, 4, 17) +OVS_CHECK_KERNEL(3, 10, 4, 18) OVS_TRAFFIC_VSWITCHD_START() AT_CHECK([ovs-vsctl -- set bridge br0 other-config:hwaddr=\"f2:ff:00:00:00:01\"]) @@ -827,7 +827,7 @@ OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP AT_SETUP([datapath - ping over ip6erspan v2 tunnel by simulated packets]) -OVS_CHECK_KERNEL(3, 10, 4, 17) +OVS_CHECK_KERNEL(3, 10, 4, 18) OVS_TRAFFIC_VSWITCHD_START() AT_CHECK([ovs-vsctl -- set bridge br0 other-config:hwaddr=\"f2:ff:00:00:00:01\"]) @@ -1066,7 +1066,7 @@ dnl ns1: connect to br0, with IP:10.1.1.2 dnl br-underlay: with IP: 172.31.1.100 dnl ns0: connect to br-underlay, with IP: 10.1.1.1 AT_SETUP([datapath - truncate and output to gre tunnel by simulated packets]) -OVS_CHECK_KERNEL(3, 10, 4, 17) +OVS_CHECK_KERNEL(3, 10, 4, 18) AT_SKIP_IF([test $HAVE_NC = no]) OVS_TRAFFIC_VSWITCHD_START() |