diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch
index de8c1bb..486d898 100644
--- a/SOURCES/openvswitch-3.1.0.patch
+++ b/SOURCES/openvswitch-3.1.0.patch
@@ -9104,7 +9104,7 @@ index 9224ee2e6d..2e1fcb3a6f 100644
              static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
              VLOG_WARN_RL(&rl, "xcache LEARN action execution failed.");
 diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
-index a9cf3cbee0..f27ce24afd 100644
+index a9cf3cbee0..43caa6ad41 100644
 --- a/ofproto/ofproto-dpif-xlate.c
 +++ b/ofproto/ofproto-dpif-xlate.c
 @@ -66,6 +66,7 @@
@@ -9267,6 +9267,19 @@ index a9cf3cbee0..f27ce24afd 100644
      }
  
      err = tnl_route_lookup_flow(ctx, flow, &d_ip6, &s_ip6, &out_dev);
+@@ -3715,9 +3810,9 @@ native_tunnel_output(struct xlate_ctx *ctx, const struct xport *xport,
+                      "sending %s request",
+                      buf_dip6, out_dev->xbridge->name, d_ip ? "ARP" : "ND");
+ 
+-        err = ovs_router_get_netdev_source_address(&d_ip6,
+-                                                   out_dev->xbridge->name,
+-                                                   &nh_s_ip6);
++        err = ovs_router_get_netdev_source_address(
++            &d_ip6, netdev_get_name(out_dev->netdev), &nh_s_ip6);
++
+         if (err) {
+             nh_s_ip6 = s_ip6;
+         }
 @@ -3906,20 +4001,17 @@ static void
  patch_port_output(struct xlate_ctx *ctx, const struct xport *in_dev,
                    struct xport *out_dev, bool is_last_action)
@@ -9516,10 +9529,10 @@ index a9cf3cbee0..f27ce24afd 100644
      uint64_t port = mf_get_subfield(&or->src, &ctx->xin->flow);
      if (port <= UINT16_MAX) {
 -        xlate_report(ctx, OFT_DETAIL, "output port is %"PRIu64, port);
--
--        union mf_subvalue value;
 +        union mf_subvalue *value = xmalloc(sizeof *value);
  
+-        union mf_subvalue value;
+-
 -        memset(&value, 0xff, sizeof value);
 -        mf_write_subfield_flow(&or->src, &value, &ctx->wc->masks);
 +        xlate_report(ctx, OFT_DETAIL, "output port is %"PRIu64, port);
diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec
index a2ef1b8..eba2a13 100644
--- a/SPECS/openvswitch3.1.spec
+++ b/SPECS/openvswitch3.1.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.1.6
-Release: 153%{?dist}
+Release: 154%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -784,6 +784,12 @@ exit 0
 %endif
 
 %changelog
+* Wed Feb 26 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-154
+- Merging upstream branch-3.1 [RH git: 3fcfd24fa3]
+    Commit list:
+    72bd7cb6a0 ofproto-dpif-xlate: Fix source IP lookup for non-bridge ports.
+
+
 * Wed Feb 26 2025 Timothy Redaelli <tredaelli@redhat.com> - 3.1.0-153
 - Add include.mk [RH git: e2ea9ebdca]