diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch
index ea18af4..11ea003 100644
--- a/SOURCES/openvswitch-3.1.0.patch
+++ b/SOURCES/openvswitch-3.1.0.patch
@@ -1023,6 +1023,25 @@ index b89dfdd52..6c9094638 100644
      opt_len = tun_metadata_to_geneve_header(&params->flow->tunnel,
                                              gnh->options, &crit_opt);
  
+diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c
+index b3421c099..2d7858f51 100644
+--- a/lib/netdev-offload-dpdk.c
++++ b/lib/netdev-offload-dpdk.c
+@@ -2345,13 +2345,13 @@ netdev_offload_dpdk_flow_destroy(struct ufid_to_rte_flow_data *rte_flow_data)
+             ovsrcu_get(void *, &netdev->hw_info.offload_data);
+         data->rte_flow_counters[tid]--;
+ 
+-        ufid_to_rte_flow_disassociate(rte_flow_data);
+         VLOG_DBG_RL(&rl, "%s/%s: rte_flow 0x%"PRIxPTR
+                     " flow destroy %d ufid " UUID_FMT,
+                     netdev_get_name(netdev), netdev_get_name(physdev),
+                     (intptr_t) rte_flow,
+                     netdev_dpdk_get_port_id(physdev),
+                     UUID_ARGS((struct uuid *) ufid));
++        ufid_to_rte_flow_disassociate(rte_flow_data);
+     } else {
+         VLOG_ERR("Failed flow: %s/%s: flow destroy %d ufid " UUID_FMT,
+                  netdev_get_name(netdev), netdev_get_name(physdev),
 diff --git a/lib/netdev-offload-tc.c b/lib/netdev-offload-tc.c
 index 4c78c4816..09f6393f8 100644
 --- a/lib/netdev-offload-tc.c
@@ -4290,6 +4309,24 @@ index cf4e3eadf..9d77a9f51 100644
  m4_include([tests/drop-stats.at])
  m4_include([tests/pytest.at])
 +m4_include([tests/learning-switch.at])
+diff --git a/utilities/ovs-appctl-bashcomp.bash b/utilities/ovs-appctl-bashcomp.bash
+index 4384be8ae..0a9af1a18 100644
+--- a/utilities/ovs-appctl-bashcomp.bash
++++ b/utilities/ovs-appctl-bashcomp.bash
+@@ -223,6 +223,13 @@ printf_stderr() {
+ # The code below is taken from Peter Amidon.  His change makes it more
+ # robust.
+ extract_bash_prompt() {
++    # On Bash 4.4+ just use the @P expansion
++    if ((BASH_VERSINFO[0] > 4 ||
++        (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 4))); then
++        _BASH_PROMPT="${PS1@P}"
++        return
++    fi
++
+     local myPS1 v
+ 
+     myPS1="$(sed 's/Begin prompt/\\Begin prompt/; s/End prompt/\\End prompt/' <<< "$PS1")"
 diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c
 index eabec18a3..3ce4e82ec 100644
 --- a/utilities/ovs-ofctl.c
@@ -4327,6 +4364,24 @@ index a49ec9f94..420c11eb8 100755
          if pipes.poll() is None:
              pipes.terminate()
  
+diff --git a/utilities/ovs-vsctl-bashcomp.bash b/utilities/ovs-vsctl-bashcomp.bash
+index fc8245bfb..c5ad24fb7 100644
+--- a/utilities/ovs-vsctl-bashcomp.bash
++++ b/utilities/ovs-vsctl-bashcomp.bash
+@@ -413,6 +413,13 @@ _ovs_vsctl_get_PS1 () {
+         return;
+     fi
+ 
++    # On Bash 4.4+ just use the @P expansion
++    if ((BASH_VERSINFO[0] > 4 ||
++        (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 4))); then
++        printf '%s\n' "${PS1@P}"
++        return
++    fi
++
+     # Original inspiration from
+     # http://stackoverflow.com/questions/10060500/bash-how-to-evaluate-ps1-ps2,
+     # but changed quite a lot to make it more robust.
 diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
 index bfb2adef1..0deca14b9 100644
 --- a/vswitchd/bridge.c
diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec
index 70fd666..361f2f9 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: 33%{?dist}
+Release: 34%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -757,6 +757,13 @@ exit 0
 %endif
 
 %changelog
+* Mon May 29 2023 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-34
+- Merging upstream branch-3.1 [RH git: c5a742a597]
+    Commit list:
+    faddfa21df utilities/bashcomp: Fix PS1 generation on new bash. (#2170344)
+    33db42a34b netdev-offload-dpdk: Fix crash in debug log.
+
+
 * Fri May 26 2023 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-33
 - Merging upstream branch-3.1 [RH git: ea7b9de7d1]
     Commit list: