commit 21d461f54c1b5f12165105c5190ef4d83e9b0789
Merge: d7b0d724f f4cc9ca82
Author: Open vSwitch CI <ovs-ci>
Date:   Thu May 11 17:02:43 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    f4cc9ca824 dpctl: Fix dereferencing null pointer in parse_ct_limit_zones().

commit d7b0d724f23dd8c2d4a436efad17444d4e6e0dfa
Merge: a0b74d148 9e27e8fe8
Author: Open vSwitch CI <ovs-ci>
Date:   Wed May 10 17:47:21 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    9e27e8fe81 netdev-offload: Fix deadlock/recursive use of the netdev_hmap_rwlock rwlock. (#2182541)
    087439e416 ofproto-dpif-xlate: Fix use-after-free when xlate_actions().

commit a0b74d148b75eebd3e7ce2e8516a9b693f166088
Merge: c0cd6bd2a bf9c834e6
Author: Open vSwitch CI <ovs-ci>
Date:   Fri May 5 14:32:23 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    bf9c834e64 ci: Separate DPDK from OVS build.

commit c0cd6bd2a31a560debce363948ffa0aa575ba29e
Merge: dd97c178a bf1b32e20
Author: Open vSwitch CI <ovs-ci>
Date:   Thu May 4 13:47:33 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    bf1b32e20e ovsdb-idl.at: Fix write-changed-only tests without change tracking.

commit dd97c178a87f1e5f8071bd84027061c0e72b3c23
Merge: a9adae047 c6cb82887
Author: Open vSwitch CI <ovs-ci>
Date:   Fri Apr 28 14:32:20 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    c6cb828870 tc: Fix cleaning chains.

commit a9adae047cfa78c5a31c7f3f7f0f1ddb61e227b5
Merge: 9f3dc364a 29c61a402
Author: Open vSwitch CI <ovs-ci>
Date:   Wed Apr 26 21:18:08 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    29c61a4024 python-stream: Handle SSL error in do_handshake.

commit 9f3dc364af41e4ca31602e23ae23c949ae0c13b5
Merge: 762902590 615548e53
Author: Open vSwitch CI <ovs-ci>
Date:   Tue Apr 25 18:02:23 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    615548e532 dpif-netlink: Fix memory leak dpif_netlink_open().
    42edc9a1d5 ofp-parse: Check ranges on string to uint32_t conversion.
    d3a479c4b4 learning-switch: Fix coredump of OpenFlow15 learning-switch.

commit 7629025902ca88553b1a98af69fe5f2a4fe71695
Merge: 4890f6931 9529e9aa9
Author: Open vSwitch CI <ovs-ci>
Date:   Mon Apr 24 18:47:16 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    9529e9aa96 ovsdb: Allow conversion records with no data in a clustered storage.
    7006bb112b ovsdb: Check for ephemeral columns before writing a new schema.
    27678b3a19 ovsdb-tool: Fix cluster-to-standalone for DB conversion records.

commit 4890f6931a1f3f309e0db710807de0c0eba40a53
Merge: 56a5f0d56 771c989a9
Author: Open vSwitch CI <ovs-ci>
Date:   Thu Apr 6 22:40:41 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    771c989a9a ovs-tcpdump: Stdout is shutdown before ovs-tcpdump exit.

commit 56a5f0d56453b67062364e1383e74d9508f60e45
Merge: 3069c68dd 8ac6375ca
Author: Open vSwitch CI <ovs-ci>
Date:   Thu Apr 6 15:23:34 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    8ac6375cac Prepare for 3.1.2.
    0187eadfce Set release date for 3.1.1.

commit 3069c68dd97d3ffb2ca2a191ba50ae0ccd6eb13c
Merge: 3607c5dbe 61b39d8c4
Author: Open vSwitch CI <ovs-ci>
Date:   Thu Apr 6 09:17:15 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    61b39d8c47 ofproto-dpif-xlate: Always mask ip proto field. (#2134873)

commit 3607c5dbe61cbaea65b1f1bd06cb4f335cffd4b4
Merge: 4868ac0e8 8019b5896
Author: Open vSwitch CI <ovs-ci>
Date:   Wed Apr 5 06:12:34 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    8019b5896e conntrack-tp: Fix clang warning.

commit 4868ac0e8523deed10a2d3853193298f23e24c2f
Author: Aaron Conole <aconole>
Date:   Fri Mar 31 17:17:27 2023 -0400

    ofproto-dpif-xlate: Always mask ip proto field.
    
    The ofproto layer currently treats nw_proto field as overloaded to mean
    both that a proper nw layer exists, as well as the value contained in
    the header for the nw proto.  However, this is incorrect behavior as
    relevant standards permit that any value, including '0' should be treated
    as a valid value.
    
    Because of this overload, when the ofproto layer builds action list for
    a packet with nw_proto of 0, it won't build the complete action list that
    we expect to be built for the packet.  That will cause a bad behavior
    where all packets passing the datapath will fall into an incomplete
    action set.
    
    The fix here is to unwildcard nw_proto, allowing us to preserve setting
    actions for protocols which we know have support for the actions we
    program.  This means that a traffic which contains nw_proto == 0 cannot
    cause connectivity breakage with other traffic on the link.
    
    Reported-by: David Marchand <dmarchand>
    Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=2134873
    Acked-by: Ilya Maximets <i.maximets>
    Signed-off-by: Aaron Conole <aconole>

commit a911cf94ce4e5d672217142baef9787300e84ad3
Merge: e6b73e056 b184a68a2
Author: Open vSwitch CI <ovs-ci>
Date:   Mon Apr 3 15:47:20 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    b184a68a20 netdev-offload-tc: Del ufid mapping if device not exist.

commit e6b73e0565cb2775daaeb984ca4727248faa6f8a
Merge: 407a020d7 037e2d916
Author: Open vSwitch CI <ovs-ci>
Date:   Thu Mar 30 17:02:20 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    037e2d916 db-ctl-base: Partially revert b8bf410a5.

commit 407a020d7a92c29abe76a8167b23b7db358c6c58
Merge: 541c8eefb fee5ea720
Author: Open vSwitch CI <ovs-ci>
Date:   Wed Mar 29 18:32:15 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    fee5ea720 netdev-tc-offloads: Fix misaligned 8 byte read.

commit 541c8eefbd1d7d6534e0e764aa1381f98666b2c2
Author: Open vSwitch CI <ovs-ci>
Date:   Wed Mar 29 06:57:58 2023 -0400

    Merging dpdk submodule
    
    Commit list:
    3812e23f6b net/i40e: revert link status check on device start (#2173794)

commit fbc56ee622ccd9becdb35fd00181befa58e52797
Merge: 28d55c3fb fff04b838
Author: Open vSwitch CI <ovs-ci>
Date:   Mon Mar 27 17:17:27 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    fff04b838 ovs-thread: Fix cpus not read for the first 10s.
    b2b467b3a dpif-netlink: Always create at least 1 handler.

commit 28d55c3fb3bc3061ff37e1f7b0710607249f9682
Merge: a9561af3d 0f30961e0
Author: Open vSwitch CI <ovs-ci>
Date:   Wed Mar 22 16:32:23 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    0f30961e0 netdev-offload-tc: Fix parse_tc_flower_to_actions() reporting errors.

commit a9561af3dc6ae981a2bfb3abc1f72bfb2d20cb8c
Merge: 398009fd5 3f50354a9
Author: Open vSwitch CI <ovs-ci>
Date:   Wed Mar 15 19:47:18 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    3f50354a9 vswitch: Add missing documentation for "ct_flush" capability.
    504f8c859 dpctl: Fix flush-conntrack with datapath as argument.
    24b47072f ofproto-dpif-upcall: Wait for valid hw flow stats before applying min-revalidate-pps.

commit 398009fd5f8d271a50abcb91514d28585d03d154
Merge: d17880bde 9f9b4de38
Author: Open vSwitch CI <ovs-ci>
Date:   Mon Mar 13 20:02:14 2023 -0400

    Merging upstream branch-3.1
    
    Commit list:
    9f9b4de38 system-traffic: Fix conntrack test cases which are failing with af_xdp.

commit d17880bde782691761e39975a71f789f7ffded3a
Merge: 54a2eb1fd dcdff1f42
Author: Open vSwitch CI <ovs-ci>
Date:   Tue Mar 7 00:58:15 2023 -0500

    Merging upstream branch-3.1
    
    Commit list:
    dcdff1f42 netdev-windows: Add checking when creating netdev with system type on Windows
    39a7a18c3 ofproto-dpif-upcall: Include hardware offloaded flows in total flows.
    f7378bc7f ofproto-dpif-upcall: Reset ukey's last stats value if the datapath changed.

commit 54a2eb1fdac05b7ce95d1f86f691c236d627ef92
Merge: 29cb42e1c 694c7b4e0
Author: Open vSwitch CI <ovs-ci>
Date:   Tue Feb 28 17:02:17 2023 -0500

    Merging upstream branch-3.1
    
    Commit list:
    694c7b4e0 classifier: Fix missing masks on a final stage with ports trie.

commit 29cb42e1cd3ac41eadf3947da98372260ab00083
Merge: 1b47f9b3a 87249e136
Author: Open vSwitch CI <ovs-ci>
Date:   Mon Feb 27 10:32:14 2023 -0500

    Merging upstream branch-3.1
    
    Commit list:
    87249e136 ofproto: Fix re-creation of tunnel backing interfaces on restart.

commit 1b47f9b3ae58b24df4684d343a79e4e5fe218443
Author: Timothy Redaelli <tredaelli>
Date:   Thu Feb 23 20:06:37 2023 +0100

    redhat: use git rev-parse instead of git name-rev
    
    Currenty, git name-rev --name-only HEAD is used in order to get the
    current branch, but it doesn't work correctly if a tag is created so use
    git rev-parse --symbolic-full-name --abbrev-ref instead.

commit 7992626cb18141fe1c6ad08f5e8730a63799636a
Merge: 1cdfcbc3b cb4eecd01
Author: Open vSwitch CI <ovs-ci>
Date:   Tue Feb 21 17:17:41 2023 -0500

    Merging upstream branch-3.1
    
    Commit list:
    cb4eecd01 conntrack: Fix conntrack_clean may access the same exp_list each time.
    372e1a835 ovs-actions: Correct typo in ovs-actions man page.

commit 1cdfcbc3bef17096364c00f682fc4dc2cdbd3bfd
Merge: 4b77c5096 9c34fc2f6
Author: Open vSwitch CI <ovs-ci>
Date:   Tue Feb 21 11:47:14 2023 -0500

    Merging upstream branch-3.1
    
    Commit list:
    9c34fc2f6 ofproto-ipfix: Use per-domain template timeouts.
    b72a7f925 Prepare for 3.1.1.