From a49cc9fe46ad7e41bfa0654c9a71d5f26b5b9516 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jul 20 2024 00:51:48 +0000
Subject: Import openvswitch3.1-3.1.0-135 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch
index 4a90798..a0d45a5 100644
--- a/SOURCES/openvswitch-3.1.0.patch
+++ b/SOURCES/openvswitch-3.1.0.patch
@@ -5827,6 +5827,19 @@ index 4fcde9ba1e..492bfcffb8 100644
          nl_msg_put_be16(buf, CTA_PROTO_SRC_PORT, tuple->src_port);
          nl_msg_put_be16(buf, CTA_PROTO_DST_PORT, tuple->dst_port);
      } else {
+diff --git a/lib/netlink-notifier.c b/lib/netlink-notifier.c
+index dfecb97789..7ea5a41818 100644
+--- a/lib/netlink-notifier.c
++++ b/lib/netlink-notifier.c
+@@ -223,7 +223,7 @@ nln_wait(struct nln *nln)
+     }
+ }
+ 
+-void
++void OVS_NO_SANITIZE_FUNCTION
+ nln_report(const struct nln *nln, void *change, int group)
+ {
+     struct nln_notifier *notifier;
 diff --git a/lib/netlink-protocol.h b/lib/netlink-protocol.h
 index 6eaa7035a4..e4bb28ac9f 100644
 --- a/lib/netlink-protocol.h
diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec
index f6eaa18..8d7f7ea 100644
--- a/SPECS/openvswitch3.1.spec
+++ b/SPECS/openvswitch3.1.spec
@@ -63,7 +63,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.1.0
-Release: 134%{?dist}
+Release: 135%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -757,6 +757,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Jul 19 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-135
+- Merging upstream branch-3.1 [RH git: e19fcfab16]
+    Commit list:
+    21948c2283 netlink-notifier: Silence the UBsan's function pointer mismatch error.
+
+
 * Fri Jul 19 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-134
 - Merging upstream branch-3.1 [RH git: 2a5554263f]
     Commit list: