diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch
index 9efdccd..dbbe11f 100644
--- a/SOURCES/openvswitch-2.15.0.patch
+++ b/SOURCES/openvswitch-2.15.0.patch
@@ -21023,7 +21023,7 @@ index 47077e9478..5cb96fa6ec 100644
          } else {
              txn->error = 0;
 diff --git a/lib/odp-util.c b/lib/odp-util.c
-index a8598d52af..ec25976d67 100644
+index a8598d52af..6245e0c26b 100644
 --- a/lib/odp-util.c
 +++ b/lib/odp-util.c
 @@ -2937,7 +2937,7 @@ odp_nsh_key_from_attr__(const struct nlattr *attr, bool is_mask,
@@ -21061,6 +21061,15 @@ index a8598d52af..ec25976d67 100644
      }
  
      if ((!tnl_type || !strcmp(tnl_type, "gtpu")) &&
+@@ -3208,7 +3208,7 @@ tun_key_to_attr(struct ofpbuf *a, const struct flow_tnl *tun_key,
+ 
+         opts.flags = tun_key->gtpu_flags;
+         opts.msgtype = tun_key->gtpu_msgtype;
+-        nl_msg_put_unspec(a, OVS_TUNNEL_KEY_ATTR_GENEVE_OPTS,
++        nl_msg_put_unspec(a, OVS_TUNNEL_KEY_ATTR_GTPU_OPTS,
+                           &opts, sizeof(opts));
+     }
+     nl_msg_end_nested(a, tun_key_ofs);
 @@ -4614,7 +4614,7 @@ odp_flow_format(const struct nlattr *key, size_t key_len,
              }
              ds_put_char(ds, ')');
@@ -21339,7 +21348,7 @@ index ff8adaefb5..249cff0512 100644
              struct ovsdb_error *error = ovsdb_syntax_error(
                  result, NULL, "bad monitor_cond_since reply format");
 diff --git a/lib/ovsdb-idl.c b/lib/ovsdb-idl.c
-index 2c8a0c9cfe..601a806c3a 100644
+index 2c8a0c9cfe..f54bc68f7b 100644
 --- a/lib/ovsdb-idl.c
 +++ b/lib/ovsdb-idl.c
 @@ -92,6 +92,9 @@ struct ovsdb_idl {
@@ -21645,6 +21654,17 @@ index 2c8a0c9cfe..601a806c3a 100644
          ovsdb_idl_destroy(loop->idl);
      }
  }
+@@ -4044,8 +4125,8 @@ ovsdb_idl_loop_run(struct ovsdb_idl_loop *loop)
+ {
+     ovsdb_idl_run(loop->idl);
+ 
+-    /* See if we can commit the loop->committing_txn. */
+-    if (loop->committing_txn) {
++    /* See if the 'committing_txn' succeeded in the meantime. */
++    if (loop->committing_txn && loop->committing_txn->status == TXN_SUCCESS) {
+         ovsdb_idl_try_commit_loop_txn(loop, NULL);
+     }
+ 
 diff --git a/lib/ovsdb-idl.h b/lib/ovsdb-idl.h
 index 05bb48d66c..d93483245e 100644
 --- a/lib/ovsdb-idl.h
diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec
index 227bef5..15d6bfb 100644
--- a/SPECS/openvswitch2.15.spec
+++ b/SPECS/openvswitch2.15.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.15.0
-Release: 69%{?dist}
+Release: 70%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -702,6 +702,13 @@ exit 0
 %endif
 
 %changelog
+* Fri Feb 04 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-70
+- Merging upstream branch-2.15 [RH git: ed4cf202b5]
+    Commit list:
+    38970bf78b odp-util: Fix tunnel key attr for GTP-U.
+    57456cec36 ovsdb-idl: Only process successful txn in ovsdb_idl_loop_run.
+
+
 * Wed Feb 02 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-69
 - Merging upstream branch-2.15 [RH git: ffd65899bd]
     Commit list: