diff --git a/SOURCES/openvswitch-3.4.0.patch b/SOURCES/openvswitch-3.4.0.patch
index 6f75e6c..7966704 100644
--- a/SOURCES/openvswitch-3.4.0.patch
+++ b/SOURCES/openvswitch-3.4.0.patch
@@ -25,15 +25,19 @@ index 2a191b57fb..5f8a1db6af 100755
  # Install python test dependencies
  pip3 install -r python/test_requirements.txt
 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
-index 9d3a13ca1c..8d2a083749 100644
+index 9d3a13ca1c..4136986f91 100644
 --- a/.github/workflows/build-and-test.yml
 +++ b/.github/workflows/build-and-test.yml
-@@ -8,10 +8,10 @@ env:
+@@ -7,15 +7,18 @@ env:
+ 
  jobs:
    build-dpdk:
++    strategy:
++      matrix:
++        runner: [ubuntu-24.04]
      env:
 -      dependencies: gcc libbpf-dev libnuma-dev libpcap-dev ninja-build pkgconf
-+      dependencies: gcc libbpf-dev libnuma-dev ninja-build pkgconf
++      dependencies: gcc libnuma-dev libxdp-dev ninja-build pkgconf
        CC: gcc
        DPDK_GIT: https://dpdk.org/git/dpdk-stable
 -      DPDK_VER: 23.11.1
@@ -41,17 +45,41 @@ index 9d3a13ca1c..8d2a083749 100644
      name: dpdk gcc
      outputs:
        dpdk_key: ${{ steps.gen_dpdk_key.outputs.key }}
-@@ -79,8 +79,7 @@ jobs:
+-    runs-on: ubuntu-22.04
++    runs-on: ${{ matrix.runner }}
+     timeout-minutes: 30
+ 
+     steps:
+@@ -33,7 +36,8 @@ jobs:
+       # This also allows us to use cache from any branch as long as version
+       # and a way we're building DPDK stays the same.
+       run:  |
+-        cat .ci/dpdk-* > dpdk-ci-signature
++        echo ${{ matrix.runner }} > dpdk-ci-signature
++        cat .ci/dpdk-* >> dpdk-ci-signature
+         grep -rwE 'DPDK_GIT|DPDK_VER' .github/ >> dpdk-ci-signature
+         if [ "${DPDK_VER##refs/*/}" != "${DPDK_VER}" ]; then
+             git ls-remote --heads $DPDK_GIT $DPDK_VER >> dpdk-ci-signature
+@@ -79,8 +83,7 @@ jobs:
      env:
        dependencies: |
          automake libtool gcc bc libjemalloc2 libjemalloc-dev libssl-dev \
 -        llvm-dev libnuma-dev libpcap-dev selinux-policy-dev libbpf-dev \
 -        lftp libreswan
-+        llvm-dev libnuma-dev selinux-policy-dev libbpf-dev lftp libreswan
++        llvm-dev libnuma-dev selinux-policy-dev libxdp-dev lftp libreswan
        CC:          ${{ matrix.compiler }}
        DPDK:        ${{ matrix.dpdk }}
        DPDK_SHARED: ${{ matrix.dpdk_shared }}
-@@ -241,14 +240,6 @@ jobs:
+@@ -93,7 +96,7 @@ jobs:
+       TEST_RANGE:  ${{ matrix.test_range }}
+ 
+     name: linux ${{ join(matrix.*, ' ') }}
+-    runs-on: ubuntu-22.04
++    runs-on: ubuntu-24.04
+     timeout-minutes: 30
+ 
+     strategy:
+@@ -241,14 +244,6 @@ jobs:
        if:   matrix.m32 != ''
        run:  sudo apt install -y gcc-multilib
  
@@ -66,17 +94,32 @@ index 9d3a13ca1c..8d2a083749 100644
      - name: prepare
        run:  ./.ci/linux-prepare.sh
  
-@@ -279,8 +270,8 @@ jobs:
+@@ -279,13 +274,13 @@ jobs:
      needs: build-dpdk
      env:
        dependencies: |
 -        automake bc clang-tools libbpf-dev libnuma-dev libpcap-dev \
 -        libunbound-dev libunwind-dev libssl-dev libtool llvm-dev
-+        automake bc clang-tools libbpf-dev libnuma-dev libunbound-dev \
-+        libunwind-dev libssl-dev libtool llvm-dev
++        automake bc clang-tools libnuma-dev libunbound-dev libunwind-dev \
++        libssl-dev libtool libxdp-dev llvm-dev
        CC:   clang
        DPDK: dpdk
        CLANG_ANALYZE: true
+     name: clang-analyze
+-    runs-on: ubuntu-22.04
++    runs-on: ubuntu-24.04
+     timeout-minutes: 30
+ 
+     steps:
+@@ -432,7 +427,7 @@ jobs:
+       DPDK:        ${{ matrix.dpdk }}
+ 
+     name: linux deb ${{ matrix.dpdk }} dpdk
+-    runs-on: ubuntu-22.04
++    runs-on: ubuntu-24.04
+     timeout-minutes: 30
+ 
+     strategy:
 diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst
 index 7c32d7acfc..d345b63d5b 100644
 --- a/Documentation/faq/releases.rst
@@ -1080,6 +1123,18 @@ index 37c509ac68..6c60c07e3f 100755
          poller.block()
  
      unixctl_server.close()
+diff --git a/lib/dpdk.c b/lib/dpdk.c
+index 940c43c070..b7516257c5 100644
+--- a/lib/dpdk.c
++++ b/lib/dpdk.c
+@@ -323,7 +323,6 @@ dpdk_init__(const struct smap *ovs_other_config)
+     if (log_stream == NULL) {
+         VLOG_ERR("Can't redirect DPDK log: %s.", ovs_strerror(errno));
+     } else {
+-        setbuf(log_stream, NULL);
+         rte_openlog_stream(log_stream);
+     }
+ 
 diff --git a/lib/mcast-snooping.c b/lib/mcast-snooping.c
 index dc5164b41c..bf25e6f20a 100644
 --- a/lib/mcast-snooping.c
diff --git a/SPECS/openvswitch3.4.spec b/SPECS/openvswitch3.4.spec
index 9c9b463..474124a 100644
--- a/SPECS/openvswitch3.4.spec
+++ b/SPECS/openvswitch3.4.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.4.0
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -770,6 +770,13 @@ exit 0
 %endif
 
 %changelog
+* Mon Nov 11 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.4.0-15
+- Merging upstream branch-3.4 [RH git: bbc8d4cbb1]
+    Commit list:
+    3d0246e3c3 ci: Update GitHub actions runner from Ubuntu 22.04 to 24.04.
+    5c13ad0002 dpdk: Fix dpdk logs being split over multiple lines.
+
+
 * Mon Nov 04 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.4.0-14
 - Merging upstream branch-3.4 [RH git: d3616fbd62]
     Commit list: