diff -pruN 257.7-1/.github/workflows/build-test.sh 257.9-0ubuntu2/.github/workflows/build-test.sh
--- 257.7-1/.github/workflows/build-test.sh	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/build-test.sh	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,191 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+set -ex
+
+shopt -s nullglob
+
+info() { echo -e "\033[33;1m$1\033[0m"; }
+fatal() { echo >&2 -e "\033[31;1m$1\033[0m"; exit 1; }
+success() { echo >&2 -e "\033[32;1m$1\033[0m"; }
+
+ARGS=(
+    "--optimization=0 -Dopenssl=disabled -Dcryptolib=gcrypt -Ddns-over-tls=gnutls -Dtpm=true -Dtpm2=enabled"
+    "--optimization=s -Dutmp=false"
+    "--optimization=2 -Dc_args=-Wmaybe-uninitialized -Ddns-over-tls=openssl"
+    "--optimization=3 -Db_lto=true -Ddns-over-tls=false"
+    "--optimization=3 -Db_lto=false -Dtpm2=disabled -Dlibfido2=disabled -Dp11kit=disabled -Defi=false -Dbootloader=disabled"
+    "--optimization=3 -Dfexecve=true -Dstandalone-binaries=true -Dstatic-libsystemd=true -Dstatic-libudev=true"
+    "-Db_ndebug=true"
+)
+PACKAGES=(
+    cryptsetup-bin
+    expect
+    fdisk
+    gettext
+    iputils-ping
+    isc-dhcp-client
+    itstool
+    kbd
+    libarchive-dev
+    libblkid-dev
+    libbpf-dev
+    libcap-dev
+    libcurl4-gnutls-dev
+    libfdisk-dev
+    libfido2-dev
+    libgpg-error-dev
+    liblz4-dev
+    liblzma-dev
+    libmicrohttpd-dev
+    libmount-dev
+    libp11-kit-dev
+    libpwquality-dev
+    libqrencode-dev
+    libssl-dev
+    libtss2-dev
+    libxkbcommon-dev
+    libxtables-dev
+    libzstd-dev
+    mold
+    mount
+    net-tools
+    python3-evdev
+    python3-jinja2
+    python3-lxml
+    python3-pefile
+    python3-pip
+    python3-pyelftools
+    python3-pyparsing
+    python3-setuptools
+    quota
+    strace
+    unifont
+    util-linux
+    zstd
+)
+COMPILER="${COMPILER:?}"
+COMPILER_VERSION="${COMPILER_VERSION:?}"
+LINKER="${LINKER:?}"
+CRYPTOLIB="${CRYPTOLIB:?}"
+RELEASE="$(lsb_release -cs)"
+
+if [ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "x86_64" ]; then
+    PACKAGES+=(libxen-dev)
+fi
+
+# Note: As we use postfixed clang/gcc binaries, we need to override $AR
+#       as well, otherwise meson falls back to ar from binutils which
+#       doesn't work with LTO
+if [[ "$COMPILER" == clang ]]; then
+    CC="clang-$COMPILER_VERSION"
+    CXX="clang++-$COMPILER_VERSION"
+    AR="llvm-ar-$COMPILER_VERSION"
+
+    if systemd-analyze compare-versions "$COMPILER_VERSION" ge 17; then
+        CFLAGS="-fno-sanitize=function"
+        CXXFLAGS="-fno-sanitize=function"
+    else
+        CFLAGS=""
+        CXXFLAGS=""
+    fi
+
+    # Prefer the distro version if available
+    if ! apt-get -y install --dry-run "llvm-$COMPILER_VERSION" >/dev/null; then
+        # Latest LLVM stack deb packages provided by https://apt.llvm.org/
+        # Following snippet was partly borrowed from https://apt.llvm.org/llvm.sh
+        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | \
+            sudo gpg --yes --dearmor --output /usr/share/keyrings/apt-llvm-org.gpg
+        echo "deb [signed-by=/usr/share/keyrings/apt-llvm-org.gpg] http://apt.llvm.org/$RELEASE/ llvm-toolchain-$RELEASE-$COMPILER_VERSION main" | \
+            sudo tee /etc/apt/sources.list.d/llvm-toolchain.list
+    fi
+
+    PACKAGES+=("clang-$COMPILER_VERSION" "lldb-$COMPILER_VERSION" "python3-lldb-$COMPILER_VERSION" "lld-$COMPILER_VERSION" "clangd-$COMPILER_VERSION" "llvm-$COMPILER_VERSION")
+elif [[ "$COMPILER" == gcc ]]; then
+    CC="gcc-$COMPILER_VERSION"
+    CXX="g++-$COMPILER_VERSION"
+    AR="gcc-ar-$COMPILER_VERSION"
+    CFLAGS=""
+    CXXFLAGS=""
+
+    if ! apt-get -y install --dry-run "gcc-$COMPILER_VERSION" >/dev/null; then
+        # Latest gcc stack deb packages provided by
+        # https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test
+        sudo add-apt-repository -y --no-update ppa:ubuntu-toolchain-r/test
+    fi
+
+    PACKAGES+=("gcc-$COMPILER_VERSION")
+    if [ "$(uname -m)" = "x86_64" ]; then
+        # Only needed for ia32 EFI builds
+        PACKAGES+=("gcc-$COMPILER_VERSION-multilib")
+    fi
+else
+    fatal "Unknown compiler: $COMPILER"
+fi
+
+# This is added by default, and it is often broken, but we don't need anything from it
+sudo rm -f /etc/apt/sources.list.d/microsoft-prod.{list,sources}
+if grep -q 'VERSION_CODENAME=jammy' /usr/lib/os-release; then
+    sudo add-apt-repository -y --no-update ppa:upstream-systemd-ci/systemd-ci
+    sudo add-apt-repository -y --no-update --enable-source
+else
+    # add-apt-repository --enable-source does not work on deb822 style sources.
+    for f in /etc/apt/sources.list.d/*.sources; do
+        sudo sed -i "s/Types: deb/Types: deb deb-src/g" "$f"
+    done
+fi
+sudo apt-get -y update
+sudo apt-get -y build-dep systemd
+sudo apt-get -y install "${PACKAGES[@]}"
+# Install more or less recent meson and ninja with pip, since the distro versions don't
+# always support all the features we need (like --optimization=). Since the build-dep
+# command above installs the distro versions, let's install the pip ones just
+# locally and add the local bin directory to the $PATH.
+pip3 install --user -r .github/workflows/requirements.txt --require-hashes --break-system-packages
+export PATH="$HOME/.local/bin:$PATH"
+
+if [[ -n "$CUSTOM_PYTHON" ]]; then
+    # If CUSTOM_PYTHON is set we need to pull jinja2 from pip, as a local interpreter is used
+    pip3 install --user --break-system-packages jinja2
+fi
+
+$CC --version
+meson --version
+ninja --version
+
+for args in "${ARGS[@]}"; do
+    SECONDS=0
+
+    if [[ "$COMPILER" == clang && "$args" =~ Wmaybe-uninitialized ]]; then
+        # -Wmaybe-uninitialized is not implemented in clang
+        continue
+    fi
+
+    info "Checking build with $args"
+    # shellcheck disable=SC2086
+    if ! AR="$AR" \
+         CC="$CC" CC_LD="$LINKER" CFLAGS="$CFLAGS" \
+         CXX="$CXX" CXX_LD="$LINKER" CXXFLAGS="$CXXFLAGS" \
+         meson setup \
+               -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true --werror \
+               -Dnobody-group=nogroup -Dcryptolib="${CRYPTOLIB:?}" -Ddebug=false \
+               $args build; then
+
+        cat build/meson-logs/meson-log.txt
+        fatal "meson failed with $args"
+    fi
+
+    if ! meson compile -C build -v; then
+        fatal "'meson compile' failed with '$args'"
+    fi
+
+    for loader in build/src/boot/efi/*{.efi,.efi.stub}; do
+        if [[ "$(sbverify --list "$loader" 2>&1)" != "No signature table present" ]]; then
+            fatal "$loader: Gaps found in section table"
+        fi
+    done
+
+    git clean -dxf
+
+    success "Build with '$args' passed in $SECONDS seconds"
+done
diff -pruN 257.7-1/.github/workflows/build-test.yml 257.9-0ubuntu2/.github/workflows/build-test.yml
--- 257.7-1/.github/workflows/build-test.yml	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/build-test.yml	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,51 @@
+---
+# vi: ts=2 sw=2 et:
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+name: Build test
+on:
+  pull_request:
+    paths:
+      - '**/meson.build'
+      - '.github/workflows/**'
+      - 'meson_options.txt'
+      - 'src/**'
+      - 'test/fuzz/**'
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ${{ matrix.runner }}
+    concurrency:
+      group: ${{ github.workflow }}-${{ toJSON(matrix.env) }}-${{ github.ref }}-${{ matrix.runner }}-${{ matrix.python-version }}
+      cancel-in-progress: true
+    strategy:
+      fail-fast: false
+      matrix:
+        runner: [ ubuntu-24.04 ]
+        python-version: [ '' ]
+        env:
+          - { COMPILER: "gcc",   COMPILER_VERSION: "11", LINKER: "bfd",  CRYPTOLIB: "gcrypt"  }
+          - { COMPILER: "gcc",   COMPILER_VERSION: "13", LINKER: "mold", CRYPTOLIB: "openssl" }
+          - { COMPILER: "clang", COMPILER_VERSION: "14", LINKER: "mold", CRYPTOLIB: "gcrypt"  }
+          - { COMPILER: "clang", COMPILER_VERSION: "16", LINKER: "bfd",  CRYPTOLIB: "openssl" }
+          - { COMPILER: "clang", COMPILER_VERSION: "18", LINKER: "lld",  CRYPTOLIB: "auto"    }
+        include:
+          # Do one run with the oldest supported python version to ensure there are no regressions
+          # It is only available on Jammy, which is useful as it will also provide a build check for
+          # older glibc
+          - env: { COMPILER: "gcc",   COMPILER_VERSION: "12", LINKER: "bfd", CRYPTOLIB: "openssl", CUSTOM_PYTHON: "1"  }
+            runner: [ ubuntu-22.04 ]
+            python-version: '3.7'
+    env: ${{ matrix.env }}
+    steps:
+      - name: Repository checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - name: Setup python
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Build check
+        run: .github/workflows/build-test.sh
diff -pruN 257.7-1/.github/workflows/build_test.sh 257.9-0ubuntu2/.github/workflows/build_test.sh
--- 257.7-1/.github/workflows/build_test.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/build_test.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,173 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-set -ex
-
-shopt -s nullglob
-
-info() { echo -e "\033[33;1m$1\033[0m"; }
-fatal() { echo >&2 -e "\033[31;1m$1\033[0m"; exit 1; }
-success() { echo >&2 -e "\033[32;1m$1\033[0m"; }
-
-ARGS=(
-    "--optimization=0 -Dopenssl=disabled -Dcryptolib=gcrypt -Ddns-over-tls=gnutls -Dtpm=true -Dtpm2=enabled"
-    "--optimization=s -Dutmp=false"
-    "--optimization=2 -Dc_args=-Wmaybe-uninitialized -Ddns-over-tls=openssl"
-    "--optimization=3 -Db_lto=true -Ddns-over-tls=false"
-    "--optimization=3 -Db_lto=false -Dtpm2=disabled -Dlibfido2=disabled -Dp11kit=disabled -Defi=false -Dbootloader=disabled"
-    "--optimization=3 -Dfexecve=true -Dstandalone-binaries=true -Dstatic-libsystemd=true -Dstatic-libudev=true"
-    "-Db_ndebug=true"
-)
-PACKAGES=(
-    cryptsetup-bin
-    expect
-    fdisk
-    gettext
-    iputils-ping
-    isc-dhcp-client
-    itstool
-    kbd
-    libblkid-dev
-    libbpf-dev
-    libcap-dev
-    libcurl4-gnutls-dev
-    libfdisk-dev
-    libfido2-dev
-    libgpg-error-dev
-    liblz4-dev
-    liblzma-dev
-    libmicrohttpd-dev
-    libmount-dev
-    libp11-kit-dev
-    libpwquality-dev
-    libqrencode-dev
-    libssl-dev
-    libtss2-dev
-    libxen-dev
-    libxkbcommon-dev
-    libxtables-dev
-    libzstd-dev
-    mold
-    mount
-    net-tools
-    python3-evdev
-    python3-jinja2
-    python3-lxml
-    python3-pefile
-    python3-pip
-    python3-pyelftools
-    python3-pyparsing
-    python3-setuptools
-    quota
-    strace
-    unifont
-    util-linux
-    zstd
-)
-COMPILER="${COMPILER:?}"
-COMPILER_VERSION="${COMPILER_VERSION:?}"
-LINKER="${LINKER:?}"
-CRYPTOLIB="${CRYPTOLIB:?}"
-RELEASE="$(lsb_release -cs)"
-
-# Note: As we use postfixed clang/gcc binaries, we need to override $AR
-#       as well, otherwise meson falls back to ar from binutils which
-#       doesn't work with LTO
-if [[ "$COMPILER" == clang ]]; then
-    CC="clang-$COMPILER_VERSION"
-    CXX="clang++-$COMPILER_VERSION"
-    AR="llvm-ar-$COMPILER_VERSION"
-
-    if systemd-analyze compare-versions "$COMPILER_VERSION" ge 17; then
-        CFLAGS="-fno-sanitize=function"
-        CXXFLAGS="-fno-sanitize=function"
-    else
-        CFLAGS=""
-        CXXFLAGS=""
-    fi
-
-    # Prefer the distro version if available
-    if ! apt-get -y install --dry-run "llvm-$COMPILER_VERSION" >/dev/null; then
-        # Latest LLVM stack deb packages provided by https://apt.llvm.org/
-        # Following snippet was partly borrowed from https://apt.llvm.org/llvm.sh
-        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | \
-            sudo gpg --yes --dearmor --output /usr/share/keyrings/apt-llvm-org.gpg
-        echo "deb [signed-by=/usr/share/keyrings/apt-llvm-org.gpg] http://apt.llvm.org/$RELEASE/ llvm-toolchain-$RELEASE-$COMPILER_VERSION main" | \
-            sudo tee /etc/apt/sources.list.d/llvm-toolchain.list
-    fi
-
-    PACKAGES+=("clang-$COMPILER_VERSION" "lldb-$COMPILER_VERSION" "python3-lldb-$COMPILER_VERSION" "lld-$COMPILER_VERSION" "clangd-$COMPILER_VERSION")
-elif [[ "$COMPILER" == gcc ]]; then
-    CC="gcc-$COMPILER_VERSION"
-    CXX="g++-$COMPILER_VERSION"
-    AR="gcc-ar-$COMPILER_VERSION"
-    CFLAGS=""
-    CXXFLAGS=""
-
-    if ! apt-get -y install --dry-run "gcc-$COMPILER_VERSION" >/dev/null; then
-        # Latest gcc stack deb packages provided by
-        # https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test
-        sudo add-apt-repository -y --no-update ppa:ubuntu-toolchain-r/test
-    fi
-
-    PACKAGES+=("gcc-$COMPILER_VERSION" "gcc-$COMPILER_VERSION-multilib")
-else
-    fatal "Unknown compiler: $COMPILER"
-fi
-
-# This is added by default, and it is often broken, but we don't need anything from it
-sudo rm -f /etc/apt/sources.list.d/microsoft-prod.{list,sources}
-# add-apt-repository --enable-source does not work on deb822 style sources.
-for f in /etc/apt/sources.list.d/*.sources; do
-    sudo sed -i "s/Types: deb/Types: deb deb-src/g" "$f"
-done
-sudo apt-get -y update
-sudo apt-get -y build-dep systemd
-sudo apt-get -y install "${PACKAGES[@]}"
-# Install more or less recent meson and ninja with pip, since the distro versions don't
-# always support all the features we need (like --optimization=). Since the build-dep
-# command above installs the distro versions, let's install the pip ones just
-# locally and add the local bin directory to the $PATH.
-pip3 install --user -r .github/workflows/requirements.txt --require-hashes --break-system-packages
-export PATH="$HOME/.local/bin:$PATH"
-
-$CC --version
-meson --version
-ninja --version
-
-for args in "${ARGS[@]}"; do
-    SECONDS=0
-
-    if [[ "$COMPILER" == clang && "$args" =~ Wmaybe-uninitialized ]]; then
-        # -Wmaybe-uninitialized is not implemented in clang
-        continue
-    fi
-
-    info "Checking build with $args"
-    # shellcheck disable=SC2086
-    if ! AR="$AR" \
-         CC="$CC" CC_LD="$LINKER" CFLAGS="$CFLAGS" \
-         CXX="$CXX" CXX_LD="$LINKER" CXXFLAGS="$CXXFLAGS" \
-         meson setup \
-               -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true --werror \
-               -Dnobody-group=nogroup -Dcryptolib="${CRYPTOLIB:?}" -Ddebug=false \
-               $args build; then
-
-        cat build/meson-logs/meson-log.txt
-        fatal "meson failed with $args"
-    fi
-
-    if ! meson compile -C build -v; then
-        fatal "'meson compile' failed with '$args'"
-    fi
-
-    for loader in build/src/boot/efi/*{.efi,.efi.stub}; do
-        if [[ "$(sbverify --list "$loader" 2>&1)" != "No signature table present" ]]; then
-            fatal "$loader: Gaps found in section table"
-        fi
-    done
-
-    git clean -dxf
-
-    success "Build with '$args' passed in $SECONDS seconds"
-done
diff -pruN 257.7-1/.github/workflows/build_test.yml 257.9-0ubuntu2/.github/workflows/build_test.yml
--- 257.7-1/.github/workflows/build_test.yml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/build_test.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
----
-# vi: ts=2 sw=2 et:
-# SPDX-License-Identifier: LGPL-2.1-or-later
-#
-name: Build test
-on:
-  pull_request:
-    paths:
-      - '**/meson.build'
-      - '.github/workflows/**'
-      - 'meson_options.txt'
-      - 'src/**'
-      - 'test/fuzz/**'
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-24.04
-    concurrency:
-      group: ${{ github.workflow }}-${{ toJSON(matrix.env) }}-${{ github.ref }}
-      cancel-in-progress: true
-    strategy:
-      fail-fast: false
-      matrix:
-        env:
-          - { COMPILER: "gcc",   COMPILER_VERSION: "11", LINKER: "bfd",  CRYPTOLIB: "gcrypt"  }
-          - { COMPILER: "gcc",   COMPILER_VERSION: "13", LINKER: "mold", CRYPTOLIB: "openssl" }
-          - { COMPILER: "clang", COMPILER_VERSION: "14", LINKER: "mold", CRYPTOLIB: "gcrypt"  }
-          - { COMPILER: "clang", COMPILER_VERSION: "16", LINKER: "bfd",  CRYPTOLIB: "openssl" }
-          - { COMPILER: "clang", COMPILER_VERSION: "18", LINKER: "lld",  CRYPTOLIB: "auto"    }
-    env: ${{ matrix.env }}
-    steps:
-      - name: Repository checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - name: Build check
-        run: .github/workflows/build_test.sh
diff -pruN 257.7-1/.github/workflows/cflite-pr.yml 257.9-0ubuntu2/.github/workflows/cflite-pr.yml
--- 257.7-1/.github/workflows/cflite-pr.yml	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/cflite-pr.yml	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,39 @@
+---
+# vi: ts=2 sw=2 et:
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+name: ClusterFuzzLite PR fuzzing
+on:
+  pull_request:
+    branches:
+      - main
+      - v[0-9]+-stable
+
+permissions: read-all
+
+jobs:
+  PR:
+    runs-on: ubuntu-24.04
+    if: github.repository != 'systemd/systemd' || github.event.pull_request.user.login == 'dependabot[bot]'
+    concurrency:
+      group: ${{ github.workflow }}-${{ matrix.sanitizer }}-${{ github.ref }}
+      cancel-in-progress: true
+    strategy:
+      fail-fast: false
+      matrix:
+        sanitizer: [address, undefined, memory]
+    steps:
+    - name: Build Fuzzers
+      id: build
+      uses: google/clusterfuzzlite/actions/build_fuzzers@v1
+      with:
+        sanitizer: ${{ matrix.sanitizer }}
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Run Fuzzers
+      id: run
+      uses: google/clusterfuzzlite/actions/run_fuzzers@v1
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        fuzz-seconds: 1200
+        mode: 'code-change'
+        sanitizer: ${{ matrix.sanitizer }}
diff -pruN 257.7-1/.github/workflows/cflite_pr.yml 257.9-0ubuntu2/.github/workflows/cflite_pr.yml
--- 257.7-1/.github/workflows/cflite_pr.yml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/cflite_pr.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
----
-# vi: ts=2 sw=2 et:
-# SPDX-License-Identifier: LGPL-2.1-or-later
-#
-name: ClusterFuzzLite PR fuzzing
-on:
-  pull_request:
-    branches:
-      - main
-      - v[0-9]+-stable
-
-permissions: read-all
-
-jobs:
-  PR:
-    runs-on: ubuntu-24.04
-    if: github.repository != 'systemd/systemd' || github.event.pull_request.user.login == 'dependabot[bot]'
-    concurrency:
-      group: ${{ github.workflow }}-${{ matrix.sanitizer }}-${{ github.ref }}
-      cancel-in-progress: true
-    strategy:
-      fail-fast: false
-      matrix:
-        sanitizer: [address, undefined, memory]
-    steps:
-    - name: Build Fuzzers
-      id: build
-      uses: google/clusterfuzzlite/actions/build_fuzzers@v1
-      with:
-        sanitizer: ${{ matrix.sanitizer }}
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Run Fuzzers
-      id: run
-      uses: google/clusterfuzzlite/actions/run_fuzzers@v1
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        fuzz-seconds: 1200
-        mode: 'code-change'
-        sanitizer: ${{ matrix.sanitizer }}
diff -pruN 257.7-1/.github/workflows/codeql.yml 257.9-0ubuntu2/.github/workflows/codeql.yml
--- 257.7-1/.github/workflows/codeql.yml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/codeql.yml	2025-09-03 18:35:40.000000000 +0000
@@ -50,7 +50,7 @@ jobs:
         languages: ${{ matrix.language }}
         config-file: ./.github/codeql-config.yml
 
-    - run: sudo -E .github/workflows/unit_tests.sh SETUP
+    - run: sudo -E .github/workflows/unit-tests.sh SETUP
 
     - name: Autobuild
       uses: github/codeql-action/autobuild@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d
diff -pruN 257.7-1/.github/workflows/coverage.yml 257.9-0ubuntu2/.github/workflows/coverage.yml
--- 257.7-1/.github/workflows/coverage.yml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/coverage.yml	2025-09-03 18:35:40.000000000 +0000
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: systemd/mkosi@5e739ef1ed02a4f3b6ae64e50a8ee186cbcb21c2
+      - uses: systemd/mkosi@d45142e329550abc9c6fc63c1f1f86e5286d3d67
 
       # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
       # immediately, we remove the files in the background. However, we first move them to a different location
@@ -49,9 +49,6 @@ jobs:
 
       - name: Configure
         run: |
-          # XXX: drop after the HyperV bug that breaks secure boot KVM guests is solved
-          sed -i "s/'firmware'\s*:\s*'auto'/'firmware' : 'uefi'/g" test/*/meson.build
-
           tee mkosi/mkosi.local.conf <<EOF
           [Distribution]
           Distribution=arch
@@ -116,6 +113,8 @@ jobs:
           # used in integration-test-wrapper.py to construct the `gh` command line to download the journals
           # of failed tests.
           sudo --preserve-env mkosi sandbox -- \
+            env \
+            TEST_RUNNER=ubuntu-24.04 \
             meson test \
             -C build \
             --no-rebuild \
diff -pruN 257.7-1/.github/workflows/coverity.yml 257.9-0ubuntu2/.github/workflows/coverity.yml
--- 257.7-1/.github/workflows/coverity.yml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/coverity.yml	2025-09-03 18:35:40.000000000 +0000
@@ -25,6 +25,6 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       # Reuse the setup phase of the unit test script to avoid code duplication
       - name: Install build dependencies
-        run: sudo -E .github/workflows/unit_tests.sh SETUP
+        run: sudo -E .github/workflows/unit-tests.sh SETUP
       - name: Build & upload the results
         run: tools/coverity.sh
diff -pruN 257.7-1/.github/workflows/development-freeze.yml 257.9-0ubuntu2/.github/workflows/development-freeze.yml
--- 257.7-1/.github/workflows/development-freeze.yml	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/development-freeze.yml	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,43 @@
+# doc: https://github.com/redhat-plumbers-in-action/devel-freezer#readme
+---
+
+name: Development Freeze
+on:
+  workflow_run:
+    workflows: [ Gather Pull Request Metadata ]
+    types:
+      - completed
+
+permissions:
+  contents: read
+
+jobs:
+  freezer:
+    if: >
+      github.event.workflow_run.event == 'pull_request' &&
+      github.event.workflow_run.conclusion == 'success' &&
+      github.repository == 'systemd/systemd'
+    runs-on: ubuntu-24.04
+
+    permissions:
+      pull-requests: write
+
+    steps:
+      - id: artifact
+        name: Download Pull Request Metadata artifact
+        uses: redhat-plumbers-in-action/download-artifact@463ae626ac2dd333491c7beccaa24c12c5c259b8
+        with:
+          name: Pull Request Metadata
+
+      - name: Repository checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        with:
+          fetch-depth: 0
+
+      - name: Development Freezer
+        uses: redhat-plumbers-in-action/devel-freezer@ad766eafd555b28d2cb8e27937835983f9c3d173
+        with:
+          pr-number: ${{ fromJSON(steps.artifact.outputs.pr-metadata-json).number }}
+          # delay start of validation to allow for some milestone/labels tweaking
+          delay: 20
+          token: ${{ secrets.GITHUB_TOKEN }}
diff -pruN 257.7-1/.github/workflows/development_freeze.yml 257.9-0ubuntu2/.github/workflows/development_freeze.yml
--- 257.7-1/.github/workflows/development_freeze.yml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/development_freeze.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-# doc: https://github.com/redhat-plumbers-in-action/devel-freezer#readme
----
-
-name: Development Freeze
-on:
-  workflow_run:
-    workflows: [ Gather Pull Request Metadata ]
-    types:
-      - completed
-
-permissions:
-  contents: read
-
-jobs:
-  freezer:
-    if: >
-      github.event.workflow_run.event == 'pull_request' &&
-      github.event.workflow_run.conclusion == 'success' &&
-      github.repository == 'systemd/systemd'
-    runs-on: ubuntu-24.04
-
-    permissions:
-      pull-requests: write
-
-    steps:
-      - id: artifact
-        name: Download Pull Request Metadata artifact
-        uses: redhat-plumbers-in-action/download-artifact@463ae626ac2dd333491c7beccaa24c12c5c259b8
-        with:
-          name: Pull Request Metadata
-
-      - name: Repository checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-        with:
-          fetch-depth: 0
-
-      - name: Development Freezer
-        uses: redhat-plumbers-in-action/devel-freezer@ad766eafd555b28d2cb8e27937835983f9c3d173
-        with:
-          pr-number: ${{ fromJSON(steps.artifact.outputs.pr-metadata-json).number }}
-          # delay start of validation to allow for some milestone/labels tweaking
-          delay: 20
-          token: ${{ secrets.GITHUB_TOKEN }}
diff -pruN 257.7-1/.github/workflows/issue-labeler.yml 257.9-0ubuntu2/.github/workflows/issue-labeler.yml
--- 257.7-1/.github/workflows/issue-labeler.yml	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/issue-labeler.yml	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,36 @@
+---
+
+name: Issue labeler
+on:
+  issues:
+    types: [ opened ]
+
+permissions:
+  contents: read
+
+jobs:
+  label-component:
+    runs-on: ubuntu-24.04
+
+    permissions:
+      issues: write
+
+    strategy:
+      matrix:
+        template: [ bug_report.yml, feature_request.yml ]
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+
+      - name: Parse issue form
+        uses: stefanbuck/github-issue-parser@1e5bdee70d4b3e066a33aa0669ab782943825f94
+        id: issue-parser
+        with:
+          template-path: .github/ISSUE_TEMPLATE/${{ matrix.template }}
+
+      - name: Set labels based on component field
+        uses: redhat-plumbers-in-action/advanced-issue-labeler@d498805e5c7c0658e336948b3363480bcfd68da6
+        with:
+          issue-form: ${{ steps.issue-parser.outputs.jsonString }}
+          template: ${{ matrix.template }}
+          token: ${{ secrets.GITHUB_TOKEN }}
diff -pruN 257.7-1/.github/workflows/issue_labeler.yml 257.9-0ubuntu2/.github/workflows/issue_labeler.yml
--- 257.7-1/.github/workflows/issue_labeler.yml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/issue_labeler.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
----
-
-name: Issue labeler
-on:
-  issues:
-    types: [ opened ]
-
-permissions:
-  contents: read
-
-jobs:
-  label-component:
-    runs-on: ubuntu-24.04
-
-    permissions:
-      issues: write
-
-    strategy:
-      matrix:
-        template: [ bug_report.yml, feature_request.yml ]
-
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-
-      - name: Parse issue form
-        uses: stefanbuck/github-issue-parser@1e5bdee70d4b3e066a33aa0669ab782943825f94
-        id: issue-parser
-        with:
-          template-path: .github/ISSUE_TEMPLATE/${{ matrix.template }}
-
-      - name: Set labels based on component field
-        uses: redhat-plumbers-in-action/advanced-issue-labeler@d498805e5c7c0658e336948b3363480bcfd68da6
-        with:
-          issue-form: ${{ steps.issue-parser.outputs.jsonString }}
-          template: ${{ matrix.template }}
-          token: ${{ secrets.GITHUB_TOKEN }}
diff -pruN 257.7-1/.github/workflows/linter.yml 257.9-0ubuntu2/.github/workflows/linter.yml
--- 257.7-1/.github/workflows/linter.yml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/linter.yml	2025-09-03 18:35:40.000000000 +0000
@@ -36,7 +36,7 @@ jobs:
           VALIDATE_ALL_CODEBASE: false
           VALIDATE_GITHUB_ACTIONS: true
 
-      - uses: systemd/mkosi@5e739ef1ed02a4f3b6ae64e50a8ee186cbcb21c2
+      - uses: systemd/mkosi@d45142e329550abc9c6fc63c1f1f86e5286d3d67
 
       - name: Check that tabs are not used in Python code
         run: sh -c '! git grep -P "\\t" -- src/ukify/ukify.py test/integration-tests/integration-test-wrapper.py'
@@ -56,11 +56,6 @@ jobs:
           mkosi sandbox -- mypy --version
           mkosi sandbox -- mypy src/test/generate-sym-test.py src/ukify/ukify.py test/integration-tests/integration-test-wrapper.py
 
-      - name: Run ruff check
-        run: |
-          mkosi sandbox -- ruff --version
-          mkosi sandbox -- ruff check src/test/generate-sym-test.py src/ukify/ukify.py test/integration-tests/integration-test-wrapper.py
-
       - name: Run ruff format
         run: |
           mkosi sandbox -- ruff --version
@@ -69,3 +64,8 @@ jobs:
               echo "Please run 'ruff format' on the above files or apply the diffs below manually"
               mkosi sandbox -- ruff format --check --quiet --diff src/test/generate-sym-test.py src/ukify/ukify.py test/integration-tests/integration-test-wrapper.py
           fi
+
+      - name: Run ruff check
+        run: |
+          mkosi sandbox -- ruff --version
+          mkosi sandbox -- ruff check src/test/generate-sym-test.py src/ukify/ukify.py test/integration-tests/integration-test-wrapper.py
diff -pruN 257.7-1/.github/workflows/make-release.yml 257.9-0ubuntu2/.github/workflows/make-release.yml
--- 257.7-1/.github/workflows/make-release.yml	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/make-release.yml	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,24 @@
+name: Make a Github release
+
+on:
+  push:
+    tags:
+      - "v*"
+
+permissions:
+  contents: read
+
+jobs:
+  release:
+    if: github.repository == 'systemd/systemd' || github.repository == 'systemd/systemd-stable'
+    runs-on: ubuntu-24.04
+
+    permissions:
+      contents: write
+
+    steps:
+      - name: Release
+        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda
+        with:
+          prerelease: ${{ contains(github.ref_name, '-rc') }}
+          draft: ${{ github.repository == 'systemd/systemd' }}
diff -pruN 257.7-1/.github/workflows/make_release.yml 257.9-0ubuntu2/.github/workflows/make_release.yml
--- 257.7-1/.github/workflows/make_release.yml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/make_release.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-name: Make a Github release
-
-on:
-  push:
-    tags:
-      - "v*"
-
-permissions:
-  contents: read
-
-jobs:
-  release:
-    if: github.repository == 'systemd/systemd' || github.repository == 'systemd/systemd-stable'
-    runs-on: ubuntu-24.04
-
-    permissions:
-      contents: write
-
-    steps:
-      - name: Release
-        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda
-        with:
-          prerelease: ${{ contains(github.ref_name, '-rc') }}
-          draft: ${{ github.repository == 'systemd/systemd' }}
diff -pruN 257.7-1/.github/workflows/mkosi.yml 257.9-0ubuntu2/.github/workflows/mkosi.yml
--- 257.7-1/.github/workflows/mkosi.yml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/mkosi.yml	2025-09-03 18:35:40.000000000 +0000
@@ -62,6 +62,17 @@ jobs:
             relabel: no
             vm: 1
           - distro: debian
+            release: stable
+            runner: ubuntu-24.04
+            sanitizers: ""
+            llvm: 0
+            cflags: "-Og"
+            relabel: no
+            vm: 0
+            no_qemu: 0
+            no_kvm: 0
+            shim: 0
+          - distro: debian
             release: testing
             sanitizers: ""
             llvm: 0
@@ -113,7 +124,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: systemd/mkosi@5e739ef1ed02a4f3b6ae64e50a8ee186cbcb21c2
+      - uses: systemd/mkosi@d45142e329550abc9c6fc63c1f1f86e5286d3d67
 
       # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
       # immediately, we remove the files in the background. However, we first move them to a different location
@@ -128,14 +139,14 @@ jobs:
         run: |
           truncate --size=100G btrfs.raw
           mkfs.btrfs btrfs.raw
-          sudo mkdir /mnt/mkosi
+          sudo mkdir -p /mnt/mkosi
           LOOP="$(sudo losetup --find --show --direct-io=on btrfs.raw)"
-          rm btrfs.raw
+          rm -f btrfs.raw
           sudo mount "$LOOP" /mnt/mkosi --options compress=zstd:1,user_subvol_rm_allowed,noatime,discard=async,space_cache=v2
           sudo chown "$(id -u):$(id -g)" /mnt/mkosi
-          mkdir /mnt/mkosi/tmp
+          mkdir -p /mnt/mkosi/tmp
           echo "TMPDIR=/mnt/mkosi/tmp" >>"$GITHUB_ENV"
-          ln -s /mnt/mkosi/build build
+          ln -sf /mnt/mkosi/build build
 
       - name: Configure
         run: |
diff -pruN 257.7-1/.github/workflows/unit-tests.sh 257.9-0ubuntu2/.github/workflows/unit-tests.sh
--- 257.7-1/.github/workflows/unit-tests.sh	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/unit-tests.sh	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,146 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+# shellcheck disable=SC2206
+PHASES=(${@:-SETUP RUN RUN_ASAN_UBSAN CLEANUP})
+ADDITIONAL_DEPS=(
+    clang
+    expect
+    fdisk
+    jekyll
+    libbpf-dev
+    libfdisk-dev
+    libfido2-dev
+    libp11-kit-dev
+    libpwquality-dev
+    libqrencode-dev
+    libssl-dev
+    libtss2-dev
+    libxkbcommon-dev
+    libzstd-dev
+    python3-libevdev
+    python3-pip
+    python3-pyelftools
+    python3-pyparsing
+    python3-pytest
+    rpm
+    zstd
+)
+
+function info() {
+    echo -e "\033[33;1m$1\033[0m"
+}
+
+function run_meson() {
+    if ! meson "$@"; then
+        find . -type f -name meson-log.txt -exec cat '{}' +
+        return 1
+    fi
+}
+
+set -ex
+
+MESON_ARGS=(-Dcryptolib=${CRYPTOLIB:-auto})
+
+if [ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "x86_64" ]; then
+    ADDITIONAL_DEPS+=(python3-pefile)
+    ADDITIONAL_DEPS+=(systemd-boot-efi)
+fi
+
+# (Re)set the current oom-{score-}adj. For some reason root on GH actions is able to _decrease_
+# its oom-score even after dropping all capabilities (including CAP_SYS_RESOURCE), until the
+# score is explicitly changed after sudo. No idea what's going on, but it breaks
+# exec-oomscoreadjust-negative.service from test-execute when running unprivileged.
+choom -p $$ -n 0
+
+for phase in "${PHASES[@]}"; do
+    case $phase in
+        SETUP)
+            info "Setup phase"
+            # This is added by default, and it is often broken, but we don't need anything from it
+            rm -f /etc/apt/sources.list.d/microsoft-prod.{list,sources}
+            # add-apt-repository --enable-source does not work on deb822 style sources.
+            for f in /etc/apt/sources.list.d/*.sources; do
+                sed -i "s/Types: deb/Types: deb deb-src/g" "$f"
+            done
+            apt-get -y update
+            apt-get -y build-dep systemd
+            apt-get -y install "${ADDITIONAL_DEPS[@]}"
+            pip3 install -r .github/workflows/requirements.txt --require-hashes --break-system-packages
+
+            # Make sure the build dir is accessible even when drop privileges, otherwise the unprivileged
+            # part of test-execute gets skipped, since it can't run systemd-executor
+            chmod o+x /home/runner
+            capsh --drop=all -- -c "stat $PWD/meson.build"
+            ;;
+        RUN|RUN_GCC|RUN_CLANG|RUN_CLANG_RELEASE)
+            if [[ "$phase" =~ ^RUN_CLANG ]]; then
+                export CC=clang
+                export CXX=clang++
+                export CFLAGS="-fno-sanitize=function"
+                export CXXFLAGS="-fno-sanitize=function"
+                if [[ "$phase" == RUN_CLANG ]]; then
+                    # The docs build is slow and is not affected by compiler/flags, so do it just once
+                    MESON_ARGS+=(-Dman=enabled)
+                else
+                    MESON_ARGS+=(-Dmode=release --optimization=2)
+                fi
+
+                # Some variation: remove machine-id, like on Debian builders to ensure unit tests still work.
+                if [ -w /etc/machine-id ]; then
+                    mv /etc/machine-id /etc/machine-id.bak
+                fi
+            fi
+            MESON_ARGS+=(--fatal-meson-warnings)
+            run_meson -Dnobody-group=nogroup --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true "${MESON_ARGS[@]}" build
+            ninja -C build -v
+            # Ensure setting a timezone (like the reproducible build tests do) does not break time/date unit tests
+            TZ=GMT+12 meson test -C build --print-errorlogs
+            ;;
+        RUN_ASAN_UBSAN|RUN_GCC_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN_NO_DEPS)
+            MESON_ARGS=(--optimization=1)
+
+            if [[ "$phase" =~ ^RUN_CLANG_ASAN_UBSAN ]]; then
+                export CC=clang
+                export CXX=clang++
+                export CFLAGS="-fno-sanitize=function"
+                export CXXFLAGS="-fno-sanitize=function"
+                # Build fuzzer regression tests only with clang (for now),
+                # see: https://github.com/systemd/systemd/pull/15886#issuecomment-632689604
+                # -Db_lundef=false: See https://github.com/mesonbuild/meson/issues/764
+                MESON_ARGS+=(-Db_lundef=false -Dfuzz-tests=true)
+
+                if [[ "$phase" == "RUN_CLANG_ASAN_UBSAN_NO_DEPS" ]]; then
+                    MESON_ARGS+=(--auto-features=disabled)
+                fi
+            fi
+            MESON_ARGS+=(--fatal-meson-warnings)
+            run_meson -Dnobody-group=nogroup --werror -Dtests=unsafe -Db_sanitize=address,undefined "${MESON_ARGS[@]}" build
+            ninja -C build -v
+
+            export ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1
+            # Never remove halt_on_error from UBSAN_OPTIONS. See https://github.com/systemd/systemd/commit/2614d83aa06592aedb.
+            export UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1
+
+            # FIXME
+            # For some strange reason the GH Actions VM stops responding after
+            # executing first ~150 tests, _unless_ there's something producing
+            # output (either running `meson test` in verbose mode, or something
+            # else in background). Despite my efforts so far I haven't been able
+            # to identify the culprit (since the issue is not reproducible
+            # during debugging, wonderful), so let's at least keep a workaround
+            # here to make the builds stable for the time being.
+            (set +x; while :; do echo -ne "\n[WATCHDOG] $(date)\n"; sleep 30; done) &
+            meson test --timeout-multiplier=3 -C build --print-errorlogs
+            ;;
+        CLEANUP)
+            info "Cleanup phase"
+            if [ ! -f /etc/machine-id ] && [ -w /etc/machine-id.bak ]; then
+                mv /etc/machine-id.bak /etc/machine-id
+            fi
+            ;;
+        *)
+            echo >&2 "Unknown phase '$phase'"
+            exit 1
+    esac
+done
diff -pruN 257.7-1/.github/workflows/unit-tests.yml 257.9-0ubuntu2/.github/workflows/unit-tests.yml
--- 257.7-1/.github/workflows/unit-tests.yml	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/unit-tests.yml	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,45 @@
+---
+# vi: ts=2 sw=2 et:
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+name: Unit tests
+on:
+  pull_request:
+    branches:
+      - main
+      - v[0-9]+-stable
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    concurrency:
+      group: ${{ github.workflow }}-${{ matrix.run_phase }}-${{ matrix.cryptolib }}-${{ github.ref }}
+      cancel-in-progress: true
+    strategy:
+      fail-fast: false
+      matrix:
+        run_phase: [GCC, GCC_ASAN_UBSAN, CLANG, CLANG_RELEASE, CLANG_ASAN_UBSAN, CLANG_ASAN_UBSAN_NO_DEPS]
+        cryptolib: [auto]
+        include:
+          - run_phase: GCC
+            cryptolib: openssl
+          - run_phase: CLANG
+            cryptolib: gcrypt
+    steps:
+      - name: Repository checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      - name: Install build dependencies
+        run: |
+          # Drop XDG_* stuff from /etc/environment, so we don't get the user
+          # XDG_* variables when running under sudo
+          sudo sed -i '/^XDG_/d' /etc/environment
+          # Pass only specific env variables through sudo, to avoid having
+          # the already existing XDG_* stuff on the "other side"
+          sudo --preserve-env=CRYPTOLIB,GITHUB_ACTIONS,CI .github/workflows/unit-tests.sh SETUP
+      - name: Build & test
+        run: sudo --preserve-env=CRYPTOLIB,GITHUB_ACTIONS,CI .github/workflows/unit-tests.sh RUN_${{ matrix.run_phase }}
+        env:
+          CRYPTOLIB: ${{ matrix.cryptolib }}
diff -pruN 257.7-1/.github/workflows/unit_tests.sh 257.9-0ubuntu2/.github/workflows/unit_tests.sh
--- 257.7-1/.github/workflows/unit_tests.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/unit_tests.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,142 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-# shellcheck disable=SC2206
-PHASES=(${@:-SETUP RUN RUN_ASAN_UBSAN CLEANUP})
-ADDITIONAL_DEPS=(
-    clang
-    expect
-    fdisk
-    jekyll
-    libbpf-dev
-    libfdisk-dev
-    libfido2-dev
-    libp11-kit-dev
-    libpwquality-dev
-    libqrencode-dev
-    libssl-dev
-    libtss2-dev
-    libxkbcommon-dev
-    libzstd-dev
-    python3-libevdev
-    python3-pefile
-    python3-pyelftools
-    python3-pyparsing
-    python3-pytest
-    rpm
-    systemd-boot-efi
-    zstd
-)
-
-function info() {
-    echo -e "\033[33;1m$1\033[0m"
-}
-
-function run_meson() {
-    if ! meson "$@"; then
-        find . -type f -name meson-log.txt -exec cat '{}' +
-        return 1
-    fi
-}
-
-set -ex
-
-MESON_ARGS=(-Dcryptolib=${CRYPTOLIB:-auto})
-
-# (Re)set the current oom-{score-}adj. For some reason root on GH actions is able to _decrease_
-# its oom-score even after dropping all capabilities (including CAP_SYS_RESOURCE), until the
-# score is explicitly changed after sudo. No idea what's going on, but it breaks
-# exec-oomscoreadjust-negative.service from test-execute when running unprivileged.
-choom -p $$ -n 0
-
-for phase in "${PHASES[@]}"; do
-    case $phase in
-        SETUP)
-            info "Setup phase"
-            # This is added by default, and it is often broken, but we don't need anything from it
-            rm -f /etc/apt/sources.list.d/microsoft-prod.{list,sources}
-            # add-apt-repository --enable-source does not work on deb822 style sources.
-            for f in /etc/apt/sources.list.d/*.sources; do
-                sed -i "s/Types: deb/Types: deb deb-src/g" "$f"
-            done
-            apt-get -y update
-            apt-get -y build-dep systemd
-            apt-get -y install "${ADDITIONAL_DEPS[@]}"
-            pip3 install -r .github/workflows/requirements.txt --require-hashes --break-system-packages
-
-            # Make sure the build dir is accessible even when drop privileges, otherwise the unprivileged
-            # part of test-execute gets skipped, since it can't run systemd-executor
-            chmod o+x /home/runner
-            capsh --drop=all -- -c "stat $PWD/meson.build"
-            ;;
-        RUN|RUN_GCC|RUN_CLANG|RUN_CLANG_RELEASE)
-            if [[ "$phase" =~ ^RUN_CLANG ]]; then
-                export CC=clang
-                export CXX=clang++
-                export CFLAGS="-fno-sanitize=function"
-                export CXXFLAGS="-fno-sanitize=function"
-                if [[ "$phase" == RUN_CLANG ]]; then
-                    # The docs build is slow and is not affected by compiler/flags, so do it just once
-                    MESON_ARGS+=(-Dman=enabled)
-                else
-                    MESON_ARGS+=(-Dmode=release --optimization=2)
-                fi
-
-                # Some variation: remove machine-id, like on Debian builders to ensure unit tests still work.
-                if [ -w /etc/machine-id ]; then
-                    mv /etc/machine-id /etc/machine-id.bak
-                fi
-            fi
-            MESON_ARGS+=(--fatal-meson-warnings)
-            run_meson -Dnobody-group=nogroup --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true "${MESON_ARGS[@]}" build
-            ninja -C build -v
-            # Ensure setting a timezone (like the reproducible build tests do) does not break time/date unit tests
-            TZ=GMT+12 meson test -C build --print-errorlogs
-            ;;
-        RUN_ASAN_UBSAN|RUN_GCC_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN_NO_DEPS)
-            MESON_ARGS=(--optimization=1)
-
-            if [[ "$phase" =~ ^RUN_CLANG_ASAN_UBSAN ]]; then
-                export CC=clang
-                export CXX=clang++
-                export CFLAGS="-fno-sanitize=function"
-                export CXXFLAGS="-fno-sanitize=function"
-                # Build fuzzer regression tests only with clang (for now),
-                # see: https://github.com/systemd/systemd/pull/15886#issuecomment-632689604
-                # -Db_lundef=false: See https://github.com/mesonbuild/meson/issues/764
-                MESON_ARGS+=(-Db_lundef=false -Dfuzz-tests=true)
-
-                if [[ "$phase" == "RUN_CLANG_ASAN_UBSAN_NO_DEPS" ]]; then
-                    MESON_ARGS+=(--auto-features=disabled)
-                fi
-            fi
-            MESON_ARGS+=(--fatal-meson-warnings)
-            run_meson -Dnobody-group=nogroup --werror -Dtests=unsafe -Db_sanitize=address,undefined "${MESON_ARGS[@]}" build
-            ninja -C build -v
-
-            export ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1
-            # Never remove halt_on_error from UBSAN_OPTIONS. See https://github.com/systemd/systemd/commit/2614d83aa06592aedb.
-            export UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1
-
-            # FIXME
-            # For some strange reason the GH Actions VM stops responding after
-            # executing first ~150 tests, _unless_ there's something producing
-            # output (either running `meson test` in verbose mode, or something
-            # else in background). Despite my efforts so far I haven't been able
-            # to identify the culprit (since the issue is not reproducible
-            # during debugging, wonderful), so let's at least keep a workaround
-            # here to make the builds stable for the time being.
-            (set +x; while :; do echo -ne "\n[WATCHDOG] $(date)\n"; sleep 30; done) &
-            meson test --timeout-multiplier=3 -C build --print-errorlogs
-            ;;
-        CLEANUP)
-            info "Cleanup phase"
-            if [ ! -f /etc/machine-id ] && [ -w /etc/machine-id.bak ]; then
-                mv /etc/machine-id.bak /etc/machine-id
-            fi
-            ;;
-        *)
-            echo >&2 "Unknown phase '$phase'"
-            exit 1
-    esac
-done
diff -pruN 257.7-1/.github/workflows/unit_tests.yml 257.9-0ubuntu2/.github/workflows/unit_tests.yml
--- 257.7-1/.github/workflows/unit_tests.yml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/.github/workflows/unit_tests.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
----
-# vi: ts=2 sw=2 et:
-# SPDX-License-Identifier: LGPL-2.1-or-later
-#
-name: Unit tests
-on:
-  pull_request:
-    branches:
-      - main
-      - v[0-9]+-stable
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-24.04
-    concurrency:
-      group: ${{ github.workflow }}-${{ matrix.run_phase }}-${{ matrix.cryptolib }}-${{ github.ref }}
-      cancel-in-progress: true
-    strategy:
-      fail-fast: false
-      matrix:
-        run_phase: [GCC, GCC_ASAN_UBSAN, CLANG, CLANG_RELEASE, CLANG_ASAN_UBSAN, CLANG_ASAN_UBSAN_NO_DEPS]
-        cryptolib: [auto]
-        include:
-          - run_phase: GCC
-            cryptolib: openssl
-          - run_phase: CLANG
-            cryptolib: gcrypt
-    steps:
-      - name: Repository checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - name: Install build dependencies
-        run: |
-          # Drop XDG_* stuff from /etc/environment, so we don't get the user
-          # XDG_* variables when running under sudo
-          sudo sed -i '/^XDG_/d' /etc/environment
-          # Pass only specific env variables through sudo, to avoid having
-          # the already existing XDG_* stuff on the "other side"
-          sudo --preserve-env=CRYPTOLIB,GITHUB_ACTIONS,CI .github/workflows/unit_tests.sh SETUP
-      - name: Build & test
-        run: sudo --preserve-env=CRYPTOLIB,GITHUB_ACTIONS,CI .github/workflows/unit_tests.sh RUN_${{ matrix.run_phase }}
-        env:
-          CRYPTOLIB: ${{ matrix.cryptolib }}
diff -pruN 257.7-1/LICENSES/README.md 257.9-0ubuntu2/LICENSES/README.md
--- 257.7-1/LICENSES/README.md	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/LICENSES/README.md	2025-09-03 18:35:40.000000000 +0000
@@ -70,8 +70,8 @@ The following exceptions apply:
    - src/fundamental/sha1-fundamental.c
    - src/fundamental/sha1-fundamental.h
  * the following files are licensed under **BSD-3-Clause** license:
-   - src/boot/efi/chid.c
-   - src/boot/efi/chid.h
+   - src/boot/chid.c
+   - src/boot/chid.h
  * Heebo fonts under docs/fonts/ are licensed under the **SIL Open Font License 1.1**,
  * any files under test/ without an explicit license we assume non-copyrightable
    (eg: computer-generated fuzzer data)
diff -pruN 257.7-1/catalog/meson.build 257.9-0ubuntu2/catalog/meson.build
--- 257.7-1/catalog/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/catalog/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -25,7 +25,6 @@ support_sed = 's~%SUPPORT_URL%~@0@~'.for
 
 foreach file : in_files
         catalogs += custom_target(
-                file,
                 input : file + '.in',
                 output: file,
                 command : [sed, support_sed, '@INPUT@'],
diff -pruN 257.7-1/debian/changelog 257.9-0ubuntu2/debian/changelog
--- 257.7-1/debian/changelog	2025-06-25 12:40:07.000000000 +0000
+++ 257.9-0ubuntu2/debian/changelog	2025-09-25 16:45:39.000000000 +0000
@@ -1,3 +1,121 @@
+systemd (257.9-0ubuntu2) questing; urgency=medium
+
+  * basic: validate timezones in get_timezones() (LP: #2125405)
+  * debian/libnss-systemd.nss: install after 'compat' too (LP: #2125403)
+  * d/t/boot-and-services: use coreutils tunable in apparmor test (LP: #2125614)
+  * d/t/upstream: use GNU cp in test setup (LP: #2122363)
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Thu, 25 Sep 2025 12:45:39 -0400
+
+systemd (257.9-0ubuntu1) questing; urgency=medium
+
+  [ Nick Rosbrook ]
+  * New upstream stable version 257.9
+    - Bug fixes only
+    - Update upstream source from tag 'ubuntu/upstream/257.9'
+      Update to upstream version '257.9'
+      with Debian dir 991861d2786efe36972fc9cc9d3dcb496264de5a
+  * Drop resolve-re-create-link-unicast-scopes-on-reload.patch
+    Applied upstream: https://github.com/systemd/systemd/commit/fc74fb8cb3
+
+  [ Marco Trevisan (Treviño) ]
+  * debian/libnss-systemd.preinst: force nsswitch.conf update
+    Drop systemd instances in nsswitch.conf, and force postinst to
+    re-generate the file (LP: #2121017)
+  * debian/linbnss-systemd.nss: Install systemd service after files.
+    As suggested by upstream the systemd NSS service should come just after
+    files
+
+  [ Luca Boccassi ]
+  * systemd-boot-tools: change architecture to linux-any.
+    The tool can be used for cross-building, and it's available on
+    all architectures, not just EFI ones (LP: #2122158)
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Mon, 08 Sep 2025 08:41:33 -0400
+
+systemd (257.8-0ubuntu2) questing; urgency=medium
+
+  [ Lukas Märdian ]
+  * d/[t/]control,d/systemd-resolved-dnssec*: Disable DNSSEC by default.
+    (LP: #2121483)
+
+  [ Nick Rosbrook ]
+  * resolve: re-create link unicast scopes on reload
+  * d/control: Conflicts: and Replaces: systemd-resolved-dnssec
+    Ensures systemd-resolved-dnssec is removed on systems that already have
+    it.
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Wed, 27 Aug 2025 16:09:22 -0400
+
+systemd (257.8-0ubuntu1) questing; urgency=medium
+
+  * New upstream stable version 257.8
+    - Bug fixes only
+    - d/gbp.conf: set upstream-branch=upstream/257.x
+    - Update upstream source from tag 'ubuntu/upstream/257.8'
+      Update to upstream version '257.8'
+      with Debian dir 8f881d0950662d924a4334d266ef5606b560f61c
+  * d/rules: drop bpf build workarounds for Ubuntu
+  * test: skip TEST-50-DISSECT.dissect (LP: #2116460)
+  * d/t/boot-and-services: tweak test_rsyslog regexes
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Mon, 25 Aug 2025 15:51:41 -0400
+
+systemd (257.7-1ubuntu3) questing; urgency=medium
+
+  * meson.build: build with -Wl,-z,gcs-report=none on arm64 (LP: #2119100)
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Fri, 01 Aug 2025 11:55:27 -0400
+
+systemd (257.7-1ubuntu2) questing; urgency=medium
+
+  [ Lukas Märdian ]
+  * d/control,d/systemd-resolved-dnssec*: Add systemd-resolved-dnssec binary,
+    shipping a drop-in config from d/extra/resolved.conf.d/ (LP: #2117730)
+  * d/t/control: Add new 'dnssec' test case.
+  * d/control: Add Recommends to systemd-resolved-dnssec
+
+  [ Nick Rosbrook ]
+  * test: ignore coredumps for gnusleep in addition to sleep (LP: #2116459)
+  * test: follow /usr/bin/sleep symlink when checking coredumps (LP: #2116465)
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Tue, 29 Jul 2025 12:11:40 -0400
+
+systemd (257.7-1ubuntu1) questing; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/boot-and-services: skip apparmor tests on armhf
+    - debian/systemd.postinst:
+      + manually call systemd-tmpfiles --create in postinst
+      + Do not create /etc/tmpfiles.d/tmp.conf on upgrades
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Make systemd-cryptsetup Priority: important
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+      + Do not build systemd-boot-efi-{amd64,arm64}-signed-template
+    - switch-root: use MS_MOVE for /run when switchig from initrd
+    - resolve,wait-online: backport wait-online DNS patches
+    - test-network: add handling for Ubuntu FAN patches (LP #2104943)
+    - d/rules: disable bpf support on riscv64 for now (LP #2099864)
+    - d/extra/dbus-1: remove SetLocale restriction from dbus policy (LP #2102028)
+    - d/extra/polkit-1: let root ignore inhibitors on reboot etc (LP #2092438)
+    - Fix d/extra/initramfs-tools/hooks/udev, so that udev rules that are
+      specific to s390x ccw devices are only prevented from being copied if
+      zdev_early=0 is set, but copy rules in case of zdev_early=1 or if
+      zdev_early is not specified at all. (LP #2102236)
+    - Delta for i386:
+      + debian/systemd.install: exclude files that are not built for i386
+      + debian/systemd.manpages: do not ship un-built manpages on i386
+      + debian/rules,debian/control,debian/tests/control:
+        Do not build with tpm libraries on i386
+      + debian/rules,debian/control,debian/tests/control:
+        Do not build with libqrencode on i386
+      + debian/rules: Remove unneeded efi artifacts on i386 to avoid debugedit errors
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Mon, 30 Jun 2025 15:11:21 -0400
+
 systemd (257.7-1) unstable; urgency=medium
 
   * udev: add 'clock' system group for PTP rules
@@ -9,6 +127,43 @@ systemd (257.7-1) unstable; urgency=medi
 
  -- Luca Boccassi <bluca@debian.org>  Wed, 25 Jun 2025 13:40:07 +0100
 
+systemd (257.6-1ubuntu1) questing; urgency=medium
+
+  * Merge with Debian unstable (LP: #2112075). Remaining changes:
+    - debian/tests/boot-and-services: skip apparmor tests on armhf
+    - debian/systemd.postinst:
+      + manually call systemd-tmpfiles --create in postinst
+      + Do not create /etc/tmpfiles.d/tmp.conf on upgrades
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Make systemd-cryptsetup Priority: important
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+      + Do not build systemd-boot-efi-{amd64,arm64}-signed-template
+    - switch-root: use MS_MOVE for /run when switchig from initrd
+    - resolve,wait-online: backport wait-online DNS patches
+    - test-network: add handling for Ubuntu FAN patches (LP #2104943)
+    - d/rules: disable bpf support on riscv64 for now (LP #2099864)
+    - d/extra/dbus-1: remove SetLocale restriction from dbus policy (LP #2102028)
+    - d/extra/polkit-1: let root ignore inhibitors on reboot etc (LP #2092438)
+    - Fix d/extra/initramfs-tools/hooks/udev, so that udev rules that are
+      specific to s390x ccw devices are only prevented from being copied if
+      zdev_early=0 is set, but copy rules in case of zdev_early=1 or if
+      zdev_early is not specified at all. (LP #2102236)
+    - Delta for i386:
+      + debian/systemd.install: exclude files that are not built for i386
+      + debian/systemd.manpages: do not ship un-built manpages on i386
+      + debian/rules,debian/control,debian/tests/control:
+        Do not build with tpm libraries on i386
+      + debian/rules,debian/control,debian/tests/control:
+        Do not build with libqrencode on i386
+      + debian/rules: Remove unneeded efi artifacts on i386 to avoid debugedit errors
+  * Dropped, no longer needed:
+    - debian/patches: drop systemd-fsckd patch (LP: #2109800, LP: #1970069)
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Fri, 30 May 2025 10:56:19 -0400
+
 systemd (257.6-1) unstable; urgency=medium
 
   [ Luca Boccassi ]
@@ -182,6 +337,61 @@ systemd (257.4-2) unstable; urgency=medi
 
  -- Luca Boccassi <bluca@debian.org>  Tue, 11 Mar 2025 14:48:10 +0000
 
+systemd (257.4-1ubuntu3) plucky; urgency=medium
+
+  * test-network: add handling for Ubuntu FAN patches (LP: #2104943)
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Fri, 28 Mar 2025 11:48:04 -0400
+
+systemd (257.4-1ubuntu2) plucky; urgency=medium
+
+  [ Frank Heimes ]
+  * Fix d/extra/initramfs-tools/hooks/udev, so that udev rules that are
+    specific to s390x ccw devices are only prevented from being copied if
+    zdev_early=0 is set, but copy rules in case of zdev_early=1 or if
+    zdev_early is not specified at all. (LP: #2102236)
+
+  [ Nick Rosbrook ]
+  * d/extra/polkit-1: let root ignore inhibitors on reboot etc (LP: #2092438)
+  * d/control: remove Build-Depends: linux-tools-generic.
+    The src:linux package now ships a bpftool binary package.
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Fri, 21 Mar 2025 17:48:15 -0400
+
+systemd (257.4-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/boot-and-services: skip apparmor tests on armhf
+    - debian/systemd.postinst:
+      + manually call systemd-tmpfiles --create in postinst
+      + Do not create /etc/tmpfiles.d/tmp.conf on upgrades
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Make systemd-cryptsetup Priority: important
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+      + Build-Depends: linux-tools-generic
+      + Do not build systemd-boot-efi-{amd64,arm64}-signed-template
+    - switch-root: use MS_MOVE for /run when switchig from initrd
+    - resolve,wait-online: backport wait-online DNS patches
+    - d/rules: disable bpf support on riscv64 for now (LP #2099864)
+    - Delta for i386:
+      + debian/systemd.install: exclude files that are not built for i386
+      + debian/systemd.manpages: do not ship un-built manpages on i386
+      + debian/rules,debian/control,debian/tests/control:
+        Do not build with tpm libraries on i386
+      + debian/rules,debian/control,debian/tests/control:
+        Do not build with libqrencode on i386
+      + debian/rules: Remove unneeded efi artifacts on i386 to avoid debugedit errors
+  * Dropped, included in Debian:
+    - initramfs-tools: copy hwdb.bin to initramfs
+    - d/rules: fix bpftool path discovery on ubuntu
+  * New changes:
+    - d/extra/dbus-1: remove SetLocale restriction from dbus policy (LP: #2102028)
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Tue, 11 Mar 2025 11:26:05 -0400
+
 systemd (257.4-1) unstable; urgency=medium
 
   [ Nick Rosbrook ]
@@ -208,6 +418,49 @@ systemd (257.4-1) unstable; urgency=medi
 
  -- Luca Boccassi <bluca@debian.org>  Thu, 06 Mar 2025 14:52:08 +0000
 
+systemd (257.3-1ubuntu3) plucky; urgency=medium
+
+  * d/control: remove other bpf deps for riscv64
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Mon, 24 Feb 2025 10:36:52 -0500
+
+systemd (257.3-1ubuntu2) plucky; urgency=medium
+
+  * d/t/tests-in-lxd: skip test on any setup error
+  * d/rules: disable bpf support on riscv64 for now (LP: #2099864)
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Mon, 24 Feb 2025 09:23:11 -0500
+
+systemd (257.3-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/boot-and-services: skip apparmor tests on armhf
+    - debian/systemd.postinst:
+      + manually call systemd-tmpfiles --create in postinst
+      + Do not create /etc/tmpfiles.d/tmp.conf on upgrades
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Make systemd-cryptsetup Priority: important
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+      + Build-Depends: linux-tools-generic
+      + Do not build systemd-boot-efi-{amd64,arm64}-signed-template
+    - switch-root: use MS_MOVE for /run when switchig from initrd
+    - resolve,wait-online: backport wait-online DNS patches
+    - initramfs-tools: copy hwdb.bin to initramfs
+    - d/rules: fix bpftool path discovery on ubuntu
+    - Delta for i386:
+      + debian/systemd.install: exclude files that are not built for i386
+      + debian/systemd.manpages: do not ship un-built manpages on i386
+      + debian/rules,debian/control,debian/tests/control:
+        Do not build with tpm libraries on i386
+      + debian/rules,debian/control,debian/tests/control:
+        Do not build with libqrencode on i386
+      + debian/rules: Remove unneeded efi artifacts on i386 to avoid debugedit errors
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Wed, 19 Feb 2025 09:27:00 -0500
+
 systemd (257.3-1) unstable; urgency=medium
 
   * d/t/control: do not pull in gdm3 on loong64. Not installable, skip it
@@ -229,6 +482,39 @@ systemd (257.3-1) unstable; urgency=medi
 
  -- Luca Boccassi <bluca@debian.org>  Thu, 13 Feb 2025 19:54:00 +0000
 
+systemd (257.2-3ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/boot-and-services: skip apparmor tests on armhf
+    - debian/systemd.postinst:
+      + manually call systemd-tmpfiles --create in postinst
+      + Do not create /etc/tmpfiles.d/tmp.conf on upgrades
+    - debian/gbp.conf,debian/extra/wrap_cl.py:
+      Use a customization script to add LP commit links to changelog
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Make systemd-cryptsetup Priority: important
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+      + Build-Depends: linux-tools-generic
+      + Do not build systemd-boot-efi-{amd64,arm64}-signed-template
+    - switch-root: use MS_MOVE for /run when switchig from initrd
+    - Delta for i386:
+      + debian/systemd.install: exclude files that are not built for i386
+      + debian/systemd.manpages: do not ship un-built manpages on i386
+      + debian/rules,debian/control,debian/tests/control:
+        Do not build with tpm libraries on i386
+      + debian/rules,debian/control,debian/tests/control:
+        Do not build with libqrencode on i386
+      + debian/rules: Remove unneeded efi artifacts on i386 to avoid debugedit errors
+  * New changes:
+    - resolve,wait-online: backport wait-online DNS patches
+    - initramfs-tools: copy hwdb.bin to initramfs
+    - d/rules: fix bpftool path discovery on ubuntu
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Fri, 31 Jan 2025 11:39:18 -0500
+
 systemd (257.2-3) unstable; urgency=medium
 
   * signing template: add override for executable-not-elf-or-script
@@ -281,6 +567,49 @@ systemd (257.2-1) unstable; urgency=medi
 
  -- Luca Boccassi <bluca@debian.org>  Tue, 07 Jan 2025 20:48:25 +0000
 
+systemd (257.1-7ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/boot-and-services: skip apparmor tests on armhf
+    - debian/systemd.postinst:
+      + manually call systemd-tmpfiles --create in postinst
+      + Do not create /etc/tmpfiles.d/tmp.conf on upgrades
+    - debian/gbp.conf,debian/extra/wrap_cl.py:
+      Use a customization script to add LP commit links to changelog
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Make systemd-cryptsetup Priority: important
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+      + Build-Depends: linux-tools-generic
+      + Do not build systemd-boot-efi-{amd64,arm64}-signed-template
+    - switch-root: use MS_MOVE for /run when switchig from initrd
+    - Delta for i386:
+      + debian/systemd.install: exclude files that are not built for i386
+      + debian/systemd.manpages: do not ship un-built manpages on i386
+      + debian/rules,debian/control,debian/tests/control:
+        Do not build with tpm libraries on i386
+      + debian/rules,debian/control,debian/tests/control:
+        Do not build with libqrencode on i386
+      + debian/rules: Remove unneeded efi artifacts on i386 to avoid debugedit errors
+  * Dropped changes, included in Debian:
+    - debian/tests/tests-in-lxd: run some autopkgtests in LXD too
+    - debian/tests/boot-and-services: drop test_no_failed
+    - debian/systemd.postinst: skip daemon-reexec and try-restarts during shutdown
+    - debian/systemd-resolved.postinst: copy existing /etc/resolv.conf to
+      /run/systemd/resolve/stub-resolv.conf
+    - debian/control:
+      + Add Breaks: systemd (<< ${binary:Version}) to udev package so that
+        systemd is upgraded as well when upgrading udev
+      + Make systemd-sysv Depends: on matching version of systemd
+  * Dropped changes, no longer needed:
+    - debian/tests/boot-and-services: consume stderr in systemctl status call in test_service
+  * Dropped changes, included upstream:
+    - test: skip TEST-69-SHUTDOWN on ubuntu too (LP #2083704)
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Tue, 07 Jan 2025 10:58:51 -0500
+
 systemd (257.1-7) unstable; urgency=medium
 
   * Add missing d/copyright file to signed template packages
@@ -356,6 +685,48 @@ systemd (257.1-1) unstable; urgency=medi
 
  -- Luca Boccassi <bluca@debian.org>  Thu, 19 Dec 2024 21:41:25 +0000
 
+systemd (257-2ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/tests-in-lxd: run some autopkgtests in LXD too
+    - debian/tests/boot-and-services:
+      + skip apparmor tests on armhf
+      + consume stderr in systemctl status call in test_service
+      + drop test_no_failed
+    - debian/systemd.postinst:
+      + skip daemon-reexec and try-restarts during shutdown
+      + manually call systemd-tmpfiles --create in postinst
+      + Do not create /etc/tmpfiles.d/tmp.conf on upgrades
+    - debian/systemd-resolved.postinst: copy existing /etc/resolv.conf to
+      /run/systemd/resolve/stub-resolv.conf
+    - debian/gbp.conf,debian/extra/wrap_cl.py:
+      Use a customization script to add LP commit links to changelog
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Make systemd-cryptsetup Priority: important
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Add Breaks: systemd (<< ${binary:Version}) to udev package so that
+        systemd is upgraded as well when upgrading udev
+      + Make systemd-sysv Depends: on matching version of systemd
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+      + Build-Depends: linux-tools-generic
+      + Do not build systemd-boot-efi-{amd64,arm64}-signed-template
+    - switch-root: use MS_MOVE for /run when switchig from initrd
+    - test: skip TEST-69-SHUTDOWN on ubuntu too (LP #2083704)
+    - Delta for i386:
+      + debian/systemd.install: exclude files that are not built for i386
+      + debian/systemd.manpages: do not ship un-built manpages on i386
+      + debian/rules,debian/control,debian/tests/control:
+        Do not build with tpm libraries on i386
+      + debian/rules,debian/control,debian/tests/control:
+        Do not build with libqrencode on i386
+      + debian/rules: Remove unneeded efi artifacts on i386 to avoid debugedit errors
+    - d/t/control: tests-in-lxd Depends: dnsmasq-base
+    - d/t/tests-in-lxd: drop patching workaround
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Thu, 12 Dec 2024 10:00:12 -0500
+
 systemd (257-2) unstable; urgency=medium
 
   [ Aurelien Jarno ]
@@ -366,6 +737,50 @@ systemd (257-2) unstable; urgency=medium
 
  -- Luca Boccassi <bluca@debian.org>  Wed, 11 Dec 2024 18:31:08 +0000
 
+systemd (257-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/tests-in-lxd: run some autopkgtests in LXD too
+    - debian/tests/boot-and-services:
+      + skip apparmor tests on armhf
+      + consume stderr in systemctl status call in test_service
+      + drop test_no_failed
+    - debian/systemd.postinst:
+      + skip daemon-reexec and try-restarts during shutdown
+      + manually call systemd-tmpfiles --create in postinst
+      + Do not create /etc/tmpfiles.d/tmp.conf on upgrades
+    - debian/systemd-resolved.postinst: copy existing /etc/resolv.conf to
+      /run/systemd/resolve/stub-resolv.conf
+    - debian/gbp.conf,debian/extra/wrap_cl.py:
+      Use a customization script to add LP commit links to changelog
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Make systemd-cryptsetup Priority: important
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Add Breaks: systemd (<< ${binary:Version}) to udev package so that
+        systemd is upgraded as well when upgrading udev
+      + Make systemd-sysv Depends: on matching version of systemd
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+      + Build-Depends: linux-tools-generic
+      + Do not build systemd-boot-efi-{amd64,arm64}-signed-template
+    - switch-root: use MS_MOVE for /run when switchig from initrd
+    - test: skip TEST-69-SHUTDOWN on ubuntu too (LP #2083704)
+    - Delta for i386:
+      + debian/systemd.install: exclude files that are not built for i386
+      + debian/systemd.manpages: do not ship un-built manpages on i386
+      + debian/rules,debian/control,debian/tests/control:
+        Do not build with tpm libraries on i386
+      + debian/rules,debian/control,debian/tests/control:
+        Do not build with libqrencode on i386
+      + debian/rules: Remove unneeded efi artifacts on i386 to avoid debugedit errors
+    - d/t/control: tests-in-lxd Depends: dnsmasq-base
+    - d/t/tests-in-lxd: drop patching workaround
+  * New changes:
+    - test: set nsec3-salt-length=8 in knot.conf
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Wed, 11 Dec 2024 11:45:03 -0500
+
 systemd (257-1) unstable; urgency=medium
 
   * Update to new upstream version v257. For a full list of changes:
@@ -374,6 +789,57 @@ systemd (257-1) unstable; urgency=medium
 
  -- Luca Boccassi <bluca@debian.org>  Tue, 10 Dec 2024 19:57:21 +0000
 
+systemd (257~rc3-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable (LP: #2091175). Remaining changes:
+    - debian/tests/tests-in-lxd: run some autopkgtests in LXD too
+    - debian/tests/boot-and-services:
+      + skip apparmor tests on armhf
+      + consume stderr in systemctl status call in test_service
+      + drop test_no_failed
+    - debian/systemd.postinst:
+      + skip daemon-reexec and try-restarts during shutdown
+      + manually call systemd-tmpfiles --create in postinst
+      + Do not create /etc/tmpfiles.d/tmp.conf on upgrades
+    - debian/systemd-resolved.postinst: copy existing /etc/resolv.conf to
+      /run/systemd/resolve/stub-resolv.conf
+    - debian/gbp.conf,debian/extra/wrap_cl.py:
+      Use a customization script to add LP commit links to changelog
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Make systemd-cryptsetup Priority: important
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Add Breaks: systemd (<< ${binary:Version}) to udev package so that
+        systemd is upgraded as well when upgrading udev
+      + Make systemd-sysv Depends: on matching version of systemd
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+      + Build-Depends: linux-tools-generic
+      + Do not build systemd-boot-efi-{amd64,arm64}-signed-template
+    - switch-root: use MS_MOVE for /run when switchig from initrd
+    - test: skip TEST-69-SHUTDOWN on ubuntu too (LP #2083704)
+    - Delta for i386:
+      + debian/systemd.install: exclude files that are not built for i386
+      + debian/systemd.manpages: do not ship un-built manpages on i386
+      + debian/rules,debian/control,debian/tests/control:
+        Do not build with tpm libraries on i386
+      + debian/rules,debian/control,debian/tests/control:
+        Do not build with libqrencode on i386
+      + debian/rules: Remove unneeded efi artifacts on i386 to avoid debugedit errors
+  * Dropped changes, included in Debian:
+    - Filter out zdev rules in the initramfs hook (LP #2044104)
+    - d/t/upstream: honor /etc/apt configured by autopkgtest
+    - debian/tests/control: only install systemd-boot-efi for supported arches
+    - debian/systemd.links: mask systemd-gpt-auto-generator by default
+      (Ubuntu only)
+  * Dropped changes, not needed
+    - debian/tests/upstream: export QEMU_MEM="1024M" for all tests
+  * New changes:
+    - d/t/control: tests-in-lxd Depends: dnsmasq-base
+    - d/t/tests-in-lxd: drop patching workaround
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Fri, 06 Dec 2024 10:30:12 -0500
+
 systemd (257~rc3-1) unstable; urgency=medium
 
   [ Luca Boccassi ]
@@ -520,6 +986,76 @@ systemd (256.6-1) unstable; urgency=medi
 
  -- Luca Boccassi <bluca@debian.org>  Tue, 10 Sep 2024 18:28:21 +0200
 
+systemd (256.5-2ubuntu4) plucky; urgency=medium
+
+  * Make sure systemd-cryptsetup is pulled in by systemd on install/upgrade
+    (LP: #2084251)
+    - d/control: make systemd-cryptsetup Priority: important
+    - d/control: make systemd Recommends: systemd-cryptsetup again
+  * debian/gbp.conf: update for plucky
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Wed, 16 Oct 2024 16:30:52 -0400
+
+systemd (256.5-2ubuntu3) oracular; urgency=medium
+
+  * d/control: demote systemd-cryptsetup from Recommends: to Suggests: of systemd
+  * test: skip TEST-69-SHUTDOWN on ubuntu too (LP: #2083704)
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Fri, 04 Oct 2024 11:37:37 -0400
+
+systemd (256.5-2ubuntu2) oracular; urgency=medium
+
+  * initramfs-tools: ensure rules file exists before invoking chzdev (LP: #2079993)
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Mon, 09 Sep 2024 09:42:11 -0400
+
+systemd (256.5-2ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/tests-in-lxd: run some autopkgtests in LXD too
+    - debian/tests/boot-and-services:
+      + skip apparmor tests on armhf
+      + consume stderr in systemctl status call in test_service
+      + drop test_no_failed
+    - debian/systemd.postinst:
+      + skip daemon-reexec and try-restarts during shutdown
+      + manually call systemd-tmpfiles --create in postinst
+    - debian/systemd-resolved.postinst: copy existing /etc/resolv.conf to
+      /run/systemd/resolve/stub-resolv.conf
+    - debian/rules:
+      + Remove unneeded efi artifacts on i386 to avoid debugedit errors
+    - debian/rules,debian/control,debian/tests/control:
+      + Do not build with tpm libraries on i386
+      + Do not build with libqrencode on i386
+    - debian/gbp.conf,debian/extra/wrap_cl.py:
+      Use a customization script to add LP commit links to changelog
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Add Breaks: systemd (<< ${binary:Version}) to udev package so that
+        systemd is upgraded as well when upgrading udev
+      + Make systemd-sysv Depends: on matching version of systemd
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+      + Build-Depends: linux-tools-generic
+    - debian/tests/upstream: export QEMU_MEM="1024M" for all tests
+    - debian/systemd.links: mask systemd-gpt-auto-generator by default
+    - debian/systemd.install: exclude files that are not built for i386
+    - debian/systemd.manpages: do not ship un-built manpages on i386
+    - debian/tests/control: only install systemd-boot-efi for supported arches
+    - switch-root: use MS_MOVE for /run when switchig from initrd
+    - debian/systemd.postinst: do not create /etc/tmpfiles.d/tmp.conf on upgrades.
+      We want the upgrades on Ubuntu to be aligned with what a new install
+      would look like.
+    - d/control: do not build systemd-boot-efi-{amd64,arm64}-signed-template
+  * New changes:
+    - Keep utmp support for this release, since we are passed Feature Freeze
+      in Ubuntu.
+    - Filter out zdev rules in the initramfs hook (LP: #2044104)
+    - d/t/upstream: honor /etc/apt configured by autopkgtest
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Fri, 06 Sep 2024 09:21:01 -0400
+
 systemd (256.5-2) unstable; urgency=medium
 
   [ Helmut Grohne ]
@@ -568,12 +1104,112 @@ systemd (256.4-3) unstable; urgency=medi
 
  -- Luca Boccassi <bluca@debian.org>  Sun, 11 Aug 2024 11:53:32 +0100
 
+systemd (256.4-2ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/tests-in-lxd: run some autopkgtests in LXD too
+    - debian/tests/boot-and-services:
+      + skip apparmor tests on armhf
+      + consume stderr in systemctl status call in test_service
+      + drop test_no_failed
+    - debian/systemd.postinst:
+      + skip daemon-reexec and try-restarts during shutdown
+      + manually call systemd-tmpfiles --create in postinst
+    - debian/systemd-resolved.postinst: copy existing /etc/resolv.conf to
+      /run/systemd/resolve/stub-resolv.conf
+    - debian/rules:
+      + Remove unneeded efi artifacts on i386 to avoid debugedit errors
+    - debian/rules,debian/control,debian/tests/control:
+      + Do not build with tpm libraries on i386
+      + Do not build with libqrencode on i386
+    - debian/gbp.conf,debian/extra/wrap_cl.py:
+      Use a customization script to add LP commit links to changelog
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Add Breaks: systemd (<< ${binary:Version}) to udev package so that
+        systemd is upgraded as well when upgrading udev
+      + Make systemd-sysv Depends: on matching version of systemd
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+      + Build-Depends: linux-tools-generic
+    - debian/tests/upstream: export QEMU_MEM="1024M" for all tests
+    - debian/systemd.links: mask systemd-gpt-auto-generator by default
+    - debian/systemd.install: exclude files that are not built for i386
+    - debian/systemd.manpages: do not ship un-built manpages on i386
+    - debian/tests/control: only install systemd-boot-efi for supported arches
+    - switch-root: use MS_MOVE for /run when switchig from initrd
+    - debian/systemd.postinst: do not create /etc/tmpfiles.d/tmp.conf on upgrades.
+      We want the upgrades on Ubuntu to be aligned with what a new install
+      would look like.
+    - d/control: do not build systemd-boot-efi-{amd64,arm64}-signed-template
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Tue, 30 Jul 2024 10:44:28 -0400
+
 systemd (256.4-2) unstable; urgency=medium
 
   * autopkgtest: allow localectl in localed tests.
 
  -- Luca Boccassi <bluca@debian.org>  Thu, 25 Jul 2024 13:18:09 +0100
 
+systemd (256.4-1ubuntu3) oracular; urgency=medium
+
+  * d/systemd.install: remove systemd-time-wait-sync again
+    This was mistakenly added back when resolving a merge conflict.
+    This binary was moved to systemd-timesyncd in commit 9d74923dd7
+    ("Move systemd-time-wait-sync to systemd-timesyncd package").
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Mon, 29 Jul 2024 10:00:05 -0400
+
+systemd (256.4-1ubuntu2) oracular; urgency=medium
+
+  * d/systemd.install: do not ship systemd-tpm2-setup on i386
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Fri, 26 Jul 2024 15:44:16 -0400
+
+systemd (256.4-1ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/tests-in-lxd: run some autopkgtests in LXD too
+    - debian/tests/boot-and-services:
+      + skip apparmor tests on armhf
+      + consume stderr in systemctl status call in test_service
+      + drop test_no_failed
+    - debian/systemd.postinst:
+      + skip daemon-reexec and try-restarts during shutdown
+      + manually call systemd-tmpfiles --create in postinst
+    - debian/systemd-resolved.postinst: copy existing /etc/resolv.conf to
+      /run/systemd/resolve/stub-resolv.conf
+    - debian/rules:
+      + Remove unneeded efi artifacts on i386 to avoid debugedit errors
+    - debian/rules,debian/control,debian/tests/control:
+      + Do not build with tpm libraries on i386
+      + Do not build with libqrencode on i386
+    - debian/gbp.conf,debian/extra/wrap_cl.py:
+      Use a customization script to add LP commit links to changelog
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Add Breaks: systemd (<< ${binary:Version}) to udev package so that
+        systemd is upgraded as well when upgrading udev
+      + Make systemd-sysv Depends: on matching version of systemd
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+      + Build-Depends: linux-tools-generic
+    - debian/tests/upstream: export QEMU_MEM="1024M" for all tests
+    - debian/systemd.links: mask systemd-gpt-auto-generator by default
+    - debian/systemd.install: exclude files that are not built for i386
+    - debian/systemd.manpages: do not ship un-built manpages on i386
+    - debian/tests/control: only install systemd-boot-efi for supported arches
+    - switch-root: use MS_MOVE for /run when switchig from initrd
+    - debian/systemd.postinst: do not create /etc/tmpfiles.d/tmp.conf on upgrades.
+      We want the upgrades on Ubuntu to be aligned with what a new install
+      would look like.
+  * New changes:
+    - d/control: do not build systemd-boot-efi-{amd64,arm64}-signed-template
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Fri, 26 Jul 2024 13:36:33 -0400
+
 systemd (256.4-1) unstable; urgency=medium
 
   [ Nick Rosbrook ]
@@ -599,6 +1235,60 @@ systemd (256.4-1) unstable; urgency=medi
 
  -- Luca Boccassi <bluca@debian.org>  Wed, 24 Jul 2024 14:23:56 +0100
 
+systemd (256.2-1ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/tests-in-lxd: run some autopkgtests in LXD too
+    - debian/tests/boot-and-services:
+      + skip apparmor tests on armhf
+      + consume stderr in systemctl status call in test_service
+      + drop test_no_failed
+    - debian/systemd.postinst:
+      + skip daemon-reexec and try-restarts during shutdown
+      + manually call systemd-tmpfiles --create in postinst
+    - debian/systemd-resolved.postinst: copy existing /etc/resolv.conf to
+      /run/systemd/resolve/stub-resolv.conf
+    - debian/rules:
+      + Remove unneeded efi artifacts on i386 to avoid debugedit errors
+    - debian/rules,debian/control,debian/tests/control:
+      + Do not build with tpm libraries on i386
+      + Do not build with libqrencode on i386
+    - debian/gbp.conf,debian/extra/wrap_cl.py:
+      Use a customization script to add LP commit links to changelog
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Add Breaks: systemd (<< ${binary:Version}) to udev package so that
+        systemd is upgraded as well when upgrading udev
+      + Make systemd-sysv Depends: on matching version of systemd
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+      + Build-Depends: linux-tools-generic
+    - debian/tests/upstream: export QEMU_MEM="1024M" for all tests
+    - debian/systemd.links: mask systemd-gpt-auto-generator by default
+    - debian/systemd.install: exclude files that are not built for i386
+    - debian/systemd.manpages: do not ship un-built manpages on i386
+    - debian/tests/control: only install systemd-boot-efi for supported arches
+    - switch-root: use MS_MOVE for /run when switchig from initrd
+    - debian/systemd.postinst: do not create /etc/tmpfiles.d/tmp.conf on upgrades.
+      We want the upgrades on Ubuntu to be aligned with what a new install
+      would look like.
+  * Dropped changes, no longer needed:
+    - Drop Revert-network-if-sys-is-rw-then-udev-should-be-around.patch
+    - Drop test-skip-exec-privatenetwork-yes-privatemounts-yes.servi.patch.
+      With security.nesting: true, this AppArmor denial is not hit. We can
+      drop this now.
+    - debian/tests/unit-tests: don't skip test-execute on armhf anymore
+  * Dropped changes, not compatible with mkosi-based test suite:
+    - debian/tests/upstream{,-1,-2}: split upstream tests into two parts
+  * New changes:
+    - debian/tests/tests-in-lxd: set security.nesting true for LXD containers
+    - d/t/boot-and-services: skip test_tmp_cleanup if tmp.mount is overridden
+    - d/t/upstream: ensure correct ubuntu codename is used
+    - d/t/control: add Depends: lib{systemd,udev}-dev for upstream
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Fri, 19 Jul 2024 11:56:45 -0400
+
 systemd (256.2-1) unstable; urgency=medium
 
   * d/not-installed: fix shutdown.standalone path
@@ -667,6 +1357,75 @@ systemd (256-2) experimental; urgency=me
 
  -- Luca Boccassi <bluca@debian.org>  Wed, 12 Jun 2024 01:30:51 +0100
 
+systemd (256-1ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/upstream{,-1,-2}: split upstream tests into two parts
+    - debian/tests/tests-in-lxd: run some autopkgtests in LXD too
+    - debian/tests/boot-and-services:
+      + skip apparmor tests on armhf
+      + consume stderr in systemctl status call in test_service
+      + drop test_no_failed
+    - debian/systemd.postinst:
+      + skip daemon-reexec and try-restarts during shutdown
+      + manually call systemd-tmpfiles --create in postinst
+    - debian/systemd-resolved.postinst: copy existing /etc/resolv.conf to
+      /run/systemd/resolve/stub-resolv.conf
+    - debian/rules:
+      + Remove unneeded efi artifacts on i386 to avoid debugedit errors
+    - debian/rules,debian/control,debian/tests/control:
+      + Do not build with tpm libraries on i386
+      + Do not build with libqrencode on i386
+    - debian/gbp.conf,debian/extra/wrap_cl.py:
+      Use a customization script to add LP commit links to changelog
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Add Breaks: systemd (<< ${binary:Version}) to udev package so that
+        systemd is upgraded as well when upgrading udev
+      + Make systemd-sysv Depends: on matching version of systemd
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+      + Build-Depends: linux-tools-generic
+    - d/p/Revert-network-if-sys-is-rw-then-udev-should-be-around.patch:
+      Revert "network: if /sys is rw, then udev should be around" upstream
+      commit
+    - debian/tests/upstream: export QEMU_MEM="1024M" for all tests
+    - debian/systemd.links: mask systemd-gpt-auto-generator by default
+    - debian/systemd.install: exclude files that are not built for i386
+    - debian/systemd.manpages: do not ship un-built manpages on i386
+    - debian/tests/control: only install systemd-boot-efi for supported arches
+    - test: skip exec-privatenetwork-yes-privatemounts-yes.service in LXC
+    - debian/test/unit-tests: skip test-execute on armhf.
+  * Dropped changes, included in Debian:
+    - debian/extra: use a drop-in resolved.conf to configure Cache=no-negative
+    - debian/extra: use a dropin to configure Nice=-1 on systemd-journald.service.
+    - debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf:
+      Set ManagedOOMSwap=auto, disabling swap kill by default
+    - debian/rules:
+      + Set default user path
+      + Disable LLMNR by default
+    - debian/tests/storage: skip tests if scsi_debug module is not available
+  * Dropped changes:
+    - debian/patches/tmpfiles.d-tmp.conf-make-cleanup-age-30d-on-Ubuntu.patch:
+      We want to stay aligned with Debian and upstream instead of keeping this
+      30d cleanup.
+    - debian/systemd-resolved.install: drop unnecessary delta
+    - d/p/debian/UBUNTU-Don-t-override-Ubuntu-s-default-sysctl-values-LP-1962038.patch:
+      We do not actually ship sysctld.d/50-default.conf in Debian or Ubuntu.
+      When this patch was written, we did, but that change was lost in a merge
+      from Debian. The preferred package to set sysctl defaults is procps
+      anyways, so rather than restoring sysctl.d/50-default.conf to make this
+      patch relevant, drop the patch.
+  * New changes:
+    - debian/extra: remove systemd-logind.service.d/nice.conf (LP: #2067927)
+    - switch-root: use MS_MOVE for /run when switchig from initrd (LP: #2064096)
+    - debian/systemd.postinst: do not create /etc/tmpfiles.d/tmp.conf on upgrades.
+      We want the upgrades on Ubuntu to be aligned with what a new install
+      would look like.
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Thu, 13 Jun 2024 11:46:06 -0400
+
 systemd (256-1) unstable; urgency=medium
 
   [ Kevin Fleming ]
@@ -730,6 +1489,80 @@ systemd (256~rc3-6) unstable; urgency=me
 
  -- Luca Boccassi <bluca@debian.org>  Thu, 30 May 2024 18:11:19 +0100
 
+systemd (256~rc3-5ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/upstream{,-1,-2}: split upstream tests into two parts
+    - debian/tests/tests-in-lxd: run some autopkgtests in LXD too
+    - debian/tests/storage: skip tests if scsi_debug module is not available
+    - debian/tests/boot-and-services:
+      + skip apparmor tests on armhf
+      + consume stderr in systemctl status call in test_service
+      + drop test_no_failed
+    - debian/systemd.postinst:
+      + skip daemon-reexec and try-restarts during shutdown
+      + manually call systemd-tmpfiles --create in postinst
+    - debian/systemd-resolved.postinst: copy existing /etc/resolv.conf to
+      /run/systemd/resolve/stub-resolv.conf
+    - debian/rules:
+      + Set default user path
+      + Disable LLMNR by default
+      + Remove unneeded efi artifacts on i386 to avoid debugedit errors
+    - debian/rules,debian/control,debian/tests/control:
+      + Do not build with tpm libraries on i386
+      + Do not build with libqrencode on i386
+    - debian/gbp.conf,debian/extra/wrap_cl.py:
+      Use a customization script to add LP commit links to changelog
+    - debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf:
+      Set ManagedOOMSwap=auto, disabling swap kill by default
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Add Breaks: systemd (<< ${binary:Version}) to udev package so that
+        systemd is upgraded as well when upgrading udev
+      + Make systemd-sysv Depends: on matching version of systemd
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+      + Build-Depends: linux-tools-generic
+    - d/p/Revert-network-if-sys-is-rw-then-udev-should-be-around.patch:
+      Revert "network: if /sys is rw, then udev should be around" upstream
+      commit
+    - d/p/debian/UBUNTU-Don-t-override-Ubuntu-s-default-sysctl-values-LP-1962038.patch:
+      Don't override Ubuntu's default sysctl values
+    - debian/extra: use a dropin to configure Nice=-1 on systemd-journald.service.
+    - debian/tests/upstream: export QEMU_MEM="1024M" for all tests
+    - debian/systemd.links: mask systemd-gpt-auto-generator by default
+    - debian/systemd.install: exclude files that are not built for i386
+    - debian/systemd.manpages: do not ship un-built manpages on i386
+    - debian/tests/control: only install systemd-boot-efi for supported arches
+    - test: skip exec-privatenetwork-yes-privatemounts-yes.service in LXC
+  * Dropped changes, no longer needed:
+    - Drop debian/UBUNTU-read-only-etc-hacks.patch
+    - Drop debian/UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch
+    - Drop debian/UBUNTU-Add-AssumedApparmorLabel-unconfined-to-timedate1-dbus.patch
+    - Drop lp1861941-dont-generate-disk-byuuid-for-bcache-uuid.patch.
+      As stated in the patch description, this is *not* the proper fix for the
+      issue. The proper fix was sent to bcache-tools upstream, but that
+      upstream is abandoned. However, that patch is now included in Debian
+      (shipped starting in 1.0.8-5). Hence, we can finally drop this patch
+      from systemd.
+    - Drop test-temporarily-skip-credentials-tests-in-LXC.patch
+      This is redundant with the current skip in tests-in-lxd, and skipping
+      on armhf all together.
+    - debian/tests/boot-and-services:
+      + skip test_syslog on s390x
+      + skip coredump tests on s390x
+  * New changes:
+    - Keep 30d cleanup for /tmp in Ubuntu
+    - debian/extra: use a drop-in resolved.conf to configure Cache=no-negative
+      This allows us to drop the current patch.
+    - debian/test/unit-tests: skip test-execute on armhf.
+      The run-unit-tests.py script supports a --skip flag for wholesale
+      skipping like this, so use that instead of a patch.
+    - debian/tests/tests-in-lxd: fix apparmor profile path
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Fri, 31 May 2024 15:52:20 -0400
+
 systemd (256~rc3-5) unstable; urgency=medium
 
   * homed: fixup pam-auth-update file via trigger pam-auth-update assumes
@@ -807,6 +1640,77 @@ systemd (256~rc3-2) unstable; urgency=me
 
  -- Luca Boccassi <bluca@debian.org>  Thu, 23 May 2024 16:31:42 +0100
 
+systemd (256~rc3-1ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/upstream{,-1,-2}: split upstream tests into two parts
+    - debian/tests/tests-in-lxd: run some autopkgtests in LXD too
+    - debian/tests/storage: skip tests if scsi_debug module is not available
+    - debian/tests/boot-and-services:
+      + skip test_syslog on s390x
+      + skip coredump tests on s390x
+      + skip apparmor tests on armhf
+      + consume stderr in systemctl status call in test_service
+      + drop test_no_failed
+    - debian/systemd.postinst:
+      + skip daemon-reexec and try-restarts during shutdown
+      + manually call systemd-tmpfiles --create in postinst
+    - debian/systemd-resolved.postinst: copy existing /etc/resolv.conf to
+      /run/systemd/resolve/stub-resolv.conf
+    - debian/rules:
+      + Set default user path
+      + Disable LLMNR by default
+      + Remove unneeded efi artifacts on i386 to avoid debugedit errors
+    - debian/rules,debian/control,debian/tests/control:
+      + Do not build with tpm libraries on i386
+      + Do not build with libqrencode on i386
+    - debian/gbp.conf,debian/extra/wrap_cl.py:
+      Use a customization script to add LP commit links to changelog
+    - debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf:
+      Set ManagedOOMSwap=auto, disabling swap kill by default
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Add Breaks: systemd (<< ${binary:Version}) to udev package so that
+        systemd is upgraded as well when upgrading udev
+      + Make systemd-sysv Depends: on matching version of systemd
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+      + Build-Depends: linux-tools-generic
+    - d/p/debian/UBUNTU-Add-AssumedApparmorLabel-unconfined-to-timedate1-dbus.patch:
+      Set AssumedAppArmorLabel=unconfined in timedate1 dbus service file
+    - d/p/debian/UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch:
+      Launch QEMU with -vga none in test-functions
+    - d/p/debian/UBUNTU-resolved-default-no-negative-caching.patch:
+      Default to Cache=no-negative in systemd-resolved
+    - d/p/Revert-network-if-sys-is-rw-then-udev-should-be-around.patch:
+      Revert "network: if /sys is rw, then udev should be around" upstream
+      commit
+    - d/p/lp1861941-dont-generate-disk-byuuid-for-bcache-uuid.patch:
+      skip disk/by-uuid for bcache devices
+    - d/p/debian/UBUNTU-Don-t-override-Ubuntu-s-default-sysctl-values-LP-1962038.patch:
+      Don't override Ubuntu's default sysctl values
+    - debian/patches/debian/UBUNTU-read-only-etc-hacks.patch:
+      Workaround Ubuntu core's read-only etc
+    - debian/extra: use a dropin to configure Nice=-1 on systemd-journald.service.
+    - debian/tests/upstream: export QEMU_MEM="1024M" for all tests
+    - debian/systemd.links: mask systemd-gpt-auto-generator by default
+    - debian/systemd.install: exclude files that are not built for i386
+    - debian/systemd.manpages: do not ship un-built manpages on i386
+    - debian/tests/control: only install systemd-boot-efi for supported arches
+    - test: temporarily skip credentials tests in LXC.
+      This was already skipped in another patch, but now that we know what's
+      going on with it, split it out.
+    - test: skip test-execute in arhmf LXC containers
+    - test: skip exec-privatenetwork-yes-privatemounts-yes.service in LXC
+  * Dropped changes, no longer needed:
+    - Provide upgrade path (Replaces:) for Jammy's systemd-repart
+    - test: deny-list TEST-08-INITRD.
+  * New changes:
+    - debian/tests/tests-in-lxd: skip until credentials can be used in LXD
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Thu, 23 May 2024 10:45:03 -0400
+
 systemd (256~rc3-1) unstable; urgency=medium
 
   * Bump Breaks on dracut, on request of the maintainer (Closes: #1071278)
@@ -833,6 +1737,90 @@ systemd (256~rc2-2) unstable; urgency=me
 
  -- Luca Boccassi <bluca@debian.org>  Thu, 16 May 2024 17:40:43 +0100
 
+systemd (256~rc2-1ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/upstream{,-1,-2}: split upstream tests into two parts
+    - debian/tests/tests-in-lxd: run some autopkgtests in LXD too
+    - debian/tests/storage: skip tests if scsi_debug module is not available
+    - debian/tests/boot-and-services:
+      + skip test_syslog on s390x
+      + skip coredump tests on s390x
+      + skip apparmor tests on armhf
+      + consume stderr in systemctl status call in test_service
+      + drop test_no_failed
+    - debian/systemd.postinst:
+      + skip daemon-reexec and try-restarts during shutdown
+      + manually call systemd-tmpfiles --create in postinst
+    - debian/systemd-resolved.postinst: copy existing /etc/resolv.conf to
+      /run/systemd/resolve/stub-resolv.conf
+    - debian/rules:
+      + Set default user path
+      + Disable LLMNR by default
+      + Remove unneeded efi artifacts on i386 to avoid debugedit errors
+    - debian/rules,debian/control,debian/tests/control:
+      + Do not build with tpm libraries on i386
+      + Do not build with libqrencode on i386
+    - debian/gbp.conf,debian/extra/wrap_cl.py:
+      Use a customization script to add LP commit links to changelog
+    - debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf:
+      Set ManagedOOMSwap=auto, disabling swap kill by default
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Provide upgrade path (Replaces:) for Jammy's systemd-repart
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Add Breaks: systemd (<< ${binary:Version}) to udev package so that
+        systemd is upgraded as well when upgrading udev
+      + Make systemd-sysv Depends: on matching version of systemd
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+      + Build-Depends: linux-tools-generic
+    - d/p/debian/UBUNTU-Add-AssumedApparmorLabel-unconfined-to-timedate1-dbus.patch:
+      Set AssumedAppArmorLabel=unconfined in timedate1 dbus service file
+    - d/p/debian/UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch:
+      Launch QEMU with -vga none in test-functions
+    - d/p/debian/UBUNTU-resolved-default-no-negative-caching.patch:
+      Default to Cache=no-negative in systemd-resolved
+    - d/p/Revert-network-if-sys-is-rw-then-udev-should-be-around.patch:
+      Revert "network: if /sys is rw, then udev should be around" upstream
+      commit
+    - d/p/lp1861941-dont-generate-disk-byuuid-for-bcache-uuid.patch:
+      skip disk/by-uuid for bcache devices
+    - d/p/debian/UBUNTU-Don-t-override-Ubuntu-s-default-sysctl-values-LP-1962038.patch:
+      Don't override Ubuntu's default sysctl values
+    - debian/patches/debian/UBUNTU-read-only-etc-hacks.patch:
+      Workaround Ubuntu core's read-only etc
+    - d/p/test-drop-etc-default-locale-handling-from-TEST-74-AUX-UT.patch
+    - d/p/meson.build-disable-Wformat-overflow-on-gcc-with-O3.patch:
+      Disable -Wformat-overflow on gcc with -O3
+    - test: ensure SYSVINIT_PATH exists in TEST-26-SYSTEMCTL.
+      On Ubuntu, we hit the case where SYSVINIT_PATH falls back to
+      /etc/init.d, but nothing guarantees that the path is created for the
+      test.
+    - test: deny-list TEST-08-INITRD.
+      Upstream already disables this: https://github.com/systemd/systemd/pull/28813.
+      It makes sense for us to as well, because we don't run systemd in the
+      initrd.
+    - debian/extra: use a dropin to configure Nice=-1 on systemd-journald.service.
+      It is preferred that we override units with dropins like this, rather
+      than patching the original. This has no functional change.
+    - debian/tests/upstream: export QEMU_MEM="1024M" for all tests
+    - debian/systemd.links: mask systemd-gpt-auto-generator by default
+    - debian/systemd.install: exclude files that are not built for i386
+    - debian/systemd.manpages: do not ship un-built manpages on i386
+    - debian/tests/control: only install systemd-boot-efi for supported arches
+    - test: temporarily skip credentials tests in LXC.
+      This was already skipped in another patch, but now that we know what's
+      going on with it, split it out.
+    - test: skip test-execute in arhmf LXC containers
+    - test: skip exec-privatenetwork-yes-privatemounts-yes.service in LXC
+  * Dropped changes:
+    - Drop test-drop-etc-default-locale-handling-from-TEST-74-AUX-UT.patch.
+    - Drop test-ensure-SYSVINIT_PATH-exists-in-TEST-26-SYSTEMCTL.patch.
+    - Drop meson.build-disable-Wformat-overflow-on-gcc-with-O3.patch
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Sun, 19 May 2024 04:07:45 +0200
+
 systemd (256~rc2-1) unstable; urgency=medium
 
   [ Luca Boccassi ]
@@ -894,6 +1882,100 @@ systemd (256~rc2-1) unstable; urgency=me
 
  -- Luca Boccassi <bluca@debian.org>  Wed, 15 May 2024 00:40:56 +0100
 
+systemd (256~rc1-1~exp2ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/upstream{,-1,-2}: split upstream tests into two parts
+    - debian/tests/tests-in-lxd: run some autopkgtests in LXD too
+    - debian/tests/storage: skip tests if scsi_debug module is not available
+    - debian/tests/boot-and-services:
+      + skip test_syslog on s390x
+      + skip coredump tests on s390x
+      + skip apparmor tests on armhf
+      + consume stderr in systemctl status call in test_service
+      + drop test_no_failed
+    - debian/systemd.postinst:
+      + skip daemon-reexec and try-restarts during shutdown
+      + manually call systemd-tmpfiles --create in postinst
+    - debian/systemd-resolved.postinst: copy existing /etc/resolv.conf to
+      /run/systemd/resolve/stub-resolv.conf
+    - debian/rules:
+      + Set default user path
+      + Disable LLMNR by default
+      + Remove unneeded efi artifacts on i386 to avoid debugedit errors
+    - debian/rules,debian/control,debian/tests/control:
+      + Do not build with tpm libraries on i386
+      + Do not build with libqrencode on i386
+    - debian/gbp.conf,debian/extra/wrap_cl.py:
+      Use a customization script to add LP commit links to changelog
+    - debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf:
+      Set ManagedOOMSwap=auto, disabling swap kill by default
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Provide upgrade path (Replaces:) for Jammy's systemd-repart
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Add Breaks: systemd (<< ${binary:Version}) to udev package so that
+        systemd is upgraded as well when upgrading udev
+      + Make systemd-sysv Depends: on matching version of systemd
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+    - d/p/debian/UBUNTU-Add-AssumedApparmorLabel-unconfined-to-timedate1-dbus.patch:
+      Set AssumedAppArmorLabel=unconfined in timedate1 dbus service file
+    - d/p/debian/UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch:
+      Launch QEMU with -vga none in test-functions
+    - d/p/debian/UBUNTU-resolved-default-no-negative-caching.patch:
+      Default to Cache=no-negative in systemd-resolved
+    - d/p/Revert-network-if-sys-is-rw-then-udev-should-be-around.patch:
+      Revert "network: if /sys is rw, then udev should be around" upstream
+      commit
+    - d/p/lp1861941-dont-generate-disk-byuuid-for-bcache-uuid.patch:
+      skip disk/by-uuid for bcache devices
+    - d/p/debian/UBUNTU-Don-t-override-Ubuntu-s-default-sysctl-values-LP-1962038.patch:
+      Don't override Ubuntu's default sysctl values
+    - debian/patches/debian/UBUNTU-read-only-etc-hacks.patch:
+      Workaround Ubuntu core's read-only etc
+    - d/p/test-drop-etc-default-locale-handling-from-TEST-74-AUX-UT.patch
+    - d/p/meson.build-disable-Wformat-overflow-on-gcc-with-O3.patch:
+      Disable -Wformat-overflow on gcc with -O3
+    - test: ensure SYSVINIT_PATH exists in TEST-26-SYSTEMCTL.
+      On Ubuntu, we hit the case where SYSVINIT_PATH falls back to
+      /etc/init.d, but nothing guarantees that the path is created for the
+      test.
+    - test: deny-list TEST-08-INITRD.
+      Upstream already disables this: https://github.com/systemd/systemd/pull/28813.
+      It makes sense for us to as well, because we don't run systemd in the
+      initrd.
+    - debian/extra: use a dropin to configure Nice=-1 on systemd-journald.service.
+      It is preferred that we override units with dropins like this, rather
+      than patching the original. This has no functional change.
+    - debian/tests/upstream: export QEMU_MEM="1024M" for all tests
+    - debian/systemd.links: mask systemd-gpt-auto-generator by default
+    - debian/systemd.install: exclude files that are not built for i386
+    - debian/systemd.manpages: do not ship sd-bsod manpages on i386
+    - debian/tests/control: only install systemd-boot-efi for supported arches
+    - test: temporarily skip credentials tests in LXC.
+      This was already skipped in another patch, but now that we know what's
+      going on with it, split it out.
+    - test: skip test-execute in arhmf LXC containers
+    - test: skip exec-privatenetwork-yes-privatemounts-yes.service in LXC
+  * Dropped changes, fixed upstream:
+    - Drop lp2058179-copy-ignore-EOPNOTSUPP-from-copy_file_range.patch.
+      Applied upstream: https://github.com/systemd/systemd/commit/c0bc1e8971
+  * Dropped changes:
+    - debian/extra/start-udev: drop scsi_mod delta.
+      We have long held this delta in Ubuntu. Right now, this script is only
+      installed in udev-udeb, but we do not build udebs on Ubuntu, so it is
+      unnecessary to carry this delta.
+    - Drop debian/Ubuntu-UseDomains-by-default.patch
+  * New changes:
+    - debian/gbp.conf: update for oracular
+    - debian/systemd-resolved.postinst: ignore cp failure (LP: #2047975)
+    - debian/control: Build-Depends: linux-tools-generic
+    - debian/systemd.manpages: don't ship un-built manpages on i386
+    - debian/tests: fix patching of autopkgtest-build-lxd
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Fri, 10 May 2024 15:44:17 -0400
+
 systemd (256~rc1-1~exp2) experimental; urgency=medium
 
   * Backport patch to fix test-build-path on RISC-V/MIPS
@@ -971,6 +2053,153 @@ systemd (255.5-1) sid; urgency=medium
 
  -- Luca Boccassi <bluca@debian.org>  Wed, 24 Apr 2024 16:34:40 +0100
 
+systemd (255.4-1ubuntu8) noble; urgency=medium
+
+  * copy: ignore -EOPNOTSUPP from copy_file_range() (LP: #2058179)
+    File: debian/patches/lp2058179-copy-ignore-EOPNOTSUPP-from-copy_file_range.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fc81bb680f5d5c8c5995fcf6ed7f55f739dcd6a7
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Fri, 19 Apr 2024 10:24:36 -0400
+
+systemd (255.4-1ubuntu7) noble; urgency=medium
+
+  * No-change rebuild against libssl3t64
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 05 Apr 2024 05:38:07 +0000
+
+systemd (255.4-1ubuntu6) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 31 Mar 2024 08:26:16 +0000
+
+systemd (255.4-1ubuntu5) noble; urgency=medium
+
+  * No-change rebuild against libcurl4t64
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 16 Mar 2024 07:04:30 +0000
+
+systemd (255.4-1ubuntu4) noble; urgency=medium
+
+  * No-change rebuild against libssl3t64
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 04 Mar 2024 21:29:45 +0000
+
+systemd (255.4-1ubuntu3) noble; urgency=medium
+
+  * No-change rebuild against libssl3t64
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 04 Mar 2024 08:28:30 +0000
+
+systemd (255.4-1ubuntu2) noble; urgency=medium
+
+  * debian/patches: modify tmpfiles.d/tmp.conf default for Ubuntu (LP: #2019026)
+    In addition to cleaning /tmp at boot as is done in Debian, add a 30d
+    cleanup age for files in /tmp.
+    File: debian/patches/debian/Bring-tmpfiles.d-tmp.conf-in-line-with-Debian-defaul.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1b9bc51bb1b58a6f625f67f1632296940d78e82c
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Thu, 29 Feb 2024 12:02:44 -0500
+
+systemd (255.4-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/upstream{,-1,-2}: split upstream tests into two parts
+    - debian/tests/tests-in-lxd: run some autopkgtests in LXD too
+    - debian/tests/storage: skip tests if scsi_debug module is not available
+    - debian/tests/boot-and-services:
+      + skip test_syslog on s390x
+      + skip coredump tests on s390x
+      + skip apparmor tests on armhf
+      + consume stderr in systemctl status call in test_service
+      + drop test_no_failed
+    - debian/systemd.postinst:
+      + skip daemon-reexec and try-restarts during shutdown
+      + manually call systemd-tmpfiles --create in postinst
+    - debian/systemd-resolved.postinst: copy existing /etc/resolv.conf to
+      /run/systemd/resolve/stub-resolv.conf
+    - debian/rules:
+      + Set default user path
+      + Disable LLMNR by default
+      + Remove unneeded efi artifacts on i386 to avoid debugedit errors
+    - debian/rules,debian/control,debian/tests/control:
+      + Do not build with tpm libraries on i386
+      + Do not build with libqrencode on i386
+    - debian/gbp.conf,debian/extra/wrap_cl.py:
+      Use a customization script to add LP commit links to changelog
+    - debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf:
+      Set ManagedOOMSwap=auto, disabling swap kill by default
+    - debian/extra/start-udev: Set scsi_mod scan=sync even if it's builtin
+      to the kernel (we previously only set it in modprobe.d)
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Provide upgrade path (Replaces:) for Jammy's systemd-repart
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Add Breaks: systemd (<< ${binary:Version}) to udev package so that
+        systemd is upgraded as well when upgrading udev
+      + Make systemd-sysv Depends: on matching version of systemd
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+    - d/p/debian/Ubuntu-UseDomains-by-default.patch:
+      Enable UseDomains by default on Ubuntu.
+    - d/p/debian/UBUNTU-Add-AssumedApparmorLabel-unconfined-to-timedate1-dbus.patch:
+      Set AssumedAppArmorLabel=unconfined in timedate1 dbus service file
+    - d/p/debian/UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch:
+      Launch QEMU with -vga none in test-functions
+    - d/p/debian/UBUNTU-resolved-default-no-negative-caching.patch:
+      Default to Cache=no-negative in systemd-resolved
+    - d/p/Revert-network-if-sys-is-rw-then-udev-should-be-around.patch:
+      Revert "network: if /sys is rw, then udev should be around" upstream
+      commit
+    - d/p/lp1861941-dont-generate-disk-byuuid-for-bcache-uuid.patch:
+      skip disk/by-uuid for bcache devices
+    - d/p/debian/UBUNTU-Don-t-override-Ubuntu-s-default-sysctl-values-LP-1962038.patch:
+      Don't override Ubuntu's default sysctl values
+    - debian/patches/debian/UBUNTU-read-only-etc-hacks.patch:
+      Workaround Ubuntu core's read-only etc
+    - d/p/test-drop-etc-default-locale-handling-from-TEST-74-AUX-UT.patch
+    - d/p/meson.build-disable-Wformat-overflow-on-gcc-with-O3.patch:
+      Disable -Wformat-overflow on gcc with -O3
+    - test: ensure SYSVINIT_PATH exists in TEST-26-SYSTEMCTL.
+      On Ubuntu, we hit the case where SYSVINIT_PATH falls back to
+      /etc/init.d, but nothing guarantees that the path is created for the
+      test.
+    - test: deny-list TEST-08-INITRD.
+      Upstream already disables this: https://github.com/systemd/systemd/pull/28813.
+      It makes sense for us to as well, because we don't run systemd in the
+      initrd.
+    - debian/systemd.install: do not install pcrlock.d on i386.
+      We don't build this stuff on i386.
+    - debian/extra: use a dropin to configure Nice=-1 on systemd-journald.service.
+      It is preferred that we override units with dropins like this, rather
+      than patching the original. This has no functional change.
+    - debian/tests/upstream: export QEMU_MEM="1024M" for all tests
+    - debian/systemd.links: mask systemd-gpt-auto-generator by default
+    - debian/systemd.install: exclude files that are not built for i386
+    - debian/systemd.manpages: do not ship sd-bsod manpages on i386
+    - debian/tests/control: only install systemd-boot-efi for supported arches
+    - test: temporarily skip credentials tests in LXC.
+      This was already skipped in another patch, but now that we know what's
+      going on with it, split it out.
+    - test: skip test-execute in arhmf LXC containers
+    - test: skip exec-privatenetwork-yes-privatemounts-yes.service in LXC
+  * Dropped changes, fixed upstream:
+    - Drop lp2046498-test-skip-test_exec_networknamespacepath-if-netns-setup-f.patch.
+      Applied upstream: https://github.com/systemd/systemd-stable/commit/019d5f88ec
+    - Drop test-skip-TEST-43-PRIVATEUSER-UNPRIV-if-unprivileged-user.patch.
+      Applied upstream: https://github.com/systemd/systemd-stable/commit/c07a21408b
+    - Drop test-skip-a-systemd-run-test-if-unprivileged-userns-is-re.patch.
+      Applied upstream: https://github.com/systemd/systemd-stable/commit/159b80d44f
+    - Drop test-execute-skip-tests-that-are-broken-without-unprivile.patch.
+      Applied upstream: https://github.com/systemd/systemd-stable/commit/8c4d70178a
+  * New changes:
+    - debian/tests/tests-in-lxd: update workaround patch (LP: #2055200)
+      The autopkgtest-build-lxd script changed in a way that this patch no
+      longer applies. Update the patch so it does apply.
+      Thanks to Florent 'Skia' Jacquet
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Tue, 27 Feb 2024 17:13:21 -0500
+
 systemd (255.4-1) sid; urgency=medium
 
   [ Luca Boccassi ]
@@ -1076,6 +2305,144 @@ systemd (255.2-4) sid; urgency=medium
 
  -- Michael Biebl <biebl@debian.org>  Sat, 06 Jan 2024 16:21:03 +0100
 
+systemd (255.2-3ubuntu2) noble; urgency=medium
+
+  * test: skip test_exec_networknamespacepath if netns setup fails (LP: #2046498)
+    Files:
+    - debian/patches/lp2046498-test-skip-test_exec_networknamespacepath-if-netns-setup-f.patch
+    - debian/patches/test-skip-failing-test-execute-tests-in-LXC.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=de1fcf756e47858f4a206db97434bce4a71384d0
+  * test: skip TEST-43-PRIVATEUSER-UNPRIV if unprivileged userns is restricted
+    File: debian/patches/test-skip-TEST-43-PRIVATEUSER-UNPRIV-if-unprivileged-user.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2aba69874c83289c43d199ca360aa2fc451486a7
+  * Drop debian/UBUNTU-src-test-test-execute.c-Skip-parts-of-test-execute-in-con.patch.
+    This will be re-addressed with a different patch.
+    File: debian/patches/debian/UBUNTU-src-test-test-execute.c-Skip-parts-of-test-execute-in-con.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c3cd814e028364fe0c641d4bacfce22aafd1b572
+  * Drop test-skip-failing-test-execute-tests-in-LXC.patch.
+    This will be re-addressed with different patches.
+    File: debian/patches/test-skip-failing-test-execute-tests-in-LXC.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ab853707f4cc3e7e2d5993ff38998c3c2c789f62
+  * test: temporarily skip credentials tests in LXC.
+    This was already skipped in another patch, but now that we know what's
+    going on with it, split it out.
+    File: debian/patches/test-temporarily-skip-credentials-tests-in-LXC.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c71acb411d315267fe811f024cdab97e032453f3
+  * test: skip test-execute in arhmf LXC containers
+    File: debian/patches/test-skip-test-execute-in-arhmf-LXC-containers.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1cb1e3060822bfadddead564e779942e73e02f62
+  * test: skip exec-privatenetwork-yes-privatemounts-yes.service in LXC (LP: #2046495)
+    File: debian/patches/test-skip-exec-privatenetwork-yes-privatemounts-yes.servi.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3ab76fd2db4291ee0531a07085c72cee06cb0d12
+  * test: skip a systemd-run test if unprivileged userns is restricted
+    File: debian/patches/test-skip-a-systemd-run-test-if-unprivileged-userns-is-re.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c85f2b4e32ee8fd1c0dc58d23e7fabdb7590d3cc
+  * test-execute: skip tests that are broken without unprivileged userns
+    File: debian/patches/test-execute-skip-tests-that-are-broken-without-unprivile.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7a6573c4f5133a7fec11fb059dd215f7c8c2204e
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Wed, 24 Jan 2024 14:53:46 -0500
+
+systemd (255.2-3ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/upstream{,-1,-2}: split upstream tests into two parts
+    - debian/tests/tests-in-lxd: run some autopkgtests in LXD too
+    - debian/tests/storage: skip tests if scsi_debug module is not available
+    - debian/tests/boot-and-services:
+      + skip test_syslog on s390x
+      + skip coredump tests on s390x
+      + skip apparmor tests on armhf
+      + consume stderr in systemctl status call in test_service
+      + drop test_no_failed
+    - debian/systemd.postinst:
+      + skip daemon-reexec and try-restarts during shutdown
+      + manually call systemd-tmpfiles --create in postinst
+    - debian/systemd-resolved.postinst: copy existing /etc/resolv.conf to
+      /run/systemd/resolve/stub-resolv.conf
+    - debian/rules:
+      + Set default user path
+      + Disable LLMNR by default
+      + Remove unneeded efi artifacts on i386 to avoid debugedit errors
+    - debian/rules,debian/control,debian/tests/control:
+      + Do not build with tpm libraries on i386
+      + Do not build with libqrencode on i386
+    - debian/gbp.conf,debian/extra/wrap_cl.py:
+      Use a customization script to add LP commit links to changelog
+    - debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf:
+      Set ManagedOOMSwap=auto, disabling swap kill by default
+    - debian/extra/start-udev: Set scsi_mod scan=sync even if it's builtin
+      to the kernel (we previously only set it in modprobe.d)
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Provide upgrade path (Replaces:) for Jammy's systemd-repart
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Add Breaks: systemd (<< ${binary:Version}) to udev package so that
+        systemd is upgraded as well when upgrading udev
+      + Make systemd-sysv Depends: on matching version of systemd
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+    - d/p/debian/Ubuntu-UseDomains-by-default.patch:
+      Enable UseDomains by default on Ubuntu.
+    - d/p/debian/UBUNTU-Add-AssumedApparmorLabel-unconfined-to-timedate1-dbus.patch:
+      Set AssumedAppArmorLabel=unconfined in timedate1 dbus service file
+    - d/p/debian/UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch:
+      Launch QEMU with -vga none in test-functions
+    - d/p/debian/UBUNTU-resolved-default-no-negative-caching.patch:
+      Default to Cache=no-negative in systemd-resolved
+    - d/p/Revert-network-if-sys-is-rw-then-udev-should-be-around.patch:
+      Revert "network: if /sys is rw, then udev should be around" upstream
+      commit
+    - d/p/lp1861941-dont-generate-disk-byuuid-for-bcache-uuid.patch:
+      skip disk/by-uuid for bcache devices
+    - d/p/debian/UBUNTU-Don-t-override-Ubuntu-s-default-sysctl-values-LP-1962038.patch:
+      Don't override Ubuntu's default sysctl values
+    - debian/patches/debian/UBUNTU-read-only-etc-hacks.patch:
+      Workaround Ubuntu core's read-only etc
+    - d/p/test-drop-etc-default-locale-handling-from-TEST-74-AUX-UT.patch
+    - d/p/meson.build-disable-Wformat-overflow-on-gcc-with-O3.patch:
+      Disable -Wformat-overflow on gcc with -O3
+    - test: ensure SYSVINIT_PATH exists in TEST-26-SYSTEMCTL.
+      On Ubuntu, we hit the case where SYSVINIT_PATH falls back to
+      /etc/init.d, but nothing guarantees that the path is created for the
+      test.
+    - test: deny-list TEST-08-INITRD.
+      Upstream already disables this: https://github.com/systemd/systemd/pull/28813.
+      It makes sense for us to as well, because we don't run systemd in the
+      initrd.
+    - debian/systemd.install: do not install pcrlock.d on i386.
+      We don't build this stuff on i386.
+    - debian/extra: use a dropin to configure Nice=-1 on systemd-journald.service.
+      It is preferred that we override units with dropins like this, rather
+      than patching the original. This has no functional change.
+    - test: skip failing test-execute tests in LXC.
+      These are hopefully temporary workarounds so that we can figure out the
+      root cause in either upstream systemd or LXC.
+  * Dropped changes, fixed upstream:
+    - Drop test-install-all-necessary-units-generators-for-LVM-on-De.patch.
+      Applied upstream: https://github.com/systemd/systemd-stable/commit/b1dba6bcaa
+    - Drop firstboot-remove-etc-localtime-on-reset.patch.
+      Applied upstream: https://github.com/systemd/systemd-stable/commit/1d1b1fa25b
+  * Dropped changes, replaced with new approach:
+    - d/p/test-increase-QEMU_MEM-for-some-tests.patch:
+      Increase QEMU_MEM for some tests to improve success rate
+  * Dropped changes, included in Debian:
+    - debian/tests/control: add Depends: mdadm lvm2 for TEST-64-UDEV-STORAGE
+    - debian/tests/upstream: drop blacklist support.
+    - test-skip-tests-for-unsupported-localectl-features.patch:
+      skip tests for unsupported localectl features
+  * New changes:
+    - debian/tests/upstream: export QEMU_MEM="1024M" for all tests
+    - Revert "Drop debian/UBUNTU-src-test-test-execute.c-Skip-parts-of-test-execute-in-con.patch"
+    - debian/systemd.links: mask systemd-gpt-auto-generator by default (LP: #2046459)
+      Re-ship the generator so that it can be used if needed, but mask the
+      generator so that it remains disabled by default.
+    - debian/systemd.install: exclude files that are not built for i386
+    - debian/systemd.manpages: do not ship sd-bsod manpages on i386
+    - debian/tests/control: only install systemd-boot-efi for supported arches
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Wed, 03 Jan 2024 17:34:00 -0500
+
 systemd (255.2-3) sid; urgency=medium
 
   * Cherry-pick fixes for upstream integration tests.
@@ -1201,6 +2568,117 @@ systemd (255.1-1) experimental; urgency=
 
  -- Michael Biebl <biebl@debian.org>  Wed, 20 Dec 2023 17:54:00 +0100
 
+systemd (255-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/upstream{,-1,-2}: split upstream tests into two parts
+    - debian/tests/tests-in-lxd: run some autopkgtests in LXD too
+    - debian/tests/storage: skip tests if scsi_debug module is not available
+    - debian/tests/boot-and-services:
+      + skip test_syslog on s390x
+      + skip coredump tests on s390x
+      + skip apparmor tests on armhf
+      + consume stderr in systemctl status call in test_service
+      + drop test_no_failed
+    - debian/systemd.postinst:
+      + skip daemon-reexec and try-restarts during shutdown
+      + manually call systemd-tmpfiles --create in postinst
+    - debian/systemd-resolved.postinst: copy existing /etc/resolv.conf to
+      /run/systemd/resolve/stub-resolv.conf
+    - debian/rules:
+      + Set default user path
+      + Disable LLMNR by default
+      + Remove unneeded efi artifacts on i386 to avoid debugedit errors
+      + Do not ship systemd-gpt-auto-generator
+    - debian/rules,debian/control,debian/tests/control:
+      + Do not build with tpm libraries on i386
+      + Do not build with libqrencode on i386
+    - debian/gbp.conf,debian/extra/wrap_cl.py:
+      Use a customization script to add LP commit links to changelog
+    - debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf:
+      Set ManagedOOMSwap=auto, disabling swap kill by default
+    - debian/extra/start-udev: Set scsi_mod scan=sync even if it's builtin
+      to the kernel (we previously only set it in modprobe.d)
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Provide upgrade path (Replaces:) for Jammy's systemd-repart
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Add Breaks: systemd (<< ${binary:Version}) to udev package so that
+        systemd is upgraded as well when upgrading udev
+      + Make systemd-sysv Depends: on matching version of systemd
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+    - d/p/debian/Ubuntu-UseDomains-by-default.patch:
+      Enable UseDomains by default on Ubuntu.
+    - d/p/debian/UBUNTU-Add-AssumedApparmorLabel-unconfined-to-timedate1-dbus.patch:
+      Set AssumedAppArmorLabel=unconfined in timedate1 dbus service file
+    - d/p/debian/UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch:
+      Launch QEMU with -vga none in test-functions
+    - d/p/debian/UBUNTU-resolved-default-no-negative-caching.patch:
+      Default to Cache=no-negative in systemd-resolved
+    - d/p/Revert-network-if-sys-is-rw-then-udev-should-be-around.patch:
+      Revert "network: if /sys is rw, then udev should be around" upstream
+      commit
+    - d/p/lp1861941-dont-generate-disk-byuuid-for-bcache-uuid.patch:
+      skip disk/by-uuid for bcache devices
+    - d/p/debian/UBUNTU-Don-t-override-Ubuntu-s-default-sysctl-values-LP-1962038.patch:
+      Don't override Ubuntu's default sysctl values
+    - d/p/test-increase-QEMU_MEM-for-some-tests.patch:
+      Increase QEMU_MEM for some tests to improve success rate
+    - debian/patches/debian/UBUNTU-read-only-etc-hacks.patch:
+      Workaround Ubuntu core's read-only etc
+    - test-skip-tests-for-unsupported-localectl-features.patch:
+      skip tests for unsupported localectl features
+    - d/p/test-drop-etc-default-locale-handling-from-TEST-74-AUX-UT.patch
+    - d/p/meson.build-disable-Wformat-overflow-on-gcc-with-O3.patch:
+      Disable -Wformat-overflow on gcc with -O3
+  * Dropped changes, fixed upstream:
+    - Drop lp2009743/test-network-add-one-more-testcase-for-DHCPv4-classless-r.patch.
+      Applied upstream: https://github.com/systemd/systemd/commit/86f6760038
+    - Drop lp2009743/network-dhcp4-do-not-ignore-the-gateway-even-if-the-desti.patch.
+      Applied upstream: https://github.com/systemd/systemd/commit/77451f654a
+    - Drop lp2013543-core-reorder-systemd-arguments-on-reexec.patch.
+      Applied upstream: https://github.com/systemd/systemd/commit/06afda6b38
+    - Drop lp2033325-Revert-core-service-when-resetting-PID-also-reset-known-f.patch.
+      Applied upstream: https://github.com/systemd/systemd/commit/996b00ede8
+    - Drop test-denylist-TEST-29-PORTABLE-again.patch.
+      According to upstream, this has been resolved by
+      https://github.com/systemd/systemd/pull/28123, and a PPA autopkgtest
+      confirms this.
+  * Dropped changes, no longer needed:
+    - Drop deny-list-TEST-55-OOMD-on-ppc64el.patch.
+      We already disable qemu tests on ppc64el, so having this too is
+      unnecessary.
+    - Drop debian/UBUNTU-src-test-test-execute.c-Skip-parts-of-test-execute-in-con.patch.
+      These tests no longer fail when run in LXD, so drop the patch.
+    - Drop debian/UBUNTU-Revert-namespace-be-more-careful-when-handling-namespacin.patch (LP: #1959047)
+  * New changes:
+    - test: ensure SYSVINIT_PATH exists in TEST-26-SYSTEMCTL.
+      On Ubuntu, we hit the case where SYSVINIT_PATH falls back to
+      /etc/init.d, but nothing guarantees that the path is created for the
+      test.
+    - firstboot: remove /etc/localtime on --reset
+    - debian/tests/upstream: drop blacklist support.
+    - test: deny-list TEST-08-INITRD.
+      Upstream already disables this: https://github.com/systemd/systemd/pull/28813.
+      It makes sense for us to as well, because we don't run systemd in the
+      initrd.
+    - debian/tests/control: add Depends: systemd-boot-efi for upstream-2.
+      TEST-70-TPM2 wants the systemd-boot EFI binary for testing pcrlock, so
+      just install the binaries.
+    - debian/systemd.install: do not install pcrlock.d on i386.
+      We don't build this stuff on i386.
+    - debian/tests/control: add Depends: mdadm lvm2 for TEST-64-UDEV-STORAGE
+    - test: install all necessary units & generators for LVM on Debian
+    - debian/extra: use a dropin to configure Nice=-1 on systemd-journald.service.
+      It is preferred that we override units with dropins like this, rather
+      than patching the original. This has no functional change.
+    - test: skip failing test-execute tests in LXC.
+      These are hopefully temporary workarounds so that we can figure out the
+      root cause in either upstream systemd or LXC.
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Thu, 14 Dec 2023 18:11:39 -0500
+
 systemd (255-1) unstable; urgency=medium
 
   * New upstream version 255. For a full list of changes, see:
@@ -1607,6 +3085,238 @@ systemd (254~rc1-1) experimental; urgenc
 
  -- Luca Boccassi <bluca@debian.org>  Fri, 07 Jul 2023 11:05:37 +0100
 
+systemd (253.5-1ubuntu7) noble; urgency=medium
+
+  * Revert "debian/rules: set MulticastDNS=resolve by default" (LP: #2038894)
+    File: debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3d753238699f54e8c2892d8107136d49f09e44b6
+  * debian/gbp.conf: update for noble
+    File: debian/gbp.conf
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a65decb3a73592af8b952b159cfb453e9c0babd5
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Thu, 26 Oct 2023 09:51:33 -0400
+
+systemd (253.5-1ubuntu6) mantic; urgency=medium
+
+  * debian/tests: Depends: tzdata-legacy for upstream-{1,2} (LP: #2035778)
+    File: debian/tests/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=28d9f59c6abb6e460dd34baa4237ef04aa06aced
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Tue, 19 Sep 2023 11:54:35 -0400
+
+systemd (253.5-1ubuntu5) mantic; urgency=medium
+
+  * Revert "core/service: when resetting PID also reset known flag" (LP: #2033325)
+    Thanks to Sergio Durigan Junior
+    File: debian/patches/lp2033325-Revert-core-service-when-resetting-PID-also-reset-known-f.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=021b6fafca7ae9bddaa479500614a4a4be40ce59
+  * debian/rules: do not ship systemd-gpt-auto-generator.
+    We do not want the functionality provided by this generator, so do not
+    ship it.
+    File: debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a366279a84730e92ed734710560ea833709f359d
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Thu, 07 Sep 2023 16:09:54 -0400
+
+systemd (253.5-1ubuntu4) mantic; urgency=medium
+
+  * Revert "Drop Provides: time-daemon for bin:systemd-timesyncd"
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e88d9f0241a307a3c1b4bcaf4bf29799d984aa3c
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Fri, 25 Aug 2023 16:36:26 -0400
+
+systemd (253.5-1ubuntu3) mantic; urgency=medium
+
+  [ Nick Rosbrook ]
+  * debian/rules: build with -ffat-lto-objects (LP: #2031416)
+    File: debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c78b7a6a2578d2b3f70638db918858f9b78107a4
+
+  [ Utkarsh Gupta ]
+  * Drop Provides: time-daemon for bin:systemd-timesyncd
+    Author: Utkarsh Gupta
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=9b78ef26d64a40c21cac1e48534c6bf33661e6d7
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Fri, 25 Aug 2023 15:31:17 -0400
+
+systemd (253.5-1ubuntu2) mantic; urgency=medium
+
+  * core: reorder systemd arguments on reexec (LP: #2013543)
+    File: debian/patches/lp2013543-core-reorder-systemd-arguments-on-reexec.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c93e797cdd4f3678cdcc7449f8a6f6820e98b7f0
+  * network/dhcp4: do not ignore the gateway even if the destination is in same network (LP: #2009743)
+    Files:
+    - debian/patches/lp2009743/network-dhcp4-do-not-ignore-the-gateway-even-if-the-desti.patch
+    - debian/patches/lp2009743/test-network-add-one-more-testcase-for-DHCPv4-classless-r.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c09bc22fca4259301c88195f34ae3b24956afb22
+  * debian/systemd.postint: do not daemon re-exec if we could hit LP: #2013543
+    File: debian/systemd.postinst
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=19447af92c6d30e331ff97420e7ddcf3e5d723e1
+  * meson.build: disable -Wformat-overflow on gcc with -O3
+    File: debian/patches/meson.build-disable-Wformat-overflow-on-gcc-with-O3.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8c8595bf0f12e56d4b3a063c93a3ba69c798add2
+  * debian: ship libsystemd.a in libsystemd-dev (LP: #2012437)
+    Thanks to Serge Hallyn
+    Files:
+    - debian/libsystemd-dev.install
+    - debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5997dd2a25a7c65d7c8a826346c0120532a0e083
+  * autopkgtest: add build test for static libsystemd
+    Files:
+    - debian/tests/build-with-static-libsystemd
+    - debian/tests/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=9d90da82d6b4adcf59b9a6b6188af3a49381fea8
+
+ -- Nick Rosbrook <enr0n@ubuntu.com>  Mon, 14 Aug 2023 11:28:09 -0400
+
+systemd (253.5-1ubuntu1) mantic; urgency=medium
+
+  * Merge 253.5-1 from Debian unstable. Remaining changes:
+    - debian/tests/upstream{,-1,-2}: split upstream tests into two parts
+    - debian/tests/tests-in-lxd: run some autopkgtests in LXD too
+    - debian/tests/storage: skip tests if scsi_debug module is not available
+    - debian/tests/boot-and-services:
+      + skip test_syslog on s390x
+      + skip coredump tests on s390x
+      + skip apparmor tests on armhf
+      + consume stderr in systemctl status call in test_service
+    - debian/systemd.postinst: skip daemon-reexec and try-restarts during shutdown
+    - debian/systemd.postinst,debian/rules:
+      Disable dh_installinit generation of tmpfiles for systemd package, and
+      manually call systemd-tmpfiles --create in postinst
+    - debian/systemd-resolved.postinst: copy existing /etc/resolv.conf to
+      /run/systemd/resolve/stub-resolv.conf
+    - debian/rules:
+      + Set default user path
+      + Disable LLMNR by default
+      + Remove unneeded efi artifacts on i386 to avoid debugedit errors
+    - debian/rules,debian/control,debian/tests/control:
+      + Do not build with tpm libraries on i386
+      + Do not build with libqrencode on i386
+    - debian/gbp.conf,debian/extra/wrap_cl.py:
+      Use a customization script to add LP commit links to changelog
+    - debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf:
+      Set ManagedOOMSwap=auto, disabling swap kill by default
+    - debian/extra/start-udev: Set scsi_mod scan=sync even if it's builtin
+      to the kernel (we previously only set it in modprobe.d)
+    - debian/control:
+      + Add Recommends: networkd-dispatcher systemd-resolved to systemd package
+      + Provide upgrade path (Replaces:) for Jammy's systemd-repart
+      + Give systemd-resolved Priority: important
+      + Add Recommends: systemd-hwe-hwdb to udev package
+      + Add Breaks: systemd (<< ${binary:Version}) to udev package so that
+        systemd is upgraded as well when upgrading udev
+      + Make systemd-sysv Depends: on matching version of systemd
+      + Drop Recommends: libnss-myhostname libnss-resolve from systemd-resolved
+    - d/p/debian/Ubuntu-UseDomains-by-default.patch:
+      Enable UseDomains by default on Ubuntu.
+    - d/p/debian/UBUNTU-Add-AssumedApparmorLabel-unconfined-to-timedate1-dbus.patch:
+      Set AssumedAppArmorLabel=unconfined in timedate1 dbus service file
+    - d/p/debian/UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch:
+      Launch QEMU with -vga none in test-functions
+    - d/p/debian/UBUNTU-journald.service-set-Nice-1-to-dodge-watchdog-on-soft-loc.patch:
+      Set Nice=-1 in journald.service to dodge watchdog on soft lockups
+    - d/p/debian/UBUNTU-Revert-namespace-be-more-careful-when-handling-namespacin.patch:
+      Revert "namespace: be more careful when handling namespacing failures gracefully"
+      upstream commit
+    - d/p/debian/UBUNTU-resolved-default-no-negative-caching.patch:
+      Default to Cache=no-negative in systemd-resolved
+    - d/p/Revert-network-if-sys-is-rw-then-udev-should-be-around.patch:
+      Revert "network: if /sys is rw, then udev should be around" upstream
+      commit
+    - d/p/debian/UBUNTU-src-test-test-execute.c-Skip-parts-of-test-execute-in-con.patch:
+      Skip some of test-execute when running in LXD
+    - d/p/lp1861941-dont-generate-disk-byuuid-for-bcache-uuid.patch:
+      skip disk/by-uuid for bcache devices
+    - d/p/deny-list-TEST-55-OOMD-on-ppc64el.patch:
+      Deny-list TEST-55-OOMD om ppc64el
+    - d/p/debian/UBUNTU-Don-t-override-Ubuntu-s-default-sysctl-values-LP-1962038.patch:
+      Don't override Ubuntu's default sysctl values
+    - d/p/test-increase-QEMU_MEM-for-some-tests.patch:
+      Increase QEMU_MEM for some tests to improve success rate
+    - d/p/test-denylist-TEST-29-PORTABLE-again.patch:
+      Deny-list TEST-29-PORTABLE
+  * Dropped changes, fixed upstream:
+    - lp1999275-binfmt-util-also-check-if-binfmt-is-mounted-in-read-write.patch:
+      Applied upstream: https://github.com/systemd/systemd/commit/5aaa79ce96
+    - lp1999275-stat-util-introduce-fd_is_read_only_fs.patch:
+      Applied upstream: https://github.com/systemd/systemd/commit/dc1752ea72
+    - lp1999275-binfmt-check-if-binfmt-is-mounted-before-applying-rules.patch:
+      Applied upstream: https://github.com/systemd/systemd/commit/94ba5b1532
+    - lp2002445-sd-netlink-do-not-swap-old-name-and-alternative-name.patch:
+      Applied upstream: https://github.com/systemd/systemd/commit/080afbb57c
+    - lp2002445-udev-net-allow-new-link-name-as-an-altname-before-renamin.patch:
+      Applied upstream: https://github.com/systemd/systemd/commit/d0b31efc1a
+    - lp2004478-network-dhcp4-accept-local-subnet-routes-from-DHCP.patch:
+      Applied upstream: https://github.com/systemd/systemd/commit/1d84a3c779
+    - lp1999275-binfmt-util-split-out-binfmt_mounted.patch:
+      Applied upstream: https://github.com/systemd/systemd/commit/a51a9684c9
+    - lp2002445-sd-netlink-restore-altname-on-error-in-rtnl_set_link_name.patch:
+      Applied upstream: https://github.com/systemd/systemd/commit/4d600667f8
+    - lp2002445-test-network-add-a-test-for-renaming-device-to-current-al.patch:
+      Applied upstream: https://github.com/systemd/systemd/commit/f68f644a16
+    - lp2002445/sd-device-make-device_set_syspath-clear-sysname-and-sysnu.patch:
+      Applied upstream: https://github.com/systemd/systemd/commit/9a26098e90
+    - lp2002445/core-device-ignore-failed-uevents.patch:
+      Applied upstream: https://github.com/systemd/systemd/commit/e9336d6ac3
+    - lp2002445/udev-restore-syspath-and-properties-on-failure.patch:
+      Applied upstream: https://github.com/systemd/systemd/commit/210033847c
+    - lp2002445/sd-device-introduce-device_get_property_int.patch:
+      Applied upstream: https://github.com/systemd/systemd/commit/eedfef0f0d
+    - lp2002445-udev-attempt-device-rename-even-if-interface-is-up.patch:
+      Applied upstream: https://github.com/systemd/systemd/commit/53584e7b61
+    - lp1999275-unit-check-more-specific-path-to-be-written-by-systemd-bi.patch:
+      Applied upstream: https://github.com/systemd/systemd/commit/f74a7cb45c
+    - lp2002445-sd-netlink-add-a-test-for-rtnl_set_link_name.patch:
+      Applied upstream: https://github.com/systemd/systemd/commit/b338a8bb40
+    - test-skip-some-tests-when-machine-id-is-not-initialized.patch:
+      Applied upstream: https://github.com/systemd/systemd/pull/25732
+    - sd-netlink-skip-test_rtnl_set_link_name-when-altnames-are.patch:
+      Applied upstream: https://github.com/systemd/systemd/commit/5ccbe7fb197
+    - debian/UBUNTU-wait-online-exit-if-no-links-are-managed.patch (LP: #1982218):
+      This has been implemented upstream in a different way, but with the same
+      outcome: https://github.com/systemd/systemd/commit/ab3aed4a034.
+    - debian/Ubuntu-units-set-ConditionVirtualization-private-users-on-j.patch:
+      This is obsoleted by an upstream change to fix the underlying issue:
+      https://github.com/systemd/systemd/commit/362235bf59.
+  * Dropped changes, no longer needed:
+    - Deny-list-TEST-74-AUX-UTILS-on-s390x.patch:
+      This test passes on s390x now.
+    - debian/UBUNTU-test-sleep-skip-test_fiemap-upon-inapproriate-ioctl-.patch:
+      This test passes without this patch now.
+    - debian/UBUNTU-Revert-cgroup-Continue-unit-reset-if-cgroup-is-busy.patch:
+      Testing libvirt against systemd without this patch passses now.
+    - debian/UBUNTU-units-block-CAP_SYS_MODULE-units-in-containers-too.patch:
+      This test passes without this patch now.
+    - debian/UBUNTU-src-test-testmount-util.c-Skip-parts-of-test-mount-util-in-LXC.patch:
+      This test passes in LXD without this patch now.
+    - debian/systemd.prerm: remove unnecessary whitespace
+    - debian/systemd.maintscript:
+      Our delta pertains to versions older than 249, which is in Jammy and is
+      therefore the oldest version direct upgrades will be supported from.
+    - test: drop /etc/default/locale handling from TEST-74-AUX-UTILS
+  * New changes:
+    - debian/patches: consolidate Ubuntu core hacks into one patch,
+      debian/UBUNTU-read-only-etc-hacks.patch:
+      + debian/UBUNTU-Fix-timezone-setting-on-read-only-etc.patch
+      + debian/UBUNTU-Support-system-image-read-only-etc.patch
+      + debian/timedatectl-lp1650688.patch
+      + lp1981042-core-firstboot-workaround-timezone-issues-caused-by-Ubunt.patch
+      + debian/UBUNTU-read-only-etc-hacks.patch
+    - debian/systemd.postinst: remove duplicate if block
+    - debian/gbp.conf: update debian-branch to ubuntu-mantic
+    - debian/tests: add ability to override SELECTED_TESTS in upstream tests
+    - debian/systemd.postinst: fix /etc/locale.conf migration
+    - debian/tests/tests-in-lxd: use --reuse flag in lxc publish (LP: #2023229)
+    - debian/rules: set MulticastDNS=resolve by default
+    - test-skip-tests-for-unsupported-localectl-features.patch:
+      skip tests for unsupported localectl features
+    - debian/tests/boot-and-services: drop test_no_failed
+
+ -- Nick Rosbrook <nick.rosbrook@canonical.com>  Tue, 11 Jul 2023 14:11:33 -0400
+
 systemd (253.5-1) unstable; urgency=medium
 
   * New upstream version 253.5 (Closes: #1040035)
@@ -1720,6 +3430,63 @@ systemd (252.6-1) unstable; urgency=medi
 
  -- Luca Boccassi <bluca@debian.org>  Tue, 28 Feb 2023 11:15:45 +0000
 
+systemd (252.5-2ubuntu3) lunar; urgency=medium
+
+  * udev: gracefully handle rename failures (LP: #2002445)
+    Files:
+    - debian/patches/lp2002445/core-device-ignore-failed-uevents.patch
+    - debian/patches/lp2002445/sd-device-introduce-device_get_property_int.patch
+    - debian/patches/lp2002445/sd-device-make-device_set_syspath-clear-sysname-and-sysnu.patch
+    - debian/patches/lp2002445/udev-restore-syspath-and-properties-on-failure.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=79536dbb165dbcc402629684e0911693626df5b1
+
+ -- Nick Rosbrook <nick.rosbrook@canonical.com>  Mon, 20 Mar 2023 10:17:24 -0400
+
+systemd (252.5-2ubuntu2) lunar; urgency=medium
+
+  * network/dhcp4: accept local subnet routes from DHCP (LP: #2004478)
+    File: debian/patches/lp2004478-network-dhcp4-accept-local-subnet-routes-from-DHCP.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b9aaaf37b8ca7c9febe5f0ebc4b82d0f895cbbd3
+  * sd-netlink: skip test_rtnl_set_link_name when altnames are not supported.
+    This has already been fixed upstream by a larger commit, so this patch
+    can be dropped when we have a new enough upstream version.
+    File: debian/patches/sd-netlink-skip-test_rtnl_set_link_name-when-altnames-are.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=195985ee5aa2cfdbbac178a07e5b43b83f0550d0
+
+ -- Nick Rosbrook <nick.rosbrook@canonical.com>  Wed, 08 Mar 2023 12:51:51 -0500
+
+systemd (252.5-2ubuntu1) lunar; urgency=medium
+
+  * Merge 252.5-2 from Debian unstable
+    - Drop test-handle-Debian-s-etc-default-locale-in-testsuite-74.f.patch.
+      Applied upstream: https://github.com/systemd/systemd/commit/9b42646b22
+      File: debian/patches/test-handle-Debian-s-etc-default-locale-in-testsuite-74.f.patch
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1b0789416172ec60d8086fe2b458b5396bb7e857
+    - Drop test-make-sure-mount-point-exists-in-testsuite-64.sh.patch.
+      Applied upstream: https://github.com/systemd/systemd/commit/07e4787106
+      File: debian/patches/test-make-sure-mount-point-exists-in-testsuite-64.sh.patch
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f97b2d5ae1a1f35668c4648f1c7fc715a588de50
+    - Drop test-remove-no-longer-needed-quirk-for-set-locale-on-Debi.patch.
+      Fixed upstream: https://github.com/systemd/systemd-stable/commit/1c325f6d7f
+      File: debian/patches/test-remove-no-longer-needed-quirk-for-set-locale-on-Debi.patch
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5f85226d61393c08d7ea51c2f28db7fd4c79bcc6
+  * udev: avoid NIC renaming race with kernel (LP: #2002445)
+    Files:
+    - debian/patches/lp2002445-sd-netlink-add-a-test-for-rtnl_set_link_name.patch
+    - debian/patches/lp2002445-sd-netlink-do-not-swap-old-name-and-alternative-name.patch
+    - debian/patches/lp2002445-sd-netlink-restore-altname-on-error-in-rtnl_set_link_name.patch
+    - debian/patches/lp2002445-test-network-add-a-test-for-renaming-device-to-current-al.patch
+    - debian/patches/lp2002445-udev-attempt-device-rename-even-if-interface-is-up.patch
+    - debian/patches/lp2002445-udev-net-allow-new-link-name-as-an-altname-before-renamin.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=58d29c2b376f03c44ed5a719877c95b332018cdc
+  * Deny-list TEST-74-AUX-UTILS on s390x.
+    Since this currently is only known to fail on the autopkgtest
+    infrastructure, we believe this is a temporary issue.
+    File: debian/patches/Deny-list-TEST-74-AUX-UTILS-on-s390x.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a3a059d86e2fe3a104419ae2afcab557171f9809
+
+ -- Nick Rosbrook <nick.rosbrook@canonical.com>  Tue, 14 Feb 2023 11:52:31 -0500
+
 systemd (252.5-2) unstable; urgency=medium
 
   * Fix boot-and-services autopkgtest.
@@ -1793,6 +3560,53 @@ systemd (252.4-2) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Wed, 25 Jan 2023 09:17:24 +0100
 
+systemd (252.4-1ubuntu1) lunar; urgency=medium
+
+  * Drop oomd-fix-unreachable-test-case-in-test-oomd-util.patch.
+    Applied upstream: https://github.com/systemd/systemd-stable/commit/bcd42b3c88
+    File: debian/patches/oomd-fix-unreachable-test-case-in-test-oomd-util.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=93cf2f4709a6768d6eeb04153c92bffec0726753
+  * Drop oomd-always-allow-root-owned-cgroups-to-set-ManagedOOMPre.patch.
+    Applied upstream: https://github.com/systemd/systemd-stable/commit/2bdf5b0382
+    File: debian/patches/oomd-always-allow-root-owned-cgroups-to-set-ManagedOOMPre.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=24f51625bcec9a7b4f32a0caf363b000b173748b
+  * debian/rules: remove explicit -fcf-protection flag.
+    This is included in the default gcc flags on Ubuntu[1], so we do not need
+    this anymore. Drop the diff to reduce our delta from Debian.
+    [1] https://wiki.ubuntu.com/ToolChain/CompilerFlags#A-fcf-protection
+    File: debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b72bf5bb964aa89769417491fcc99926a06490ba
+  * Revert "Drop systemd.prerm safety check."
+    This reverts commit 0244c4d56556317f14eecc2f51871969ef02ba7b.
+    systemd does not run in a chroot, so /run/systemd/system should not
+    exist in chroots. Debian has kept this without issue, so revert this in
+    order to reduce delta with Debian.
+    File: debian/systemd.prerm
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d7df55f11603022cde6cf897aaddc02624e79336
+  * Drop 0001-Revert-tests-add-test-case-for-UMask-BindPaths-combi.patch.
+    This patch is specific to privileged LXD containers, which we are not
+    testing anymore, so there is no need to carry the patch anymore.
+    File: debian/patches/0001-Revert-tests-add-test-case-for-UMask-BindPaths-combi.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2acbc4741346c684ea3fa8aecf1d6ed88a7444cd
+  * binfmt: fix systemd-binfmt in LXD containers (LP: #1999275)
+    Files:
+    - debian/patches/lp1999275-binfmt-check-if-binfmt-is-mounted-before-applying-rules.patch
+    - debian/patches/lp1999275-binfmt-util-also-check-if-binfmt-is-mounted-in-read-write.patch
+    - debian/patches/lp1999275-binfmt-util-split-out-binfmt_mounted.patch
+    - debian/patches/lp1999275-stat-util-introduce-fd_is_read_only_fs.patch
+    - debian/patches/lp1999275-unit-check-more-specific-path-to-be-written-by-systemd-bi.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=41fa3a0420c5633200ecd60add6cadb149c98ccd
+  * debian/patches: update test-skip-some-tests-when-machine-id-is-not-initialized.patch.
+    The latest stable tag includes some, but not all patches which [1] needs
+    to work correctly. For now, just simplify the `machine_id_initialized()`
+    helper and make a note in the patch that the changes were forwarded
+    upstream.
+    [1] https://github.com/systemd/systemd/pull/25732
+    File: debian/patches/test-skip-some-tests-when-machine-id-is-not-initialized.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d17ca14b237f477899c7af793b698dc0740985d1
+
+ -- Nick Rosbrook <nick.rosbrook@canonical.com>  Wed, 04 Jan 2023 13:56:18 -0500
+
 systemd (252.4-1) unstable; urgency=medium
 
   * Enable p11kit. Backport patch to dlopen-ify p11kit support and enable
@@ -1847,6 +3661,102 @@ systemd (252.2-1) unstable; urgency=medi
 
  -- Luca Boccassi <bluca@debian.org>  Mon, 28 Nov 2022 22:35:56 +0000
 
+systemd (252.1-1ubuntu1) lunar; urgency=medium
+
+  [ Nick Rosbrook ]
+  * Merge 252.1-1 from Debian unstable
+    - Resolve merge conflicts:
+      + debian/patches: Do not take back Add-support-for-TuxOnIce-hibernation.patch.
+      + debian/libsystemd0.symbols: Increment sd_hwdb_new_from_path min version
+        to reduce delta with Debian.
+      + debian/control: Keep Ubuntu systemd-repart delta for now.
+      + debian/rules: Keep our diff for TPM2 build on i386
+      + debian/systemd-resolved.postrm: Take Debian DPKG_ROOT changes, removing
+        the Ubuntu delta.
+    - Drop patches:
+      + Drop sd-hwdb-add-sd_hwdb_new_from_path.patch:
+        Applied upstream: https://github.com/systemd/systemd-stable/commit/60f0ba7556
+      + Drop test-copy-libgcc_s.so.1-to-TPM2-test-image-on-Debian-like.patch:
+        Applied upstream: https://github.com/systemd/systemd-stable/commit/ddbc88188c
+      + Drop lp1991829-add-CAP_LINUX_IMMUTABLE-to-systemd-machined-so-it-ca.patch:
+        Applied upstream: https://github.com/systemd/systemd-stable/commit/137d162c42
+      + Drop hwdb-implement-root-option-for-systemd-hwdb-query.patch:
+        Applied upstream: https://github.com/systemd/systemd-stable/commit/beff73f94e
+      + Drop lp1978079-pstore-Run-after-modules-are-loaded.patch:
+        Applied upstream: https://github.com/systemd/systemd-stable/commit/70e74a5997
+      + Drop debian/UBUNTU-deny-list-TEST-10-ISSUE-2467.patch:
+        It looks like this has not been a problem upstream. Let's try it again
+        in autopkgtest.
+      + Drop debian/deny-list-upstream-test-02-ppc64el.patch:
+        There was never any movement on the upstream issue. Since it has been a
+        while, let's re-enable for now to see if it is still a problem.
+      + Drop debian/deny-list-upstream-test-25.patch:
+        It's been a while, let's see if this still presents a problem.
+      + Drop lp1989969-test-deny-list-TEST-36-NUMAPOLICY-on-ppc64el.patch:
+        This is likely due to [1], and is not specific to TEST-36-NUMAPOLICY.
+        [1] https://github.com/systemd/systemd/issues/25091
+      + Drop lp1950794-Revert-sd-dhcp-do-not-use-detect_container-to-guess-.patch:
+        This patch no longer applies, see:
+        https://github.com/systemd/systemd/commit/14805b1468
+    - Refresh patches
+    - debian/gbp.conf: Update debian-branch to ubuntu-lunar
+      File: debian/gbp.conf
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=aa7b7c457ce90478b38fc73e628f8b5a4874614f
+    - debian/rules: do not enable libqrencode on i386
+      Files:
+      - debian/control
+      - debian/rules
+      - debian/tests/control
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3ed5e1433e2ee05e2941f0e16ebc482933a382fd
+    - Add handling for /etc/default/locale to firstboot.
+      The TEST-74-AUX-UTILS upstream test revealed that firstboot does not
+      currently handle Debian's /etc/default/locale.
+      File: debian/patches/debian/Use-Debian-specific-config-files.patch
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=9dc07337354155b100ea0423ed090f3dc6040a7a
+    - test: remove no-longer-needed quirk for set-locale on Debian/Ubuntu
+      File: debian/patches/test-remove-no-longer-needed-quirk-for-set-locale-on-Debi.patch
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e14e582fe158c7e63d6146386ec901fededa2e78
+    - oomd: always allow root-owned cgroups to set ManagedOOMPreference
+      File: debian/patches/oomd-always-allow-root-owned-cgroups-to-set-ManagedOOMPre.patch
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e2fc04c5a6dfbe4bada17f117b957febcc5356d7
+    - oomd: fix unreachable test case in test-oomd-util
+      File: debian/patches/oomd-fix-unreachable-test-case-in-test-oomd-util.patch
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a9ad5284e2730c777fbc4dd7919be1631b788c44
+    - test: make sure mount point exists in testsuite-64.sh
+      File: debian/patches/test-make-sure-mount-point-exists-in-testsuite-64.sh.patch
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1a6bae6133ebe11108b1b8515da7371e5567a189
+    - test: handle Debian's /etc/default/locale in testsuite-74.firstboot.sh
+      File: debian/patches/test-handle-Debian-s-etc-default-locale-in-testsuite-74.f.patch
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5e80690a112fb579070d99d6cbd3623f3cea790c
+    - test: skip some tests when machine-id is not initialized
+      File: debian/patches/test-skip-some-tests-when-machine-id-is-not-initialized.patch
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=362c58ae565eefc172f085dc22f5058c5d3adb85
+    - debian/tests: stop testing in privileged LXD containers
+      File: debian/tests/tests-in-lxd
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a74c46945722f9bb8d925543a0fabe64d38f7c8f
+    - debian/systemd.postinst: drop our v234-specific delta.
+      Upgrades from systems this old are not supported to Lunar and newer.
+      File: debian/systemd.postinst
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a3f79c2d259da6d0537cb4a31e0eb7bf0c2aaeff
+    - debian/tests: stop skipping test_service in boot-and-services.
+      The linked github issue has been resolved and is included in this
+      release.
+      File: debian/tests/boot-and-services
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=bdb12cb08e0f959ff875713a78cb2a3beadae87e
+    - debian/systemd-resolved.postinst: consolidate Ubuntu delta
+      File: debian/systemd-resolved.postinst
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7f6c0a62320ce5670ba9a0648ae54af24ae3dc1c
+
+  [ Luca Boccassi ]
+  * Build depend on dh-package-notes, sequence was removed.
+    Only the makefile is in use now, no files are generated at build time
+    as --package-metadata from the linkers is used now
+    Author: Luca Boccassi
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5501f9d2629d4e22dc45e6569946aefd9c78d3c6
+
+ -- Nick Rosbrook <nick.rosbrook@canonical.com>  Tue, 06 Dec 2022 11:00:38 -0500
+
 systemd (252.1-1) unstable; urgency=medium
 
   * d/watch: switch back to stable repository
@@ -2035,6 +3945,166 @@ systemd (251.4-2) unstable; urgency=medi
 
  -- Luca Boccassi <bluca@debian.org>  Fri, 26 Aug 2022 23:16:23 +0100
 
+systemd (251.4-1ubuntu7) kinetic; urgency=medium
+
+  [ Nick Rosbrook ]
+  * autopkgtest: do not allow qemu to be used on ppc64el (LP: #1992178)
+    Almost every run on ppc64el takes 12 to 24 hours, so do this as a last
+    resort to relieve pressure on autopkgtest infrastructure.
+    File: debian/tests/upstream
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5ab2b8ad13a3d7441935d6f43bb81fbd540e2c33
+
+  [ Dan Streetman ]
+  * make machinectl read-only work (LP: #1991829)
+    Author: Dan Streetman
+    File: debian/patches/lp1991829-add-CAP_LINUX_IMMUTABLE-to-systemd-machined-so-it-ca.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a8a41b11d712c8cfbf595d34f39d95096f23e202
+
+ -- Nick Rosbrook <nick.rosbrook@canonical.com>  Tue, 11 Oct 2022 11:51:25 -0400
+
+systemd (251.4-1ubuntu6) kinetic; urgency=medium
+
+  * test: deny-list TEST-36-NUMAPOLICY on ppc64el (LP: #1989969)
+    File: debian/patches/lp1989969-test-deny-list-TEST-36-NUMAPOLICY-on-ppc64el.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0f61b31fbeb57cf7e47a5f0922fd2ff47b81caa7
+  * debian/control: drop systemd-resolved Recommends: (LP: #1990187)
+    libnss-resolve was previously explicitly excluded from ubuntu-minimal,
+    and this Recommends: reverses that change. While here, drop
+    libnss-myhostname too, because it is in universe and there is no real
+    need for systemd-resolved to Recommends: it.
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=88c134fac13b738efdcc657e160350c061d0a018
+  * debian/control: set Priority: important on systemd-resolved (LP: #1990278)
+    Since this package used to be a part of the systemd binary package,
+    systemd-resolved would be installed by debootstrap by default. Retain
+    this previous behavior by setting Priority: important on
+    systemd-resolved.
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1d9ca06dfe8351ed4d03073fbafa5e2212fe4fcb
+
+ -- Nick Rosbrook <nick.rosbrook@canonical.com>  Tue, 20 Sep 2022 11:19:06 -0400
+
+systemd (251.4-1ubuntu5) kinetic; urgency=medium
+
+  * enable building systemd-boot for riscv64 (LP: #1989457) 
+
+ -- Heinrich Schuchardt <heinrich.schuchardt@canonical.com>  Tue, 13 Sep 2022 13:43:01 +0200
+
+systemd (251.4-1ubuntu4) kinetic; urgency=medium
+
+  * debian/systemd-resolved.postinst: copy existing /etc/resolv.conf on new installs (LP: #1988772)
+    Commit 20bc8a37fa ("Always setup /etc/resolv.conf on new installations.")
+    added logic to copy any existing /etc/resolv.conf to
+    /run/systemd/resolve/stub-resolv.conf before creating the final symlink.
+    When we merged the systemd-resolved package split changes from Debian,
+    this logic was not replicated, which has caused regressions.
+    Move the necessary pieces from systemd.postint to systemd-resolved.postinst
+    to maintain the previous /etc/resolv.conf logic.
+    Files:
+    - debian/systemd-resolved.postinst
+    - debian/systemd.postinst
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a34a768a929921978a67ef2192ee787255400ee5
+
+ -- Nick Rosbrook <nick.rosbrook@canonical.com>  Tue, 06 Sep 2022 19:39:59 -0400
+
+systemd (251.4-1ubuntu3) kinetic; urgency=medium
+
+  * Fix version of backported sd_hwdb_new_from_path symbol.
+    The systemd-hwdb binary calling into this library is linked statically,
+    but we still want to keep a future proof ABI, just in case.
+    Files:
+    - debian/libsystemd0.symbols
+    - debian/patches/sd-hwdb-add-sd_hwdb_new_from_path.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=dee01ca169cd41e514658f8a631847c9e852e842
+
+ -- Lukas Märdian <slyon@ubuntu.com>  Thu, 01 Sep 2022 12:42:10 +0200
+
+systemd (251.4-1ubuntu2) kinetic; urgency=medium
+
+  [ Lukas Märdian ]
+  * Provide upgrade path (Replaces:) for Jammy's systemd-repart (LP: 1897932)
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2281670aa8007179170d5cc485bb94e3bbc3b63c
+
+  [ Luca Boccassi ]
+  * resolved: switch from .links to postinst/rm (LP: #1988300)
+    dpkg refuses to install the symlink in chroot/container environments
+    where /etc/resolv.conf is bind mounted:
+    | Unpacking systemd-resolved (251.4-1) ...
+    | dpkg: error processing archive /var/cache/apt/archives/systemd-resolved_251.4-1_amd64.deb (--unpack):
+    |  unable to make backup link of './etc/resolv.conf' before installing new version: Invalid cross-device link
+    So unfortunately manual handling via maintainerscripts is necessary.
+    Use maintainer scripts to avoid failing the installation, and provide
+    feedback to the user if the symlink cannot be successfully installed.
+    Also on removal, either copy /run/systemd/resolve/resolv.conf or
+    create an empty /etc/resolv.conf.
+    Amend to use the correct Ubuntu version string (251.4-1ubuntu2).
+    Author: Luca Boccassi
+    Files:
+    - debian/systemd-resolved.links
+    - debian/systemd-resolved.postinst
+    - debian/systemd-resolved.postrm
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=faf479a6158aac977c2cdb32fd1eaecc0862a7ef
+  * resolv.conf: take backup as a fallback
+    piuparts doesn't like seeing an empty resolv.conf after removing
+    the package, so take a backup and use it in case resolved/resolv.conf
+    is not available
+    Author: Luca Boccassi
+    Files:
+    - debian/systemd-resolved.postinst
+    - debian/systemd-resolved.postrm
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c2b15f43eb7779953a3dda7f461edbb1bf038701
+
+  [ Nick Rosbrook ]
+  * debian/systemd-resolved.{postinst,postrm}: do not use DPKG_ROOT.
+    We cherry-picked "resolved: switch from .links to postinst/rm" and
+    "resolv.conf: take backup as a fallback" from debian/251.4-3 to fix a
+    systemd-resolved installation issue, but we are not taking the DPKG_ROOT
+    changes at the moment due to feature freeze.
+    Files:
+    - debian/systemd-resolved.postinst
+    - debian/systemd-resolved.postrm
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5664be09ce9813cb2dd2bd71c5d325036655c312
+
+ -- Nick Rosbrook <nick.rosbrook@canonical.com>  Wed, 31 Aug 2022 09:55:31 -0400
+
+systemd (251.4-1ubuntu1) kinetic; urgency=medium
+
+  * Merge 251.4-1 from Debian
+    - debian/rules: Keep our diff for TPM2 build on i386
+    - Drop EFI build patches.
+      An upstream patch that covers these changes was backported to the 251
+      stable branch.
+      Files:
+      - debian/patches/lp1979215-boot-efi-missing-.note.GNU-stack-section-implies-executab.patch
+      - debian/patches/lp1979236-boot-efi-set-no-warn-rwx-segments-on-arm.patch
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=983b46f110b5a6e32a28b87c4b9458442624c0cd
+    - Drop debian/patches/units-remove-the-restart-limit-on-the-modprobe-.service.patch.
+      This patch was backported to the 251 stable branch.
+      File: debian/patches/units-remove-the-restart-limit-on-the-modprobe-.service.patch
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=959fe326da87466775b37088e9bfd476056373ea
+    - debian/rules: update i386 debugedit workaround.
+      This linuxia32.elf.stub is shipped with systemd-boot-efi now, so update
+      the workaround to include that path as well.
+      File: debian/rules
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=354f9fccc94dcb0d555329921510d5f22e62351a
+  * test: denylist TEST-29-PORTABLE again
+    File: debian/patches/test-denylist-TEST-29-PORTABLE-again.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6036de78481f8cbf3e8f3a52dac711c732d80c59
+  * debian/control: add systemd-resolved to systemd's Recommends:
+    In Ubuntu, systemd-resolved is used by default, so after the
+    systemd-resolved package split, we should have a stronger relationship
+    than Suggests: systemd-resolved.
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=400bf9dd2cf83c91f47326769eff0259429f3e0a
+  * debian/control: add Recommends: systemd-hwe-hwdb to udev.
+    The systemd-hwe-hwdb brings in additional hwdb rules for HWE, so we want
+    those installed with udev by default.
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=148d8d9cd4c260559ad944de3427f183e04858cc
+
+ -- Nick Rosbrook <nick.rosbrook@canonical.com>  Tue, 23 Aug 2022 17:45:48 -0400
+
 systemd (251.4-1) unstable; urgency=medium
 
   * New upstream version 251.4
@@ -2191,6 +4261,164 @@ systemd (251.2-3) experimental; urgency=
 
  -- Luca Boccassi <bluca@debian.org>  Wed, 08 Jun 2022 23:56:04 +0100
 
+systemd (251.2-2ubuntu2) kinetic; urgency=medium
+
+  [ Lukas Märdian ]
+  * Remove restart limit on the modprobe@.service (LP: #1982462)
+    File: debian/patches/units-remove-the-restart-limit-on-the-modprobe-.service.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=46c36d4c73df8980f6b6137142fb16ba90465a94
+
+  [ Nick Rosbrook ]
+  * core,firstboot: workaround timezone issues on Ubuntu Core (LP: #1981042)
+    Thanks to Robert Ancell for preparing the patch.
+    File: debian/patches/lp1981042-core-firstboot-workaround-timezone-issues-caused-by-Ubunt.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=9a435d43e753f39531c9a5517a85e8eb259e18f1
+  * pstore: do not try to load mtdpstore (LP: #1981622)
+    File: debian/patches/lp1978079-pstore-Run-after-modules-are-loaded.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=38d8d12be924477f0eecb64f3737e07b03d73a42
+
+ -- Nick Rosbrook <nick.rosbrook@canonical.com>  Fri, 22 Jul 2022 15:23:45 -0400
+
+systemd (251.2-2ubuntu1) kinetic; urgency=medium
+
+  [ Nick Rosbrook ]
+  * Merge to Ubuntu from Debian unstable
+    - Dropped patches (applied upstream)
+      + test-explicitly-configure-oomd-stuff-via-dropins.patch
+      + test-enable-systemd-oomd.service.patch
+      + linux-5.15-compat-ioprio/shared-split-out-ioprio-related-stuff-into-ioprio-util.-c.patch
+      + linux-5.15-compat-ioprio/variuos-add-missing-includes.patch
+      + linux-5.15-compat-ioprio/man-don-t-mention-IOSchedulingClass-none-anymore-in-the-d.patch
+      + linux-5.15-compat-ioprio/test-add-test-for-ioprio-normalization.patch
+      + linux-5.15-compat-ioprio/Define-ioprio_-get-set-the-same-as-other-compat-syscalls.patch
+      + linux-5.15-compat-ioprio/Get-rid-of-ioprio.h-and-add-a-minimalistic-reimplementati.patch
+      + linux-5.15-compat-ioprio/ioprio-util-add-macro-for-default-ioprio-settings.patch
+      + linux-5.15-compat-ioprio/ioprio-normalize-io-priority-values-in-configuration.patch
+      + linux-5.15-compat-ioprio/core-normalize-ioprio-values-we-acquire-from-kernel.patch
+      + test-also-show-the-memory-pressure-of-testchill.service.patch
+      + test-make-test-55-oomd-less-flaky.patch
+      + lp1964494-network-do-not-enable-IPv4-ACD-for-IPv4-link-local-a.patch
+      + lp1966381-oomd-calculate-used-memory-with-MemAvailable-instead-of-M.patch
+      + lp1926860-hwdb-remove-the-tablet-pad-entry-for-the-UC-Logic-1060N.patch
+      + oomd-move-oomctl-to-bindir.patch
+      + test-enable-debug-logging-of-systemd-oomd.patch
+      + lp1943561/Add-additional-Dell-models-that-require-ACCEL_LOCATION-ba.patch
+      + lp1943561/Use-SKU-to-identify-Dell-clamshell-models-for-acceleromet.patch
+      + lp1929345/hwdb-Force-release-calculator-key-on-all-HP-OMEN-laptops.patch
+      + lp1929345/hwdb-Add-force-release-for-HP-Omen-15-calculator-key.-205.patch
+      + sysusers-split-up-systemd.conf.patch
+      + hwdb-Add-mic-mute-key-mapping-for-HP-Elite-x360.patch
+      + test-check-memory-pressure-more-frequently.patch
+      + meson-minor-cleanup.patch
+      + units-don-t-install-dbus-org.freedesktop.oom1.service-ali.patch
+      + lp1950508-cgroup-check-if-any-controller-is-in-use-as-v1.patch
+      + lp1952735-keymap-Add-microphone-mute-keymap-for-Dell-Machine.patch
+      + test-tweak-parameters-for-TEST-55-OOMD.patch
+      + deny-list-TEST-29-PORTABLE-and-TEST-50-DISSECT.patch
+      + lp1955997-unmask-intel-hid-for-HP-machines.patch
+      + lp1952733-hwdb-60-keyboard-Update-Dell-Privacy-Micmute-Hotkey-Map.patch
+      + Merge-pull-request-20705-from-yuwata-test-oomd-util.patch
+    - Refreshed patches
+      + debian/Ubuntu-UseDomains-by-default.patch
+      + debian/UBUNTU-Support-system-image-read-only-etc.patch
+      + Revert-network-if-sys-is-rw-then-udev-should-be-around.patch
+      + debian/UBUNTU-src-test-testmount-util.c-Skip-parts-of-test-mount-util-in-LXC.patch
+      + lp1950794-Revert-sd-dhcp-do-not-use-detect_container-to-guess-.patch
+      + 0001-Revert-tests-add-test-case-for-UMask-BindPaths-combi.patch
+  * Drop debian/Ubuntu-core-in-execute-soft-fail-setting-Nice-priority-when.patch.
+    This patch was originally proposed upstream in [1], but was later
+    superseded by [2] (which eventually got committed upstream as
+    390902012c). Thus, we should not need to carry this patch anymore.
+    [1] https://github.com/systemd/systemd/pull/6503
+    [2] https://github.com/systemd/systemd/pull/11397
+    File: debian/patches/debian/Ubuntu-core-in-execute-soft-fail-setting-Nice-priority-when.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f1b7fdbe2f1f9be35a1e7bec104e87643718e082
+  * Drop Add-support-for-TuxOnIce-hibernation.patch.
+    This patch adds support for TuxOnIce hibernation, which requires an
+    out-of-tree kernel patch to be operable. Given that this functionality
+    is not appropriate for upstream systemd, the kernel never accepted
+    TuxOnIce, and the project appears to be largely unmaintained, it does
+    not seem appropriate to carry this patch in Ubuntu.
+    See [1] for original Debian discussion of this patch.
+    [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746463
+    File: debian/patches/debian/Add-support-for-TuxOnIce-hibernation.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=33a592e26c50cb544713ae82ab42872775c2c583
+  * Drop -Dtpm-pcrindex build option.
+    Support for this was dropped in faacf1807e8fcbee4bf60495e0145e4522d76393.
+    However, following discussion in [1], upstream changed the hardcoded PCR
+    index for kernel command line measurement from 8 to 12 in
+    4d32507f5186a89e98093659fbbe386787a97b9f. Thus, there is no functional
+    change here.
+    [1] https://github.com/systemd/systemd/issues/22635
+    File: debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=03464b170d5db5d2ebb77bea1f3706e55b645148
+  * debian/gbp.conf: Update debian-branch to ubuntu-kinetic
+    File: debian/gbp.conf
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2bf42327dfda5e666d15d1a715c3403f5fbc74a3
+  * Do not build with tpm libraries on i386
+    libtss2-dev is not built for i386, so do not try to build against it in
+    that case.
+    Files:
+    - debian/control
+    - debian/rules
+    - debian/tests/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3c48036b9d0e3fbd4b209c2312134d431da66b17
+  * d/t/boot-and-services: Ignore failed snap mount units in test_no_failed
+    (LP: #1967576)
+    File: debian/tests/boot-and-services
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=075d08b15ab944021f392cef32d3ee877e844c5c
+  * Skip exec-specifier-credentials-dir.service test in LXC.
+    This test fails in privileged LXC containers, and a set of tests are
+    already patched out for this reason. Refresh this patch to also skip the
+    new test.
+    File: debian/patches/debian/UBUNTU-src-test-test-execute.c-Skip-parts-of-test-execute-in-con.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1f1f105b1ecc6b5e9f4fe1f851f4c7be6da4ef81
+  * boot/efi: ignore 'missing .note.GNU-stack section implies executable stack' warning (LP: #1979215)
+    File: debian/patches/lp1979215-boot-efi-missing-.note.GNU-stack-section-implies-executab.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5ce8112c93097bcfe99795580d3e61bd32d7e742
+  * boot/efi: set --no-warn-rwx-segments on arm (LP: #1979236)
+    File: debian/patches/lp1979236-boot-efi-set-no-warn-rwx-segments-on-arm.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d0d97980410802ea4402b7826dc172e2ee79af31
+  * pstore: Run after modules are loaded (LP: #1978079)
+    File: debian/patches/lp1978079-pstore-Run-after-modules-are-loaded.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=988e120566a1f2f57bc86143283c986a12f1a13a
+  * hwdb: implement --root option for systemd-hwdb query
+    Files:
+    - debian/libsystemd0.symbols
+    - debian/patches/hwdb-implement-root-option-for-systemd-hwdb-query.patch
+    - debian/patches/sd-hwdb-add-sd_hwdb_new_from_path.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=031d5b5cfc8ad64df5eca604314b8aeda5455def
+  * test: increase QEMU_MEM for some tests
+    File: debian/patches/test-increase-QEMU_MEM-for-some-tests.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=24a49e196d63015cc466d4d38f1cd523d87cb0be
+  * autopkgtest: skip CoredumpTest on s390x (LP: #1980003)
+    File: debian/tests/boot-and-services
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8c8cf122ba7921f3d952688d32bd834c855f537f
+  * systemd-oomd: set ManagedOOMSwap=auto on -.slice (LP: #1972159)
+    This has the effect of disabling swap kill by default, so cgroups will
+    only be monitored for memory pressure, and not swap usage.
+    File: debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a03b493a8ffa9b39161347fae418f56f0d7dbdeb
+  * debian/control: drop unnecessary 'Section:' from systemd-oomd
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=546cfce76d2648d1fba7d65d70f21b44482288f4
+  * autopkgtest: add libgcc-s1 for TEST-70-TPM2
+    File: debian/tests/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7a9a7bcd39476088e878f7cbd79c9dab6019d056
+  * test: copy libgcc_s.so.1 to TPM2 test image on Debian-like systems
+    File: debian/patches/test-copy-libgcc_s.so.1-to-TPM2-test-image-on-Debian-like.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8d1acca269463693f9485ed6904dd2604d3ca5dc
+
+  [ Lukas Märdian ]
+  * Run tests-in-lxd autopkgtest via LXD snap, deb is no more (LP: #1976607)
+    Author: Lukas Märdian
+    Files:
+    - debian/tests/control
+    - debian/tests/tests-in-lxd
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b224dd958fe6260886265d170eb3d12467fbabaa
+
+ -- Nick Rosbrook <nick.rosbrook@canonical.com>  Wed, 29 Jun 2022 11:16:00 -0400
+
 systemd (251.2-2) unstable; urgency=medium
 
   * sha256: fix compilation on efi-ia32
@@ -2566,6 +4794,186 @@ systemd (250~rc3-1) experimental; urgenc
 
  -- Michael Biebl <biebl@debian.org>  Tue, 21 Dec 2021 01:10:16 +0100
 
+systemd (249.11-0ubuntu4) kinetic; urgency=medium
+
+  * d/p/lp1964494-network-do-not-enable-IPv4-ACD-for-IPv4-link-local-a.patch:
+    do not enable IPv4 ACD for IPv4 link-local address if ACD is
+    disabled explicitly (LP: #1964494)
+
+ -- Dan Streetman <ddstreet@ieee.org>  Tue, 31 May 2022 08:25:36 -0400
+
+systemd (249.11-0ubuntu3.1) jammy; urgency=medium
+
+  [ Andy Chi ]
+  * Add mic mute key support for HP Elite x360 series (LP: #1967038)
+    Author: Andy Chi
+    File: debian/patches/hwdb-Add-mic-mute-key-mapping-for-HP-Elite-x360.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=45e809103de9c356c75b692d35089e8770602617
+
+ -- Lukas Märdian <slyon@ubuntu.com>  Thu, 21 Apr 2022 14:14:26 +0200
+
+systemd (249.11-0ubuntu3) jammy; urgency=medium
+
+  * oomd: calculate 'used' memory with MemAvailable instead of MemFree (LP: #1966381)
+    File: debian/patches/lp1966381-oomd-calculate-used-memory-with-MemAvailable-instead-of-M.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=15fc4c53d726e1dcae7296a9306cfd453fd1a046
+  * hwdb: remove the tablet pad entry for the UC-Logic 1060N (LP: #1926860)
+    File: debian/patches/lp1926860-hwdb-remove-the-tablet-pad-entry-for-the-UC-Logic-1060N.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7bf31946a52e55f9f6ea4ecfa30e311685b20997
+
+ -- Nick Rosbrook <nick.rosbrook@canonical.com>  Thu, 07 Apr 2022 15:28:15 -0400
+
+systemd (249.11-0ubuntu2) jammy; urgency=medium
+
+  * Fix calculator key on HP Omen, using upstream 6f2353a & 7092021 (LP: #1929345)
+    Files:
+    - debian/patches/lp1929345/hwdb-Add-force-release-for-HP-Omen-15-calculator-key.-205.patch
+    - debian/patches/lp1929345/hwdb-Force-release-calculator-key-on-all-HP-OMEN-laptops.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f834f64842191c7c7af450806964297babc764d5
+
+ -- Lukas Märdian <slyon@ubuntu.com>  Fri, 18 Mar 2022 17:12:07 +0100
+
+systemd (249.11-0ubuntu1) jammy; urgency=medium
+
+  * Merge 249.11 bugfix release from upstream systemd-stable
+  * Drop patches applied in upstream systemd-stable v249.11
+    File: debian/patches/pid1-set-SYSTEMD_NSS_DYNAMIC_BYPASS-1-env-var-for-dbus-da.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=67b0362ae91711e037e89ba72af947b788319be5
+  * Refresh patches
+    File: debian/patches/debian/UBUNTU-wait-online-exit-if-no-links-are-managed.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ef686a8d28ab452ae4756ab2367a322be66d6262
+
+ -- Lukas Märdian <slyon@ubuntu.com>  Mon, 14 Mar 2022 10:57:42 +0100
+
+systemd (249.10-0ubuntu2) jammy; urgency=medium
+
+  * Fix deadlock between pid1 and dbus-daemon (LP: #1871538)
+    File: debian/patches/pid1-set-SYSTEMD_NSS_DYNAMIC_BYPASS-1-env-var-for-dbus-da.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=100a7bfc2d0f82c3afbede04a022c655529cffac
+  * Don't override Ubuntu's default sysctl values (LP: #1962038)
+    File: debian/patches/debian/UBUNTU-Don-t-override-Ubuntu-s-default-sysctl-values-LP-1962038.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b10cdb7da3539b3a3c3e619b470a75c83e46ef11
+
+ -- Lukas Märdian <slyon@ubuntu.com>  Tue, 08 Mar 2022 14:58:00 +0100
+
+systemd (249.10-0ubuntu1) jammy; urgency=medium
+
+  [ Lukas Märdian ]
+  * Merge 249.10 from upstream
+  * Denylist 29-PORTABLE & 50-DISSECT
+    Files:
+    - debian/patches/deny-list-TEST-29-PORTABLE-and-TEST-50-DISSECT.patch
+    - debian/patches/deny-list-TEST-29-PORTABLE-on-ppc64el.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c16d9b8201f2321395f817e77ec07df5aef152a9
+
+ -- Lukas Märdian <slyon@ubuntu.com>  Wed, 16 Feb 2022 19:08:40 +0100
+
+systemd (249.9-0ubuntu2) jammy; urgency=medium
+
+  * Skip flaky 55-OOMD test on ppc64el
+    File: debian/patches/deny-list-TEST-55-OOMD-on-ppc64el.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=211f8962ce89d416c2866444e0e2da794ecd5dd1
+
+ -- Lukas Märdian <slyon@ubuntu.com>  Fri, 28 Jan 2022 10:46:41 +0100
+
+systemd (249.9-0ubuntu1) jammy; urgency=medium
+
+  [ Lukas Märdian ]
+  * Merge 249.7-1 from Debian
+    - d/rules: re-enable LTO
+      File: debian/rules
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=616eb2eb7d2b30e50acc9cccdc39a7264c5582fb
+    - Refresh and drop patches, applied upstream
+      Files:
+      - debian/patches/Merge-pull-request-20705-from-yuwata-test-oomd-util.patch
+      - debian/patches/lp1952599/0001-virt-Support-detection-for-ARM64-Hyper-V-guests.patch
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=877259bfeb7106a923b3066ad2c10fba2405195e
+  * Merge 249.9 from upstream
+    - Refresh and drop patches, applied upstream
+      Files:
+      - debian/patches/CVE-2021-3997-1.patch
+      - debian/patches/CVE-2021-3997-2.patch
+      - debian/patches/CVE-2021-3997-3.patch
+      - debian/patches/linux-5.15-compat-ioprio/test-make-test-execute-pass-on-Linux-5.15.patch
+      - debian/patches/lp1952599/0002-virt-Fix-the-detection-for-Hyper-V-VMs.patch
+      - debian/patches/rm-rf-optionally-fsync-after-removing-directory-tree.patch
+      - debian/patches/rm-rf-refactor-rm-rf-children-split-out-body-of-directory.patch
+      - debian/patches/debian/udev-drop-SystemCallArchitectures-native-from-systemd-ude.patch
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=21b655193a5b91415d75516e458dcc5bce8855c0
+    - Disable new test case for UMask=+BindPaths= combination (LP: #1959013)
+      File: debian/patches/0001-Revert-tests-add-test-case-for-UMask-BindPaths-combi.patch
+      https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5e9df936d2625c84856b101881e217064571e7e7
+  * Fix build in local git tree
+    meson is checking `git ls-files` if built inside a git tree (dpkg-buildpackage,
+    gbp buildpackage) and complaining about the missing src/basic/ioprio.h file.
+    So we should keep that file around (empty) to avoid this failure.
+    File: debian/patches/linux-5.15-compat-ioprio/Get-rid-of-ioprio.h-and-add-a-minimalistic-reimplementati.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=94f21032cd1d6e9dfae8d8f892bc627dbf9b4414
+  * Add lp1955997-unmask-intel-hid-for-HP-machines.patch (LP: #1955997)
+    File: debian/patches/lp1955997-unmask-intel-hid-for-HP-machines.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b90d59c81a1fd8a00e10147b1f5fd9bcf135d40e
+  * d/rules: Enable build of systemd-oomd
+    File: debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f4e16926c4e146f0b106a277b5b499c78db82bcb
+  * d/control: Ship oomd in a systemd-oomd package.
+    Deploying the default configuration as used in Fedora.
+    Files:
+    - debian/control
+    - debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf
+    - debian/extra/systemd-oomd-defaults/oomd.conf.d/10-oomd-defaults.conf
+    - debian/extra/systemd-oomd-defaults/user@.service.d/10-oomd-user-service-defaults.conf
+    - debian/systemd-oomd.install
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=771fee9e73316c92e065e93946ec64c578b43706
+  * Start systemd-oomd.service after package installation
+    File: debian/systemd-oomd.postinst
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d330cee174bd0e62a344d2aec4ec7435c9484fa2
+  * Cherry-pick upstream fixes to make 55-OOMD test less flaky
+    Files:
+    - debian/patches/test-also-show-the-memory-pressure-of-testchill.service.patch
+    - debian/patches/test-check-memory-pressure-more-frequently.patch
+    - debian/patches/test-enable-debug-logging-of-systemd-oomd.patch
+    - debian/patches/test-make-test-55-oomd-less-flaky.patch
+    - debian/patches/test-tweak-parameters-for-TEST-55-OOMD.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7054dcaf04b028a092c58cf638847b2266377218
+
+  [ Michael Biebl ]
+  * oomd: move oomctl to bindir
+    Author: Michael Biebl
+    Files:
+    - debian/patches/oomd-move-oomctl-to-bindir.patch
+    - debian/systemd-oomd.install
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6ce915c31c8daf3aec8b6d0e7b9712e21a87fa10
+  * test: explicitly configure oomd stuff via dropins
+    Author: Michael Biebl
+    File: debian/patches/test-explicitly-configure-oomd-stuff-via-dropins.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=11d415ee259f5642165e64ddd5d65d344515da66
+  * Don't install dbus-org.freedesktop.oom1.service symlink (Closes: #1003580)
+    Author: Michael Biebl
+    Files:
+    - debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch
+    - debian/patches/test-enable-systemd-oomd.service.patch
+    - debian/patches/units-don-t-install-dbus-org.freedesktop.oom1.service-ali.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b6df52f078fe61acf171300648f87116cf7dac74
+  * autopkgtest: add systemd-oomd dependency to upstream test.
+    We want systemd-oomd to be tested via the upstream provided
+    TEST-55-OOMD.
+    Author: Michael Biebl
+    File: debian/tests/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fd80b766c4194c88486ebc62ca7d02b9f41a6454
+
+  [ Luca Boccassi ]
+  * systemd-oomd: add dependency on adduser.
+    Needed by postinst script
+    Author: Luca Boccassi
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=146a97963a3a8551e9bda9fe7e726c6d2bd17cec
+  * systemd-oomd: fix description-synopsis-starts-with-article Lintian warning
+    Author: Luca Boccassi
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5dfe4f9c92e924fdda9e127b339cdccb7f1b2f58
+
+ -- Lukas Märdian <slyon@ubuntu.com>  Wed, 26 Jan 2022 08:42:00 +0100
+
 systemd (249.7-1) unstable; urgency=medium
 
   * New upstream version 249.7
@@ -2615,6 +5023,185 @@ systemd (249.6-1) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Thu, 11 Nov 2021 22:04:31 +0100
 
+systemd (249.5-2ubuntu4) jammy; urgency=medium
+
+  * SECURITY UPDATE: systemd-tmpfiles could be made to crash.
+    - d/p/rm-rf-refactor-rm-rf-children-split-out-body-of-directory.patch:
+      Backport upstream patch from PR#20173
+    - d/p/rm-rf-optionally-fsync-after-removing-directory-tree.patch:
+      Backport upstream patch required for CVE-2021-3997 patches
+    - d/p/CVE-2021-3997-1.patch: Backport upstream patch to refactor
+      rm_rf_children_inner()
+    - d/p/CVE-2021-3997-2.patch: Backport upstream patch to refactor
+      rm_rf()
+    - d/p/CVE-2021-3997-3.patch: Backport upstream patch to loop over
+      nested directories instead of using recursion
+    - CVE-2021-3997
+
+ -- Alex Murray <alex.murray@canonical.com>  Mon, 10 Jan 2022 10:56:19 +1030
+
+systemd (249.5-2ubuntu3) jammy; urgency=medium
+
+  * Fix Linux >= 5.15 compat (ioprio API/test-execute)
+    Files:
+    - debian/patches/linux-5.15-compat-ioprio/Define-ioprio_-get-set-the-same-as-other-compat-syscalls.patch
+    - debian/patches/linux-5.15-compat-ioprio/Get-rid-of-ioprio.h-and-add-a-minimalistic-reimplementati.patch
+    - debian/patches/linux-5.15-compat-ioprio/core-normalize-ioprio-values-we-acquire-from-kernel.patch
+    - debian/patches/linux-5.15-compat-ioprio/ioprio-normalize-io-priority-values-in-configuration.patch
+    - debian/patches/linux-5.15-compat-ioprio/ioprio-util-add-macro-for-default-ioprio-settings.patch
+    - debian/patches/linux-5.15-compat-ioprio/man-don-t-mention-IOSchedulingClass-none-anymore-in-the-d.patch
+    - debian/patches/linux-5.15-compat-ioprio/shared-split-out-ioprio-related-stuff-into-ioprio-util.-c.patch
+    - debian/patches/linux-5.15-compat-ioprio/test-add-test-for-ioprio-normalization.patch
+    - debian/patches/linux-5.15-compat-ioprio/test-make-test-execute-pass-on-Linux-5.15.patch
+    - debian/patches/linux-5.15-compat-ioprio/variuos-add-missing-includes.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a88474c8d9a8ea006434512905d84e42a774e1c6
+
+ -- Lukas Märdian <slyon@ubuntu.com>  Fri, 07 Jan 2022 12:28:29 +0100
+
+systemd (249.5-2ubuntu2) jammy; urgency=medium
+
+  * d/p/debian/timedatectl-lp1650688.patch,
+    d/p/debian/UBUNTU-Fix-timezone-setting-on-read-only-etc.patch:
+    Fix timedated unable to retrieve & properly set timezone on
+    read-only /etc (e.g. Ubuntu Core and system-image-based systems)
+    (LP: #1650688, LP: #1733881)
+
+ -- Ratchanan Srirattanamet <ratchanan@ubports.com>  Wed, 08 Dec 2021 09:25:28 +0100
+
+systemd (249.5-2ubuntu1) jammy; urgency=medium
+
+  * Merge to Ubuntu from Debian unstable
+    - Dropped changes (applied upstream):
+      + UBUNTU-units-disable-journald-watchdog.patch
+      + test-Allow-running-only-a-subset-of-integration-tests-by-.patch
+      + hwdb-Add-ProBook-to-use-micmute-hotkey.patch
+      + d/p/lp1931578/*.patch (ActivationPolicy=)
+      + lp1932352-hwdb-Add-mic-mute-key-mapping-for-HP-Elite-Dragonfly.patch
+      + d/p/lp1858210/*.patch (tzdata.zi)
+      + lp1914740-network-enable-DHCP-broadcast-flag-if-required-by-in.patch
+      + lp1934981-correct-suspend-then-sleep-string.patch
+      + CVE-2020-13529.patch
+      + CVE-2021-33910.patch
+      + Merge-pull-request-20199-from-ddstreet-unit_cgroup_catchu.patch
+      + udev-fix-slot-based-network-names-on-s390.patch
+      + udev-add-missing-initialization-to-fix-freeing-invalid-ad.patch
+      + udev-allow-onboard-index-up-to-65535.patch
+      + lp1940635.patch (networkd failed to acquire a DHCP6 lease, v249.5)
+  * debian/gbp.conf: Update debian-branch to ubuntu-jammy
+    File: debian/gbp.conf
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f35b4d6c0653c3125b2e0e5d962f84543733c3c0
+  * Refresh Ubuntu-UseDomains-by-default.patch
+    File: debian/patches/debian/Ubuntu-UseDomains-by-default.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6e3b2ffb1c2c2bf2223f91b350c1fd06b8903346
+  * Refresh UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch
+    File: debian/patches/debian/UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7142fb9381ab98d750a7c2473087ea7264be860d
+  * Refresh UBUNTU-Revert-cgroup-Continue-unit-reset-if-cgroup-is-busy.patch
+    File: debian/patches/debian/UBUNTU-Revert-cgroup-Continue-unit-reset-if-cgroup-is-busy.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3de0f444bfc0cf3b601c4a1ad8939d2cd69cdad6
+  * Refresh UBUNTU-resolved-default-no-negative-caching.patch
+    File: debian/patches/debian/UBUNTU-resolved-default-no-negative-caching.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d7b25651ea7ceae2ebfeafb84d9d65fb8284367a
+  * Refresh Revert-network-if-sys-is-rw-then-udev-should-be-around.patch
+    File: debian/patches/Revert-network-if-sys-is-rw-then-udev-should-be-around.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=61b004d7710b305d9996b3ad9bb47dc372fcbbac
+  * Refresh UBUNTU-src-test-testmount-util.c-Skip-parts-of-test-mount-util-in-LXC.patch
+    File: debian/patches/debian/UBUNTU-src-test-testmount-util.c-Skip-parts-of-test-mount-util-in-LXC.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5fe343a0fc89771820f997c2d6621ac517d9070f
+  * Refresh Merge-pull-request-20705-from-yuwata-test-oomd-util.patch
+    File: debian/patches/Merge-pull-request-20705-from-yuwata-test-oomd-util.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e88125e4580e29ccc4417464301d68a23f313415
+  * Refresh patches/offset, using gbp
+    Files:
+    - debian/patches/debian/UBUNTU-Revert-namespace-be-more-careful-when-handling-namespacin.patch
+    - debian/patches/debian/UBUNTU-Support-system-image-read-only-etc.patch
+    - debian/patches/debian/UBUNTU-journald.service-set-Nice-1-to-dodge-watchdog-on-soft-loc.patch
+    - debian/patches/debian/UBUNTU-src-test-test-execute.c-Skip-parts-of-test-execute-in-con.patch
+    - debian/patches/debian/UBUNTU-test-sleep-skip-test_fiemap-upon-inapproriate-ioctl-.patch
+    - debian/patches/debian/UBUNTU-units-block-CAP_SYS_MODULE-units-in-containers-too.patch
+    - debian/patches/debian/UBUNTU-wait-online-exit-if-no-links-are-managed.patch
+    - debian/patches/debian/Ubuntu-core-in-execute-soft-fail-setting-Nice-priority-when.patch
+    - debian/patches/lp1861941-dont-generate-disk-byuuid-for-bcache-uuid.patch
+    - debian/patches/lp1894622-Add-systemd-resolve-backwards-compatibility-section-.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fd33ff25c6aa25f33054053c06f2936d51e8f645
+  * debian/rules: Fix FTBFS on i386 by removing unneeded linuxia32.elf.sub to avoid
+    debugedit errors
+    File: debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=381cc855978f441f6f45f215a7c864e61d67ab0a
+  * debian/control: cleanup (upstart is no more)
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e93509e1970ee170e4a4ed655c55f55446e4078d
+  * debian/systemd.NEWS: re-add comment about cgroups v2
+    File: debian/systemd.NEWS
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=51a7a11dba9a6248b8575c05c00e70aa6b9141fb
+  * debian/rules: explicitly enable default-hierarchy=unified
+    to stay in line with Debian
+    File: debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b6804a5aee1bcf1dfd3415c048cbf94d482652a2
+  * debian/udev.postinst: Drop old 'getent group kvm' workaround
+    File: debian/udev.postinst
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=081fddb76415eb959fd898b503eec0354d44fb31
+  * d/t/boot-and-services: skip test_service, broken on kernel > 5.10
+    (systemd#20989)
+    File: debian/tests/boot-and-services
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8ca6fbb84ccd09c4e199dec9fd9536c0b3637bc5
+  * d/t/tests-in-lxd: account for different locations of source tree
+    File: debian/tests/tests-in-lxd
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f454c89619915566af2644b14eada41075631f6a
+  * d/t/control: fix upstream* test dependencies
+    File: debian/tests/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ca404329f73f90316241680985ee8721d27d6092
+  * d/t/tests-in-lxd: work around systemd-sysusers issue on privileged containers
+    (LP: #1950787)
+    File: debian/tests/tests-in-lxd
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d4e05ecbc1a32d2e6d454c05a2899058c3a04bac
+  * Drop units-Don-t-start-systemd-udev-trigger.service-in-a-conta.patch
+    we do run udevd in our containers and actually rely on udevadm trigger
+    happening on boot for the udev database to populate with the relevant
+    network devices that are present in the container
+    It was added when systemd upstream made udevadm trigger more picky
+    (would fail when it used to succeed), but they now have failures from udevadm
+    ignored in the upstream unit
+    making this patch un-necessary and actually harmful to those running Ubuntu in
+    system containers
+    File: debian/patches/units-Don-t-start-systemd-udev-trigger.service-in-a-conta.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ba89ae0b007e1fed3d9e1b2aefa86cf9c6e7a022
+  * Drop lp1894622-Add-systemd-resolve-backwards-compatibility-section-.patch.
+    The systemd-resolve symlink for backwards compatibility is no more as of v249
+    File: debian/patches/lp1894622-Add-systemd-resolve-backwards-compatibility-section-.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c26f6843f498966e8506e71870255b627fcbd7c7
+  * Revert: sd-dhcp: do not use detect_container() to guess udev is running or not
+    (LP: #1950794)
+    File: debian/patches/lp1950794-Revert-sd-dhcp-do-not-use-detect_container-to-guess-.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=794597758ac9527b81696bb785d99cd2ddfa2707
+  * Support detection for ARM64 Hyper-V guests (LP: #1952599)
+    Files:
+    - debian/patches/lp1952599/0001-virt-Support-detection-for-ARM64-Hyper-V-guests.patch
+    - debian/patches/lp1952599/0002-virt-Fix-the-detection-for-Hyper-V-VMs.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=57f51781646327832f15294368842da015f3c433
+
+  [ Yao Wei ]
+  * Add ACCEL_LOCATION=base property for Dell clamshell models (LP: #1943561)
+    Files:
+    - debian/patches/lp1943561/Add-additional-Dell-models-that-require-ACCEL_LOCATION-ba.patch
+    - debian/patches/lp1943561/Use-SKU-to-identify-Dell-clamshell-models-for-acceleromet.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=9f99081482b76a7b717e39ef4380f08093e4359a
+
+  [ Andy Chi ]
+  * Add privacy micmute hotkey for Dell machine. (LP: #1952733)
+    File: debian/patches/lp1952733-hwdb-60-keyboard-Update-Dell-Privacy-Micmute-Hotkey-Map.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e590db02f015a0e999909b67e0cefbb4295c53a5
+  * Add microphone mute key for Dell machine. (LP: #1952735)
+    File: debian/patches/lp1952735-keymap-Add-microphone-mute-keymap-for-Dell-Machine.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=03799d7649fd5e0dae226c81441932d19cb6cc36
+
+  [ Dan Streetman ]
+  * d/p/lp1950508-cgroup-check-if-any-controller-is-in-use-as-v1.patch:
+    Use cgroupv1 in container if host using cgroupv1
+    (LP: #1950508)
+
+ -- Lukas Märdian <slyon@ubuntu.com>  Thu, 02 Dec 2021 10:16:33 +0100
+
 systemd (249.5-2) unstable; urgency=medium
 
   [ Helmut Grohne ]
@@ -2774,6 +5361,163 @@ systemd (249~rc1-1) experimental; urgenc
 
  -- Michael Biebl <biebl@debian.org>  Thu, 17 Jun 2021 18:09:43 +0200
 
+systemd (248.3-1ubuntu8) impish; urgency=medium
+
+  [ Dan Streetman ]
+  * d/p/dell-clamshell-accel-location-base-with-sku.patch:
+    Revert incorrect patch (LP: #1942899)
+
+  [ Lukas Märdian ]
+  * Add d/p/Merge-pull-request-20705-from-yuwata-test-oomd-util.patch
+    Replace lp1942113.patch with upstream commit 54966b7 (LP: #1942113)
+    Files:
+    - debian/patches/lp1942113.patch
+    - debian/patches/Merge-pull-request-20705-from-yuwata-test-oomd-util.patch
+  * Drop snapd cgroupv2 workaround, not needed anymore as of snapd 2.53~pre1
+    File: debian/tests/tests-in-lxd
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f9f340f74abdc4060cfd27a7cb3001929b6f9cf4
+
+ -- Lukas Märdian <slyon@ubuntu.com>  Mon, 04 Oct 2021 11:23:28 +0200
+
+systemd (248.3-1ubuntu7) impish; urgency=medium
+
+  * d/tests/tests-in-lxd: suppress the cgroups v2 warning on stderr from
+    lxd/lxc even more comprehensively until the snapd change required to
+    do it nicely gets into a release.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Wed, 01 Sep 2021 19:21:58 +1200
+
+systemd (248.3-1ubuntu6) impish; urgency=medium
+
+  * Replace my patch in previous upload with upstream's functionally similar
+    but much more elegant fix.
+  * d/patches/lp1942113.patch: Do not run a test that fails in a container
+    (this has only started running because 248.3-1ubuntu4 changed to default
+    to a unified cgroups hierarchy). (LP: #1942113)
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Tue, 31 Aug 2021 22:59:13 +1200
+
+systemd (248.3-1ubuntu5) impish; urgency=medium
+
+  * d/patches/lp1940635.patch: Pass a larger control message buffer to recvmsg
+    in icmp6_receive to have enough room for glibc 2.34's timestamp
+    translation games. (LP: #1940635)
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Sun, 29 Aug 2021 23:11:50 +1200
+
+systemd (248.3-1ubuntu4) impish; urgency=medium
+
+  [ Yao Wei ]
+  * d/p/dell-clamshell-accel-location-base-with-sku.patch:
+    Use SKU to identify Dell clamshell models for accelerometer properties
+    (LP: #1938259)
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d02cab1a9aad017b68ca1117bf3f0bbcb1b9315c
+
+  [ Simon Chopin ]
+  * d/p/lp1914740-network-enable-DHCP-broadcast-flag-if-required-by-in.patch:
+    - Apply upstream patch to fix Hipersocket DHCP mode (LP: #1914740)
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=9e20d2f9d70b25782bdd1c7dbec0d179604b88cc
+
+  [ Dan Streetman ]
+  * d/p/lp1934981-correct-suspend-then-sleep-string.patch:
+    Fix sleep verb used by logind during suspend-then-hibernate
+    (LP: #1934981)
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b09083d520fecd57ebe28319ad7638442db2e2bd
+  * d/p/debian/UBUNTU-drop-kernel.-settings-from-sysctl-defaults-shipped.patch:
+    Revert patch, no reason to diverge from upstream on these sysctl settings
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8959a2640c631f026988f1fef6b1a825af6c97dd
+
+  [ Lukas Märdian ]
+  * Use upstream's default -Ddefault-hierarchy=unified. (LP: #1850667)
+    File: debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=93ba352792db14b3d21d12909b3b6f8a1165c5de
+  * tests: hide snapd cgroupv2 warning.
+    Pending release of PR https://github.com/snapcore/snapd/pull/10589
+    but it won't hurt to have it in there anyways.
+    File: debian/tests/tests-in-lxd
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c06736c1fb90d976fe5cd520b97c0272ef8fcc64
+  * Add d/p/Merge-pull-request-20199-from-ddstreet-unit_cgroup_catchu.patch
+    File: debian/patches/Merge-pull-request-20199-from-ddstreet-unit_cgroup_catchu.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=57ab55efaee92466bd5dbf046badc623188d254b
+  * Add RoCE: Predictable Interface Names (LP: #1929184)
+    Files:
+    - debian/patches/udev-add-missing-initialization-to-fix-freeing-invalid-ad.patch
+    - debian/patches/udev-allow-onboard-index-up-to-65535.patch
+    - debian/patches/udev-fix-slot-based-network-names-on-s390.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=44d2c4bef78a2cbaeaad9acd512dad89d272489c
+
+ -- Lukas Märdian <slyon@ubuntu.com>  Tue, 17 Aug 2021 12:05:30 +0200
+
+systemd (248.3-1ubuntu3) impish; urgency=medium
+
+  * SECURITY UPDATE: DoS via DHCP FORCERENEW
+    - debian/patches/CVE-2020-13529.patch: tentatively ignore FORCERENEW
+      command in src/libsystemd-network/sd-dhcp-client.c.
+    - CVE-2020-13529
+  * SECURITY UPDATE: denial of service via stack exhaustion
+    - debian/patches/CVE-2021-33910.patch: do not use strdupa() on a path
+      in src/basic/unit-name.c.
+    - CVE-2021-33910
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Tue, 20 Jul 2021 11:35:20 -0400
+
+systemd (248.3-1ubuntu2) impish; urgency=medium
+
+  [ Kai-Heng Feng ]
+  * d/p/hwdb-Add-ProBook-to-use-micmute-hotkey.patch:
+    - Add ProBook to use micmute hotkey (LP: #1930910)
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=30b96fac92d911cb725f7220a9539085a24fe5f7
+
+  [ Jeremy Szu ]
+  * d/p/lp1932352-hwdb-Add-mic-mute-key-mapping-for-HP-Elite-Dragonfly.patch:
+    - Fix micmute hotkeys on HP Elite Dragonfly (LP: #1932352)
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ac93cfcca200644b743deab94f655ccd74ff90a6
+
+  [ Dan Streetman ]
+  * d/p/debian/UBUNTU-resolved-Mitigate-DVE-2018-0001-by-retrying-NXDOMAIN-with.patch:
+    Remove no-longer-needed patch for DVE-2018-0001 (LP: #1785383)
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=943b2dd5884e67c67d6336c24352b02e17809df0
+  * d/p/lp1931578/0001-network-default-RequiredForOnline-false-if-Activacti.patch,
+    d/p/lp1931578/0002-networkctl-add-field-Required-For-Online.patch,
+    d/p/lp1931578/0003-test-add-test-to-verify-RequiredForOnline-setting-wi.patch:
+    Adjust default for RequiredForOnline when using ActivationPolicy
+    (LP: #1931578)
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d0b8629ec14396f1a5d5f7c132c9b687065136b0
+  * d/p/lp1894622-Add-systemd-resolve-backwards-compatibility-section-.patch:
+    Add man page symlink and deprecation notice for systemd-resolve
+    (LP: #1894622)
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f719185253f989d6708c894150c0878cabee6589
+  * d/p/lp1858210/0001-time-simplify-get_timezones.patch,
+    d/p/lp1858210/0002-time-split-get_timezone-into-main-function-and-zone1.patch,
+    d/p/lp1858210/0003-time-get-timezones-from-tzdata.zi.patch:
+    Parse tzdata.zi so timedatectl list-timezones also lists aliases
+    (LP: #1858210)
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8e5b0a7c7c4e1e29b5e81511a1145633d9b75be5
+
+ -- Dan Streetman <ddstreet@canonical.com>  Tue, 06 Jul 2021 13:37:59 -0400
+
+systemd (248.3-1ubuntu1) impish; urgency=medium
+
+  * Merge to Ubuntu from Debian unstable
+    - Dropped changes:
+      * tests: Skip test-execute in containers
+      * debian/tests/root-unittests: Skip newly failing test-mount-utils in LXC
+  * Deny-list flaky TEST-10-ISSUE-2467 on all architectures
+    Files:
+    - debian/patches/debian/UBUNTU-deny-list-TEST-10-ISSUE-2467.patch
+    - debian/patches/deny-list-upstream-test-10-s390x.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8490979f8f69214c0764d3ec882fe1339fb30323
+  * debian/tests/unit-tests:  Skip part of test-mount-util which fail in LXC.
+    The whole test-mount-util test used to be skipped before. (LP: 1878051)
+    File: debian/patches/debian/UBUNTU-src-test-testmount-util.c-Skip-parts-of-test-mount-util-in-LXC.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=dd2bee75e34c3b0ccd884b4ce594c1ef301149db
+  * debian/tests/unit-tests:  Skip parts of test-execute in LXC to pass.
+    The whole test-execute test used to be skipped before. (LP: 1878051)
+    File: debian/patches/debian/UBUNTU-src-test-test-execute.c-Skip-parts-of-test-execute-in-con.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=65fdc9a4bdb91bc261f112ab51abcd77781f0520
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Fri, 21 May 2021 18:50:58 +0200
+
 systemd (248.3-1) experimental; urgency=medium
 
   [ Michael Biebl ]
@@ -2787,6 +5531,37 @@ systemd (248.3-1) experimental; urgency=
 
  -- Michael Biebl <biebl@debian.org>  Wed, 19 May 2021 13:09:57 +0200
 
+systemd (248.2-1ubuntu1) impish; urgency=medium
+
+  * Merge to Ubuntu from Debian unstable
+    - Dropped changes:
+      * Many cherry-picked upstream fixes:
+        - debian/patches/0001-hwdb-60-keyboard-Update-Dell-Privacy-Micmute-Hotkey-.patch
+        - debian/patches/lp1887744-basic-unit-file-when-loading-linked-unit-files-use-l.patch
+        - debian/patches/lp1906331-sd-event-ref-event-loop-while-in-sd_event_prepare-ot.patch
+        - debian/patches/lp1907306/*
+        - debian/patches/lp1914062-udevadm-don-t-return-early.patch
+        - debian/patches/lp1917458-udev-rules-add-rule-to-create-dev-ptp_hyperv.patch
+        - debian/patches/lp1921696/rfkill-improve-error-logging.patch
+        - debian/patches/lp1921696/rfkill-use-short-writes-and-accept-long-reads.patch
+  * debian/tests/root-unittests: Skip newly failing test-mount-utils in LXC
+    File: debian/tests/root-unittests
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=02e0d518ea9e40e81c4693dd49eec1c9aab736e7
+  * Merge lp1895418.patch to UBUNTU-resolved-default-no-negative-caching.patch
+    Files:
+    - debian/patches/debian/UBUNTU-resolved-default-no-negative-caching.patch
+    - debian/patches/test-Allow-running-only-a-subset-of-integration-tests-by-.patch
+    - debian/patches/lp1895418.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b285544ed5e3233abc54493defe65bd7525729e5
+  * Deny-list TEST-10-ISSUE-2467 again on s390x because it is flaky
+    File: debian/patches/deny-list-upstream-test-10-s390x.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a85a3471d2ef6a9dbd4e2dee90abc3d52fb5c78e
+  * Deny-list TEST-29-PORTABLE on ppc64el
+    File: debian/patches/deny-list-TEST-29-PORTABLE-on-ppc64el.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=42479a9ba8c4dc7a81266b6679ac1853307bfb67
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Thu, 13 May 2021 18:08:29 +0200
+
 systemd (248.2-1) experimental; urgency=medium
 
   * New upstream version 248.2
@@ -2937,6 +5712,32 @@ systemd (247.3-6) unstable; urgency=high
 
  -- Salvatore Bonaccorso <carnil@debian.org>  Tue, 13 Jul 2021 19:29:24 +0200
 
+systemd (247.3-5ubuntu1) impish; urgency=medium
+
+  [ Balint Reczey ]
+  * Merge to Ubuntu from Debian unstable
+    - Dropped changes:
+      * LoadCredentials: do not assert on invalid syntax (now present in Debian)
+  * debian/tests: Split upstream test to two parts.
+    The test can take very long time and may time out as it could be
+    observed in Ubuntu's CI system many times.
+    Files:
+    - debian/tests/control
+    - debian/tests/upstream
+    - debian/tests/upstream-1
+    - debian/tests/upstream-2
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a7f894c42d650e3ec62c88c34bdd693a9dfd8df6
+  * debian/gbp.conf: Update debian-branch to ubuntu-impish
+    File: debian/gbp.conf
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=98449bf7530b1b834ba71c80c1a58f2e3909c668
+
+  [ Andy Chi ]
+  * Apply upstream patch to correct key and device mapping (LP: #1926547)
+    File: debian/patches/0001-hwdb-60-keyboard-Update-Dell-Privacy-Micmute-Hotkey-.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0ad362c1975705805c94a17e1887cd3982cc192f
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Tue, 04 May 2021 14:20:02 +0200
+
 systemd (247.3-5) unstable; urgency=medium
 
   * udev-udeb: setup /dev/fd, /dev/std{in,out,err} symlinks.
@@ -2961,6 +5762,35 @@ systemd (247.3-4) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Sun, 11 Apr 2021 16:06:46 +0200
 
+systemd (247.3-3ubuntu3) hirsute; urgency=medium
+
+  * Make systemd-rfkill work with latest Linux kernels (LP: #1921696)
+    Files:
+    - debian/patches/lp1921696/rfkill-improve-error-logging.patch
+    - debian/patches/lp1921696/rfkill-use-short-writes-and-accept-long-reads.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7fc7bece33c21b155822ef6640adffb0e703da50
+  * LoadCredentials: do not assert on invalid syntax
+    File: debian/patches/LoadCredentials-do-not-assert-on-invalid-syntax.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5e7f913d0fd36b0800a8d99f809f61d263200343
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 07 Apr 2021 17:57:49 +0200
+
+systemd (247.3-3ubuntu2) hirsute; urgency=medium
+
+  [ Dan Streetman ]
+  * d/p/lp1887744-basic-unit-file-when-loading-linked-unit-files-use-l.patch:
+    Use src name, not dst name, of symlinked unit files (LP: #1887744)
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=667a881ab3bace6c4a7550067d4ecf2e4b9ece82
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Mon, 29 Mar 2021 12:22:06 +0200
+
+systemd (247.3-3ubuntu1) hirsute; urgency=medium
+
+  * Merge to Ubuntu from Debian unstable
+  * Bugfix only upload
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 17 Mar 2021 13:12:43 +0100
+
 systemd (247.3-3) unstable; urgency=medium
 
   * pkg-config: make prefix overridable again (Closes: #984763)
@@ -2973,8 +5803,16 @@ systemd (247.3-3) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Thu, 11 Mar 2021 18:09:35 +0100
 
+systemd (247.3-2ubuntu1) hirsute; urgency=medium
+
+  * Merge to Ubuntu from Debian unstable
+  * Bugfix only upload
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 10 Mar 2021 15:09:55 +0100
+
 systemd (247.3-2) unstable; urgency=medium
 
+  [ Michael Biebl ]
   * Downgrade a couple of warnings to debug.
     If a package still ships only a SysV init script or if a service file or
     tmpfile uses /var/run, downgrade those messages to debug. We can use
@@ -2993,7 +5831,92 @@ systemd (247.3-2) unstable; urgency=medi
   * table: drop trailing white spaces of the last cell in row
     (Closes: #980820)
 
- -- Michael Biebl <biebl@debian.org>  Sat, 06 Mar 2021 22:32:14 +0100
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 10 Mar 2021 15:01:50 +0100
+
+systemd (247.3-1ubuntu4) hirsute; urgency=medium
+
+  [ Dimitri John Ledkov ]
+  * d/p/debian/UBUNTU-resolved-Mitigate-DVE-2018-0001-by-retrying-NXDOMAIN-with.patch:
+    Patch updated to reduce log level to debug
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=299002546ec2d62e7f0dd7d614ba958fc9df83c2
+
+  [ Dan Streetman ]
+  * d/p/lp1906331-sd-event-ref-event-loop-while-in-sd_event_prepare-ot.patch:
+    Take event reference while processing (LP: #1906331)
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1bc38abcd3b62d317fcb62b72e26d9cb2e35ccf9
+  * d/p/lp1917458-udev-rules-add-rule-to-create-dev-ptp_hyperv.patch:
+    Create symlink for hyperv-provided ptp device (LP: #1917458)
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8f1ee790ad66395457ca64cb5f8a01fdd8aabe47
+
+  [ Balint Reczey ]
+  * Pick proposed patch for not returning early in udevadm (LP: #1914062)
+    File: debian/patches/lp1914062-udevadm-don-t-return-early.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d8c80751a97b0c6c4df972f6f8325293aa1607c4
+  * debian/tests/control: Mark systemd-fsckd flaky again.
+    As promised in LP: 1915126, until further investigation.
+    File: debian/tests/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=68fbaab272af81aab29497f7c6a3e4e6e9aa091b
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Thu, 04 Mar 2021 12:19:05 +0100
+
+systemd (247.3-1ubuntu3) hirsute; urgency=medium
+
+  * No-change rebuild to drop the udeb package.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 22 Feb 2021 10:36:23 +0100
+
+systemd (247.3-1ubuntu2) hirsute; urgency=medium
+
+  [ Stéphane Graber ]
+  * Revert the change to udevd service and sockets. They must start in LXC.
+    LXD containers do have proper uevent handling and actively send
+    uevents for udevd to handle.
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Thu, 11 Feb 2021 18:50:13 +0100
+
+systemd (247.3-1ubuntu1) hirsute; urgency=medium
+
+  [ Dan Streetman ]
+  * d/p/lp1907306/0001-sd-dhcp-client-don-t-log-timeouts-if-already-expired.patch,
+    d/p/lp1907306/0002-sd-dhcp-client-track-dhcp4-t1-t2-expire-times.patch,
+    d/p/lp1907306/0003-sd-dhcp-client-add-RFC2131-retransmission-details.patch,
+    d/p/lp1907306/0004-sd-dhcp-client-simplify-dhcp4-t1-t2-parsing.patch,
+    d/p/lp1907306/0005-sd-dhcp-client-correct-dhcpv4-renew-rebind-retransmi.patch,
+    d/p/lp1907306/0006-sd-dhcp-client-correct-retransmission-timeout-to-mat.patch,
+    d/p/lp1907306/0007-test-network-increase-wait_online-timeout-to-handle-.patch,
+    d/p/lp1907306/0008-sd-dhcp-client-fix-renew-rebind-timeout-calculation-.patch:
+    Send correct number of dhcpv4 renew and rebind requests
+    (LP: #1907306)
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=9454c4cb1b85f6f6945a29b6860e0747432318a1
+  * d/t/root-unittests:
+    Remove any corrupt journal files (LP: #1881947)
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c4f2a65d53972eec7d4cf46facb9f72e989e3af2
+
+  [ Balint Reczey ]
+  * Merge to Ubuntu from Debian unstable
+    - Dropped changes:
+      * test: use modern qemu numa arguments
+  * Switch default hierarchy (back) to hybrid again because snapd is not ready
+    yet (LP: 1850667)
+    Files:
+    - debian/rules
+    - debian/systemd.NEWS
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=4976b9474aa3b3b2587bb805472b8c37a4574346
+  * Drop reverts that used to keep netplan.io's autopkgtest happy
+    Files:
+    - debian/patches/Revert-network-fix-assertion-when-link-get-carrier.patch
+    - debian/patches/Revert-network-prevent-interfaces-to-be-initialized-multi.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=23340d4608eb9f281ecc47f7356b40f2ac8db540
+  * Fall back to device name when net_get_name(device) fails again, dropping
+    the patch to skip it
+    File: debian/patches/Skip-falling-back-to-device-name-when-net_get_name-device.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=34cfe66296463dcc8ad9ebe07add846dd955fedc
+  * Don't start udevd service and sockets in LXC.
+    LXC mounts /sys in read-write mode unlike other containers. (LP: #1914062)
+    File: debian/patches/debian/UBUNTU-Don-t-start-udevd-service-and-sockets-in-LXC.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fa63ef6891eff6762509b322429687d4d506bdb2
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 10 Feb 2021 20:21:08 +0100
 
 systemd (247.3-1) unstable; urgency=medium
 
@@ -3081,6 +6004,38 @@ systemd (247.2-1) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Sun, 20 Dec 2020 20:44:31 +0100
 
+systemd (247.1-4ubuntu1) hirsute; urgency=medium
+
+  [ Dan Streetman ]
+  * d/p/lp1905044-test-use-cap_last_cap-for-max-supported-cap-number-n.patch:
+    Fix test use of new cap numbers with 5.8 kernel (LP: #1905044)
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d55c6f8186cb2cb73f61d6ff5b2e0ded82ef265c
+
+  [ Balint Reczey ]
+  * Merge to Ubuntu from Debian unstable
+  * Refresh patches
+    - Dropped changes:
+      * debian/patches/dhcp-Allow-setting-request-options-again.patch
+        (Upstream code has been changed in a similar way)
+      * debian/patches/Revert-network-do-not-drop-foreign-config-if-interface-is.patch
+        debian/patches/network-Set-link-state-to-LINK_STATE_PENDING-instead-of-t.patch
+        (Revert-network-prevent-interfaces-to-be-initialized-multi.patch is still kept)
+      * debian/patches/lp1845909/0002-network-add-link-setting_genmode-flag.patch
+      * d/p/lp1905044-test-use-cap_last_cap-for-max-supported-cap-number-n.patch
+        (Present in upstream 247.)
+  * debian/udev.NEWS: Mention udev rules changes in 247
+    File: debian/udev.NEWS
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=9f33f19683c2b864384c2ae59b312b2c844ed633
+  * Don't start systemd-udev-trigger.service in containers.
+    It fails and is not likely to be useful.
+    File: debian/patches/units-Don-t-start-systemd-udev-trigger.service-in-a-conta.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7b04fe5f98a4d204f73a1ec22884b9b3053a9a82
+  * test: use modern qemu numa arguments (LP: #1908259)
+    File: debian/patches/test-use-modern-qemu-numa-arguments.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=158106e74d452cf6cd5cd737432cbe6b7d47286c
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 16 Dec 2020 10:27:06 +0100
+
 systemd (247.1-4) unstable; urgency=medium
 
   [ наб ]
@@ -3177,6 +6132,16 @@ systemd (247~rc2-1) experimental; urgenc
 
  -- Michael Biebl <biebl@debian.org>  Thu, 12 Nov 2020 21:23:22 +0100
 
+systemd (246.6-5ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian unstable
+  * debian/control: Make udev break systemd (<< ${binary:Version})
+    This ensures upgrading systemd as well when upgrading udev
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=9e52d28054c2c1ba118014ad9442189d7039f871
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Fri, 27 Nov 2020 15:55:01 +0100
+
 systemd (246.6-5) unstable; urgency=medium
 
   * Drop non-functional DefaultTasksMax patch.
@@ -3223,6 +6188,35 @@ systemd (246.6-3) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Tue, 17 Nov 2020 23:34:07 +0100
 
+systemd (246.6-2ubuntu1) hirsute; urgency=medium
+
+  [ Dan Streetman ]
+  * d/t/boot-smoke: update test to avoid false negatives
+    File: debian/tests/boot-smoke
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=205c30ca53b0e421db28bb56afaf5f88650ce592
+  * d/t/boot-and-services: remove unneeded test lines
+    File: debian/tests/boot-and-services
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=71853082af4e668996db574915c5a156f9897fd3
+  * d/t/systemd-fsckd: rewrite test to try to fix false negatives (LP: #1892358)
+    Files:
+    - debian/tests/control
+    - debian/tests/systemd-fsckd
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6ae6be039ec582410769d2d6d131e12bdcd19a68
+
+  [ Balint Reczey ]
+  * debian/gbp.conf: Update debian-branch to ubuntu-hirsute
+    File: debian/gbp.conf
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e0b78512dbb5141458468ba5e9c2a4e966ada088
+  * Merge from Debian unstable
+    - Move sysusers.d/sysctl.d/binfmt.d/modules-load.d back to /usr
+    (LP: #1897620)
+  * debian/tests/systemd-fsckd: Plymouth-start stays active in 20.10 and later
+    (LP: #1892358)
+    File: debian/tests/systemd-fsckd
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c46eda821e97df5595a4cdc5f5c41a9b49a51745
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Thu, 29 Oct 2020 18:38:15 +0100
+
 systemd (246.6-2) unstable; urgency=medium
 
   * XDG autostart improvements
@@ -3245,6 +6239,28 @@ systemd (246.6-2) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Thu, 15 Oct 2020 23:48:34 +0200
 
+systemd (246.6-1ubuntu1) groovy; urgency=medium
+
+  [ Dan Streetman ]
+  * Fix resolved.conf Cache= default to match default (LP: #1895418)
+    Files:
+    - debian/patches/lp1895418.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=dd4d93d94ebe2cf416f6b5a5eb59a16432cbc47b
+
+  [ Balint Reczey ]
+  * Bugfix-only upload
+  * Merge from Debian unstable
+    - core: propagate unit start limit hit state to triggering path unit (LP: #1891657)
+  * Skip test_rsyslog in s390x containers.
+    The test is failing almost all the time. (LP: #1895576)
+    File: debian/tests/boot-and-services
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ff8d286de52daa8b0856213ae52e66b81474fb57
+  * debian/tests/tests-in-lxd: Don't create the lxd test image twice
+    File: debian/tests/tests-in-lxd
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e858e7c41b84bc4c34e8af79d6e4b6114fe23952
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Thu, 24 Sep 2020 21:27:11 +0200
+
 systemd (246.6-1) unstable; urgency=medium
 
   * New upstream version 246.6
@@ -3252,8 +6268,16 @@ systemd (246.6-1) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Mon, 21 Sep 2020 20:28:36 +0200
 
+systemd (246.5-1ubuntu1) groovy; urgency=medium
+
+  * Bugfix-only upload
+  * Merge from Debian unstable
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Mon, 14 Sep 2020 13:01:29 +0200
+
 systemd (246.5-1) unstable; urgency=medium
 
+  [ Michael Biebl ]
   * New upstream version 246.5
     - network: fix NDisc handling for the case when multiple routers exist
       (Closes: #969599)
@@ -3261,7 +6285,23 @@ systemd (246.5-1) unstable; urgency=medi
       (Closes: #970156)
   * Rebase patches
 
- -- Michael Biebl <biebl@debian.org>  Mon, 14 Sep 2020 08:04:39 +0200
+ -- Balint Reczey <rbalint@ubuntu.com>  Mon, 14 Sep 2020 13:01:26 +0200
+
+systemd (246.4-1ubuntu1) groovy; urgency=medium
+
+  * Bugfix-only upload
+  * Merge from Debian unstable
+    - Changes dropped from Ubuntu delta:
+      * test: accept that char device 0/0 can now be created witout privileges.
+      * cherry-pick from stable: network: only process non-error message
+      * network: wait for previous address removal before configuring static
+        addresses.
+      * network: do not fail if UseMTU=yes on DHCP lease lost
+      * debian/systemd.postinst: Restart systemd-networkd.socket on incompatible
+        change
+      * Add riscv64 seccomp support.
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 02 Sep 2020 19:07:27 +0200
 
 systemd (246.4-1) unstable; urgency=medium
 
@@ -3297,6 +6337,42 @@ systemd (246.2-2) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Sat, 29 Aug 2020 16:24:49 +0200
 
+systemd (246.2-1ubuntu1) groovy; urgency=medium
+
+  * Merge from Debian unstable
+  * Refresh patches
+  * test: accept that char device 0/0 can now be created witout privileges.
+    This fixes tests with Linux 5.8 and later (LP: #1891527)
+    Files:
+    - debian/patches/debian/Add-env-variable-for-machine-ID-path.patch
+    - debian/patches/test-accept-that-char-device-0-0-can-now-be-created-witou.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=57909a0fa4999ba9ff918cfe6bb3fa53c230dd36
+  * debian/tests/systemd-fsckd: Fail plymouth-start with overriding ExecStart=
+    The 'process-killer' stopped working with plymouth 0.9.5 (LP: #1886886)
+    File: debian/tests/systemd-fsckd
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=efcc25b6011f23b9f90841f4ca0ee29ee674157f
+  * cherry-pick from stable: network: only process non-error message
+    File: debian/patches/network-only-process-non-error-message.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=dc97e3f5330ae64909ef640ad1ac401374f18c16
+  * network: wait for previous address removal before configuring static addresses.
+    Fixes systemd-networkd to establish connection after resume from suspend
+    Files:
+    - debian/patches/network-wait-for-previous-address-removal-before-configur.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=31390403bc000892ada9cb0cbedb198dd83fe7a2
+  * network: do not fail if UseMTU=yes on DHCP lease lost
+    File: debian/patches/network-do-not-fail-if-UseMTU-yes-on-DHCP-lease-lost.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=21c23966e8dc5fd0858664a5b89d6a9460c41f61
+  * debian/systemd.postinst: Restart systemd-networkd.socket on incompatible change
+    (Closes: #968589) (LP: #1891716)
+    File: debian/systemd.postinst
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e144a644488c6ff52c2bb7cee71f50aa95c4efd8
+  * debian/tests/control: Mark systemd-fsckd test as flaky.
+    It is flaky on Ubuntu CI infrastructure (LP: #1892358)
+    File: debian/tests/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8c55289624c6f44beb2c5bbae78aabc074d36b1a
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Thu, 20 Aug 2020 23:37:48 +0200
+
 systemd (246.2-1) unstable; urgency=medium
 
   * New upstream version 246.2
@@ -3327,6 +6403,45 @@ systemd (246.1-1) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Sun, 16 Aug 2020 13:14:46 +0200
 
+systemd (246-2ubuntu1) groovy; urgency=medium
+
+  [ Balint Reczey ]
+  * Merge to Ubuntu from Debian unstable
+    - Dropped changes:
+      * core: set /run size to 10%, like initramfs-tools does.
+        This is now upstream's default, also setting other limits
+      * UBUNTU-resolved-disable-global-LLMNR-and-MulticastDNS.patch
+      * Lock swap blockdevice while calling mkswap
+      * Cherry-pick reversion of detecting WSL by the presence of "microsoft"
+        in osrelease
+      * journald: stream pid change newline fix
+      * network: Change IgnoreCarrierLoss default to value of
+        ConfigureWithoutCarrier.
+      * network: do not re-attach sd-event object
+      * network: attach sd-event in link_load() when creating link dhcp_client
+        or ipv4ll
+  * debian/rules: Configure LLMNR and MulticastDNS to be disabled by default
+    instead of using a carried patch, like before.
+    File: debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a186cce127ee1d2b0288e4db1470e45a2b1914d9
+  * debian/rules: Configure LLMNR and MulticastDNS to be disabled by default
+    instead of using a carried patch, like before.
+    File: debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a186cce127ee1d2b0288e4db1470e45a2b1914d9
+
+  [ Dimitri John Ledkov ]
+  * dhclient-enter-hooks.d/resolved: drop in favor of exit hooks shipped elsewhere.
+    isc-dhcp / ifupdown now ship the hooks themselves to push DNS data to
+    resolved. Thus enter hook no longer required. (LP: #1890609)
+    Files:
+    - debian/control
+    - debian/rules
+    - debian/systemd.maintscript
+    - debian/extra/dhclient-enter-resolved-hook
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=97b9397e0ac23c4975cbd13ec6ae8d2f9bc48c92
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Thu, 06 Aug 2020 17:13:31 +0200
+
 systemd (246-2) unstable; urgency=medium
 
   * Upload to unstable
@@ -3344,6 +6459,17 @@ systemd (246-1) experimental; urgency=me
 
  -- Michael Biebl <biebl@debian.org>  Thu, 30 Jul 2020 22:22:24 +0200
 
+systemd (245.7-1ubuntu1) groovy; urgency=medium
+
+  * Merge to Ubuntu from Debian unstable
+    - Dropped changes:
+      * basic/cap-list: Print unknown capabilities in hexadecimal
+      * hwdb: Mask rfkill event from intel-hid on HP platforms
+      * networkd: if RA was implicit, do not await ndisc_configured
+        (upstream's #15469 fixed the delay differently)
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Fri, 31 Jul 2020 13:05:33 +0200
+
 systemd (245.7-1) unstable; urgency=medium
 
   [ Michael Biebl ]
@@ -3360,6 +6486,30 @@ systemd (245.7-1) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Mon, 27 Jul 2020 23:24:47 +0200
 
+systemd (245.6-3ubuntu3) groovy; urgency=medium
+
+  * Rebuild against libselinux 3.0
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Thu, 16 Jul 2020 16:54:53 +0200
+
+systemd (245.6-3ubuntu2) groovy; urgency=medium
+
+  * basic/cap-list: Print unknown capabilities in hexadecimal.
+    This fixes autopkgtest running on 5.8 kernels
+    (when systemd was built on an earlier one) (LP: #1885755)
+    File: debian/patches/basic-cap-list-parse-print-numerical-capabilities.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ef46ec8289df815d42c9a3fdbf9fb347226d6be4
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 15 Jul 2020 19:21:02 +0200
+
+systemd (245.6-3ubuntu1) groovy; urgency=medium
+
+  * Merge to Ubuntu from Debian unstable
+    - Dropped changes:
+      * Enable EFI/bootctl on armhf.
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 15 Jul 2020 16:38:45 +0200
+
 systemd (245.6-3) unstable; urgency=medium
 
   [ Dan Streetman ]
@@ -3383,6 +6533,49 @@ systemd (245.6-3) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Tue, 14 Jul 2020 18:16:57 +0200
 
+systemd (245.6-2ubuntu2) groovy; urgency=medium
+
+  [ Balint Reczey ]
+  * debian/tests/tests-in-lxd: Work around snapd.seeded.service hanging
+    File: debian/tests/tests-in-lxd
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=04a3342ff533b234ccb1a1020f6d854ab0acd053
+
+  [ Dimitri John Ledkov ]
+  * ubuntu: enable CET on amd64.
+    File: debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=cc42a377e7e8c372124bcf43d9f4fb9c169f4292
+
+  [ Dan Streetman ]
+  * Lock swap blockdevice while calling mkswap (LP: #1838329)
+    Files:
+    - debian/patches/lp1838329/0001-blockdev-propagate-one-more-unexpected-error.patch
+    - debian/patches/lp1838329/0003-dissect-use-log_debug_errno-where-appropriate.patch
+    - debian/patches/lp1838329/0004-blockdev-add-helper-for-locking-whole-block-device.patch
+    - debian/patches/lp1838329/0005-makefs-lock-device-while-we-operate.patch
+    - debian/patches/lp1838329/0006-makefs-normalize-logging-a-bit.patch
+    - debian/patches/lp1838329/0007-cryptsetup-generator-use-systemd-makefs-for-implemen.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=652a148cf1d3ecfa93cfee288c152c90caee3ac6
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Tue, 14 Jul 2020 18:37:58 +0200
+
+systemd (245.6-2ubuntu1) groovy; urgency=medium
+
+  * Merge to Ubuntu from Debian unstable
+    - Dropped changes:
+      * dhclient-exit-hooks.d/timesyncd: Act only when systemd-timesyncd is enabled
+  * hwdb: Mask rfkill event from intel-hid on HP platforms (LP: #1883846)
+    File: debian/patches/hwdb-Mask-rfkill-event-from-intel-hid-on-HP-platforms.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c705323d61b9cd4e36ceb92e236cd6e9ba4c1b1a
+  * debian/tests/tests-in-lxd: Show debugging info about reason of skipping test
+    File: debian/tests/tests-in-lxd
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1c835ca2d4f6d09977525d781d224a87ba7cde24
+  * debian/tests/tests-in-lxd: Drop workaround removing fstab from the container
+    (LP: #1886430)
+    File: debian/tests/tests-in-lxd
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f13213af98fa4c27c5f7e58c511b9691bb56065a
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Mon, 06 Jul 2020 16:30:25 +0200
+
 systemd (245.6-2) unstable; urgency=medium
 
   [ Dan Streetman ]
@@ -3407,6 +6600,36 @@ systemd (245.6-2) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Sun, 05 Jul 2020 11:44:39 +0200
 
+systemd (245.6-1ubuntu1) groovy; urgency=medium
+
+  [ Balint Reczey ]
+  * Merge to Ubuntu from Debian unstable
+  - Dropped changes:
+    * Don't try calling NULL callback in bus_wait_for_units_clear.
+    * test: Skip test-boot-timestamps on permission denied.
+    * From journald: stream pid change newline fix
+      - debian/patches/lp1875708/journald-Increase-stdout-buffer-size-sooner-when-almost-f.patch
+    * meson: initialize time-epoch to reproducible builds compatible value
+  * dhclient-exit-hooks.d/timesyncd: Act only when systemd-timesyncd is enabled
+    (LP: #1873031)
+    File: debian/extra/dhclient-exit-hooks.d/timesyncd
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7d5a31fb7523d1ecef0d2932df5efa3b99322919
+  * debian/udev.postinst: Allow kvm to be an already present non-system group
+    (LP: #1880541)
+    File: debian/udev.postinst
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8b5c31828d4323ddb719326b1316c179b7cdbdef
+  * Cherry-pick reversion of detecting WSL by the presence of "microsoft" in osrelease
+    File: debian/patches/Revert-detect-virt-also-detect-microsoft-as-WSL.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e13f4452698b84ecb0ca6b7950b5f0c42c02c2cf
+
+  [ Ryan Harper ]
+  * Skip over by-uuid/by-label symlinks for bcache backing and cache devices
+    (LP: #1861941)
+    File: debian/patches/lp1861941-dont-generate-disk-byuuid-for-bcache-uuid.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=4b9a0e888ca40eaed561ec48aece23218fab18ff
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Thu, 11 Jun 2020 12:54:02 +0200
+
 systemd (245.6-1) unstable; urgency=medium
 
   [ Michael Biebl ]
@@ -3418,6 +6641,38 @@ systemd (245.6-1) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Mon, 08 Jun 2020 00:56:37 +0200
 
+systemd (245.5-3ubuntu1) groovy; urgency=medium
+
+  [ Dan Streetman ]
+  * Hotadd only offline memory and CPUs (LP: #1876018)
+    File: debian/extra/rules-ubuntu/40-vm-hotadd.rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=dc68569fb46b04791202a40326003799becae859
+
+  [ Balint Reczey ]
+  * Merge to Ubuntu from Debian unstable
+  - Dropped changes:
+    * Cherry-pick fix from upstream master to adjust UseGateway= default
+  * journald: stream pid change newline fix (LP: #1875708)
+    Files:
+    - debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch
+    - debian/patches/lp1875708/journald-Increase-stdout-buffer-size-sooner-when-almost-f.patch
+    - debian/patches/lp1875708/journald-rework-end-of-line-marker-handling-to-use-a-fiel.patch
+    - debian/patches/lp1875708/journald-rework-pid-change-handling.patch
+    - debian/patches/lp1875708/journald-use-log_warning_errno-where-appropriate.patch
+    - debian/patches/lp1875708/journald-use-the-fact-that-client_context_release-returns.patch
+    - debian/patches/lp1875708/man-document-the-new-_LINE_BREAK-type.patch
+    - debian/patches/lp1875708/socket-util-introduce-type-safe-dereferencing-wrapper-CMS.patch
+    - debian/patches/lp1875708/test-Add-a-test-case-for-15654.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=95302fbe53202bdac33f86031aa56026444a92d3
+
+  [ Dimitri John Ledkov ]
+  * meson: initialize time-epoch to reproducible builds compatible value
+    (LP: #1878969)
+    File: debian/patches/meson-initialize-time-epoch-to-reproducible-builds-compat.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6785dfd98f81dfe3e3d5273511ec33b196ddb0c3
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Tue, 19 May 2020 19:43:50 +0200
+
 systemd (245.5-3) unstable; urgency=medium
 
   [ Michael Biebl ]
@@ -3450,6 +6705,56 @@ systemd (245.5-3) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Sun, 17 May 2020 19:28:49 +0200
 
+systemd (245.5-2ubuntu2) groovy; urgency=medium
+
+  [ Dan Streetman ]
+  * network: Change IgnoreCarrierLoss default to value of ConfigureWithoutCarrier.
+    This fixes bridges with static IP configuration. (LP: #1860926)
+    File: debian/patches/lp1860926-network-Change-IgnoreCarrierLoss-default-to-value-of.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=59d655136ca05d830d46e5cd90e6b549406cd670
+  * Cherry-pick fix from upstream master to adjust UseGateway= default
+    - network: change UseGateway= default to UseRoutes= setting
+    - network: honor SetDNSRoutes= even if UseGateway=False (LP: #1867375)
+    Files:
+    - debian/patches/network-change-UseGateway-default-to-UseRoutes-setting.patch
+    - debian/patches/network-honor-SetDNSRoutes-even-if-UseGateway-False.patch
+    - debian/patches/test-modify-add-tests-for-UseRoutes-and-UseGateway-config.patch
+    - debian/patches/test-verify-RoutesToDNS-is-independent-of-UseGateway.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=4ddb639d6bb0ca07368348bc588c21c41f08a5e7
+  * refresh quilt patches
+
+  [ Balint Reczey ]
+  * Rename a few patches which are expected to stay longer in Ubuntu
+    Files:
+    - debian/patches/Revert-cgroup-Continue-unit-reset-if-cgroup-is-busy.patch
+    - debian/patches/Revert-namespace-be-more-careful-when-handling-namespacin.patch
+    - debian/patches/resolved-Mitigate-DVE-2018-0001-by-retrying-NXDOMAIN-with.patch
+    - debian/patches/debian/UBUNTU-Revert-cgroup-Continue-unit-reset-if-cgroup-is-busy.patch
+    - debian/patches/debian/UBUNTU-Revert-namespace-be-more-careful-when-handling-namespacin.patch
+    - debian/patches/debian/UBUNTU-resolved-Mitigate-DVE-2018-0001-by-retrying-NXDOMAIN-with.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=41e97add3900c761fafc58c7a2b024f7b618d313
+  * test: Skip test-boot-timestamps on permission denied.
+    This fixes root-unittests in unprivileged LXD containers
+    File: debian/patches/test-Skip-test-boot-timestamps-on-permission-denied.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b98a63c04e9e82b0f57617e21233aa103b069785
+  * tests: Skip test-execute in containers
+    File: debian/tests/root-unittests
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2d6f282bf20866f711c6ae509228b0c513218ca9
+  * Run some tests in LXD, too
+    Files:
+    - debian/tests/control
+    - debian/tests/tests-in-lxd
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=bf0bb5176284d9ec1b348b84e70f961ee12e3cac
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Tue, 12 May 2020 16:59:54 +0200
+
+systemd (245.5-2ubuntu1) groovy; urgency=medium
+
+  * Merge to Ubuntu from Debian unstable
+    - Dropped changes: none
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Tue, 28 Apr 2020 13:20:31 +0200
+
 systemd (245.5-2) unstable; urgency=medium
 
   * Cherry-pick various fixes from upstream master
@@ -3467,6 +6772,13 @@ systemd (245.5-2) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Mon, 27 Apr 2020 17:38:44 +0200
 
+systemd (245.5-1ubuntu1) groovy; urgency=medium
+
+  * Merge to Ubuntu from Debian unstable
+    - Dropped changes: none
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Mon, 27 Apr 2020 13:11:34 +0200
+
 systemd (245.5-1) unstable; urgency=medium
 
   [ Michael Biebl ]
@@ -3486,6 +6798,29 @@ systemd (245.5-1) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Sat, 18 Apr 2020 20:41:18 +0200
 
+systemd (245.4-4ubuntu3) focal; urgency=medium
+
+  * dhcp: Allow setting request options again
+    link_configure() may be called multiple times on a link causing request options
+    set multiple times. (LP: #1870410)
+    File: debian/patches/dhcp-Allow-setting-request-options-again.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=4c48893eb04b01a2ec62d2d2823a79a9f5cb2b80
+  * Don't try calling NULL callback in bus_wait_for_units_clear.
+    This fixes a crash most frequently occurring in the Unity session
+    (LP: #1870930)
+    File: debian/patches/shared-Don-t-try-calling-NULL-callback-in-bus_wait_for_un.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b2ec1a3367cef401f8de745fecc9c385f020be78
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 22 Apr 2020 11:04:26 +0200
+
+systemd (245.4-4ubuntu1) focal; urgency=medium
+
+  * Merge to Ubuntu from Debian unstable
+  - Dropped changes:
+    * d/rules: in dh_auto_test, include meson param --print-errorlogs.
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Tue, 14 Apr 2020 00:05:30 +0200
+
 systemd (245.4-4) unstable; urgency=medium
 
   * Drop Conflicts: virtualbox-guest-utils from systemd-timesyncd.
@@ -3522,6 +6857,222 @@ systemd (245.4-3) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Fri, 10 Apr 2020 11:55:15 +0200
 
+systemd (245.4-2ubuntu1) focal; urgency=medium
+
+  [ Balint Reczey ]
+  * Merge to Ubuntu from Debian unstable
+  * Refresh patches
+    - Dropped changes:
+      * units: Don't mount tracefs in LXC.
+    - Remaining changes:
+      * Specify Ubuntu's Vcs-Git
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fd832930ef280c9a4a9dda2440d5a46a6fdb6232
+      * Enable EFI/bootctl on armhf.
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=043122f7d8a1487bfd357e815a6ece1ceea6e7d1
+      * Recommend networkd-dispatcher
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d1e3b2c7e4757119da0d550b0b3c0a6626a176dc
+      * Add conflicts with upstart and systemd-shim
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=83ed7496afc7c27be026014d109855f7d0ad1176
+      * debian/control: strengthen dependencies.
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d1ecf0c372f5212129c85ae60fddf26b2271a1fe
+      * debian/rules: Set -Duser-path instead of patching the source for the same result
+        File: debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=67d2ac5d806b55b0d178fca7e0af08cd9d12580c
+      * config: tpm-pcrindex=12, on Ubuntu only.
+        File: debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2f8c22d44a619ce8fa17eb0cd7c7e2c601cdbbeb
+      * Ubuntu/extra: ship dhclient-enter hook.
+        Files:
+        - debian/extra/dhclient-enter-resolved-hook
+        - debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f3398a213f80b02bf3db0c1ce9e22d69f6d56764
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=258893bae8cbb12670e4807636fe8f7e9fb5407a
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0725c1169ddde4f41cacba7af3e546704e2206be
+      * udev-udeb: ship modprobe.d snippet to force scsi_mod.scan=sync in d-i.
+        Files:
+        - debian/extra/modprobe.d-udeb/scsi-mod-scan-sync.conf
+        - debian/udev-udeb.install
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=eb6d8a2b9504917abb7aa2c4035fdbb7b98227f7
+      * debian/extra/start-udev: Set scsi_mod scan=sync even if it's builtin to the kernel (we previously only set it in modprobe.d)
+        Files:
+        - debian/extra/start-udev
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6b72628f8de991e2c67ac4289fc74daf3abe7d14
+      * debian/extra/units/systemd-resolved.service.d/resolvconf.conf:
+        drop resolvconf.conf drop-in, resolved integration moved to resolvconf package.
+      * debian/extra/wrap_cl.py: add changelog formatter
+        Files:
+        - debian/extra/wrap_cl.py
+        - debian/gbp.conf
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=26e69bceab9cec8df64cdca18cd71e7c0874f8b3
+      * debian/gbp.conf: Set tag format to ubuntu/*
+      * debian/gbp.conf: Change debian-branch to ubuntu-focal
+      * libnss-resolve: do not disable and stop systemd-resolved
+        File: debian/libnss-resolve.postrm
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=95577d14e84e19b614b83b2e24985d89e8c2dac0
+      * core: Revert strict mount namespacing/sandboxing, until LXD allows the needed mounts.
+        File: debian/patches/Revert-namespace-be-more-careful-when-handling-namespacin.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=030919ba5e4931d6ee576d0259fae67fe4ed9770
+      * Revert upstream adding LINK_STATE_INITIALIZED because it breaks netplan.io's
+        ethernets autopkgtest.
+        Files:
+        - debian/patches/Revert-network-do-not-drop-foreign-config-if-interface-is.patch
+        - debian/patches/Revert-network-fix-assertion-when-link-get-carrier.patch
+        - debian/patches/Revert-network-prevent-interfaces-to-be-initialized-multi.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=22a9fa3bb03ba2a629926af39ea7df81fe33c9b8
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=70e93c2a05f0f7435614f8d52944d726601e319c
+      * Revert upstream commit breaking IPv4 DHCP in LXC containers in 244.1
+        (LP: #1857123)
+        File: debian/patches/Revert-network-if-sys-is-rw-then-udev-should-be-around.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=39c12f8e736afd1b7bdeb13ff6bccaea85020873
+      * Skip falling back to device name when net_get_name(device) fails.
+        File: debian/patches/Skip-falling-back-to-device-name-when-net_get_name-device.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c79fe0e2dc29834e0cd236ade6e4e44a6ffb74fa
+      * Add "AssumedApparmorLabel=unconfined" to timedate1 dbus service file
+        File: debian/patches/debian/UBUNTU-Add-AssumedApparmorLabel-unconfined-to-timedate1-dbus.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5ad0879e10bbe3d641f940260b93c7eb2cf4624c
+      * Re-add support for /etc/writable for core18
+        File: debian/patches/debian/UBUNTU-Support-system-image-read-only-etc.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a5b5fca66c1127068e4ce0cc9ab497814211f4f7
+      * core: set /run size to 10%, like initramfs-tools does.
+        File: debian/patches/debian/UBUNTU-core-set-run-size-to-10-like-initramfs-tools-does.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1fac2568fe716dc1a41bada78293dc6327a6df0d
+      * Ship systemd sysctl settings.
+        Files:
+        - debian/patches/debian/UBUNTU-drop-kernel.-settings-from-sysctl-defaults-shipped.patch
+        - debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7cd041a6d0ef459e4b2a82d8ea5fa1ce05184dfb
+      * journald.service: set Nice=-1 to dodge watchdog on soft lockups.
+        File: debian/patches/debian/UBUNTU-journald.service-set-Nice-1-to-dodge-watchdog-on-soft-loc.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e0a9aeffac556492bf517ce2d23313ff7a277926
+      * networkd: if RA was implicit, do not await ndisc_configured.
+        File: debian/patches/debian/UBUNTU-networkd-if-RA-was-implicit-do-not-await-ndisc_con.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2f749ff528d1b788aa4ca778e954c16b213ee629
+      * networkd: [Route] PreferredSource not working in *.network files.
+        Files:
+        - debian/patches/debian/UBUNTU-networkd-if-RA-was-implicit-do-not-await-ndisc_con.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4e2ee0b2ac1be2ae78952890a56a2d5398df518
+      * systemd-resolved: Default to Cache=no-negative
+        File: debian/patches/debian/UBUNTU-resolved-default-no-negative-caching.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b42658843a9496d6b6bb68ac159f2a9f0a8ba9db
+      * Disable LLMNR and MulticastDNS by default
+        Files:
+        - debian/patches/debian/UBUNTU-resolved-disable-global-LLMNR-and-MulticastDNS.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4ec428e83696a5cd0405b677a35e97681867629
+      * test-sleep: skip test_fiemap upon inapproriate ioctl for device.
+        File: debian/patches/debian/UBUNTU-test-sleep-skip-test_fiemap-upon-inapproriate-ioctl-.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6ebb5b9f6b77760a5470e8a780d69875b1db76f7
+      * test/test-functions: launch qemu-system with -vga none.
+        File: debian/patches/debian/UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=90af1fa893cce5ed49999d16da0b793da6523394
+      * units: conditionalize more units to not start in containers.
+        Files:
+        - debian/patches/debian/UBUNTU-units-block-CAP_SYS_MODULE-units-in-containers-too.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3689afa1a782de8c19a757459b6360de1195ad55
+      * units: Disable journald Watchdog
+        File: debian/patches/debian/UBUNTU-units-disable-journald-watchdog.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=64d2b4f1d0d057073fba585f19823332e2a6eed5
+      * wait-online: do not wait, if no links are managed (neither configured, or failed).
+        File: debian/patches/debian/UBUNTU-wait-online-exit-if-no-links-are-managed.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=31f04c3fc769dacb3cf2a78240a1710a99a865b8
+      * Set UseDomains to true, by default, on Ubuntu.
+        File: debian/patches/debian/Ubuntu-UseDomains-by-default.patch
+      * Ignore failures to set Nice priority on services in containers.
+        File: debian/patches/debian/Ubuntu-core-in-execute-soft-fail-setting-Nice-priority-when.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5b8e457f8d883fc6f55d33d46b3474926a495d29
+      * units: set ConditionVirtualization=!private-users on journald audit socket.
+        File: debian/patches/debian/Ubuntu-units-set-ConditionVirtualization-private-users-on-j.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=03ed18a9940731bbf794ad320fabf337488835c6
+      * Workaround captive portals not responding to EDNS0 queries (DVE-2018-0001).
+        File: debian/patches/resolved-Mitigate-DVE-2018-0001-by-retrying-NXDOMAIN-with.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=87d3fe81b7281687ecf3c0b9a8356e90cc714d0b
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2974114ed9b89ea922a23893e8eff70d5cac77fe
+      * Disable dh_installinit generation of tmpfiles for the systemd package.
+        Files:
+        - debian/rules
+        - debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1fd144cbe31cc7a9383cc76f21f4b84c22a9dd1b
+      * Enable systemd-resolved by default
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=05adfa0902115f51c1196ad623165a75bb8b4313
+      * Create /etc/resolv.conf at postinst, pointing at the stub resolver.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ef4adf46bbbe2d22508b70b889d23da53b85039d
+      * Always setup /etc/resolv.conf on new installations.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=20bc8a37fa3c9620bed21a56a4eabd71db71d861
+      * Disable systemd-networkd-wait-online by default.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=694473d812b50d2fefd6494d494ca02b91bc8785
+      * postinst: drop empty/stock /etc/rc.local
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e7d071a26a79558771303b0b87f007e650eaebbe
+      * systemd.postinst: enable persistent journal
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f94f18d9dbc085b6a9ff33c141a6e542142f85b5
+      * debian/systemd.postinst: Skip daemon-reexec and try-restarts during shutdown
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=51daab96ae79483b5e5fb62e1e0477c87ee11fd1
+      * Drop systemd.prerm safety check.
+        File: debian/systemd.prerm
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0244c4d56556317f14eecc2f51871969ef02ba7b
+      * boot-and-services: stderr is ok, for status command on the c1 container.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=da14d34e7cc33c44ad67e64c9fd092f8cc1675f9
+      * adt: boot-and-services: assert any kernel syslog messages.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=29dc34f7a6e5dc505f6212c17c42e4420b47ed16
+      * Wait for systemctl is-system-running state.
+        File: debian/tests/boot-smoke
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=776998f1f55c445b6e385cab69a4219c42d00838
+      * debian/tests: Enforce udev upgrade.
+        Files:
+        - debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f350b43ccc1aa31c745b4ccebbb4084d5cea41ff
+      * Only test that gdm3 comes up on amd64. Stalls on other arches.
+        File: debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=97cb13685dfb353045c449ec5d6d1df60f661079
+      * debian/tests/systemd-fsckd: update assertions expectations for v237
+        File: debian/tests/systemd-fsckd
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d5becd9a416b55dcdb7b9a7aba60c4e3d304e6a6
+      * Skip systemd-fsckd on arm64, because of broken/lack of clean shutdown.
+        File: debian/tests/systemd-fsckd
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=bf5b501ac934497dbef5f64908ff37643dc7288e
+      * debian/tests: blacklist upstream test-24-unit-tests on ppc64le.
+        File: debian/tests/upstream
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8062b9a2712c390010d2948eaf764a1b52e68715
+      * debian/test/boot-and-services: Skip AppArmor tests in arm containers.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=9d3b35df77aa939365563a4edaee54ebb7f559a3
+      * d/t/control: run udev tests only with isolation-machine.
+        File: debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4b4c9bf44f4b8d7f75a4204aff697f549c8aad7
+      * Add riscv64 seccomp support.
+  * network: do not re-attach sd-event object (LP: #1870410)
+    File: debian/patches/network-do-not-re-attach-sd-event-object.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b10aee06d30b98395d20344195d3e671e25498ab
+  * Enable seccomp support on riscv64 again.
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a1ffd64333784a10dd0eeb87f5198462b85c6f9a
+
+  [ Dan Streetman ]
+  * network: attach sd-event in link_load() when creating link dhcp_client or ipv4ll
+    (LP: #1870410)
+    Author: Dan Streetman
+    Files:
+    - debian/patches/network-attach-sd-event-in-link_load-when-creating-link-d.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3408963020c6c0cf180130eabfd96e758d1a9c1f
+  * d/rules: in dh_auto_test, include meson param --print-errorlogs.
+    Also, don't cat testlog.txt; it's noisy and not very helpful.
+    File: debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ca8ed6fb7fa0f2a63557f705b1fdc97ab7ba5ace
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 08 Apr 2020 10:21:18 +0200
+
 systemd (245.4-2) unstable; urgency=medium
 
   [ Balint Reczey ]
@@ -3556,6 +7107,237 @@ systemd (245.4-1) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Thu, 02 Apr 2020 11:58:18 +0200
 
+systemd (245.2-1ubuntu3) focal; urgency=medium
+
+  * Add riscv64 seccomp support.
+
+ -- William Grant <wgrant@ubuntu.com>  Sun, 05 Apr 2020 17:33:43 +1000
+
+systemd (245.2-1ubuntu2) focal; urgency=medium
+
+  * units: Don't mount tracefs in LXC.
+    This fixes autopkgtest in LXC.
+    File: debian/patches/units-Don-t-mount-tracefs-in-LXC.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=cedcc2ceb7e788b2b0cbb97c7fbbd596d6c010a3
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Tue, 24 Mar 2020 13:09:27 +0100
+
+systemd (245.2-1ubuntu1) focal; urgency=medium
+
+  * Merge to Ubuntu from Debian unstable
+    - Notable changes in 245 missing from NEWS
+      * Modprobing is split out to a separate service unit, modprobe@.service
+      * New mount for for tracefs, under /sys/kernel/tracing
+  * Refresh patches
+    - Dropped changes:
+      * Keep sd_bus_enqueue_for_read() public
+      * Improve autopkgtest success rate, by bumping up timeouts
+      * d/p/lp1762391/0001-user-util-Add-helper-functions-for-gid-lists-operati.patch,
+        d/p/lp1762391/0002-execute-Restore-call-to-pam_setcred.patch,
+        d/p/lp1762391/0003-execute-Detect-groups-added-by-PAM-and-merge-them-wi.patch,
+        d/p/lp1762391/0004-test-Add-tests-for-gid-list-ops.patch,
+        d/p/lp1762391/0005-execute-add-const-to-array-parameters-where-possible.patch,
+        d/p/lp1762391/0006-execute-allow-pam_setcred-to-fail-ignore-errors.patch:
+        - Restore call to pam_setcred (LP: #1762391)
+      * d/p/0001-network-rename-linux_configure_after_setting_mtu-to-linux.patch,
+        d/p/0002-network-add-link-setting_genmode-flag.patch,
+        d/p/0003-network-if-ipv6ll-is-disabled-enumerate-tentative-ipv6-ad.patch,
+        d/p/0004-network-drop-foreign-config-after-addr_gen_mode-has-been-.patch:
+        - drop foreign config and raise interface after setting genmode
+      * pstore: Don't start systemd-pstore.service in containers.
+      * shutdown: do not detach autoclear loopback devices
+      * shutdown: cherry-pick PR#14409 to fix detach of loopback devices
+        for Ubuntu Core 20
+    - Remaining changes:
+      * Specify Ubuntu's Vcs-Git
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fd832930ef280c9a4a9dda2440d5a46a6fdb6232
+      * Enable EFI/bootctl on armhf.
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=043122f7d8a1487bfd357e815a6ece1ceea6e7d1
+      * Recommend networkd-dispatcher
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d1e3b2c7e4757119da0d550b0b3c0a6626a176dc
+      * Add conflicts with upstart and systemd-shim
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=83ed7496afc7c27be026014d109855f7d0ad1176
+      * debian/control: strengthen dependencies.
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d1ecf0c372f5212129c85ae60fddf26b2271a1fe
+      * debian/rules: Set -Duser-path instead of patching the source for the same result
+        File: debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=67d2ac5d806b55b0d178fca7e0af08cd9d12580c
+      * config: tpm-pcrindex=12, on Ubuntu only.
+        File: debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2f8c22d44a619ce8fa17eb0cd7c7e2c601cdbbeb
+      * Ubuntu/extra: ship dhclient-enter hook.
+        Files:
+        - debian/extra/dhclient-enter-resolved-hook
+        - debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f3398a213f80b02bf3db0c1ce9e22d69f6d56764
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=258893bae8cbb12670e4807636fe8f7e9fb5407a
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0725c1169ddde4f41cacba7af3e546704e2206be
+      * udev-udeb: ship modprobe.d snippet to force scsi_mod.scan=sync in d-i.
+        Files:
+        - debian/extra/modprobe.d-udeb/scsi-mod-scan-sync.conf
+        - debian/udev-udeb.install
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=eb6d8a2b9504917abb7aa2c4035fdbb7b98227f7
+      * debian/extra/start-udev: Set scsi_mod scan=sync even if it's builtin to the kernel (we previously only set it in modprobe.d)
+        Files:
+        - debian/extra/start-udev
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6b72628f8de991e2c67ac4289fc74daf3abe7d14
+      * debian/extra/units/systemd-resolved.service.d/resolvconf.conf:
+        drop resolvconf.conf drop-in, resolved integration moved to resolvconf package.
+      * debian/extra/wrap_cl.py: add changelog formatter
+        Files:
+        - debian/extra/wrap_cl.py
+        - debian/gbp.conf
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=26e69bceab9cec8df64cdca18cd71e7c0874f8b3
+      * debian/gbp.conf: Set tag format to ubuntu/*
+      * debian/gbp.conf: Change debian-branch to ubuntu-focal
+      * libnss-resolve: do not disable and stop systemd-resolved
+        File: debian/libnss-resolve.postrm
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=95577d14e84e19b614b83b2e24985d89e8c2dac0
+      * core: Revert strict mount namespacing/sandboxing, until LXD allows the needed mounts.
+        File: debian/patches/Revert-namespace-be-more-careful-when-handling-namespacin.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=030919ba5e4931d6ee576d0259fae67fe4ed9770
+      * Revert upstream adding LINK_STATE_INITIALIZED because it breaks netplan.io's
+        ethernets autopkgtest.
+        Files:
+        - debian/patches/Revert-network-do-not-drop-foreign-config-if-interface-is.patch
+        - debian/patches/Revert-network-fix-assertion-when-link-get-carrier.patch
+        - debian/patches/Revert-network-prevent-interfaces-to-be-initialized-multi.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=22a9fa3bb03ba2a629926af39ea7df81fe33c9b8
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=70e93c2a05f0f7435614f8d52944d726601e319c
+      * Revert upstream commit breaking IPv4 DHCP in LXC containers in 244.1
+        (LP: #1857123)
+        File: debian/patches/Revert-network-if-sys-is-rw-then-udev-should-be-around.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=39c12f8e736afd1b7bdeb13ff6bccaea85020873
+      * Skip falling back to device name when net_get_name(device) fails.
+        File: debian/patches/Skip-falling-back-to-device-name-when-net_get_name-device.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c79fe0e2dc29834e0cd236ade6e4e44a6ffb74fa
+      * Add "AssumedApparmorLabel=unconfined" to timedate1 dbus service file
+        File: debian/patches/debian/UBUNTU-Add-AssumedApparmorLabel-unconfined-to-timedate1-dbus.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5ad0879e10bbe3d641f940260b93c7eb2cf4624c
+      * Re-add support for /etc/writable for core18
+        File: debian/patches/debian/UBUNTU-Support-system-image-read-only-etc.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a5b5fca66c1127068e4ce0cc9ab497814211f4f7
+      * core: set /run size to 10%, like initramfs-tools does.
+        File: debian/patches/debian/UBUNTU-core-set-run-size-to-10-like-initramfs-tools-does.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1fac2568fe716dc1a41bada78293dc6327a6df0d
+      * Ship systemd sysctl settings.
+        Files:
+        - debian/patches/debian/UBUNTU-drop-kernel.-settings-from-sysctl-defaults-shipped.patch
+        - debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7cd041a6d0ef459e4b2a82d8ea5fa1ce05184dfb
+      * journald.service: set Nice=-1 to dodge watchdog on soft lockups.
+        File: debian/patches/debian/UBUNTU-journald.service-set-Nice-1-to-dodge-watchdog-on-soft-loc.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e0a9aeffac556492bf517ce2d23313ff7a277926
+      * networkd: if RA was implicit, do not await ndisc_configured.
+        File: debian/patches/debian/UBUNTU-networkd-if-RA-was-implicit-do-not-await-ndisc_con.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2f749ff528d1b788aa4ca778e954c16b213ee629
+      * networkd: [Route] PreferredSource not working in *.network files.
+        Files:
+        - debian/patches/debian/UBUNTU-networkd-if-RA-was-implicit-do-not-await-ndisc_con.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4e2ee0b2ac1be2ae78952890a56a2d5398df518
+      * systemd-resolved: Default to Cache=no-negative
+        File: debian/patches/debian/UBUNTU-resolved-default-no-negative-caching.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b42658843a9496d6b6bb68ac159f2a9f0a8ba9db
+      * Disable LLMNR and MulticastDNS by default
+        Files:
+        - debian/patches/debian/UBUNTU-resolved-disable-global-LLMNR-and-MulticastDNS.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4ec428e83696a5cd0405b677a35e97681867629
+      * test-sleep: skip test_fiemap upon inapproriate ioctl for device.
+        File: debian/patches/debian/UBUNTU-test-sleep-skip-test_fiemap-upon-inapproriate-ioctl-.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6ebb5b9f6b77760a5470e8a780d69875b1db76f7
+      * test/test-functions: launch qemu-system with -vga none.
+        File: debian/patches/debian/UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=90af1fa893cce5ed49999d16da0b793da6523394
+      * units: conditionalize more units to not start in containers.
+        Files:
+        - debian/patches/debian/UBUNTU-units-block-CAP_SYS_MODULE-units-in-containers-too.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3689afa1a782de8c19a757459b6360de1195ad55
+      * units: Disable journald Watchdog
+        File: debian/patches/debian/UBUNTU-units-disable-journald-watchdog.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=64d2b4f1d0d057073fba585f19823332e2a6eed5
+      * wait-online: do not wait, if no links are managed (neither configured, or failed).
+        File: debian/patches/debian/UBUNTU-wait-online-exit-if-no-links-are-managed.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=31f04c3fc769dacb3cf2a78240a1710a99a865b8
+      * Set UseDomains to true, by default, on Ubuntu.
+        File: debian/patches/debian/Ubuntu-UseDomains-by-default.patch
+      * Ignore failures to set Nice priority on services in containers.
+        File: debian/patches/debian/Ubuntu-core-in-execute-soft-fail-setting-Nice-priority-when.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5b8e457f8d883fc6f55d33d46b3474926a495d29
+      * units: set ConditionVirtualization=!private-users on journald audit socket.
+        File: debian/patches/debian/Ubuntu-units-set-ConditionVirtualization-private-users-on-j.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=03ed18a9940731bbf794ad320fabf337488835c6
+      * Workaround captive portals not responding to EDNS0 queries (DVE-2018-0001).
+        File: debian/patches/resolved-Mitigate-DVE-2018-0001-by-retrying-NXDOMAIN-with.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=87d3fe81b7281687ecf3c0b9a8356e90cc714d0b
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2974114ed9b89ea922a23893e8eff70d5cac77fe
+      * Disable dh_installinit generation of tmpfiles for the systemd package.
+        Files:
+        - debian/rules
+        - debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1fd144cbe31cc7a9383cc76f21f4b84c22a9dd1b
+      * Enable systemd-resolved by default
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=05adfa0902115f51c1196ad623165a75bb8b4313
+      * Create /etc/resolv.conf at postinst, pointing at the stub resolver.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ef4adf46bbbe2d22508b70b889d23da53b85039d
+      * Always setup /etc/resolv.conf on new installations.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=20bc8a37fa3c9620bed21a56a4eabd71db71d861
+      * Disable systemd-networkd-wait-online by default.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=694473d812b50d2fefd6494d494ca02b91bc8785
+      * postinst: drop empty/stock /etc/rc.local
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e7d071a26a79558771303b0b87f007e650eaebbe
+      * systemd.postinst: enable persistent journal
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f94f18d9dbc085b6a9ff33c141a6e542142f85b5
+      * debian/systemd.postinst: Skip daemon-reexec and try-restarts during shutdown
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=51daab96ae79483b5e5fb62e1e0477c87ee11fd1
+      * Drop systemd.prerm safety check.
+        File: debian/systemd.prerm
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0244c4d56556317f14eecc2f51871969ef02ba7b
+      * boot-and-services: stderr is ok, for status command on the c1 container.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=da14d34e7cc33c44ad67e64c9fd092f8cc1675f9
+      * adt: boot-and-services: assert any kernel syslog messages.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=29dc34f7a6e5dc505f6212c17c42e4420b47ed16
+      * Wait for systemctl is-system-running state.
+        File: debian/tests/boot-smoke
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=776998f1f55c445b6e385cab69a4219c42d00838
+      * debian/tests: Enforce udev upgrade.
+        Files:
+        - debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f350b43ccc1aa31c745b4ccebbb4084d5cea41ff
+      * Only test that gdm3 comes up on amd64. Stalls on other arches.
+        File: debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=97cb13685dfb353045c449ec5d6d1df60f661079
+      * debian/tests/systemd-fsckd: update assertions expectations for v237
+        File: debian/tests/systemd-fsckd
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d5becd9a416b55dcdb7b9a7aba60c4e3d304e6a6
+      * Skip systemd-fsckd on arm64, because of broken/lack of clean shutdown.
+        File: debian/tests/systemd-fsckd
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=bf5b501ac934497dbef5f64908ff37643dc7288e
+      * debian/tests: blacklist upstream test-24-unit-tests on ppc64le.
+        File: debian/tests/upstream
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8062b9a2712c390010d2948eaf764a1b52e68715
+      * debian/test/boot-and-services: Skip AppArmor tests in arm containers.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=9d3b35df77aa939365563a4edaee54ebb7f559a3
+      * d/t/control: run udev tests only with isolation-machine.
+        File: debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4b4c9bf44f4b8d7f75a4204aff697f549c8aad7
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Thu, 19 Mar 2020 17:36:59 +0100
+
 systemd (245.2-1) unstable; urgency=medium
 
   * New upstream version 245.2
@@ -3595,6 +7377,15 @@ systemd (245-1) unstable; urgency=medium
 
  -- Michael Biebl <biebl@debian.org>  Wed, 11 Mar 2020 13:33:37 +0100
 
+systemd (244.3-1ubuntu1) focal; urgency=medium
+
+  * Merge to Ubuntu from Debian unstable
+  * Refresh patches:
+    - Dropped changes: none
+    - Remaining changes: all
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Mon, 24 Feb 2020 20:29:44 +0100
+
 systemd (244.3-1) unstable; urgency=medium
 
   * New upstream version 244.3
@@ -3604,6 +7395,227 @@ systemd (244.3-1) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Sat, 15 Feb 2020 15:44:45 +0100
 
+systemd (244.2-1ubuntu1) focal; urgency=medium
+
+  * Merge to Ubuntu from Debian unstable
+  * Refresh patches:
+    - Dropped changes:
+      * SECURITY UPDATE: heap use-after-free with async polkit queries
+    - Remaining changes:
+      * Recommend networkd-dispatcher
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d1e3b2c7e4757119da0d550b0b3c0a6626a176dc
+      * Enable EFI/bootctl on armhf.
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=043122f7d8a1487bfd357e815a6ece1ceea6e7d1
+      * debian/control: strengthen dependencies.
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d1ecf0c372f5212129c85ae60fddf26b2271a1fe
+      * Add conflicts with upstart and systemd-shim
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=83ed7496afc7c27be026014d109855f7d0ad1176
+      * Specify Ubuntu's Vcs-Git
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fd832930ef280c9a4a9dda2440d5a46a6fdb6232
+      * debian/rules: Set -Duser-path instead of patching the source for the same result
+        File: debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=67d2ac5d806b55b0d178fca7e0af08cd9d12580c
+      * config: tpm-pcrindex=12, on Ubuntu only.
+        File: debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2f8c22d44a619ce8fa17eb0cd7c7e2c601cdbbeb
+      * Ubuntu/extra: ship dhclient-enter hook.
+        Files:
+        - debian/extra/dhclient-enter-resolved-hook
+        - debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f3398a213f80b02bf3db0c1ce9e22d69f6d56764
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=258893bae8cbb12670e4807636fe8f7e9fb5407a
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0725c1169ddde4f41cacba7af3e546704e2206be
+      * udev-udeb: ship modprobe.d snippet to force scsi_mod.scan=sync in d-i.
+        Files:
+        - debian/extra/modprobe.d-udeb/scsi-mod-scan-sync.conf
+        - debian/udev-udeb.install
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=eb6d8a2b9504917abb7aa2c4035fdbb7b98227f7
+      * debian/extra/start-udev: Set scsi_mod scan=sync even if it's builtin to the kernel (we previously only set it in modprobe.d)
+        Files:
+        - debian/extra/start-udev
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6b72628f8de991e2c67ac4289fc74daf3abe7d14
+      * debian/extra/units/systemd-resolved.service.d/resolvconf.conf:
+        drop resolvconf.conf drop-in, resolved integration moved to resolvconf package.
+      * debian/extra/wrap_cl.py: add changelog formatter
+        Files:
+        - debian/extra/wrap_cl.py
+        - debian/gbp.conf
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=26e69bceab9cec8df64cdca18cd71e7c0874f8b3
+      * debian/gbp.conf: Set tag format to ubuntu/*
+      * debian/gbp.conf: Change debian-branch to ubuntu-focal
+      * libnss-resolve: do not disable and stop systemd-resolved
+        File: debian/libnss-resolve.postrm
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=95577d14e84e19b614b83b2e24985d89e8c2dac0
+      * core: Revert strict mount namespacing/sandboxing, until LXD allows the needed mounts.
+        File: debian/patches/Revert-namespace-be-more-careful-when-handling-namespacin.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=030919ba5e4931d6ee576d0259fae67fe4ed9770
+      * Revert upstream adding LINK_STATE_INITIALIZED because it breaks netplan.io's
+        ethernets autopkgtest.
+        Files:
+        - debian/patches/Revert-network-do-not-drop-foreign-config-if-interface-is.patch
+        - debian/patches/Revert-network-fix-assertion-when-link-get-carrier.patch
+        - debian/patches/Revert-network-prevent-interfaces-to-be-initialized-multi.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=22a9fa3bb03ba2a629926af39ea7df81fe33c9b8
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=70e93c2a05f0f7435614f8d52944d726601e319c
+      * Revert upstream commit breaking IPv4 DHCP in LXC containers in 244.1
+        (LP: #1857123)
+        File: debian/patches/Revert-network-if-sys-is-rw-then-udev-should-be-around.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=39c12f8e736afd1b7bdeb13ff6bccaea85020873
+      * Skip falling back to device name when net_get_name(device) fails.
+        File: debian/patches/Skip-falling-back-to-device-name-when-net_get_name-device.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c79fe0e2dc29834e0cd236ade6e4e44a6ffb74fa
+      * Add "AssumedApparmorLabel=unconfined" to timedate1 dbus service file
+        File: debian/patches/debian/UBUNTU-Add-AssumedApparmorLabel-unconfined-to-timedate1-dbus.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5ad0879e10bbe3d641f940260b93c7eb2cf4624c
+      * Re-add support for /etc/writable for core18
+        File: debian/patches/debian/UBUNTU-Support-system-image-read-only-etc.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a5b5fca66c1127068e4ce0cc9ab497814211f4f7
+      * Improve autopkgtest success rate, by bumping up timeouts
+        File: debian/patches/debian/UBUNTU-bump-selftest-timeouts.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c05586d9da033bbfd6b6a74e10b87520843c7c48
+      * core: set /run size to 10%, like initramfs-tools does.
+        File: debian/patches/debian/UBUNTU-core-set-run-size-to-10-like-initramfs-tools-does.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1fac2568fe716dc1a41bada78293dc6327a6df0d
+      * Ship systemd sysctl settings.
+        Files:
+        - debian/patches/debian/UBUNTU-drop-kernel.-settings-from-sysctl-defaults-shipped.patch
+        - debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7cd041a6d0ef459e4b2a82d8ea5fa1ce05184dfb
+      * journald.service: set Nice=-1 to dodge watchdog on soft lockups.
+        File: debian/patches/debian/UBUNTU-journald.service-set-Nice-1-to-dodge-watchdog-on-soft-loc.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e0a9aeffac556492bf517ce2d23313ff7a277926
+      * networkd: if RA was implicit, do not await ndisc_configured.
+        File: debian/patches/debian/UBUNTU-networkd-if-RA-was-implicit-do-not-await-ndisc_con.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2f749ff528d1b788aa4ca778e954c16b213ee629
+      * networkd: [Route] PreferredSource not working in *.network files.
+        Files:
+        - debian/patches/debian/UBUNTU-networkd-if-RA-was-implicit-do-not-await-ndisc_con.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4e2ee0b2ac1be2ae78952890a56a2d5398df518
+      * systemd-resolved: Default to Cache=no-negative
+        File: debian/patches/debian/UBUNTU-resolved-default-no-negative-caching.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b42658843a9496d6b6bb68ac159f2a9f0a8ba9db
+      * Disable LLMNR and MulticastDNS by default
+        Files:
+        - debian/patches/debian/UBUNTU-resolved-disable-global-LLMNR-and-MulticastDNS.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4ec428e83696a5cd0405b677a35e97681867629
+      * test-sleep: skip test_fiemap upon inapproriate ioctl for device.
+        File: debian/patches/debian/UBUNTU-test-sleep-skip-test_fiemap-upon-inapproriate-ioctl-.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6ebb5b9f6b77760a5470e8a780d69875b1db76f7
+      * test/test-functions: launch qemu-system with -vga none.
+        File: debian/patches/debian/UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=90af1fa893cce5ed49999d16da0b793da6523394
+      * units: conditionalize more units to not start in containers.
+        Files:
+        - debian/patches/debian/UBUNTU-units-block-CAP_SYS_MODULE-units-in-containers-too.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3689afa1a782de8c19a757459b6360de1195ad55
+      * units: Disable journald Watchdog
+        File: debian/patches/debian/UBUNTU-units-disable-journald-watchdog.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=64d2b4f1d0d057073fba585f19823332e2a6eed5
+      * wait-online: do not wait, if no links are managed (neither configured, or failed).
+        File: debian/patches/debian/UBUNTU-wait-online-exit-if-no-links-are-managed.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=31f04c3fc769dacb3cf2a78240a1710a99a865b8
+      * Set UseDomains to true, by default, on Ubuntu.
+        File: debian/patches/debian/Ubuntu-UseDomains-by-default.patch
+      * Ignore failures to set Nice priority on services in containers.
+        File: debian/patches/debian/Ubuntu-core-in-execute-soft-fail-setting-Nice-priority-when.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5b8e457f8d883fc6f55d33d46b3474926a495d29
+      * units: set ConditionVirtualization=!private-users on journald audit socket.
+        File: debian/patches/debian/Ubuntu-units-set-ConditionVirtualization-private-users-on-j.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=03ed18a9940731bbf794ad320fabf337488835c6
+      * d/p/lp1762391/0001-user-util-Add-helper-functions-for-gid-lists-operati.patch,
+        d/p/lp1762391/0002-execute-Restore-call-to-pam_setcred.patch,
+        d/p/lp1762391/0003-execute-Detect-groups-added-by-PAM-and-merge-them-wi.patch,
+        d/p/lp1762391/0004-test-Add-tests-for-gid-list-ops.patch,
+        d/p/lp1762391/0005-execute-add-const-to-array-parameters-where-possible.patch,
+        d/p/lp1762391/0006-execute-allow-pam_setcred-to-fail-ignore-errors.patch:
+        - Restore call to pam_setcred (LP: #1762391)
+      * pstore: Don't start systemd-pstore.service in containers.
+        Usually it is not useful and can also fail making
+        boot-and-services autopkgtest fail. (LP: #1856729)
+        File: debian/patches/pstore-Don-t-start-systemd-pstore.service-in-containers.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=28b5a03769cbed9d3170ebac38508b867530a2d6
+      * Workaround captive portals not responding to EDNS0 queries (DVE-2018-0001).
+        File: debian/patches/resolved-Mitigate-DVE-2018-0001-by-retrying-NXDOMAIN-with.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=87d3fe81b7281687ecf3c0b9a8356e90cc714d0b
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2974114ed9b89ea922a23893e8eff70d5cac77fe
+      * shutdown: do not detach autoclear loopback devices
+        File: debian/patches/shutdown-do-not-detach-autoclear-loopback-devices.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3978d34b59e98cdd01836c41a10442967636b8fc
+      * shutdown: cherry-pick PR#14409 to fix detach of loopback devices
+        for Ubuntu Core 20
+        File: debian/patches/shutdown-modernizations-pr-14409.patch
+        https://github.com/systemd/systemd/pull/14409.diff
+      * Disable dh_installinit generation of tmpfiles for the systemd package.
+        Files:
+        - debian/rules
+        - debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1fd144cbe31cc7a9383cc76f21f4b84c22a9dd1b
+      * Enable systemd-resolved by default
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=05adfa0902115f51c1196ad623165a75bb8b4313
+      * Create /etc/resolv.conf at postinst, pointing at the stub resolver.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ef4adf46bbbe2d22508b70b889d23da53b85039d
+      * Always setup /etc/resolv.conf on new installations.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=20bc8a37fa3c9620bed21a56a4eabd71db71d861
+      * Disable systemd-networkd-wait-online by default.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=694473d812b50d2fefd6494d494ca02b91bc8785
+      * postinst: drop empty/stock /etc/rc.local
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e7d071a26a79558771303b0b87f007e650eaebbe
+      * systemd.postinst: enable persistent journal
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f94f18d9dbc085b6a9ff33c141a6e542142f85b5
+      * debian/systemd.postinst: Skip daemon-reexec and try-restarts during shutdown
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=51daab96ae79483b5e5fb62e1e0477c87ee11fd1
+      * Drop systemd.prerm safety check.
+        File: debian/systemd.prerm
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0244c4d56556317f14eecc2f51871969ef02ba7b
+      * boot-and-services: stderr is ok, for status command on the c1 container.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=da14d34e7cc33c44ad67e64c9fd092f8cc1675f9
+      * adt: boot-and-services: assert any kernel syslog messages.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=29dc34f7a6e5dc505f6212c17c42e4420b47ed16
+      * Wait for systemctl is-system-running state.
+        File: debian/tests/boot-smoke
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=776998f1f55c445b6e385cab69a4219c42d00838
+      * debian/tests: Enforce udev upgrade.
+        Files:
+        - debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f350b43ccc1aa31c745b4ccebbb4084d5cea41ff
+      * Only test that gdm3 comes up on amd64. Stalls on other arches.
+        File: debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=97cb13685dfb353045c449ec5d6d1df60f661079
+      * debian/tests/systemd-fsckd: update assertions expectations for v237
+        File: debian/tests/systemd-fsckd
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d5becd9a416b55dcdb7b9a7aba60c4e3d304e6a6
+      * Skip systemd-fsckd on arm64, because of broken/lack of clean shutdown.
+        File: debian/tests/systemd-fsckd
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=bf5b501ac934497dbef5f64908ff37643dc7288e
+      * debian/tests: blacklist upstream test-24-unit-tests on ppc64le.
+        File: debian/tests/upstream
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8062b9a2712c390010d2948eaf764a1b52e68715
+      * debian/test/boot-and-services: Skip AppArmor tests in arm containers.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=9d3b35df77aa939365563a4edaee54ebb7f559a3
+      * d/t/control: run udev tests only with isolation-machine.
+        File: debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4b4c9bf44f4b8d7f75a4204aff697f549c8aad7
+  * Keep sd_bus_enqueue_for_read() public
+    File: debian/patches/Export-sd_bus_enqueue_for_read.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1eb313b0e2d0a13bb891125b611ef2dc47e483b5
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Tue, 11 Feb 2020 19:21:08 +0100
+
 systemd (244.2-1) unstable; urgency=medium
 
   [ Michael Biebl ]
@@ -3683,6 +7695,342 @@ systemd (244.1-1) unstable; urgency=medi
 
  -- Michael Biebl <biebl@debian.org>  Sat, 25 Jan 2020 18:53:23 +0100
 
+systemd (244.1-0ubuntu3) focal; urgency=medium
+
+  * SECURITY UPDATE: heap use-after-free with async polkit queries
+    - debian/patches/CVE-2020-1712-1.patch: on async pk requests,
+      re-validate action/details in src/shared/bus-util.c.
+    - debian/patches/CVE-2020-1712-2.patch: introduce API for re-enqueuing
+      incoming messages in src/libsystemd/libsystemd.sym,
+      src/libsystemd/sd-bus/sd-bus.c, src/systemd/sd-bus.h.
+    - debian/patches/CVE-2020-1712-3.patch: when authorizing via PK
+      re-resolve callback/userdata instead of caching it in
+      src/shared/bus-util.c.
+    - debian/patches/CVE-2020-1712-4.patch: fix typo in function name in
+      src/libsystemd/libsystemd.sym, src/libsystemd/sd-bus/sd-bus.c,
+      src/systemd/sd-bus.h, src/shared/bus-util.c.
+    - debian/libsystemd0.symbols: added new symbols.
+    - CVE-2020-1712
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Wed, 05 Feb 2020 12:56:57 -0500
+
+systemd (244.1-0ubuntu2) focal; urgency=medium
+
+  [ Dimitri John Ledkov ]
+  * shutdown: do not detach autoclear loopback devices
+    Author: Dimitri John Ledkov
+    File: debian/patches/shutdown-do-not-detach-autoclear-loopback-devices.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3978d34b59e98cdd01836c41a10442967636b8fc
+
+  [ Balint Reczey ]
+  * Revert upstream commit breaking IPv4 DHCP in LXC containers in 244.1
+    (LP: #1857123)
+    File: debian/patches/Revert-network-if-sys-is-rw-then-udev-should-be-around.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=39c12f8e736afd1b7bdeb13ff6bccaea85020873
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 22 Jan 2020 16:27:49 +0100
+
+systemd (244.1-0ubuntu1) focal; urgency=medium
+
+  * New upstream version 244.1
+    - network: set ipv6 mtu after link-up or device mtu change (LP: #1671951)
+    - & other changes
+  * Refresh patches.
+    - Dropped changes:
+      * d/p/lp-1853852-*: fix issues with muliplexed shmat calls (LP: #1853852)
+        Files:
+        - debian/patches/lp-1853852-seccomp-fix-multiplexed-system-calls.patch
+        - debian/patches/lp-1853852-seccomp-mmap-test-results-depend-on-kernel-libseccom.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=382271662c60c339b0a404c7a1772fe5670516ef
+      * d/p/lp1671951-network-set-ipv6-mtu-after-link-up-or-device-mtu-cha.patch:
+        set ipv6 mtu at correct time
+  * pstore: Don't start systemd-pstore.service in containers.
+    Usually it is not useful and can also fail making
+    boot-and-services autopkgtest fail. (LP: #1856729)
+    File: debian/patches/pstore-Don-t-start-systemd-pstore.service-in-containers.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=28b5a03769cbed9d3170ebac38508b867530a2d6
+  * Revert: network: do not drop foreign config if interface is in initialized state.
+    This fixes FTBFS with the other network-related reverts.
+    File: debian/patches/Revert-network-do-not-drop-foreign-config-if-interface-is.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=22a9fa3bb03ba2a629926af39ea7df81fe33c9b8
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 18 Dec 2019 21:40:27 +0100
+
+systemd (244-3ubuntu5) focal; urgency=medium
+
+  [ Dariusz Gadomski ]
+  * d/p/lp1762391/0001-user-util-Add-helper-functions-for-gid-lists-operati.patch,
+    d/p/lp1762391/0002-execute-Restore-call-to-pam_setcred.patch,
+    d/p/lp1762391/0003-execute-Detect-groups-added-by-PAM-and-merge-them-wi.patch,
+    d/p/lp1762391/0004-test-Add-tests-for-gid-list-ops.patch,
+    d/p/lp1762391/0005-execute-add-const-to-array-parameters-where-possible.patch,
+    d/p/lp1762391/0006-execute-allow-pam_setcred-to-fail-ignore-errors.patch:
+    - Restore call to pam_setcred (LP: #1762391)
+
+  [ Dan Streetman ]
+  * d/t/storage: without scsi_debug, skip test (LP: #1847816)
+
+ -- Dan Streetman <ddstreet@canonical.com>  Sun, 19 Jan 2020 09:59:58 -0500
+
+systemd (244-3ubuntu4) focal; urgency=medium
+
+  * d/p/lp1671951-network-set-ipv6-mtu-after-link-up-or-device-mtu-cha.patch:
+    set ipv6 mtu at correct time (LP: #1671951)
+  * d/p/0001-network-rename-linux_configure_after_setting_mtu-to-linux.patch,
+    d/p/0002-network-add-link-setting_genmode-flag.patch,
+    d/p/0003-network-if-ipv6ll-is-disabled-enumerate-tentative-ipv6-ad.patch,
+    d/p/0004-network-drop-foreign-config-after-addr_gen_mode-has-been-.patch:
+    - drop foreign config and raise interface after setting genmode
+      (LP: #1845909)
+
+ -- Dan Streetman <ddstreet@canonical.com>  Tue, 14 Jan 2020 14:01:15 -0500
+
+systemd (244-3ubuntu3) focal; urgency=medium
+
+  * shutdown: cherry-pick PR#14409 to fix detach of loopback devices
+    for Ubuntu Core 20
+    File: debian/patches/shutdown-modernizations-pr-14409.patch
+    https://github.com/systemd/systemd/pull/14409.diff
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 10 Jan 2020 10:08:42 +0100
+
+systemd (244-3ubuntu2) focal; urgency=medium
+
+  * d/p/debian/UBUNTU-Support-system-image-read-only-etc.patch:
+    - re-add missing bits for timedated.c (LP: #1778936)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 08 Jan 2020 16:15:05 +0100
+
+systemd (244-3ubuntu1) focal; urgency=medium
+
+  [ Balint Reczey ]
+  * Merge to Ubuntu from Debian unstable
+  * Refresh patches:
+    - Dropped changes:
+      * d/t/control: mark udev test skippable.
+        File: debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c3419bd2a30a78d05cca9c38e50c9726de7e7632
+      * test-execute: Filter /dev/.lxc in exec-dynamicuser-statedir.service.
+        File: debian/patches/test-execute-Filter-dev-.lxc-in-exec-dynamicuser-statedir.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=75af888d5552f706b86182a56f12ccc8e83ca04e
+      * Pass personality test even when i386 userland runs on amd64 kernel
+        File: debian/patches/debian/UBUNTU-test-Pass-personality-test-even-when-i386-userland-runs-o.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=42e0bfc426f19430f6768ef4922a9531a345765f
+      * Fix resolved fallback to TCP (LP: #1849658)
+        Author: Dan Streetman
+        File: debian/patches/resolved-set-stream-type-during-DnsStream-creation.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f1ee30b13c9d2d34968b09ce620f3bc24a1a78c7
+    - Remaining changes:
+      * Recommend networkd-dispatcher
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d1e3b2c7e4757119da0d550b0b3c0a6626a176dc
+      * Enable EFI/bootctl on armhf.
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=043122f7d8a1487bfd357e815a6ece1ceea6e7d1
+      * debian/control: strengthen dependencies.
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d1ecf0c372f5212129c85ae60fddf26b2271a1fe
+      * Add conflicts with upstart and systemd-shim
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=83ed7496afc7c27be026014d109855f7d0ad1176
+      * Specify Ubuntu's Vcs-Git
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fd832930ef280c9a4a9dda2440d5a46a6fdb6232
+      * Ubuntu/extra: ship dhclient-enter hook.
+        Files:
+        - debian/extra/dhclient-enter-resolved-hook
+        - debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f3398a213f80b02bf3db0c1ce9e22d69f6d56764
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=258893bae8cbb12670e4807636fe8f7e9fb5407a
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0725c1169ddde4f41cacba7af3e546704e2206be
+      * udev-udeb: ship modprobe.d snippet to force scsi_mod.scan=sync in d-i.
+        Files:
+        - debian/extra/modprobe.d-udeb/scsi-mod-scan-sync.conf
+        - debian/udev-udeb.install
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=eb6d8a2b9504917abb7aa2c4035fdbb7b98227f7
+      * debian/extra/start-udev: Set scsi_mod scan=sync even if it's builtin to the kernel (we previously only set it in modprobe.d)
+        Files:
+        - debian/extra/start-udev
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6b72628f8de991e2c67ac4289fc74daf3abe7d14
+      * debian/extra/units/systemd-resolved.service.d/resolvconf.conf:
+        drop resolvconf.conf drop-in, resolved integration moved to resolvconf package.
+      * debian/extra/wrap_cl.py: add changelog formatter
+        Files:
+        - debian/extra/wrap_cl.py
+        - debian/gbp.conf
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=26e69bceab9cec8df64cdca18cd71e7c0874f8b3
+      * debian/gbp.conf: Set tag format to ubuntu/*
+      * debian/gbp.conf: Change debian-branch to ubuntu-eoan
+      * libnss-resolve: do not disable and stop systemd-resolved
+        File: debian/libnss-resolve.postrm
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=95577d14e84e19b614b83b2e24985d89e8c2dac0
+      * core: Revert strict mount namespacing/sandboxing, until LXD allows the needed mounts.
+        File: debian/patches/Revert-namespace-be-more-careful-when-handling-namespacin.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=030919ba5e4931d6ee576d0259fae67fe4ed9770
+      * Add "AssumedApparmorLabel=unconfined" to timedate1 dbus service file
+        File: debian/patches/debian/UBUNTU-Add-AssumedApparmorLabel-unconfined-to-timedate1-dbus.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5ad0879e10bbe3d641f940260b93c7eb2cf4624c
+      * Re-add support for /etc/writable for core18
+        File: debian/patches/debian/UBUNTU-Support-system-image-read-only-etc.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a5b5fca66c1127068e4ce0cc9ab497814211f4f7
+      * Improve autopkgtest success rate, by bumping up timeouts
+        File: debian/patches/debian/UBUNTU-bump-selftest-timeouts.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c05586d9da033bbfd6b6a74e10b87520843c7c48
+      * core: set /run size to 10%, like initramfs-tools does.
+        File: debian/patches/debian/UBUNTU-core-set-run-size-to-10-like-initramfs-tools-does.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1fac2568fe716dc1a41bada78293dc6327a6df0d
+      * Ship systemd sysctl settings.
+        Files:
+        - debian/patches/debian/UBUNTU-drop-kernel.-settings-from-sysctl-defaults-shipped.patch
+        - debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7cd041a6d0ef459e4b2a82d8ea5fa1ce05184dfb
+      * journald.service: set Nice=-1 to dodge watchdog on soft lockups.
+        File: debian/patches/debian/UBUNTU-journald.service-set-Nice-1-to-dodge-watchdog-on-soft-loc.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e0a9aeffac556492bf517ce2d23313ff7a277926
+      * networkd: if RA was implicit, do not await ndisc_configured.
+        File: debian/patches/debian/UBUNTU-networkd-if-RA-was-implicit-do-not-await-ndisc_con.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2f749ff528d1b788aa4ca778e954c16b213ee629
+      * networkd: [Route] PreferredSource not working in *.network files.
+        Files:
+        - debian/patches/debian/UBUNTU-networkd-if-RA-was-implicit-do-not-await-ndisc_con.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4e2ee0b2ac1be2ae78952890a56a2d5398df518
+      * Disable LLMNR and MulticastDNS by default
+        Files:
+        - debian/patches/debian/UBUNTU-resolved-disable-global-LLMNR-and-MulticastDNS.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4ec428e83696a5cd0405b677a35e97681867629
+      * test-sleep: skip test_fiemap upon inapproriate ioctl for device.
+        File: debian/patches/debian/UBUNTU-test-sleep-skip-test_fiemap-upon-inapproriate-ioctl-.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6ebb5b9f6b77760a5470e8a780d69875b1db76f7
+      * test/test-functions: launch qemu-system with -vga none.
+        File: debian/patches/debian/UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=90af1fa893cce5ed49999d16da0b793da6523394
+      * units: conditionalize more units to not start in containers.
+        Files:
+        - debian/patches/debian/UBUNTU-units-block-CAP_SYS_MODULE-units-in-containers-too.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3689afa1a782de8c19a757459b6360de1195ad55
+      * units: Disable journald Watchdog
+        File: debian/patches/debian/UBUNTU-units-disable-journald-watchdog.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=64d2b4f1d0d057073fba585f19823332e2a6eed5
+      * wait-online: do not wait, if no links are managed (neither configured, or failed).
+        File: debian/patches/debian/UBUNTU-wait-online-exit-if-no-links-are-managed.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=31f04c3fc769dacb3cf2a78240a1710a99a865b8
+      * Set UseDomains to true, by default, on Ubuntu.
+        File: debian/patches/debian/Ubuntu-UseDomains-by-default.patch
+      * Ignore failures to set Nice priority on services in containers.
+        File: debian/patches/debian/Ubuntu-core-in-execute-soft-fail-setting-Nice-priority-when.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5b8e457f8d883fc6f55d33d46b3474926a495d29
+      * units: set ConditionVirtualization=!private-users on journald audit socket.
+        File: debian/patches/debian/Ubuntu-units-set-ConditionVirtualization-private-users-on-j.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=03ed18a9940731bbf794ad320fabf337488835c6
+      * Workaround captive portals not responding to EDNS0 queries (DVE-2018-0001).
+        File: debian/patches/resolved-Mitigate-DVE-2018-0001-by-retrying-NXDOMAIN-with.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=87d3fe81b7281687ecf3c0b9a8356e90cc714d0b
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2974114ed9b89ea922a23893e8eff70d5cac77fe
+      * Disable dh_installinit generation of tmpfiles for the systemd package.
+        Files:
+        - debian/rules
+        - debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1fd144cbe31cc7a9383cc76f21f4b84c22a9dd1b
+      * Enable systemd-resolved by default
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=05adfa0902115f51c1196ad623165a75bb8b4313
+      * Create /etc/resolv.conf at postinst, pointing at the stub resolver.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ef4adf46bbbe2d22508b70b889d23da53b85039d
+      * Always setup /etc/resolv.conf on new installations.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=20bc8a37fa3c9620bed21a56a4eabd71db71d861
+      * Disable systemd-networkd-wait-online by default.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=694473d812b50d2fefd6494d494ca02b91bc8785
+      * postinst: drop empty/stock /etc/rc.local
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e7d071a26a79558771303b0b87f007e650eaebbe
+      * systemd.postinst: enable persistent journal
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f94f18d9dbc085b6a9ff33c141a6e542142f85b5
+      * debian/systemd.postinst: Skip daemon-reexec and try-restarts during shutdown
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=51daab96ae79483b5e5fb62e1e0477c87ee11fd1
+      * Drop systemd.prerm safety check.
+        File: debian/systemd.prerm
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0244c4d56556317f14eecc2f51871969ef02ba7b
+      * boot-and-services: stderr is ok, for status command on the c1 container.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=da14d34e7cc33c44ad67e64c9fd092f8cc1675f9
+      * adt: boot-and-services: assert any kernel syslog messages.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=29dc34f7a6e5dc505f6212c17c42e4420b47ed16
+      * Wait for systemctl is-system-running state.
+        File: debian/tests/boot-smoke
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=776998f1f55c445b6e385cab69a4219c42d00838
+      * debian/tests: Enforce udev upgrade.
+        Files:
+        - debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f350b43ccc1aa31c745b4ccebbb4084d5cea41ff
+      * Only test that gdm3 comes up on amd64. Stalls on other arches.
+        File: debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=97cb13685dfb353045c449ec5d6d1df60f661079
+      * debian/tests/systemd-fsckd: update assertions expectations for v237
+        File: debian/tests/systemd-fsckd
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d5becd9a416b55dcdb7b9a7aba60c4e3d304e6a6
+      * Skip systemd-fsckd on arm64, because of broken/lack of clean shutdown.
+        File: debian/tests/systemd-fsckd
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=bf5b501ac934497dbef5f64908ff37643dc7288e
+      * debian/tests: blacklist upstream test-24-unit-tests on ppc64le.
+        File: debian/tests/upstream
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8062b9a2712c390010d2948eaf764a1b52e68715
+      * Skip falling back to device name when net_get_name(device) fails.
+        File: debian/patches/Skip-falling-back-to-device-name-when-net_get_name-device.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c79fe0e2dc29834e0cd236ade6e4e44a6ffb74fa
+      * debian/test/boot-and-services: Skip AppArmor tests in arm containers.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=9d3b35df77aa939365563a4edaee54ebb7f559a3
+      * d/t/control: run udev tests only with isolation-machine.
+        File: debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4b4c9bf44f4b8d7f75a4204aff697f549c8aad7
+      * UBUNTU: drop setting fs.protected_regular and fs.protected_fifos
+        File: debian/patches/debian/UBUNTU-drop-kernel.-settings-from-sysctl-defaults-shipped.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6e583847b04c3f83a50f3bd6947dcae6a73d8388
+  * debian/rules: Set -Duser-path instead of patching the source for the same result
+    File: debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=67d2ac5d806b55b0d178fca7e0af08cd9d12580c
+  * systemd-resolved: Default to Cache=no-negative
+    File: debian/patches/debian/UBUNTU-resolved-default-no-negative-caching.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b42658843a9496d6b6bb68ac159f2a9f0a8ba9db
+
+  [ Dan Streetman ]
+  * Remove tempfile used by dhclient-enter-resolved-hook
+    File: debian/extra/dhclient-enter-resolved-hook
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=00a0d3997f7f9664df5cc2d7f96622e8c641f3e5
+
+  [ Christian Ehrhardt ]
+  * drop d/p/test-expect-mmap-to-fail-in-seccomp-test-on-s390-and-s390.patch.
+    File: debian/patches/test-expect-mmap-to-fail-in-seccomp-test-on-s390-and-s390.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2edd57973b9342d46d5d4095d80dfe0969cd08e4
+  * d/p/lp-1853852-*: fix issues with muliplexed shmat calls (LP: #1853852)
+    Author: Christian Ehrhardt
+    Files:
+    - debian/patches/lp-1853852-seccomp-fix-multiplexed-system-calls.patch
+    - debian/patches/lp-1853852-seccomp-mmap-test-results-depend-on-kernel-libseccom.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=382271662c60c339b0a404c7a1772fe5670516ef
+  * changelog: fix issues with muliplexed shmat calls (LP: #1853852)
+    File: debian/changelog
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7048d92d071e70e5b17989ae2e03c996c843df78
+
+  [ Dimitri John Ledkov ]
+  * config: tpm-pcrindex=12, on Ubuntu only.
+    In Ubuntu, we are trying to integrate measured boot with either bootctl or
+    grub, or sometimes both using chainloading. In those cases we may want to seal
+    against grub's PCRs, bootctl stub PCRs, or both at the same time. To achieve
+    that, we wouldn't like to decouple grub's & bootctl's PCR and make the latter
+    one use PCR #12.
+    Author: Dimitri John Ledkov
+    File: debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2f8c22d44a619ce8fa17eb0cd7c7e2c601cdbbeb
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Fri, 13 Dec 2019 19:05:14 +0100
+
 systemd (244-3) unstable; urgency=medium
 
   * Update udev-udeb to use 73-usb-net-by-mac.link
@@ -3782,12 +8130,306 @@ systemd (243-4) experimental; urgency=me
 
  -- Michael Biebl <biebl@debian.org>  Sat, 09 Nov 2019 01:15:08 +0100
 
+systemd (243-3ubuntu1) focal; urgency=medium
+
+  [ Dan Streetman ]
+  * Fix resolved fallback to TCP (LP: #1849658)
+    Author: Dan Streetman
+    File: debian/patches/resolved-set-stream-type-during-DnsStream-creation.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f1ee30b13c9d2d34968b09ce620f3bc24a1a78c7
+  * Separate stderr and stdout of /etc/dhcp/dhclient-enter-hooks.d/resolved
+    (LP: #1849608)
+    Author: Dan Streetman
+    File: debian/extra/dhclient-enter-resolved-hook
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fec4d6d026488a1d32ad9dceef18d9ea9c8acbda
+
+  [ Balint Reczey ]
+  * Merge to Ubuntu from Debian experimental
+  * Refresh patches:
+    - Dropped changes:
+      * udevadm trigger: do not propagate EACCES and ENODEV.
+        File: debian/patches/udevadm-trigger-do-not-propagate-EACCES-and-ENODEV.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=334e3fdc904de05105c78763c88220c1976d1946
+      * Pass personality test even when i386 userland runs on amd64 kernel
+        File: debian/patches/debian/UBUNTU-test-Pass-personality-test-even-when-i386-userland-runs-o.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=42e0bfc426f19430f6768ef4922a9531a345765f
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 30 Oct 2019 15:19:33 +0100
+
 systemd (243-3) experimental; urgency=medium
 
   * Import patches from v243-stable branch (up to ef677436aa)
 
  -- Michael Biebl <biebl@debian.org>  Mon, 14 Oct 2019 15:26:01 +0200
 
+systemd (243-2ubuntu1) focal; urgency=medium
+
+  [ Balint Reczey ]
+  * Merge to Ubuntu from experimental
+  * Refresh patches:
+    - Dropped changes:
+      * Cherrypick ask-password: prevent buffer overrow when reading from keyring.
+        File: debian/patches/ask-password-prevent-buffer-overrow-when-reading-fro.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6d6e9cbd4fc6e018031a4762e88f2c3aa19e24e8
+      * random-util: eat up bad RDRAND values seen on AMD CPUs.
+        File: debian/patches/+rdrand-workaround-on-amd.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?h=ubuntu-eoan&id=6ab88231efca4b04b26de6cfb5d671be154aabe0
+    - Remaining changes:
+      * Recommend networkd-dispatcher
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d1e3b2c7e4757119da0d550b0b3c0a6626a176dc
+      * Enable EFI/bootctl on armhf.
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=043122f7d8a1487bfd357e815a6ece1ceea6e7d1
+      * debian/control: strengthen dependencies.
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d1ecf0c372f5212129c85ae60fddf26b2271a1fe
+      * Add conflicts with upstart and systemd-shim
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=83ed7496afc7c27be026014d109855f7d0ad1176
+      * Specify Ubuntu's Vcs-Git
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fd832930ef280c9a4a9dda2440d5a46a6fdb6232
+      * Ubuntu/extra: ship dhclient-enter hook.
+        Files:
+        - debian/extra/dhclient-enter-resolved-hook
+        - debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f3398a213f80b02bf3db0c1ce9e22d69f6d56764
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=258893bae8cbb12670e4807636fe8f7e9fb5407a
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0725c1169ddde4f41cacba7af3e546704e2206be
+      * udev-udeb: ship modprobe.d snippet to force scsi_mod.scan=sync in d-i.
+        Files:
+        - debian/extra/modprobe.d-udeb/scsi-mod-scan-sync.conf
+        - debian/udev-udeb.install
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=eb6d8a2b9504917abb7aa2c4035fdbb7b98227f7
+      * debian/extra/start-udev: Set scsi_mod scan=sync even if it's builtin to the kernel (we previously only set it in modprobe.d)
+        Files:
+        - debian/extra/start-udev
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6b72628f8de991e2c67ac4289fc74daf3abe7d14
+      * debian/extra/units/systemd-resolved.service.d/resolvconf.conf:
+        drop resolvconf.conf drop-in, resolved integration moved to resolvconf package.
+      * debian/extra/wrap_cl.py: add changelog formatter
+        Files:
+        - debian/extra/wrap_cl.py
+        - debian/gbp.conf
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=26e69bceab9cec8df64cdca18cd71e7c0874f8b3
+      * debian/gbp.conf: Set tag format to ubuntu/*
+      * debian/gbp.conf: Change debian-branch to ubuntu-eoan
+      * libnss-resolve: do not disable and stop systemd-resolved
+        File: debian/libnss-resolve.postrm
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=95577d14e84e19b614b83b2e24985d89e8c2dac0
+      * core: Revert strict mount namespacing/sandboxing, until LXD allows the needed mounts.
+        File: debian/patches/Revert-namespace-be-more-careful-when-handling-namespacin.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=030919ba5e4931d6ee576d0259fae67fe4ed9770
+      * Add "AssumedApparmorLabel=unconfined" to timedate1 dbus service file
+        File: debian/patches/debian/UBUNTU-Add-AssumedApparmorLabel-unconfined-to-timedate1-dbus.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5ad0879e10bbe3d641f940260b93c7eb2cf4624c
+      * Re-add support for /etc/writable for core18
+        File: debian/patches/debian/UBUNTU-Support-system-image-read-only-etc.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a5b5fca66c1127068e4ce0cc9ab497814211f4f7
+      * Improve autopkgtest success rate, by bumping up timeouts
+        File: debian/patches/debian/UBUNTU-bump-selftest-timeouts.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c05586d9da033bbfd6b6a74e10b87520843c7c48
+      * core: set /run size to 10%, like initramfs-tools does.
+        File: debian/patches/debian/UBUNTU-core-set-run-size-to-10-like-initramfs-tools-does.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1fac2568fe716dc1a41bada78293dc6327a6df0d
+      * Ship systemd sysctl settings.
+        Files:
+        - debian/patches/debian/UBUNTU-drop-kernel.-settings-from-sysctl-defaults-shipped.patch
+        - debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7cd041a6d0ef459e4b2a82d8ea5fa1ce05184dfb
+      * journald.service: set Nice=-1 to dodge watchdog on soft lockups.
+        File: debian/patches/debian/UBUNTU-journald.service-set-Nice-1-to-dodge-watchdog-on-soft-loc.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e0a9aeffac556492bf517ce2d23313ff7a277926
+      * networkd: if RA was implicit, do not await ndisc_configured.
+        File: debian/patches/debian/UBUNTU-networkd-if-RA-was-implicit-do-not-await-ndisc_con.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2f749ff528d1b788aa4ca778e954c16b213ee629
+      * networkd: [Route] PreferredSource not working in *.network files.
+        Files:
+        - debian/patches/debian/UBUNTU-networkd-if-RA-was-implicit-do-not-await-ndisc_con.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4e2ee0b2ac1be2ae78952890a56a2d5398df518
+      * Disable LLMNR and MulticastDNS by default
+        Files:
+        - debian/patches/debian/UBUNTU-resolved-disable-global-LLMNR-and-MulticastDNS.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4ec428e83696a5cd0405b677a35e97681867629
+      * test-sleep: skip test_fiemap upon inapproriate ioctl for device.
+        File: debian/patches/debian/UBUNTU-test-sleep-skip-test_fiemap-upon-inapproriate-ioctl-.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6ebb5b9f6b77760a5470e8a780d69875b1db76f7
+      * test/test-functions: launch qemu-system with -vga none.
+        File: debian/patches/debian/UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=90af1fa893cce5ed49999d16da0b793da6523394
+      * units: conditionalize more units to not start in containers.
+        Files:
+        - debian/patches/debian/UBUNTU-units-block-CAP_SYS_MODULE-units-in-containers-too.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3689afa1a782de8c19a757459b6360de1195ad55
+      * units: Disable journald Watchdog
+        File: debian/patches/debian/UBUNTU-units-disable-journald-watchdog.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=64d2b4f1d0d057073fba585f19823332e2a6eed5
+      * wait-online: do not wait, if no links are managed (neither configured, or failed).
+        File: debian/patches/debian/UBUNTU-wait-online-exit-if-no-links-are-managed.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=31f04c3fc769dacb3cf2a78240a1710a99a865b8
+      * Set UseDomains to true, by default, on Ubuntu.
+        File: debian/patches/debian/Ubuntu-UseDomains-by-default.patch
+      * Ignore failures to set Nice priority on services in containers.
+        File: debian/patches/debian/Ubuntu-core-in-execute-soft-fail-setting-Nice-priority-when.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5b8e457f8d883fc6f55d33d46b3474926a495d29
+      * units: set ConditionVirtualization=!private-users on journald audit socket.
+        File: debian/patches/debian/Ubuntu-units-set-ConditionVirtualization-private-users-on-j.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=03ed18a9940731bbf794ad320fabf337488835c6
+      * Workaround captive portals not responding to EDNS0 queries (DVE-2018-0001).
+        File: debian/patches/resolved-Mitigate-DVE-2018-0001-by-retrying-NXDOMAIN-with.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=87d3fe81b7281687ecf3c0b9a8356e90cc714d0b
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2974114ed9b89ea922a23893e8eff70d5cac77fe
+      * Disable dh_installinit generation of tmpfiles for the systemd package.
+        Files:
+        - debian/rules
+        - debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1fd144cbe31cc7a9383cc76f21f4b84c22a9dd1b
+      * Enable systemd-resolved by default
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=05adfa0902115f51c1196ad623165a75bb8b4313
+      * Create /etc/resolv.conf at postinst, pointing at the stub resolver.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ef4adf46bbbe2d22508b70b889d23da53b85039d
+      * Always setup /etc/resolv.conf on new installations.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=20bc8a37fa3c9620bed21a56a4eabd71db71d861
+      * Disable systemd-networkd-wait-online by default.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=694473d812b50d2fefd6494d494ca02b91bc8785
+      * postinst: drop empty/stock /etc/rc.local
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e7d071a26a79558771303b0b87f007e650eaebbe
+      * systemd.postinst: enable persistent journal
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f94f18d9dbc085b6a9ff33c141a6e542142f85b5
+      * debian/systemd.postinst: Skip daemon-reexec and try-restarts during shutdown
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=51daab96ae79483b5e5fb62e1e0477c87ee11fd1
+      * Drop systemd.prerm safety check.
+        File: debian/systemd.prerm
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0244c4d56556317f14eecc2f51871969ef02ba7b
+      * boot-and-services: stderr is ok, for status command on the c1 container.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=da14d34e7cc33c44ad67e64c9fd092f8cc1675f9
+      * adt: boot-and-services: assert any kernel syslog messages.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=29dc34f7a6e5dc505f6212c17c42e4420b47ed16
+      * tests/boot-smoke: ignore udevd connection timeouts resolving colord group.
+        File: debian/tests/boot-smoke
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e1477b764fa9ef23f5181ef3d31a1332191c3e0b
+      * Fix false negative checking for running jobs after boot.
+        File: debian/tests/boot-smoke
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=aeb01631efbaf3fe851dee15d496e0b66b5c347f
+      * Wait for systemctl is-system-running state.
+        File: debian/tests/boot-smoke
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=776998f1f55c445b6e385cab69a4219c42d00838
+      * debian/tests: Enforce udev upgrade.
+        Files:
+        - debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f350b43ccc1aa31c745b4ccebbb4084d5cea41ff
+      * Only test that gdm3 comes up on amd64. Stalls on other arches.
+        File: debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=97cb13685dfb353045c449ec5d6d1df60f661079
+      * debian/tests/systemd-fsckd: update assertions expectations for v237
+        File: debian/tests/systemd-fsckd
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d5becd9a416b55dcdb7b9a7aba60c4e3d304e6a6
+      * Skip systemd-fsckd on arm64, because of broken/lack of clean shutdown.
+        File: debian/tests/systemd-fsckd
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=bf5b501ac934497dbef5f64908ff37643dc7288e
+      * debian/tests: blacklist upstream test-24-unit-tests on ppc64le.
+        File: debian/tests/upstream
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8062b9a2712c390010d2948eaf764a1b52e68715
+      * Skip falling back to device name when net_get_name(device) fails.
+        File: debian/patches/Skip-falling-back-to-device-name-when-net_get_name-device.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c79fe0e2dc29834e0cd236ade6e4e44a6ffb74fa
+      * d/t/control: mark udev test skippable.
+        File: debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c3419bd2a30a78d05cca9c38e50c9726de7e7632
+      * debian/extra/wrap_cl.py: add changelog formatter
+        Files:
+        - debian/extra/wrap_cl.py
+        - debian/gbp.conf
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=26e69bceab9cec8df64cdca18cd71e7c0874f8b3
+      * debian/test/boot-and-services: Skip AppArmor tests in arm containers.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=9d3b35df77aa939365563a4edaee54ebb7f559a3
+      * d/t/control: run udev tests only with isolation-machine.
+        File: debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4b4c9bf44f4b8d7f75a4204aff697f549c8aad7
+      * UBUNTU: drop setting fs.protected_regular and fs.protected_fifos
+        File: debian/patches/debian/UBUNTU-drop-kernel.-settings-from-sysctl-defaults-shipped.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6e583847b04c3f83a50f3bd6947dcae6a73d8388
+      * test-execute: Filter /dev/.lxc in exec-dynamicuser-statedir.service.
+        File: debian/patches/test-execute-Filter-dev-.lxc-in-exec-dynamicuser-statedir.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=75af888d5552f706b86182a56f12ccc8e83ca04e
+      * Pass personality test even when i386 userland runs on amd64 kernel
+        File: debian/patches/debian/UBUNTU-test-Pass-personality-test-even-when-i386-userland-runs-o.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=42e0bfc426f19430f6768ef4922a9531a345765f
+  * Revert manager putting bin before sbin in user instances
+    File: debian/patches/Revert-manager-put-bin-before-sbin-for-user-instances.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a01b494922bf76c4c3659b43df4f45a554f3276a
+  * Set the previous default, -Ddefault-hierarchy=hybrid at build-time.
+    This prevents breaking container managers
+    File: debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ad8bc71956b7bcc97563383345024c93a0572cc7
+  * Revert "cgroup: Continue unit reset if cgroup is busy"
+    The change broke libvirt autopkgtest in Ubuntu. (LP: #1844879)
+    File: debian/patches/Revert-cgroup-Continue-unit-reset-if-cgroup-is-busy.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=9bed00d9ea138f08d79c83c40ed3933eb04a5624
+  * debian/tests/boot-smoke: Drop part of the delta to gain better debug info
+    File: debian/tests/boot-smoke
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=06715f3af3099cae57768de99d1b84fecca5a15d
+  * Revert upstream adding LINK_STATE_INITIALIZED because it breaks netplan.io's
+    ethernets autopkgtest.
+    Files:
+    - debian/patches/Revert-network-fix-assertion-when-link-get-carrier.patch
+    - debian/patches/Revert-network-prevent-interfaces-to-be-initialized-multi.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=70e93c2a05f0f7435614f8d52944d726601e319c
+  * d/e/checkout-upstream: UPSTREAM_REPO can override default systemd repo
+    File: debian/extra/checkout-upstream
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a658380b58e5082e79476096fe7ee85358546f64
+  * debian/extra/checkout-upstream: rebase only PRs on upstream master.
+    This fixes testing arbitrary upstream commits with UPSTREAM_HEAD=<commit-id>.
+    File: debian/extra/checkout-upstream
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7b8d2ae3cc68e7c388ce9ef7189c0451745ad6c2
+  * d/e/checkout-upstream: Add KEEP_DEBIAN_PATCHES option to keep patches.
+    The Debian patches that apply cleanly are kept when KEEP_DEBIAN_PATCHES
+    is set to give a better picture of how the tested upstream version
+    would work packaged.
+    File: debian/extra/checkout-upstream
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a69135efeb8ee0bb92ff56523c117db2585922c4
+  * d/e/checkout-upstream: Keep all autopkgtests when KEEP_DEBIAN_TESTS is set
+    File: debian/extra/checkout-upstream
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=50ae2b41d87a7791d609d66e3d27a3a50d814edc
+  * debian/extra/checkout-upstream: Use dots when deriving version from upstream
+    to sort higher than potential versions in Debian and also to conform native
+    package versioning practice.
+    File: debian/extra/checkout-upstream
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=11c23cb721fa402160ea81b10cf3022a3f4cba8c
+  * Use package's version as systemd's reported version (LP: #1849158)
+    File: debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5245cbb5d168b56adc8106ccdb9b224830d55a45
+  * Fix test: expect mmap to fail in seccomp test on s390 and s390x
+    File: debian/patches/test-expect-mmap-to-fail-in-seccomp-test-on-s390-and-s390.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=04b28d6b177c2cf84c4bd262183098f47c356885
+  * udevadm trigger: do not propagate EACCES and ENODEV.
+    Propagating the errors broke udisks2 install scripts among others.
+    (LP: #1845314)
+    File: debian/patches/udevadm-trigger-do-not-propagate-EACCES-and-ENODEV.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=334e3fdc904de05105c78763c88220c1976d1946
+  * debian/gbp.conf: Set debian-branch to ubuntu-focal
+    File: debian/gbp.conf
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fae20a0dd7c2b24f6f6b49edf6e8f70adf57dc44
+
+  [ Dan Streetman ]
+  * d/extra/rules/73-special-net-names.rules: use $$ instead of $ in PROGRAM= value.
+    Author: Dan Streetman
+    File: debian/extra/rules/73-special-net-names.rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c5a86d7e286d14f2bc78473c3a1cc6ddc0df9158
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Tue, 22 Oct 2019 19:17:05 +0200
+
 systemd (243-2) experimental; urgency=medium
 
   * Import patches from v243-stable branch (up to fab6f010ac)
@@ -3839,6 +8481,45 @@ systemd (242-8) unstable; urgency=medium
 
  -- Michael Biebl <biebl@debian.org>  Fri, 08 Nov 2019 23:18:00 +0100
 
+systemd (242-7ubuntu2) eoan; urgency=medium
+
+  [ Bryan Quigley ]
+  * Update patch for resolved: Mitigate DVE-2018-0001, by retrying NXDOMAIN
+    without EDNS0. This disables the workaround if DNSSEC=yes.
+    Falls back directly to simple UDP instead of trying an intermediate.
+    (LP: #1796501)
+    Author: Bryan Quigley
+    File: debian/patches/resolved-Mitigate-DVE-2018-0001-by-retrying-NXDOMAIN-with.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2974114ed9b89ea922a23893e8eff70d5cac77fe
+
+  [ Balint Reczey ]
+  * Pass personality test even when i386 userland runs on amd64 kernel
+    File: debian/patches/debian/UBUNTU-test-Pass-personality-test-even-when-i386-userland-runs-o.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=42e0bfc426f19430f6768ef4922a9531a345765f
+  * Refresh patches
+    Files:
+    - debian/patches/Revert-namespace-be-more-careful-when-handling-namespacin.patch
+    - debian/patches/debian/Ubuntu-core-in-execute-soft-fail-setting-Nice-priority-when.patch
+    - debian/patches/test-execute-Filter-dev-.lxc-in-exec-dynamicuser-statedir.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ff8387be07322230e9afe87f1c767ee241e9a0e1
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Tue, 08 Oct 2019 22:31:17 +0200
+
+systemd (242-7ubuntu1) eoan; urgency=medium
+
+  * Merge from unstable
+  * UBUNTU: drop setting fs.protected_regular and fs.protected_fifos from
+    sysctl defaults shipped by systemd (LP: #1845637)
+    File: debian/patches/debian/UBUNTU-drop-kernel.-settings-from-sysctl-defaults-shipped.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6e583847b04c3f83a50f3bd6947dcae6a73d8388
+  * test-execute: Filter /dev/.lxc in exec-dynamicuser-statedir.service.
+    It appears in nested LXC containers and broke the armhf autopkgtest.
+    (LP: #1845337)
+    File: debian/patches/test-execute-Filter-dev-.lxc-in-exec-dynamicuser-statedir.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=75af888d5552f706b86182a56f12ccc8e83ca04e
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 02 Oct 2019 14:13:28 +0200
+
 systemd (242-7) unstable; urgency=medium
 
   * sleep: properly pass verb to sleep script
@@ -3853,6 +8534,243 @@ systemd (242-7) unstable; urgency=medium
 
  -- Michael Biebl <biebl@debian.org>  Wed, 04 Sep 2019 19:34:17 +0200
 
+systemd (242-6ubuntu1) eoan; urgency=medium
+
+  [ Dan Streetman ]
+  * d/t/control: mark udev test skippable.
+    The udev test will return 77 (from udev-test.pl) if it can't
+    setup the test environment; mark it skipped in that case.
+    Author: Dan Streetman
+    File: debian/tests/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c3419bd2a30a78d05cca9c38e50c9726de7e7632
+
+  [ Dimitri John Ledkov ]
+  * debian/extra/wrap_cl.py: add changelog formatter
+    Author: Dimitri John Ledkov
+    Files:
+    - debian/extra/wrap_cl.py
+    - debian/gbp.conf
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=26e69bceab9cec8df64cdca18cd71e7c0874f8b3
+
+  [ Balint Reczey ]
+  * debian/test/boot-and-services: Skip AppArmor tests in arm containers.
+    The test is failing on armhf testbeds using containers
+    File: debian/tests/boot-and-services
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=9d3b35df77aa939365563a4edaee54ebb7f559a3
+  * d/t/control: run udev tests only with isolation-machine.
+    It fails in Ubuntu CI armhf containers and may fail elsewhere, too.
+    File: debian/tests/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4b4c9bf44f4b8d7f75a4204aff697f549c8aad7
+  * Merge to Ubuntu from unstable
+    - Dropped changes:
+      * Skip starting systemd-remount-fs.service in containers
+        even when /etc/fstab is present.
+        File: debian/patches/debian/Skip-starting-systemd-remount-fs.service-in-containers.patch
+      * resolved: add support for pipelined requests
+        Files:
+        - debian/patches/llmnr-add-comment-why-we-install-no-complete-handler-on-s.patch
+        - debian/patches/resolved-add-comment-to-dns_stream_complete-about-its-err.patch
+        - debian/patches/resolved-keep-stub-stream-connections-up-for-as-long-as-c.patch
+        - debian/patches/resolved-only-call-complete-with-zero-argument-in-LLMNR-c.patch
+        - debian/patches/resolved-restart-stream-timeout-whenever-we-managed-to-re.patch
+        - debian/patches/stream-follow-coding-style-don-t-use-degrade-to-bool-for-.patch
+        - debian/patches/stream-track-type-of-DnsStream-object.patch
+        - debian/patches/transaction-simplify-handling-if-we-get-an-unexpected-DNS.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8ad1db08c2135af098a33957ce7cffbe21fb683f
+      * pam-systemd: use secure_getenv() rather than getenv()
+        File: debian/patches/pam-systemd-use-secure_getenv-rather-than-getenv.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f3291e9e8c3eafd0c8921cb26a0d5ee0fd563b3c
+      * support PPC64LE qemu based testing.
+        Files:
+        - debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=483a4daba07f809883883e8e8b9c365cfbf7256e
+      * tests/storage: make the test more resilient.
+        File: debian/tests/storage
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c08dcb1ffe372acd3a21496758a1984ff78dcdd4
+      * Wait for cryptsetup unit to start, before stopping.
+        File: debian/tests/storage
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b65aa350be7e61c65927fbc0921a750fcfaa51cd
+      * Fix typpo in storage test.
+        File: debian/tests/storage
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f28aa5fe4ab175b99b6ea702559c59ca473b4ca8
+    - Remaining changes:
+      * Set UseDomains to true, by default, on Ubuntu.
+        File: debian/patches/debian/Ubuntu-UseDomains-by-default.patch
+      * Enable systemd-resolved by default
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=05adfa0902115f51c1196ad623165a75bb8b4313
+      * Create /etc/resolv.conf at postinst, pointing at the stub resolver.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ef4adf46bbbe2d22508b70b889d23da53b85039d
+      * libnss-resolve: do not disable and stop systemd-resolved
+        File: debian/libnss-resolve.postrm
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=95577d14e84e19b614b83b2e24985d89e8c2dac0
+      * Ignore failures to set Nice priority on services in containers.
+        File: debian/patches/debian/Ubuntu-core-in-execute-soft-fail-setting-Nice-priority-when.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5b8e457f8d883fc6f55d33d46b3474926a495d29
+      * units: set ConditionVirtualization=!private-users on journald audit socket.
+        File: debian/patches/debian/Ubuntu-units-set-ConditionVirtualization-private-users-on-j.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=03ed18a9940731bbf794ad320fabf337488835c6
+      * debian/tests: Enforce udev upgrade.
+        Files:
+        - debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f350b43ccc1aa31c745b4ccebbb4084d5cea41ff
+      * Always setup /etc/resolv.conf on new installations.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=20bc8a37fa3c9620bed21a56a4eabd71db71d861
+      * Ubuntu/extra: ship dhclient-enter hook.
+        Files:
+        - debian/extra/dhclient-enter-resolved-hook
+        - debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f3398a213f80b02bf3db0c1ce9e22d69f6d56764
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=258893bae8cbb12670e4807636fe8f7e9fb5407a
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0725c1169ddde4f41cacba7af3e546704e2206be
+      * Disable systemd-networkd-wait-online by default.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=694473d812b50d2fefd6494d494ca02b91bc8785
+      * postinst: drop empty/stock /etc/rc.local
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e7d071a26a79558771303b0b87f007e650eaebbe
+      * Ship systemd sysctl settings.
+        Files:
+        - debian/patches/debian/UBUNTU-drop-kernel.-settings-from-sysctl-defaults-shipped.patch
+        - debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7cd041a6d0ef459e4b2a82d8ea5fa1ce05184dfb
+      * systemd.postinst: enable persistent journal
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f94f18d9dbc085b6a9ff33c141a6e542142f85b5
+      * Disable LLMNR and MulticastDNS by default
+        Files:
+        - debian/patches/debian/UBUNTU-resolved-disable-global-LLMNR-and-MulticastDNS.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4ec428e83696a5cd0405b677a35e97681867629
+      * Add "AssumedApparmorLabel=unconfined" to timedate1 dbus service file
+        File: debian/patches/debian/UBUNTU-Add-AssumedApparmorLabel-unconfined-to-timedate1-dbus.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5ad0879e10bbe3d641f940260b93c7eb2cf4624c
+      * debian/tests/systemd-fsckd: update assertions expectations for v237
+        File: debian/tests/systemd-fsckd
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d5becd9a416b55dcdb7b9a7aba60c4e3d304e6a6
+      * test/test-functions: launch qemu-system with -vga none.
+        File: debian/patches/debian/UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=90af1fa893cce5ed49999d16da0b793da6523394
+      * tests/boot-smoke: ignore udevd connection timeouts resolving colord group.
+        File: debian/tests/boot-smoke
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e1477b764fa9ef23f5181ef3d31a1332191c3e0b
+      * Drop systemd.prerm safety check.
+        File: debian/systemd.prerm
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0244c4d56556317f14eecc2f51871969ef02ba7b
+      * wait-online: do not wait, if no links are managed (neither configured, or failed).
+        File: debian/patches/debian/UBUNTU-wait-online-exit-if-no-links-are-managed.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=31f04c3fc769dacb3cf2a78240a1710a99a865b8
+      * journald.service: set Nice=-1 to dodge watchdog on soft lockups.
+        File: debian/patches/debian/UBUNTU-journald.service-set-Nice-1-to-dodge-watchdog-on-soft-loc.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e0a9aeffac556492bf517ce2d23313ff7a277926
+      * Workaround captive portals not responding to EDNS0 queries (DVE-2018-0001).
+        File: debian/patches/resolved-Mitigate-DVE-2018-0001-by-retrying-NXDOMAIN-with.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=87d3fe81b7281687ecf3c0b9a8356e90cc714d0b
+      * Recommend networkd-dispatcher
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d1e3b2c7e4757119da0d550b0b3c0a6626a176dc
+      * networkd: if RA was implicit, do not await ndisc_configured.
+        File: debian/patches/debian/UBUNTU-networkd-if-RA-was-implicit-do-not-await-ndisc_con.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2f749ff528d1b788aa4ca778e954c16b213ee629
+      * udev-udeb: ship modprobe.d snippet to force scsi_mod.scan=sync in d-i.
+        Files:
+        - debian/extra/modprobe.d-udeb/scsi-mod-scan-sync.conf
+        - debian/udev-udeb.install
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=eb6d8a2b9504917abb7aa2c4035fdbb7b98227f7
+      * Disable dh_installinit generation of tmpfiles for the systemd package.
+        Files:
+        - debian/rules
+        - debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1fd144cbe31cc7a9383cc76f21f4b84c22a9dd1b
+      * Enable EFI/bootctl on armhf.
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=043122f7d8a1487bfd357e815a6ece1ceea6e7d1
+      * boot-and-services: stderr is ok, for status command on the c1 container.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=da14d34e7cc33c44ad67e64c9fd092f8cc1675f9
+      * Skip systemd-fsckd on arm64, because of broken/lack of clean shutdown.
+        File: debian/tests/systemd-fsckd
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=bf5b501ac934497dbef5f64908ff37643dc7288e
+      * adt: boot-and-services: assert any kernel syslog messages.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=29dc34f7a6e5dc505f6212c17c42e4420b47ed16
+      * debian/extra/start-udev: Set scsi_mod scan=sync even if it's builtin to the kernel (we previously only set it in modprobe.d)
+        Files:
+        - debian/extra/start-udev
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6b72628f8de991e2c67ac4289fc74daf3abe7d14
+      * units: conditionalize more units to not start in containers.
+        Files:
+        - debian/patches/debian/UBUNTU-units-block-CAP_SYS_MODULE-units-in-containers-too.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3689afa1a782de8c19a757459b6360de1195ad55
+      * test-sleep: skip test_fiemap upon inapproriate ioctl for device.
+        File: debian/patches/debian/UBUNTU-test-sleep-skip-test_fiemap-upon-inapproriate-ioctl-.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6ebb5b9f6b77760a5470e8a780d69875b1db76f7
+      * Re-add support for /etc/writable for core18
+        File: debian/patches/debian/UBUNTU-Support-system-image-read-only-etc.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a5b5fca66c1127068e4ce0cc9ab497814211f4f7
+      * debian/control: strengthen dependencies.
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d1ecf0c372f5212129c85ae60fddf26b2271a1fe
+      * Improve autopkgtest success rate, by bumping up timeouts
+        File: debian/patches/debian/UBUNTU-bump-selftest-timeouts.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c05586d9da033bbfd6b6a74e10b87520843c7c48
+      * units: Disable journald Watchdog
+        File: debian/patches/debian/UBUNTU-units-disable-journald-watchdog.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=64d2b4f1d0d057073fba585f19823332e2a6eed5
+      * Add conflicts with upstart and systemd-shim
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=83ed7496afc7c27be026014d109855f7d0ad1176
+      * Specify Ubuntu's Vcs-Git
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fd832930ef280c9a4a9dda2440d5a46a6fdb6232
+      * debian/systemd.postinst: Skip daemon-reexec and try-restarts during shutdown
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=51daab96ae79483b5e5fb62e1e0477c87ee11fd1
+      * Switch gbp.conf to disco.
+        File: debian/gbp.conf
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fea585b259e3e766d8d3dbc9690e879c054ddc87
+      * core: set /run size to 10%, like initramfs-tools does.
+        File: debian/patches/debian/UBUNTU-core-set-run-size-to-10-like-initramfs-tools-does.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1fac2568fe716dc1a41bada78293dc6327a6df0d
+      * core: Revert strict mount namespacing/sandboxing, until LXD allows the needed mounts.
+        File: debian/patches/Revert-namespace-be-more-careful-when-handling-namespacin.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=030919ba5e4931d6ee576d0259fae67fe4ed9770
+      * networkd: [Route] PreferredSource not working in *.network files.
+        Files:
+        - debian/patches/debian/UBUNTU-networkd-if-RA-was-implicit-do-not-await-ndisc_con.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4e2ee0b2ac1be2ae78952890a56a2d5398df518
+      * debian/tests: blacklist upstream test-24-unit-tests on ppc64le.
+        File: debian/tests/upstream
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8062b9a2712c390010d2948eaf764a1b52e68715
+      * debian/control: Update Vcs-{Browser|Git} to Ubuntu's packaging repository
+      * debian/gbp.conf: Set tag format to ubuntu/*
+      * Only test that gdm3 comes up on amd64. Stalls on other arches.
+        File: debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=97cb13685dfb353045c449ec5d6d1df60f661079
+      * Fix false negative checking for running jobs after boot.
+        File: debian/tests/boot-smoke
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=aeb01631efbaf3fe851dee15d496e0b66b5c347f
+      * Cherrypick ask-password: prevent buffer overrow when reading from keyring.
+        File: debian/patches/ask-password-prevent-buffer-overrow-when-reading-fro.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6d6e9cbd4fc6e018031a4762e88f2c3aa19e24e8
+      * Wait for systemctl is-system-running state.
+        File: debian/tests/boot-smoke
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=776998f1f55c445b6e385cab69a4219c42d00838
+      * random-util: eat up bad RDRAND values seen on AMD CPUs.
+        File: debian/patches/+rdrand-workaround-on-amd.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?h=ubuntu-eoan&id=6ab88231efca4b04b26de6cfb5d671be154aabe0
+  * Refresh patches
+  * debian/tests/boot-smoke: Restore exit handling Ubuntu delta lost in 241 merge
+    File: debian/tests/boot-smoke
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3bad1cf23cc91299471542e83c589f2b6237a162
+  * Skip falling back to device name when net_get_name(device) fails.
+    This fixes network-manager and netplan.io autopkgtests
+    File: debian/patches/Skip-falling-back-to-device-name-when-net_get_name-device.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c79fe0e2dc29834e0cd236ade6e4e44a6ffb74fa
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Thu, 12 Sep 2019 10:28:46 +0200
+
 systemd (242-6) unstable; urgency=medium
 
   [ Dan Streetman ]
@@ -3998,6 +8916,313 @@ systemd (242-1) experimental; urgency=me
 
  -- Michael Biebl <biebl@debian.org>  Wed, 08 May 2019 01:33:56 +0200
 
+systemd (241-7ubuntu1) eoan; urgency=medium
+
+  * Merge from unstable
+    - Dropped changes:
+      * debian/tests: Switch to gdm
+        Files:
+        - debian/tests/boot-and-services
+        - debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f350b43ccc1aa31c745b4ccebbb4084d5cea41ff
+      * Cherrypick proposed patch to fix LinkLocalAddressing post-unify-MTU settings.
+        File: debian/patches/networkd-honour-LinkLocalAddressing.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=cd9ba0d0f47634c9e5d862b8208cdc3178f25496
+      * Import patches to support PPC64LE qemu based testing.
+        Files:
+        - debian/tests/control
+        - debian/patches/test-test-functions-on-PP64-use-vmlinux.patch
+        - debian/patches/test-test-functions-on-PPC64-use-hvc0-console.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=483a4daba07f809883883e8e8b9c365cfbf7256e
+      * networkd: [Route] PreferredSource not working in *.network files.
+        Files:
+        - debian/patches/Install-routes-after-addresses-are-ready.patch
+        - debian/patches/Move-link_check_ready-to-later-in-the-file.patch
+        - debian/patches/tests-Add-test-for-IPv6-source-routing.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4e2ee0b2ac1be2ae78952890a56a2d5398df518
+      * udevadm: Fix segfault with subsystem-match containing '/' (Closes: #919206)
+        File: debian/patches/udevadm-fix-segfault.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=736973d38676301f276716f22a746aed2489baac
+      * Blacklist TEST-10-ISSUE-2467 #11706
+        File: debian/tests/upstream
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f93b9e46b54388370da7b0cd7f858031be3a2578
+      * Fix comment about why we disable hwclock.service.
+        File: debian/systemd.links
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8473f88fffdb9db1f5ba547bb692a911997f2569
+      * debian/tests/storage: fix for LUKS2 and avoid interactive password prompts.
+        File: debian/tests/storage
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5594ebf325816e76a8c58043c56fc94f2d52b2a6
+      * d/p/network-remove-routing-policy-rule-from-foreign-rule.patch
+      * d/p/network-do-not-remove-rule-when-it-is-requested-by-e.patch
+        - Fix RoutingPolicyRule does not apply correctly
+      * core: queue jobs on uninstall to generate PropertiesChanged signal.
+        File: debian/patches/core-when-we-uninstall-a-job-add-unit-to-dbus-queue.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=241deca98fb9a0f1ba9a6ba781f738fb31a3bd80
+      * systemd-stable: cherrypick many bugfixes from the v240-stable branch.
+        Files:
+        - debian/patches/Add-missing-dash-to-all-option-in-the-timedatectl-man-pag.patch
+        - debian/patches/Add-note-about-transactions-being-genereated-independentl.patch
+        - debian/patches/Change-job-mode-of-manager-triggered-restarts-to-JOB_REPL.patch
+        - debian/patches/Fix-omission-in-docs.patch
+        - debian/patches/Log-the-job-being-merged.patch
+        - debian/patches/NEWS-document-deprecation-of-PermissionsStartOnly-in-v240.patch
+        - debian/patches/NEWS-retroactively-describe-.include-deprecation.patch
+        - debian/patches/Update-systemd-system.conf.xml.patch
+        - debian/patches/basic-prioq-add-prioq_peek_item.patch
+        - debian/patches/core-Fix-EOPNOTSUPP-emergency-action-error-string.patch
+        - debian/patches/core-Fix-return-argument-check-for-parse_emergency_action.patch
+        - debian/patches/core-mount-do-not-add-Before-local-fs.target-or-remote-fs.patch
+        - debian/patches/core-mount-move-static-function-earlier-in-file.patch
+        - debian/patches/curl-util-fix-use-after-free.patch
+        - debian/patches/ethtool-Make-sure-advertise-is-actually-set-when-autonego.patch
+        - debian/patches/journal-avoid-buffer-overread-when-locale-name-is-too-lon.patch
+        - debian/patches/journal-limit-the-number-of-entries-in-the-cache-based-on.patch
+        - debian/patches/journald-periodically-drop-cache-for-all-dead-PIDs.patch
+        - debian/patches/machinectl-fix-argument-index-in-error-log.patch
+        - debian/patches/man-Fix-a-typo-in-systemd.exec.xml.patch
+        - debian/patches/man-fix-reference.patch
+        - debian/patches/man-fix-volume-num-of-journalctl.patch
+        - debian/patches/man-update-DefaultDependency-in-systemd.mount-5.patch
+        - debian/patches/netlink-set-maximum-size-of-WGDEVICE_A_IFNAME.patch
+        - debian/patches/network-make-Link-and-NetDev-always-have-the-valid-poiter.patch
+        - debian/patches/network-unset-Network-manager-when-loading-.network-file-.patch
+        - debian/patches/network-wireguard-rename-and-split-set_wireguard_interfac.patch
+        - debian/patches/networkd-wait-for-kernel-to-reply-ipv6-peer-address.patch
+        - debian/patches/nspawn-ignore-SIGPIPE-for-nspawn-itself.patch
+        - debian/patches/pager-improve-english-a-bit.patch
+        - debian/patches/pid1-fix-cleanup-of-stale-implicit-deps-based-on-proc-sel.patch
+        - debian/patches/procfs-util-expose-functionality-to-query-total-memory.patch
+        - debian/patches/pull-fix-invalid-error-check.patch
+        - debian/patches/shared-Revert-commit-49fe5c099-in-parts-for-function-pars.patch
+        - debian/patches/shared-dissect-image-make-sure-that-we-don-t-truncate-dev.patch
+        - debian/patches/test-execute-unset-HOME-before-testing.patch
+        - debian/patches/udev-do-logging-before-setting-variables-to-NULL.patch
+        - debian/patches/udev-val-may-be-NULL-use-strempty.patch
+        - debian/patches/udevadm-info-a-should-enumerate-sysfs-attributes-not-envs.patch
+        - debian/patches/udevd-use-worker_free-on-failure-in-worker_new.patch
+        - debian/patches/units-make-sure-initrd-cleanup.service-terminates-before-.patch
+        - debian/patches/wait-online-do-not-fail-if-we-receive-invalid-messages.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2b3db732ba7e5418d45ca42884e8d075189f2724
+      * Cherrypick missing systemd-stable patches to unbreak wireguard peer endpoints.
+        Files:
+        - debian/patches/network-wireguard-fixes-sending-wireguard-peer-setti.patch
+        - debian/patches/network-wireguard-use-sd_netlink_message_append_sock.patch
+        - debian/patches/sd-netlink-introduce-sd_netlink_message_append_socka.patch
+        - debian/patches/test-network-add-more-checks-in-NetworkdNetDevTests..patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=4046f515e40c4dc80d18d2303466737f1f451f11
+      * Cherry-pick patches to fix FTBFS with GCC 9:
+        - d/p/strv-rework-FOREACH_STRING-macro.patch
+        - d/p/test-systemctl-nspawn-use-const-char-instead-of-char-as-i.patch
+    - Remaining changes:
+      * Skip starting systemd-remount-fs.service in containers
+        even when /etc/fstab is present.
+        File: debian/patches/debian/Skip-starting-systemd-remount-fs.service-in-containers.patch
+      * resolved: add support for pipelined requests
+        Files:
+        - debian/patches/llmnr-add-comment-why-we-install-no-complete-handler-on-s.patch
+        - debian/patches/resolved-add-comment-to-dns_stream_complete-about-its-err.patch
+        - debian/patches/resolved-keep-stub-stream-connections-up-for-as-long-as-c.patch
+        - debian/patches/resolved-only-call-complete-with-zero-argument-in-LLMNR-c.patch
+        - debian/patches/resolved-restart-stream-timeout-whenever-we-managed-to-re.patch
+        - debian/patches/stream-follow-coding-style-don-t-use-degrade-to-bool-for-.patch
+        - debian/patches/stream-track-type-of-DnsStream-object.patch
+        - debian/patches/transaction-simplify-handling-if-we-get-an-unexpected-DNS.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8ad1db08c2135af098a33957ce7cffbe21fb683f
+      * networkd: [Route] PreferredSource not working in *.network files.
+        Files:
+        - debian/patches/debian/UBUNTU-networkd-if-RA-was-implicit-do-not-await-ndisc_con.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4e2ee0b2ac1be2ae78952890a56a2d5398df518
+      * virt: detect WSL environment as a container
+        Files:
+        - debian/patches/virt-detect-WSL-environment-as-a-container-id-wsl.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=20b10ce955ad6ddb85c185a13e05a72c3e717f20
+      * pam-systemd: use secure_getenv() rather than getenv()
+        File: debian/patches/pam-systemd-use-secure_getenv-rather-than-getenv.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f3291e9e8c3eafd0c8921cb26a0d5ee0fd563b3c
+      * Set UseDomains to true, by default, on Ubuntu.
+        File: debian/patches/debian/Ubuntu-UseDomains-by-default.patch
+      * Enable systemd-resolved by default
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=05adfa0902115f51c1196ad623165a75bb8b4313
+      * Create /etc/resolv.conf at postinst, pointing at the stub resolver.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ef4adf46bbbe2d22508b70b889d23da53b85039d
+      * libnss-resolve: do not disable and stop systemd-resolved
+        File: debian/libnss-resolve.postrm
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=95577d14e84e19b614b83b2e24985d89e8c2dac0
+      * Ignore failures to set Nice priority on services in containers.
+        File: debian/patches/debian/Ubuntu-core-in-execute-soft-fail-setting-Nice-priority-when.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5b8e457f8d883fc6f55d33d46b3474926a495d29
+      * units: set ConditionVirtualization=!private-users on journald audit socket.
+        File: debian/patches/debian/Ubuntu-units-set-ConditionVirtualization-private-users-on-j.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=03ed18a9940731bbf794ad320fabf337488835c6
+      * debian/tests: Enforce udev upgrade.
+        Files:
+        - debian/tests/boot-and-services
+        - debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f350b43ccc1aa31c745b4ccebbb4084d5cea41ff
+      * Always setup /etc/resolv.conf on new installations.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=20bc8a37fa3c9620bed21a56a4eabd71db71d861
+      * Ubuntu/extra: ship dhclient-enter hook.
+        Files:
+        - debian/extra/dhclient-enter-resolved-hook
+        - debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f3398a213f80b02bf3db0c1ce9e22d69f6d56764
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=258893bae8cbb12670e4807636fe8f7e9fb5407a
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0725c1169ddde4f41cacba7af3e546704e2206be
+      * Disable systemd-networkd-wait-online by default.
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=694473d812b50d2fefd6494d494ca02b91bc8785
+      * postinst: drop empty/stock /etc/rc.local
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e7d071a26a79558771303b0b87f007e650eaebbe
+      * Ship systemd sysctl settings.
+        Files:
+        - debian/patches/debian/UBUNTU-drop-kernel.-settings-from-sysctl-defaults-shipped.patch
+        - debian/rules
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7cd041a6d0ef459e4b2a82d8ea5fa1ce05184dfb
+      * systemd.postinst: enable persistent journal
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f94f18d9dbc085b6a9ff33c141a6e542142f85b5
+      * Disable LLMNR and MulticastDNS by default
+        Files:
+        - debian/patches/debian/UBUNTU-resolved-disable-global-LLMNR-and-MulticastDNS.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4ec428e83696a5cd0405b677a35e97681867629
+      * Add "AssumedApparmorLabel=unconfined" to timedate1 dbus service file
+        File: debian/patches/debian/UBUNTU-Add-AssumedApparmorLabel-unconfined-to-timedate1-dbus.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5ad0879e10bbe3d641f940260b93c7eb2cf4624c
+      * debian/tests/systemd-fsckd: update assertions expectations for v237
+        File: debian/tests/systemd-fsckd
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d5becd9a416b55dcdb7b9a7aba60c4e3d304e6a6
+      * test/test-functions: launch qemu-system with -vga none.
+        File: debian/patches/debian/UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=90af1fa893cce5ed49999d16da0b793da6523394
+      * tests/boot-smoke: ignore udevd connection timeouts resolving colord group.
+        File: debian/tests/boot-smoke
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e1477b764fa9ef23f5181ef3d31a1332191c3e0b
+      * Drop systemd.prerm safety check.
+        File: debian/systemd.prerm
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0244c4d56556317f14eecc2f51871969ef02ba7b
+      * wait-online: do not wait, if no links are managed (neither configured, or failed).
+        File: debian/patches/debian/UBUNTU-wait-online-exit-if-no-links-are-managed.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=31f04c3fc769dacb3cf2a78240a1710a99a865b8
+      * journald.service: set Nice=-1 to dodge watchdog on soft lockups.
+        File: debian/patches/debian/UBUNTU-journald.service-set-Nice-1-to-dodge-watchdog-on-soft-loc.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e0a9aeffac556492bf517ce2d23313ff7a277926
+      * Workaround captive portals not responding to EDNS0 queries (DVE-2018-0001).
+        File: debian/patches/resolved-Mitigate-DVE-2018-0001-by-retrying-NXDOMAIN-with.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=87d3fe81b7281687ecf3c0b9a8356e90cc714d0b
+      * Recommend networkd-dispatcher
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d1e3b2c7e4757119da0d550b0b3c0a6626a176dc
+      * networkd: if RA was implicit, do not await ndisc_configured.
+        File: debian/patches/debian/UBUNTU-networkd-if-RA-was-implicit-do-not-await-ndisc_con.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2f749ff528d1b788aa4ca778e954c16b213ee629
+      * udev-udeb: ship modprobe.d snippet to force scsi_mod.scan=sync in d-i.
+        Files:
+        - debian/extra/modprobe.d-udeb/scsi-mod-scan-sync.conf
+        - debian/udev-udeb.install
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=eb6d8a2b9504917abb7aa2c4035fdbb7b98227f7
+      * Disable dh_installinit generation of tmpfiles for the systemd package.
+        Files:
+        - debian/rules
+        - debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1fd144cbe31cc7a9383cc76f21f4b84c22a9dd1b
+      * Enable EFI/bootctl on armhf.
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=043122f7d8a1487bfd357e815a6ece1ceea6e7d1
+      * boot-and-services: stderr is ok, for status command on the c1 container.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=da14d34e7cc33c44ad67e64c9fd092f8cc1675f9
+      * Skip systemd-fsckd on arm64, because of broken/lack of clean shutdown.
+        File: debian/tests/systemd-fsckd
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=bf5b501ac934497dbef5f64908ff37643dc7288e
+      * adt: boot-and-services: assert any kernel syslog messages.
+        File: debian/tests/boot-and-services
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=29dc34f7a6e5dc505f6212c17c42e4420b47ed16
+      * debian/extra/start-udev: Set scsi_mod scan=sync even if it's builtin to the kernel (we previously only set it in modprobe.d)
+        Files:
+        - debian/extra/start-udev
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6b72628f8de991e2c67ac4289fc74daf3abe7d14
+      * units: conditionalize more units to not start in containers.
+        Files:
+        - debian/patches/debian/UBUNTU-units-block-CAP_SYS_MODULE-units-in-containers-too.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3689afa1a782de8c19a757459b6360de1195ad55
+      * test-sleep: skip test_fiemap upon inapproriate ioctl for device.
+        File: debian/patches/debian/UBUNTU-test-sleep-skip-test_fiemap-upon-inapproriate-ioctl-.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6ebb5b9f6b77760a5470e8a780d69875b1db76f7
+      * Re-add support for /etc/writable for core18
+        File: debian/patches/debian/UBUNTU-Support-system-image-read-only-etc.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a5b5fca66c1127068e4ce0cc9ab497814211f4f7
+      * debian/control: strengthen dependencies.
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d1ecf0c372f5212129c85ae60fddf26b2271a1fe
+      * Improve autopkgtest success rate, by bumping up timeouts
+        File: debian/patches/debian/UBUNTU-bump-selftest-timeouts.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c05586d9da033bbfd6b6a74e10b87520843c7c48
+      * units: Disable journald Watchdog
+        File: debian/patches/debian/UBUNTU-units-disable-journald-watchdog.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=64d2b4f1d0d057073fba585f19823332e2a6eed5
+      * Add conflicts with upstart and systemd-shim
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=83ed7496afc7c27be026014d109855f7d0ad1176
+      * Specify Ubuntu's Vcs-Git
+        File: debian/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fd832930ef280c9a4a9dda2440d5a46a6fdb6232
+      * debian/systemd.postinst: Skip daemon-reexec and try-restarts during shutdown
+        File: debian/systemd.postinst
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=51daab96ae79483b5e5fb62e1e0477c87ee11fd1
+      * Switch gbp.conf to disco.
+        File: debian/gbp.conf
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fea585b259e3e766d8d3dbc9690e879c054ddc87
+      * core: set /run size to 10%, like initramfs-tools does.
+        File: debian/patches/debian/UBUNTU-core-set-run-size-to-10-like-initramfs-tools-does.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1fac2568fe716dc1a41bada78293dc6327a6df0d
+      * support PPC64LE qemu based testing.
+        Files:
+        - debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=483a4daba07f809883883e8e8b9c365cfbf7256e
+      * core: Revert strict mount namespacing/sandboxing, until LXD allows the needed mounts.
+        File: debian/patches/Revert-namespace-be-more-careful-when-handling-namespacin.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=030919ba5e4931d6ee576d0259fae67fe4ed9770
+      * networkd: [Route] PreferredSource not working in *.network files.
+        Files:
+        - debian/patches/debian/UBUNTU-networkd-if-RA-was-implicit-do-not-await-ndisc_con.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4e2ee0b2ac1be2ae78952890a56a2d5398df518
+      * debian/tests: blacklist upstream test-24-unit-tests on ppc64le.
+        File: debian/tests/upstream
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8062b9a2712c390010d2948eaf764a1b52e68715
+      * debian/control: Update Vcs-{Browser|Git} to Ubuntu's packaging repository
+      * debian/gbp.conf: Set tag format to ubuntu/*
+      * Only test that gdm3 comes up on amd64. Stalls on other arches.
+        File: debian/tests/control
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=97cb13685dfb353045c449ec5d6d1df60f661079
+      * tests/storage: make the test more resilient.
+        File: debian/tests/storage
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c08dcb1ffe372acd3a21496758a1984ff78dcdd4
+      * Fix false negative checking for running jobs after boot.
+        File: debian/tests/boot-smoke
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=aeb01631efbaf3fe851dee15d496e0b66b5c347f
+      * Cherrypick ask-password: prevent buffer overrow when reading from keyring.
+        File: debian/patches/ask-password-prevent-buffer-overrow-when-reading-fro.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6d6e9cbd4fc6e018031a4762e88f2c3aa19e24e8
+      * Wait for cryptsetup unit to start, before stopping.
+        File: debian/tests/storage
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b65aa350be7e61c65927fbc0921a750fcfaa51cd
+      * Wait for systemctl is-system-running state.
+        File: debian/tests/boot-smoke
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=776998f1f55c445b6e385cab69a4219c42d00838
+      * Fix typpo in storage test.
+        File: debian/tests/storage
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f28aa5fe4ab175b99b6ea702559c59ca473b4ca8
+      * random-util: eat up bad RDRAND values seen on AMD CPUs.
+        File: debian/patches/+rdrand-workaround-on-amd.patch
+        https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?h=ubuntu-eoan&id=6ab88231efca4b04b26de6cfb5d671be154aabe0
+  * Refresh patches
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 28 Aug 2019 17:19:28 +0200
+
 systemd (241-7) unstable; urgency=medium
 
   [ Michael Biebl ]
@@ -4173,6 +9398,247 @@ systemd (241-1) unstable; urgency=medium
 
  -- Felipe Sateler <fsateler@debian.org>  Thu, 21 Feb 2019 20:10:15 -0300
 
+systemd (240-6ubuntu13) eoan; urgency=medium
+
+  * Drop s390x seccomp fix causing regression on s390x
+    Files:
+    - debian/patches/src-shared-seccomp-util.c-Add-mmap-definitions-for-s390.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=da95e1d022e94a4d3ce0b69bd6eb398c95d09f24
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Mon, 26 Aug 2019 17:02:54 +0200
+
+systemd (240-6ubuntu12) eoan; urgency=medium
+
+  * Depends on g++-8 as well
+    Files:
+    - debian/control
+    - debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5594b4f2ba2a4f68911ecebb5fab4f3cf99a5f30
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 22 Aug 2019 16:41:11 +0100
+
+systemd (240-6ubuntu11) eoan; urgency=medium
+
+  [ Dan Streetman ]
+  * d/p/lp1835581-src-network-networkd-dhcp4.c-set-prefsrc-for-classle.patch:
+    - Set src address for dhcp 'classless' routes (LP: #1835581)
+
+  [ Jorge Niedbalski ]
+  * d/p/lp1668771-resolved-switch-cache-option-to-a-tri-state-option-s.patch:
+    Allows cache=no-negative option to be set, ignoring negative
+    answers to be cached (LP: #1668771).
+
+  [ Jeremy Soller ]
+  * random-util: eat up bad RDRAND values seen on AMD CPUs.
+    This fixes AMD Ryzen 3000 series failing to boot (LP: #1835809)
+
+  [ You-Sheng Yang ]
+  * d/p/d/Revert-udev-network-device-renaming-immediately-give.patch:
+    - udev: drop Revert-udev-network-device-renaming-immediately-give.patch.
+      The removing patch was for the already deprecated
+      "75-persistent-net-generator.rules" based interface renaming mechanism,
+      and it's causing unnecessary problem when a system happends to NICs with
+      same MAC address, e.g. Dell's MAC address pass-thru. (LP: #1837700)
+
+  [ Dimitri John Ledkov ]
+  * Cherrypick seccomp fixes for new kernel and glibc.
+    Files:
+    - debian/patches/seccomp-add-new-5.1-syscall-pidfd_send_signal-to-filter-s.patch
+    - debian/patches/seccomp-add-rseq-to-default-list-of-syscalls-to-whitelist.patch
+    - debian/patches/seccomp-allow-shmat-to-be-a-separate-syscall-on-architect.patch
+    - debian/patches/seccomp-drop-mincore-from-system-service-syscall-filter-g.patch
+    - debian/patches/seccomp-shm-get-at-dt-now-have-their-own-numbers-everywhe.patch
+    - debian/patches/shared-seccomp-add-sync_file_range2.patch
+    - debian/patches/src-shared-seccomp-util.c-Add-mmap-definitions-for-s390.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=627919b0cbcc7e094995f167f8c5eb899f801fd3
+
+  * Build with gcc-8, otherwise tests segfault.
+    Files:
+    - debian/control
+    - debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1ca0100244e46b00a97dfa10a5d980de7bdc6735
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 22 Aug 2019 15:03:45 +0100
+
+systemd (240-6ubuntu9) eoan; urgency=medium
+
+  * Fix typpo in storage test.
+    File: debian/tests/storage
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f28aa5fe4ab175b99b6ea702559c59ca473b4ca8
+
+  * Fix bashism
+    File: debian/extra/dhclient-enter-resolved-hook
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0725c1169ddde4f41cacba7af3e546704e2206be
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 30 May 2019 21:45:50 +0100
+
+systemd (240-6ubuntu8) eoan; urgency=medium
+
+  * Only restart resolved on changes in dhclient enter hook.
+    This prevents spurious restarts of resolved on rebounds when
+    the addresses did not change. (LP: #1805183)
+    Author: Julian Andres Klode
+    File: debian/extra/dhclient-enter-resolved-hook
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=258893bae8cbb12670e4807636fe8f7e9fb5407a
+
+  * Wait for cryptsetup unit to start, before stopping.
+    Patch from cascardo. Plus small refactor for readability. (LP: #1814373)
+    File: debian/tests/storage
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b65aa350be7e61c65927fbc0921a750fcfaa51cd
+
+  * Wait for systemctl is-system-running state.
+    File: debian/tests/boot-smoke
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=776998f1f55c445b6e385cab69a4219c42d00838
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 30 May 2019 14:59:04 +0100
+
+systemd (240-6ubuntu7) eoan; urgency=medium
+
+  * Revert "Add check to switch VTs only between K_XLATE or K_UNICODE"
+    This reverts commit 60407728a1a453104e3975ecfdf25a254dd7cc44.
+    Files:
+    - debian/patches/Add-check-to-switch-VTs-only-between-K_XLATE-or-K_UNICODE.patch
+    - debian/patches/Move-verify_vc_kbmode-to-terminal-util.c-as-vt_verify_kbm.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=18029ab5ff436bfb3b401f24cd1e3a4cf2a1579c
+
+  * Cherrypick missing systemd-stable patches to unbreak wireguard peer endpoints.
+    Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com> (LP: #1825378)
+    Author: Dan Streetman
+    Files:
+    - debian/patches/network-wireguard-fixes-sending-wireguard-peer-setti.patch
+    - debian/patches/network-wireguard-use-sd_netlink_message_append_sock.patch
+    - debian/patches/sd-netlink-introduce-sd_netlink_message_append_socka.patch
+    - debian/patches/test-network-add-more-checks-in-NetworkdNetDevTests..patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=4046f515e40c4dc80d18d2303466737f1f451f11
+
+  * Remove expected failure from passing test.
+    Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com> (LP: #1829450)
+    Author: Dan Streetman
+    File: debian/tests/systemd-fsckd
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c43b12037d08555dc1d26593307726d7c7992df0
+
+  * Fix false negative checking for running jobs after boot.
+    Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com> (LP: #1825997)
+    Author: Dan Streetman
+    File: debian/tests/boot-smoke
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=aeb01631efbaf3fe851dee15d496e0b66b5c347f
+
+  * Cherrypick ask-password: prevent buffer overrow when reading from keyring.
+    Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com> (LP: #1814373)
+    Author: Dan Streetman
+    File: debian/patches/ask-password-prevent-buffer-overrow-when-reading-fro.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6d6e9cbd4fc6e018031a4762e88f2c3aa19e24e8
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 29 May 2019 19:54:37 +0100
+
+systemd (240-6ubuntu6) eoan; urgency=medium
+
+  * Add check to switch VTs only between K_XLATE or K_UNICODE.
+    Switching to K_UNICODE from other than L_XLATE can make the keyboard
+    unusable and possibly leak keypresses from X. (LP: #1803993)
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Thu, 16 May 2019 23:22:15 +0200
+
+systemd (240-6ubuntu5) disco; urgency=medium
+
+  * systemd-stable: cherrypick many bugfixes from the v240-stable branch.
+    Includes many documentation fixes, memory safety (use after free, read
+    overruns, etc), networkd wireguard fixes, POSIX ACL fix which is preventing adm
+    group from reading journals (LP: #1824342), journal dropping caches
+    improvement, fixes regressions in udevadm / machinectl command line parsing.
+    Files:
+    - debian/patches/Add-missing-dash-to-all-option-in-the-timedatectl-man-pag.patch
+    - debian/patches/Add-note-about-transactions-being-genereated-independentl.patch
+    - debian/patches/Change-job-mode-of-manager-triggered-restarts-to-JOB_REPL.patch
+    - debian/patches/Fix-omission-in-docs.patch
+    - debian/patches/Log-the-job-being-merged.patch
+    - debian/patches/NEWS-document-deprecation-of-PermissionsStartOnly-in-v240.patch
+    - debian/patches/NEWS-retroactively-describe-.include-deprecation.patch
+    - debian/patches/Update-systemd-system.conf.xml.patch
+    - debian/patches/basic-prioq-add-prioq_peek_item.patch
+    - debian/patches/core-Fix-EOPNOTSUPP-emergency-action-error-string.patch
+    - debian/patches/core-Fix-return-argument-check-for-parse_emergency_action.patch
+    - debian/patches/core-mount-do-not-add-Before-local-fs.target-or-remote-fs.patch
+    - debian/patches/core-mount-move-static-function-earlier-in-file.patch
+    - debian/patches/curl-util-fix-use-after-free.patch
+    - debian/patches/ethtool-Make-sure-advertise-is-actually-set-when-autonego.patch
+    - debian/patches/journal-avoid-buffer-overread-when-locale-name-is-too-lon.patch
+    - debian/patches/journal-limit-the-number-of-entries-in-the-cache-based-on.patch
+    - debian/patches/journald-periodically-drop-cache-for-all-dead-PIDs.patch
+    - debian/patches/machinectl-fix-argument-index-in-error-log.patch
+    - debian/patches/man-Fix-a-typo-in-systemd.exec.xml.patch
+    - debian/patches/man-fix-reference.patch
+    - debian/patches/man-fix-volume-num-of-journalctl.patch
+    - debian/patches/man-update-DefaultDependency-in-systemd.mount-5.patch
+    - debian/patches/netlink-set-maximum-size-of-WGDEVICE_A_IFNAME.patch
+    - debian/patches/network-make-Link-and-NetDev-always-have-the-valid-poiter.patch
+    - debian/patches/network-unset-Network-manager-when-loading-.network-file-.patch
+    - debian/patches/network-wireguard-rename-and-split-set_wireguard_interfac.patch
+    - debian/patches/networkd-wait-for-kernel-to-reply-ipv6-peer-address.patch
+    - debian/patches/nspawn-ignore-SIGPIPE-for-nspawn-itself.patch
+    - debian/patches/pager-improve-english-a-bit.patch
+    - debian/patches/pid1-fix-cleanup-of-stale-implicit-deps-based-on-proc-sel.patch
+    - debian/patches/procfs-util-expose-functionality-to-query-total-memory.patch
+    - debian/patches/pull-fix-invalid-error-check.patch
+    - debian/patches/shared-Revert-commit-49fe5c099-in-parts-for-function-pars.patch
+    - debian/patches/shared-dissect-image-make-sure-that-we-don-t-truncate-dev.patch
+    - debian/patches/test-execute-unset-HOME-before-testing.patch
+    - debian/patches/udev-do-logging-before-setting-variables-to-NULL.patch
+    - debian/patches/udev-val-may-be-NULL-use-strempty.patch
+    - debian/patches/udevadm-info-a-should-enumerate-sysfs-attributes-not-envs.patch
+    - debian/patches/udevd-use-worker_free-on-failure-in-worker_new.patch
+    - debian/patches/units-make-sure-initrd-cleanup.service-terminates-before-.patch
+    - debian/patches/wait-online-do-not-fail-if-we-receive-invalid-messages.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2b3db732ba7e5418d45ca42884e8d075189f2724
+
+  * Only test that gdm3 comes up on amd64. Stalls on other arches.
+    File: debian/tests/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=97cb13685dfb353045c449ec5d6d1df60f661079
+
+  * tests/storage: make the test more resilient.
+    Skip if the scsi_debug module is not available (like on custom kernels). Do not
+    fail the tests if removing the module fail, at the end of the test run.
+    File: debian/tests/storage
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c08dcb1ffe372acd3a21496758a1984ff78dcdd4
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 11 Apr 2019 14:44:08 +0100
+
+systemd (240-6ubuntu4) disco; urgency=medium
+
+  * pam-systemd: use secure_getenv() rather than getenv()
+    CVE-2019-3842
+    File: debian/patches/pam-systemd-use-secure_getenv-rather-than-getenv.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f3291e9e8c3eafd0c8921cb26a0d5ee0fd563b3c
+
+  * core: queue jobs on uninstall to generate PropertiesChanged signal.
+    (LP: #1816812)
+    File: debian/patches/core-when-we-uninstall-a-job-add-unit-to-dbus-queue.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=241deca98fb9a0f1ba9a6ba781f738fb31a3bd80
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 10 Apr 2019 01:06:03 +0100
+
+systemd (240-6ubuntu3) disco; urgency=medium
+
+  * virt: detect WSL environment as a container (LP: #1816753)
+  * debian/control: Update Vcs-{Browser|Git} to Ubuntu's packaging repository
+  * debian/gbp.conf: Set tag format to ubuntu/*
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Fri, 22 Mar 2019 18:39:48 +0100
+
+systemd (240-6ubuntu2) disco; urgency=medium
+
+  * d/p/network-remove-routing-policy-rule-from-foreign-rule.patch
+  * d/p/network-do-not-remove-rule-when-it-is-requested-by-e.patch
+    - Fix RoutingPolicyRule does not apply correctly (LP: #1818282)
+
+ -- Ioanna Alifieraki <ioanna-marial.alifieraki@canonical.com>  Mon, 04 Mar 2019 10:32:19 +0000
+
+systemd (240-6ubuntu1) disco; urgency=medium
+
+  * Release to ubuntu.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 20 Feb 2019 21:41:03 +0100
+
 systemd (240-6) unstable; urgency=high
 
   * High urgency as this fixes a vulnerability.
@@ -4220,6 +9686,113 @@ systemd (240-6) unstable; urgency=high
 
  -- Martin Pitt <mpitt@debian.org>  Mon, 18 Feb 2019 13:54:04 +0000
 
+systemd (240-5ubuntu4) disco; urgency=medium
+
+  * debian/tests/control: add socat to upstream tests for pull #11591
+    File: debian/tests/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7dff5196e23f50d15c0e0c4cb6742a1cc1cc704a
+
+  * udevadm: Fix segfault with subsystem-match containing '/' (Closes: #919206)
+    Author: Martin Pitt
+    File: debian/patches/udevadm-fix-segfault.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=736973d38676301f276716f22a746aed2489baac
+
+  * Blacklist TEST-10-ISSUE-2467 #11706
+    File: debian/tests/upstream
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f93b9e46b54388370da7b0cd7f858031be3a2578
+
+  * Fix comment about why we disable hwclock.service.
+    Systemd nowadays doesn't do it itself because the kernel does it on its own when necessary,
+    and when not, it is not safe to save the hwclock (eg, there is no certainty the system clock
+    is correct)
+    Author: Felipe Sateler
+    File: debian/systemd.links
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8473f88fffdb9db1f5ba547bb692a911997f2569
+
+  * udev: Backport upstream preventing mass killings when not running under systemd
+    (Closes: #918764)
+    Author: Felipe Sateler
+    File: debian/patches/udev-check-whether-systemd-is-running-and-do-not-use-cg_k.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=617ee70c31c45ea5d5c6c7b30766d47f0b89446c
+
+  * debian/tests/storage: fix for LUKS2 and avoid interactive password prompts.
+    File: debian/tests/storage
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5594ebf325816e76a8c58043c56fc94f2d52b2a6
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 14 Feb 2019 14:51:37 +0000
+
+systemd (240-5ubuntu3) disco; urgency=medium
+
+  * debian/tests: blacklist upstream test-24-unit-tests on ppc64le.
+    Fails, not a regression as it's a new test case, which was never before
+    executed on ppc64le.
+    File: debian/tests/upstream
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8062b9a2712c390010d2948eaf764a1b52e68715
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Sat, 02 Feb 2019 11:05:12 +0100
+
+systemd (240-5ubuntu2) disco; urgency=medium
+
+  * core: Revert strict mount namespacing/sandboxing, until LXD allows the needed mounts.
+    (LP: #1813622)
+    File: debian/patches/Revert-namespace-be-more-careful-when-handling-namespacin.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=030919ba5e4931d6ee576d0259fae67fe4ed9770
+
+  * resolved: add support for pipelined requests. (LP: #1811471)
+    Files:
+    - debian/patches/llmnr-add-comment-why-we-install-no-complete-handler-on-s.patch
+    - debian/patches/resolved-add-comment-to-dns_stream_complete-about-its-err.patch
+    - debian/patches/resolved-keep-stub-stream-connections-up-for-as-long-as-c.patch
+    - debian/patches/resolved-only-call-complete-with-zero-argument-in-LLMNR-c.patch
+    - debian/patches/resolved-restart-stream-timeout-whenever-we-managed-to-re.patch
+    - debian/patches/stream-follow-coding-style-don-t-use-degrade-to-bool-for-.patch
+    - debian/patches/stream-track-type-of-DnsStream-object.patch
+    - debian/patches/transaction-simplify-handling-if-we-get-an-unexpected-DNS.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=8ad1db08c2135af098a33957ce7cffbe21fb683f
+
+  * networkd: [Route] PreferredSource not working in *.network files.
+    (LP: #1812760)
+    Files:
+    - debian/patches/Install-routes-after-addresses-are-ready.patch
+    - debian/patches/Move-link_check_ready-to-later-in-the-file.patch
+    - debian/patches/tests-Add-test-for-IPv6-source-routing.patch
+    - debian/patches/debian/UBUNTU-networkd-if-RA-was-implicit-do-not-await-ndisc_con.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4e2ee0b2ac1be2ae78952890a56a2d5398df518
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 30 Jan 2019 11:46:53 +0000
+
+systemd (240-5ubuntu1) disco; urgency=medium
+
+  * Reenable pristine-tar in gbp.conf.
+    The pristine-tar bug has been fixed, so we can use it again.
+    This reverts commit 9fcfbbf6fea15eacfa3fad74240431c5f2c3300e.
+    Author: Felipe Sateler
+    File: debian/gbp.conf
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=045998b2a974f9322535fef6018b3c5fff6da342
+
+  * debian/tests/storage: improve cleanups.
+    On fast ppc64el machines, cryptsetup start job may not complete by the time
+    tearDown is executed. In that case stop, causes to simply cancel the start job
+    without actually cleaning up the dmsetup node. This leads to failing subsequent
+    test as it no longer starts with a clean device. Thus ensure the
+    systemd-cryptsetup unit is started, before stopping it.
+    Also rmmod scsi_debug module at the end, to allow re-running the test in a
+    loop.
+    File: debian/tests/storage
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=bfafb0924a59f2a93bcde00fc9eeea5c4d058977
+
+  * d/watch: add version mangle to transform -rc to ~rc.
+    Upstream has started releasing rcs, so let's account for that
+    Author: Felipe Sateler
+    File: debian/watch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=db2dbed693ac75c88ea6ed923537d18d30fc1cdf
+
+  * debian/tests/upstream: Mark TEST-13-NSPAWN-SMOKE as flakey.
+    File: debian/tests/upstream
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a106d9c60b7b9fc3e16e423ca6a4d376560927cc
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 28 Jan 2019 13:52:58 +0000
+
 systemd (240-5) unstable; urgency=medium
 
   [ Felipe Sateler ]
@@ -4230,6 +9803,337 @@ systemd (240-5) unstable; urgency=medium
 
  -- Martin Pitt <mpitt@debian.org>  Sun, 27 Jan 2019 21:33:07 +0000
 
+systemd (240-4ubuntu2) disco; urgency=medium
+
+  * Import patches to support PPC64LE qemu based testing.
+    Files:
+    - debian/tests/control
+    - debian/patches/test-test-functions-on-PP64-use-vmlinux.patch
+    - debian/patches/test-test-functions-on-PPC64-use-hvc0-console.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=483a4daba07f809883883e8e8b9c365cfbf7256e
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 24 Jan 2019 16:55:01 +0000
+
+systemd (240-4ubuntu1) disco; urgency=medium
+
+  * Skip starting systemd-remount-fs.service in containers
+    even when /etc/fstab is present.
+    This allows entering fully running state even when /etc/fstab
+    lists / to be mounted from a device which is not present in the
+    container. (LP: #1576341)
+    Author: Balint Reczey
+    File: debian/patches/debian/Skip-starting-systemd-remount-fs.service-in-containers.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3bde262e129a9d2c60eeff37e63d3da7d58ce5dd
+
+  * Set UseDomains to true, by default, on Ubuntu.
+    On Ubuntu, fallback DNS servers are disabled, therefore we do not leak queries
+    to a preset 3rd party by default. In resolved, dnssec is also disabled by
+    default, as too much of the internet is broken and using Ubuntu users to debug
+    the internet is not very productive - most of the time the end-user cannot fix
+    or know how to notify the site owners about the dnssec mistakes. Inherintally
+    the DHCP acquired DNS servers are therefore trusted, and are free to spoof
+    records. Not trusting DNS search domains, in such scenario, provides limited
+    security or privacy benefits. From user point of view, this also appears to be
+    a regression from previous Ubuntu releases which do trust DHCP acquired search
+    domains by default.
+    Therefore we are enabling UseDomains by default on Ubuntu.
+    Users may override this setting in the .network files by specifying
+    [DHCP|IPv6AcceptRA] UseDomains=no|route options.
+    File: debian/patches/debian/Ubuntu-UseDomains-by-default.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1e5b00cdfd6b9317704e1383d26365a68c041c56
+
+  * Enable systemd-resolved by default
+    File: debian/systemd.postinst
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=05adfa0902115f51c1196ad623165a75bb8b4313
+
+  * Create /etc/resolv.conf at postinst, pointing at the stub resolver.
+    The stub resolver file is dynamically managed by systemd-resolved. It points at
+    the stub resolver as the nameserver, however it also dynamically updates the
+    search stanza, thus non-nss dns tools work correctly with unqualified names and
+    correctly use the DHCP acquired search domains.
+    File: debian/systemd.postinst
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=ef4adf46bbbe2d22508b70b889d23da53b85039d
+
+  * libnss-resolve: do not disable and stop systemd-resolved
+    resolved is always used by default on ubuntu via stub resolver, therefore it
+    should continue to operate without libnss-resolve module installed.
+    File: debian/libnss-resolve.postrm
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=95577d14e84e19b614b83b2e24985d89e8c2dac0
+
+  * Ignore failures to set Nice priority on services in containers.
+    File: debian/patches/debian/Ubuntu-core-in-execute-soft-fail-setting-Nice-priority-when.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5b8e457f8d883fc6f55d33d46b3474926a495d29
+
+  * units: set ConditionVirtualization=!private-users on journald audit socket.
+    It fails to start in unprivileged containers.
+    File: debian/patches/debian/Ubuntu-units-set-ConditionVirtualization-private-users-on-j.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=03ed18a9940731bbf794ad320fabf337488835c6
+
+  * debian/tests: Switch to gdm, enforce udev upgrade.
+    Files:
+    - debian/tests/boot-and-services
+    - debian/tests/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f350b43ccc1aa31c745b4ccebbb4084d5cea41ff
+
+  * Always setup /etc/resolv.conf on new installations.
+    On new installations, /etc/resolv.conf will always exist. Move it to /run
+    and replace it with the desired final symlink. (LP: #1712283)
+    File: debian/systemd.postinst
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=20bc8a37fa3c9620bed21a56a4eabd71db71d861
+
+  * Enable systemd-networkd by default.
+    File: debian/systemd.postinst
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e5ff45174306b17077b907bc25cfd763ac6934f1
+
+  * boot-and-services: skip gdm3 tests when absent, as it is on s390x.
+    Files:
+    - debian/tests/boot-and-services
+    - debian/tests/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=cf05ba013979f53ad69fd2c548ec01c7a5339f64
+
+  * initramfs-tools: trigger udevadm add actions with subsystems first.
+    This updates the initramfs-tools init-top udev script to trigger udevadm
+    actions with type specified. This mimicks the
+    systemd-udev-trigger.service. Without type specified only devices are
+    triggered, but triggering subsystems may also be required and should happen
+    before triggering the devices. This is the case for example on s390x with zdev
+    generated udev rules. (LP: #1713536)
+    File: debian/extra/initramfs-tools/scripts/init-top/udev
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=4016ca5629b6c56b41a4f654e7a808c82e290cac
+
+  * Ubuntu/extra: ship dhclient-enter hook.
+    This allows isc-dhcp dhclient to set search domains and nameservers via
+    resolved.
+    Files:
+    - debian/extra/dhclient-enter-resolved-hook
+    - debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f3398a213f80b02bf3db0c1ce9e22d69f6d56764
+
+  * Disable systemd-networkd-wait-online by default.
+    Currently it is not fit for purpose, as it leads to long boot times when
+    networking is unplugged or not yet configured on boot. (LP: #1714301)
+    File: debian/systemd.postinst
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=694473d812b50d2fefd6494d494ca02b91bc8785
+
+  * postinst: drop empty/stock /etc/rc.local (LP: #1716979)
+    File: debian/systemd.postinst
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e7d071a26a79558771303b0b87f007e650eaebbe
+
+  * Improve resolvconf integration.
+    Make the .path|.service unit that feed resolved data into resolvconf not
+    generate failures if resolvconf is not installed.
+    Add a check to make sure that resolved does not read /etc/resolv.conf when that
+    is symlinked to stub-resolv.conf. (LP: #1717995)
+    File: debian/patches/debian/Ubuntu-resolved-resolvconf-integration.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d9f0f89985a141c1588d67e4868ad68cff6956fb
+
+  * Ship systemd sysctl settings.
+    Patch systemd's default sysctl settings to drop things that are set elsewhere
+    already.
+    The promote secondary IP addresses is required for networkd to successfully
+    renew DHCP leases with a change of an IP address.
+    Set default package scheduler to Fair Queue CoDel. (LP: #1721223)
+    Files:
+    - debian/patches/debian/UBUNTU-drop-kernel.-settings-from-sysctl-defaults-shipped.patch
+    - debian/rules
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=7cd041a6d0ef459e4b2a82d8ea5fa1ce05184dfb
+
+  * resolved.service: set DefaultDependencies=no (LP: #1734167)
+    File: debian/patches/resolved.service-set-DefaultDependencies-no.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a6ced6331ff7f99704213547a0b94dc06935d508
+
+  * systemd.postinst: enable persistent journal. (LP: #1618188)
+    File: debian/systemd.postinst
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=f94f18d9dbc085b6a9ff33c141a6e542142f85b5
+
+  * Disable LLMNR and MulticastDNS by default LP: #1739672
+    Files:
+    - debian/changelog
+    - debian/patches/debian/UBUNTU-resolved-disable-global-LLMNR-and-MulticastDNS.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b4ec428e83696a5cd0405b677a35e97681867629
+
+  * Enable qemu tests on all architectures LP: #1749540
+    Files:
+    - debian/changelog
+    - debian/tests/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b416d1bdfb4f5e33565178e01ba4c4e3939b6176
+
+  * Add "AssumedApparmorLabel=unconfined" to timedate1 dbus service file
+    (LP: #1749000)
+    Author: Michael Vogt
+    File: debian/patches/debian/UBUNTU-Add-AssumedApparmorLabel-unconfined-to-timedate1-dbus.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5ad0879e10bbe3d641f940260b93c7eb2cf4624c
+
+  * debian/tests/systemd-fsckd: update assertions expectations for v237
+    fsck got rewritten to use "safe_fork" and whilst previously it would ignore the
+    error, when fsck is terminated by signal PIPE, it no longer does so. Thus one
+    should expect systemd-fsck-root.service to have failed in certain test cases.
+    File: debian/tests/systemd-fsckd
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d5becd9a416b55dcdb7b9a7aba60c4e3d304e6a6
+
+  * test/test-functions: launch qemu-system with -vga none.
+    Should resolve booting qemu-system-ppc64 without seabios.
+    File: debian/patches/debian/UBUNTU-test-test-functions-launch-qemu-with-vga-none.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=90af1fa893cce5ed49999d16da0b793da6523394
+
+  * tests/boot-smoke: ignore udevd connection timeouts resolving colord group.
+    File: debian/tests/boot-smoke
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e1477b764fa9ef23f5181ef3d31a1332191c3e0b
+
+  * tests/systemd-fsckd: ignore systemd_fsck_with_plymouth_failure.
+    File: debian/tests/systemd-fsckd
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c392e1ca3da67dbf8a7dfe0dcad470f7636f7405
+
+  * tests/control: ensure boot-smoke uses latest systemd & udev.
+    File: debian/tests/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=b7b66380641755bc21fd7dcbc307760b1d18b8af
+
+  * Drop systemd.prerm safety check.
+    On Ubuntu, systemd is the only choice, and is essential, via init ->
+    systemd-sysv -> systemd dependency chain, thus removing systemd is already
+    quite hard, and appropriate warnings are emitted by dpkg. (LP: #1758438)
+    File: debian/systemd.prerm
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0244c4d56556317f14eecc2f51871969ef02ba7b
+
+  * wait-online: do not wait, if no links are managed (neither configured, or failed).
+    (LP: #1728181)
+    File: debian/patches/debian/UBUNTU-wait-online-exit-if-no-links-are-managed.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=31f04c3fc769dacb3cf2a78240a1710a99a865b8
+
+  * journald.service: set Nice=-1 to dodge watchdog on soft lockups.
+    (LP: #1696970)
+    File: debian/patches/debian/UBUNTU-journald.service-set-Nice-1-to-dodge-watchdog-on-soft-loc.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e0a9aeffac556492bf517ce2d23313ff7a277926
+
+  * Workaround captive portals not responding to EDNS0 queries (DVE-2018-0001).
+    (LP: #1727237)
+    File: debian/patches/resolved-Mitigate-DVE-2018-0001-by-retrying-NXDOMAIN-with.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=87d3fe81b7281687ecf3c0b9a8356e90cc714d0b
+
+  * Recommend networkd-dispatcher (LP: #1762386)
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d1e3b2c7e4757119da0d550b0b3c0a6626a176dc
+
+  * networkd: if RA was implicit, do not await ndisc_configured.
+    If RA was iplicit, meaning not otherwise requested, and a kernel default was in
+    use. Do not prevent link entering configured state, whilst ndisc configuration
+    is pending. Implicit kernel RA, is expected to be asynchronous and
+    non-blocking. (LP: #1765173)
+    File: debian/patches/debian/UBUNTU-networkd-if-RA-was-implicit-do-not-await-ndisc_con.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2f749ff528d1b788aa4ca778e954c16b213ee629
+
+  * udev-udeb: ship modprobe.d snippet to force scsi_mod.scan=sync in d-i.
+    This ensures that all scans are completed, before installer reaches
+    partitioning stage. (LP: #1751813)
+    Files:
+    - debian/extra/modprobe.d-udeb/scsi-mod-scan-sync.conf
+    - debian/udev-udeb.install
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=eb6d8a2b9504917abb7aa2c4035fdbb7b98227f7
+
+  * Disable dh_installinit generation of tmpfiles for the systemd package.
+    Replace with a manual safe call to systemd-tmpfiles which will process any
+    updates to the tmpfiles shipped by systemd package, taking into account any
+    overrides shipped by other packages, sysadmin, or specified in the runtime
+    directories. (LP: #1748147)
+    Files:
+    - debian/rules
+    - debian/systemd.postinst
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1fd144cbe31cc7a9383cc76f21f4b84c22a9dd1b
+
+  * Enable EFI/bootctl on armhf.
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=043122f7d8a1487bfd357e815a6ece1ceea6e7d1
+
+  * boot-and-services: stderr is ok, for status command on the c1 container.
+    systemctl may print warnings on the stderr when checking the status of
+    completed units. This should not, overall fail the autopkgtest run.
+    File: debian/tests/boot-and-services
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=da14d34e7cc33c44ad67e64c9fd092f8cc1675f9
+
+  * Skip systemd-fsckd on arm64, because of broken/lack of clean shutdown.
+    File: debian/tests/systemd-fsckd
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=bf5b501ac934497dbef5f64908ff37643dc7288e
+
+  * adt: boot-and-services: assert any kernel syslog messages.
+    It appears that on arm64 the syslog is truncated and is missing early kernel
+    messages. Print full one, and check for any kernel messages instead.
+    File: debian/tests/boot-and-services
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=29dc34f7a6e5dc505f6212c17c42e4420b47ed16
+
+  * debian/extra/start-udev: Set scsi_mod scan=sync even if it's builtin to the kernel (we previously only set it in modprobe.d) LP: #1779815
+    Files:
+    - debian/changelog
+    - debian/extra/start-udev
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6b72628f8de991e2c67ac4289fc74daf3abe7d14
+
+  * units: conditionalize more units to not start in containers.
+    Files:
+    - debian/changelog
+    - debian/patches/debian/UBUNTU-units-block-CAP_SYS_MODULE-units-in-containers-too.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3689afa1a782de8c19a757459b6360de1195ad55
+
+  * test-sleep: skip test_fiemap upon inapproriate ioctl for device.
+    On v4.4 kernels, on top of btrfs ephemeral lxd v3.0 containers generate this
+    other error code, instead of not supported. Skip the test for both error codes.
+    File: debian/patches/debian/UBUNTU-test-sleep-skip-test_fiemap-upon-inapproriate-ioctl-.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=6ebb5b9f6b77760a5470e8a780d69875b1db76f7
+
+  * Re-add support for /etc/writable for core18. (LP: #1778936)
+    Author: Michael Vogt
+    File: debian/patches/debian/UBUNTU-Support-system-image-read-only-etc.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a5b5fca66c1127068e4ce0cc9ab497814211f4f7
+
+  * debian/control: strengthen dependencies.
+    Make systemd-sysv depend on matching version of systemd. Autopkgtests at times
+    upgrade systemd-sysv without upgrading systemd. However, upgrading systemd-sysv
+    alone makes little sense.
+    Make systemd conflict, rather than just break, systemd-shim. As there are
+    upgrade failures cause by systemd-shim presence whilst upgrading to new
+    systemd.
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d1ecf0c372f5212129c85ae60fddf26b2271a1fe
+
+  * Improve autopkgtest success rate, by bumping up timeouts. (LP: #1789841)
+    Author: Christian Ehrhardt
+    File: debian/patches/debian/UBUNTU-bump-selftest-timeouts.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=c05586d9da033bbfd6b6a74e10b87520843c7c48
+
+  * units: Disable journald Watchdog (LP: #1773148)
+    File: debian/patches/debian/UBUNTU-units-disable-journald-watchdog.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=64d2b4f1d0d057073fba585f19823332e2a6eed5
+
+  * Add conflicts with upstart and systemd-shim. (LP: #1793092)
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=83ed7496afc7c27be026014d109855f7d0ad1176
+
+  * Specify Ubuntu's Vcs-Git
+    File: debian/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fd832930ef280c9a4a9dda2440d5a46a6fdb6232
+
+  * debian/systemd.postinst: Skip daemon-reexec and try-restarts during shutdown
+    (LP: #1803391)
+    Author: Balint Reczey
+    File: debian/systemd.postinst
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=51daab96ae79483b5e5fb62e1e0477c87ee11fd1
+
+  * Switch gbp.conf to disco.
+    File: debian/gbp.conf
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fea585b259e3e766d8d3dbc9690e879c054ddc87
+
+  * core: set /run size to 10%, like initramfs-tools does.
+    Currently there is a difference between initrd and initrd-less boots,
+    w.r.t. size= mount option of /run. This yields different runtime journald caps
+    (1% vs 10%), and on dense deployments of containers may result in OOM kills.
+    (LP: #1799251)
+    File: debian/patches/debian/UBUNTU-core-set-run-size-to-10-like-initramfs-tools-does.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1fac2568fe716dc1a41bada78293dc6327a6df0d
+
+  * Cherrypick proposed patch to fix LinkLocalAddressing post-unify-MTU settings.
+    File: debian/patches/networkd-honour-LinkLocalAddressing.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=cd9ba0d0f47634c9e5d862b8208cdc3178f25496
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 21 Jan 2019 16:09:03 +0000
+
 systemd (240-4) unstable; urgency=medium
 
   [ Benjamin Drung ]
@@ -4521,6 +10425,280 @@ systemd (239-8) unstable; urgency=medium
 
  -- Michael Biebl <biebl@debian.org>  Fri, 07 Sep 2018 08:41:12 +0200
 
+systemd (239-7ubuntu15) disco; urgency=medium
+
+  * core: set /run size to 10%, like initramfs-tools does.
+    Currently there is a difference between initrd and initrd-less boots,
+    w.r.t. size= mount option of /run. This yields different runtime journald caps
+    (1% vs 10%), and on dense deployments of containers may result in OOM kills.
+    (LP: #1799251)
+    File: debian/patches/debian/UBUNTU-core-set-run-size-to-10-like-initramfs-tools-does.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=1fac2568fe716dc1a41bada78293dc6327a6df0d
+
+  * resolved: Increase size of TCP stub replies.
+    DNS_PACKET_PAYLOAD_SIZE_MAX is limiting the size of the stub replies to
+    512 with EDNS off or 4096 with EDNS on, without checking the protocol
+    used. This makes TCP replies for clients without EDNS support to be
+    limited to 512, making the truncate flag useless if the query result is
+    bigger than 512 bytes.
+    This commit increases the size of TCP replies to DNS_PACKET_SIZE_MAX
+    Fixes: #10816
+    (cherry picked from commit e6eed9445956cfa496e1db933bfd3530db23bfce)
+    (LP: #1804487)
+    Author: Victor Tapia
+    File: debian/patches/resolved-Increase-size-of-TCP-stub-replies.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=702a4566174c4d2bd84b70805107cfc1a7c128cc
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 03 Dec 2018 13:49:24 +0000
+
+systemd (239-7ubuntu14) disco; urgency=medium
+
+  * Fix compat with new meson.
+    File: debian/patches/meson-rename-Ddebug-to-Ddebug-extra.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3b764ec1b76768a8c40635019fa5a8acb81b223e
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 29 Nov 2018 16:53:00 +0000
+
+systemd (239-7ubuntu13) disco; urgency=medium
+
+  * Stop testing that gdm3 is up.
+    Ubuntu Desktop is only supported on amd64, and on real hardware. Testing that
+    gdm3 fails to start (yet continues to be running, with a half broken logind
+    session) is not useful on dummy xorg video cards in nested VMs.
+    (LP: #1805358)
+    File: debian/tests/control
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=3006fedda1d1ca3f04c5f593e8018bb6d1196025
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 28 Nov 2018 16:02:25 +0000
+
+systemd (239-7ubuntu12) disco; urgency=medium
+
+  * hwdb: Revert wlan keycode changes, rely on xkeyboard-config fixes instead.
+    (LP: #1799364)
+    Author: seb128
+    File: debian/patches/hwdb-revert-airplane-mode-keys-handling-on-Dell.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=cabc076fdd67ced21fc789e44e0366a2f561a5bc
+
+  * test: Set executable bits on TEST-22-TMPFILES shell scripts. (LP: #1804864)
+    File: debian/patches/test-Set-executable-bits-on-TEST-22-TMPFILES-shell-script.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=0e5b6e44a962f299565949e1006a4ba86d171dc3
+
+  * Switch gbp.conf to disco.
+    File: debian/gbp.conf
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=fea585b259e3e766d8d3dbc9690e879c054ddc87
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 23 Nov 2018 18:38:43 +0000
+
+systemd (239-7ubuntu11) disco; urgency=medium
+
+  * hwdb: Fix wlan keycode for all Dell Latitude and Precision systems
+    (LP: #1799364)
+    Author: Shih-Yuan Lee (FourDollars)
+    File: debian/patches/hwdb-Fix-wlan-keycode-for-all-Dell-Latitude-and-Precision.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d8ac9a5640be39ede9cebcd8c4cc44e8811e0e49
+
+  * hwdb: Update PNP IDs of Goldstar (now: LG Electronics) (LP: #1804584)
+    File: debian/patches/hwdb-Update-PNP-IDs-of-Goldstar-now-LG-Electronics-.-1005.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=10204fb5761c759be6ddf27dc43c851ef24c96cb
+
+  * btrfs-util: unbreak tmpfiles' subvol creation
+    File: debian/patches/btrfs-util-unbreak-tmpfiles-subvol-creation.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=4ab5b8275a0487e301553fb6de6a905abb7ea833
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 22 Nov 2018 16:30:28 +0000
+
+systemd (239-7ubuntu10.4) cosmic-security; urgency=medium
+
+  [ Chris Coulson ]
+  * SECURITY UPDATE: symlink mishandling in systemd-tmpfiles
+    - debian/patches/CVE-2018-6954_2.patch: backport the remaining patches to
+      resolve this completely
+    - CVE-2018-6954
+
+  [ Balint Reczey ]
+  * Fix LP: #1803391 - Skip daemon-reexec and try-restarts during shutdown
+    - update debian/systemd.postinst
+
+ -- Chris Coulson <chris.coulson@canonical.com>  Thu, 15 Nov 2018 20:42:32 +0000
+
+systemd (239-7ubuntu10.3) cosmic-security; urgency=medium
+
+  * SECURITY UPDATE: reexec state injection
+    - debian/patches/CVE-2018-15686.patch: when deserializing state always use
+      read_line(…, LONG_LINE_MAX, …) rather than fgets()
+    - CVE-2018-15686
+  * SECURITY UPDATE: chown_one() can dereference symlinks
+    - debian/patches/CVE-2018-15687.patch: rework recursive logic to use O_PATH
+    - CVE-2018-15687
+
+ -- Chris Coulson <chris.coulson@canonical.com>  Tue, 06 Nov 2018 20:52:41 +0000
+
+systemd (239-7ubuntu10.1) cosmic-security; urgency=medium
+
+  * SECURITY UPDATE: buffer overflow in dhcp6 client
+    - debian/patches/CVE-2018-15688.patch:  make sure we have enough space
+      for the DHCP6 option header in src/libsystemd-network/dhcp6-option.c.
+    - CVE-2018-15688
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Wed, 31 Oct 2018 11:36:32 -0400
+
+systemd (239-7ubuntu10) cosmic; urgency=medium
+
+  * units: Disable journald Watchdog (LP: #1773148)
+  * Add conflicts with upstart and systemd-shim. (LP: #1773859)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 04 Oct 2018 15:58:51 +0100
+
+systemd (239-7ubuntu9) cosmic; urgency=medium
+
+  * core: export environment when running generators.
+    Ensure that manager's environment (including e.g. PATH) is exported when
+    running generators. Otherwise, one is at a mercy of running without PATH which
+    can lead to buggy generator behaviour. (LP: #1771858)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 26 Sep 2018 11:01:58 +0100
+
+systemd (239-7ubuntu8) cosmic; urgency=medium
+
+  [ Dimitri John Ledkov ]
+  * Cherrypick many bugfixes from master.
+  * systemctl: correctly proceed to immediate shutdown if scheduling fails
+    (LP: #1670291)
+
+  [ Julian Andres Klode ]
+  * Improve networkd states documentation.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 12 Sep 2018 16:03:08 +0100
+
+systemd (239-7ubuntu7) cosmic; urgency=medium
+
+  * boot-and-services: skip gdm test, when gdm-x-session fails.
+    Across all architectures, gdm fails to come up reliably since cosmic.
+    (LP: #1790478)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 03 Sep 2018 16:33:00 +0100
+
+systemd (239-7ubuntu6) cosmic; urgency=medium
+
+  [ Dimitri John Ledkov ]
+  * debian/control: strengthen dependencies.
+    Make systemd-sysv depend on matching version of systemd. Autopkgtests at times
+    upgrade systemd-sysv without upgrading systemd. However, upgrading systemd-sysv
+    alone makes little sense.
+    Make systemd conflict, rather than just break, systemd-shim. As there are
+    upgrade failures cause by systemd-shim presence whilst upgrading to new
+    systemd.
+  * Correct gdm3 exclution on arm64, in boot-and-services test.
+
+  [ Christian Ehrhardt ]
+  * Improve autopkgtest success rate, by bumping up timeouts. (LP: #1789841)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 31 Aug 2018 14:17:54 +0100
+
+systemd (239-7ubuntu5) cosmic; urgency=medium
+
+  [ Michael Biebl ]
+  * Clean up dbus-org.freedesktop.timesync1.service Alias on purge
+    (Closes: #904290)
+
+  [ Martin Pitt ]
+  * timedated: Fix wrong PropertyChanged values and refcounting
+
+  [ Dimitri John Ledkov ]
+  * autopkgtest: drop gdm3 on arm64 as well.
+    The cloud instances are configured without a graphics card, and thus X fails to
+    start, hence the gdm test fails.
+  * Revert "Workaround broken meson copying symlinked data files, as dangling symlinks."
+    This reverts commit 059bfb5349123fabc8c92324e0473193f01fc87c.
+  * Cherrypick v239-stable patches.
+  * cryptsetup: add support for sector-size= option (LP: #1776626)
+  * Cherrypick upstrem patches to fix ftbfs with new glibc.
+
+  [ Michael Vogt ]
+  * Re-add support for /etc/writable for core18. (LP: #1778936)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 28 Aug 2018 17:35:51 +0100
+
+systemd (239-7ubuntu4) cosmic; urgency=medium
+
+  * Workaround broken meson copying symlinked data files, as dangling symlinks.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 22 Aug 2018 14:11:35 +0100
+
+systemd (239-7ubuntu3) cosmic; urgency=medium
+
+  * Revert "networkd: Unify set MTU"
+    This reverts commit 44b598a1c9d11c23420a5ef45ff11bcb0ed195eb due to regression
+    of ignoring LinkLocalAddressing=no.
+    Bug-Upstream: https://github.com/systemd/systemd/issues/9890
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 21 Aug 2018 21:51:31 +0100
+
+systemd (239-7ubuntu2) cosmic; urgency=medium
+
+  * test-sleep: skip test_fiemap upon inapproriate ioctl for device.
+    On v4.4 kernels, on top of btrfs ephemeral lxd v3.0 containers generate this
+    other error code, instead of not supported. Skip the test for both error codes.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 03 Aug 2018 16:49:10 +0100
+
+systemd (239-7ubuntu1) cosmic; urgency=medium
+
+  Merged from Debian Unstable, remaining changes are:
+
+  * Set UseDomains to true, by default, on Ubuntu.
+  * Enable systemd-resolved by default.
+  * postinst: Create /etc/resolv.conf at postinst, pointing at the stub
+    resolver.
+  * postinst: drop empty/stock /etc/rc.local.
+  * postinst: enable persistent journal.
+  * Drop systemd.prerm safety check.
+  * Ship systemd sysctl settings.
+  * libnss-resolve: do not disable and stop systemd-resolved.
+  * boot-smoke: refactor ADT test.
+  * Fix test-functions failing with Ubuntu units.
+  * units: set ConditionVirtualization=!private-users on journald audit socket.
+  * units: drop resolvconf.conf drop-in, resolved integration moved to
+    resolvconf package.
+  * debian/tests: Switch to gdm3, enforce udev upgrade.
+  * Ubuntu/extra: ship dhclient-enter hook.
+  * Ignore failures to set Nice priority on services in containers.
+  * systemd-fsckd: Fix ADT tests to work on s390x too.
+  * Disable LLMNR and MulticastDNS by default.
+  * Enable qemu tests on most architectures.
+  * debian/tests/systemd-fsckd: update assertions expectations for v237.
+  * test/test-fs-util: detect container, in addition to root.
+  * test/test-functions: launch qemu-system with -vga none.
+  * Blacklist TEST-16-EXTEND-TIMEOUT.
+  * tests/boot-smoke: ignore udevd connection timeouts resolving colord group.
+  * tests/systemd-fsckd: ignore systemd_fsck_with_plymouth_failure.
+  * tests/control: ensure boot-smoke uses latest systemd & udev.
+  * wait-online: do not wait, if no links are managed (neither configured, or
+    failed).
+  * journald.service: set Nice=-1 to dodge watchdog on soft lockups.
+  * Workaround captive portals not responding to EDNS0 queries.
+  * resolved: Listen on both TCP and UDP by default.
+  * Recommend networkd-dispatcher
+  * networkd: if RA was implicit, do not await ndisc_configured.
+  * udev-udeb: ship modprobe.d snippet to force scsi_mod.scan=sync in d-i.
+  * Skip starting systemd-remount-fs.service in containers.
+  * Add "AssumedApparmorLabel=unconfined" to timedate1 dbus service file.
+  * Disable dh_installinit generation of tmpfiles for the systemd package.
+    Replace with a manual safe call to systemd-tmpfiles which will process any
+    updates to the tmpfiles shipped by systemd package, taking into account any
+    overrides shipped by other packages, sysadmin, or specified in the runtime
+    directories. (LP: #1748147)
+  * Enable EFI/bootctl on armhf.
+  * boot-and-services: stderr is ok, for status command on the c1 container.
+  * Skip systemd-fsckd on arm64, because of broken/lack of clean shutdown.
+  * adt: boot-and-services: assert any kernel syslog messages.
+  * debian/extra/start-udev: Set scsi_mod scan=sync even if it's builtin to the
+    kernel (we previously only set it in modprobe.d) LP: #1779815
+  * units: conditionalize more units to not start in containers.
+  * tests: conditionalize more unit tests to pass in LXD container.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 26 Jul 2018 16:26:22 +0100
+
 systemd (239-7) unstable; urgency=medium
 
   * autopkgtest: Add iputils-ping dependency to root-unittests.
@@ -4679,6 +10857,83 @@ systemd (239-1) unstable; urgency=medium
 
  -- Michael Biebl <biebl@debian.org>  Sat, 23 Jun 2018 00:18:08 +0200
 
+systemd (238-5ubuntu3) cosmic; urgency=medium
+
+  * debian/extra/start-udev: Set scsi_mod scan=sync even if it's builtin
+    to the kernel (we previously only set it in modprobe.d) LP: #1779815
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 20 Jul 2018 11:13:58 -0600
+
+systemd (238-5ubuntu2) cosmic; urgency=medium
+
+  * Disable dh_installinit generation of tmpfiles for the systemd package.
+    Replace with a manual safe call to systemd-tmpfiles which will process any
+    updates to the tmpfiles shipped by systemd package, taking into account any
+    overrides shipped by other packages, sysadmin, or specified in the runtime
+    directories. (LP: #1748147)
+  * Re-cherrypick keyring setreuid/setregid tricks, as that was merged post-v238.
+  * Enable EFI/bootctl on armhf.
+  * boot-and-services: stderr is ok, for status command on the c1 container.
+    systemctl may print warnings on the stderr when checking the status of
+    completed units. This should not, overall fail the autopkgtest run.
+
+ -- Dimitri John Ledkov 🌈 <xnox@ubuntu.com>  Tue, 26 Jun 2018 10:55:51 +0100
+
+systemd (238-5ubuntu1) cosmic; urgency=medium
+
+  Merged from Debian Unstable, remaining changes are:
+
+  * Set UseDomains to true, by default, on Ubuntu.
+  * Enable systemd-resolved by default.
+  * postinst: Create /etc/resolv.conf at postinst, pointing at the stub
+    resolver.
+  * postinst: drop empty/stock /etc/rc.local.
+  * postinst: enable persistent journal.
+  * Drop systemd.prerm safety check.
+  * Ship systemd sysctl settings.
+  * libnss-resolve: do not disable and stop systemd-resolved.
+  * boot-smoke: refactor ADT test.
+  * Fix test-functions failing with Ubuntu units.
+  * units: set ConditionVirtualization=!private-users on journald audit socket.
+  * units: drop resolvconf.conf drop-in, resolved integration moved to
+    resolvconf package.
+  * debian/tests: Switch to gdm3, enforce udev upgrade.
+  * Ubuntu/extra: ship dhclient-enter hook.
+  * Ignore failures to set Nice priority on services in containers.
+  * tests: Do not use nested kvm during ADT tests.
+  * systemd-fsckd: Fix ADT tests to work on s390x too.
+  * Disable LLMNR and MulticastDNS by default.
+  * Enable qemu tests on most architectures.
+  * debian/tests/systemd-fsckd: update assertions expectations for v237.
+  * test/test-fs-util: detect container, in addition to root.
+  * test/test-functions: launch qemu-system with -vga none.
+  * Blacklist TEST-16-EXTEND-TIMEOUT.
+  * tests/boot-smoke: ignore udevd connection timeouts resolving colord group.
+  * tests/systemd-fsckd: ignore systemd_fsck_with_plymouth_failure.
+  * tests/control: ensure boot-smoke uses latest systemd & udev.
+  * wait-online: do not wait, if no links are managed (neither configured, or
+    failed).
+  * journald.service: set Nice=-1 to dodge watchdog on soft lockups.
+  * Workaround captive portals not responding to EDNS0 queries.
+  * resolved: Listen on both TCP and UDP by default.
+  * Recommend networkd-dispatcher
+  * networkd: if RA was implicit, do not await ndisc_configured.
+  * udev-udeb: ship modprobe.d snippet to force scsi_mod.scan=sync in d-i.
+  * Skip starting systemd-remount-fs.service in containers.
+  * Add "AssumedApparmorLabel=unconfined" to timedate1 dbus service file.
+
+  * Apply systemd-stable/v238-stable patches.
+
+  * Cherrypick feature to hibernate with disk offsets.
+
+  * Remove dropped patches
+  * Drop merged keyring patch
+  * Drop write_persistent_net_s390x_virtio, as an LTS release was made.
+  * Revert debian/tests/upstream to be more like Debian's.
+  * Do not skip test-execute anymore, should be fixed on armhf now.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 30 May 2018 14:30:45 +0100
+
 systemd (238-5) unstable; urgency=medium
 
   [ Evgeny Vereshchagin ]
@@ -4804,6 +11059,138 @@ systemd (237-4) unstable; urgency=medium
 
  -- Michael Biebl <biebl@debian.org>  Wed, 28 Feb 2018 19:18:34 +0100
 
+systemd (237-3ubuntu11) cosmic; urgency=medium
+
+  [ Dimitri John Ledkov ]
+  * hwdb: Fix wlan/rfkill keycode on Dell systems. (LP: #1762385)
+  * Cherrypick upstream fix for corrected detection of Virtualbox & Xen.
+    (LP: #1768104)
+  * Further improve captive portal workarounds.
+    Retry any NXDOMAIN results with lower feature levels, instead of just those
+    with 'secure' in the domain name. (LP: #1766969)
+  * Bump gbp.conf to cosmic
+
+  [ Michael Biebl ]
+  * Add dependencies of libsystemd-shared to Pre-Depends.
+    This is necessary so systemctl is functional at all times during a
+    dist-upgrade. (Closes: #897986) (LP: #1771791)
+  * basic/macros: Rename noreturn into _noreturn_
+    "noreturn" is reserved and can be used in other header files we include.
+    (Closes: #893426)
+
+  [ Mario Limonciello ]
+  * Fix hibernate disk offsets.
+    Configure resume offset via sysfs, to enable resume from a swapfile.
+    (LP: #1760106)
+
+  [ Felipe Sateler ]
+  * Don't include libmount.h in a header file.
+    Kernel and glibc headers both use MS_* constants, but are not in sync, so
+    only one of them can be used at a time. Thus, only import them where needed
+    Works around #898743
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Sat, 19 May 2018 00:35:30 +0100
+
+systemd (237-3ubuntu10) bionic; urgency=medium
+
+  * Create tmpfiles for persistent journal in postinst only when running
+    systemd (LP: #1748659)
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Fri, 20 Apr 2018 18:55:56 +0200
+
+systemd (237-3ubuntu9) bionic; urgency=medium
+
+  * networkd: if RA was implicit, do not await ndisc_configured.
+    If RA was iplicit, meaning not otherwise requested, and a kernel default was in
+    use. Do not prevent link entering configured state, whilst ndisc configuration
+    is pending. Implicit kernel RA, is expected to be asynchronous and
+    non-blocking. (LP: #1765173)
+  * udev-udeb: ship modprobe.d snippet to force scsi_mod.scan=sync in d-i.
+    This ensures that all scans are completed, before installer reaches
+    partitioning stage. (LP: #1751813)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 20 Apr 2018 04:35:33 +0100
+
+systemd (237-3ubuntu8) bionic; urgency=medium
+
+  * Workaround captive portals not responding to EDNS0 queries (DVE-2018-0001).
+    (LP: #1727237)
+  * resolved: Listen on both TCP and UDP by default. (LP: #1731522)
+  * Recommend networkd-dispatcher (LP: #1762386)
+  * Refresh patches
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 12 Apr 2018 12:12:24 +0100
+
+systemd (237-3ubuntu7) bionic; urgency=medium
+
+  * Introduce suspend then hibernate (LP: #1756006)
+
+ -- Mario Limonciello <mario.limonciello@dell.com>  Mon, 02 Apr 2018 14:25:04 -0500
+
+systemd (237-3ubuntu6) bionic; urgency=medium
+
+  * Adjust the new dropin test, for v237 systemd.
+  * Refresh the keyring patch, to the one merged.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 27 Mar 2018 13:40:09 +0100
+
+systemd (237-3ubuntu5) bionic; urgency=medium
+
+  * Drop old keyring/invocation_id patch, which made keyring setup be skipped in containers.
+  * Use new patch, which sets up session keyring without relying on chown operation.
+  * Drop systemd.prerm safety check.
+    On Ubuntu, systemd is the only choice, and is essential, via init ->
+    systemd-sysv -> systemd dependency chain, thus removing systemd is already
+    quite hard, and appropriate warnings are emitted by dpkg. (LP: #1758438)
+  * Detect Masked unit with drop-ins. (LP: #1752722)
+  * wait-online: do not wait, if no links are managed (neither configured, or failed).
+    (LP: #1728181)
+  * journald.service: set Nice=-1 to dodge watchdog on soft lockups.
+    (LP: #1696970)
+  * Refresh all patches.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 26 Mar 2018 15:55:25 +0100
+
+systemd (237-3ubuntu4) bionic; urgency=medium
+
+  * systemd-sysv-install: fix name initialisation.
+    Only initialise NAME, after --root optional argument has been parsed, otherwise
+    NAME is initialized to e.g. `enable', instead of to the `unit-name`, resulting
+    in failures. (LP: #1752882)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 05 Mar 2018 09:57:58 +0100
+
+systemd (237-3ubuntu3) bionic; urgency=medium
+
+  * tests/control: drop qemu-system-ppc.
+    Whilst some tests pass, many regress / fail to boot. This is not a regression,
+    as qemu-based tests were not run previously.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 20 Feb 2018 17:40:02 +0000
+
+systemd (237-3ubuntu2) bionic; urgency=medium
+
+  * tests/boot-smoke: ignore udevd connection timeouts resolving colord group.
+  * tests/systemd-fsckd: ignore systemd_fsck_with_plymouth_failure.
+  * tests/control: ensure boot-smoke uses latest systemd & udev.
+  * test/test-functions: on PPC64 use hvc0 console.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 20 Feb 2018 12:03:14 +0000
+
+systemd (237-3ubuntu1) bionic; urgency=medium
+
+  [ Gunnar Hjalmarsson ]
+  * Fix PO template creation.
+    Cherry-pick upstream patches to build a correct systemd.pot including
+    the polkit policy files even without policykit-1 being installed.
+    (LP: #1707898)
+
+  [ Dimitri John Ledkov ]
+  * Blacklist TEST-16-EXTEND-TIMEOUT
+  * test/test-functions: use vmlinux for ppc64 tests.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 19 Feb 2018 21:15:23 +0000
+
 systemd (237-3) unstable; urgency=medium
 
   [ Martin Pitt ]
@@ -4826,6 +11213,52 @@ systemd (237-3) unstable; urgency=medium
 
  -- Michael Biebl <biebl@debian.org>  Wed, 14 Feb 2018 23:07:17 +0100
 
+systemd (237-2ubuntu3) bionic; urgency=medium
+
+  * test/test-fs-util: detect container, in addition to root.
+    On armhf, during autopkgtests, whilst root is avilable, full capabilities in
+    parent namespace are not, since the tests are run in an LXD container.
+    This should resolve armhf autopkgtest failure.
+  * test/test-functions: launch qemu-system with -vga none.
+    Should resolve booting qemu-system-ppc64 without seabios.
+  * tests/upstream: skip parts of extend time out tests, regressed.
+    (LP: #1750364)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 19 Feb 2018 13:32:07 +0000
+
+systemd (237-2ubuntu2) bionic; urgency=medium
+
+  * Fix cryptsetup tests by shipping 95-dm-notify udev rule. (LP: #1749432)
+  * debian/tests/systemd-fsckd: update assertions expectations for v237
+    fsck got rewritten to use "safe_fork" and whilst previously it would ignore the
+    error, when fsck is terminated by signal PIPE, it no longer does so. Thus one
+    should expect systemd-fsck-root.service to have failed in certain test cases.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 15 Feb 2018 00:32:54 +0000
+
+systemd (237-2ubuntu1) bionic; urgency=medium
+
+  [ Michael Vogt ]
+  * Add "AssumedApparmorLabel=unconfined" to timedate1 dbus service file
+    (LP: #1749000)
+
+  [ Martin Pitt ]
+  * debian/tests/boot-smoke: More robust journal checking.
+    Also fail the test if calling journalctl fails, and avoid calling it
+    twice. See https://github.com/systemd/systemd/pull/8032
+
+  [ Gunnar Hjalmarsson ]
+  * Fix creation of translation template
+    - State the gettext package domain "systemd" explicitly, as with the
+      move to meson it ended up as "untitled.pot"
+    - Call xgettext to extract strings from polkit *.policy.in files, which
+      intltool-update ignores. (LP: #1707898)
+
+  [ Dimitri John Ledkov ]
+  * Enable qemu tests on all architectures LP: #1749540
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 14 Feb 2018 16:43:12 +0000
+
 systemd (237-2) unstable; urgency=medium
 
   * Drop debian/extra/rules/70-debian-uaccess.rules.
@@ -4838,6 +11271,47 @@ systemd (237-2) unstable; urgency=medium
 
  -- Michael Biebl <biebl@debian.org>  Fri, 09 Feb 2018 23:35:31 +0100
 
+systemd (237-1ubuntu3) bionic; urgency=medium
+
+  * Re-enable gnu-efi on arm64, binutils is fixed
+  * Cherrpick PR8133 to resolve too strict PidFile handling, which breaks
+    services starting with potentially insecure pidfiles e.g. munin
+  * Disable LLMNR and MulticastDNS by default LP: #1739672
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 09 Feb 2018 15:49:01 +0000
+
+systemd (237-1ubuntu2) bionic; urgency=medium
+
+  * Disable gnu-efi on arm64, due to FTBFS. LP: #1746765
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 02 Feb 2018 23:30:05 +0000
+
+systemd (237-1ubuntu1) bionic; urgency=medium
+
+  * Remaining delta from Debian:
+    - ship dhclient enter hook for dhclient integration with resolved
+    - Use stub-resolv.conf as the default provider of /etc/resolv.conf
+    - ship s390x virtio interface names migration
+    - do not disable systemd-resolved upon libnss-resolve removal
+    - do not remount fs in containers, for non-degrated boot
+    - Unlink invocation id key, upon chown failure in containers
+    - Change default to UseDomains by default
+    - Do not treat failure to set Nice= setting as error in containers
+    - Add a condition to systemd-journald-audit.socet to not start in
+      containers (fails)
+    - Build without any built-in/fallback DNS server setting
+    - Enable resolved by default
+    - Update autopkgtests for reliability/raciness, and testing for typical
+      defaults
+    - Always upgrade udev, when running adt tests
+    - Skip test-execute on armhf
+    - Cherry-pick a few testsuite fixes
+    - Do not use nested kvm during ADT tests
+    - Fix ADT systemd-fsckd tests to work on s390x too
+    - Enable persistent journal by default
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 30 Jan 2018 13:52:27 +0000
+
 systemd (237-1) unstable; urgency=medium
 
   * New upstream version 237
@@ -4946,6 +11420,51 @@ systemd (236-1) unstable; urgency=medium
 
  -- Michael Biebl <biebl@debian.org>  Sun, 17 Dec 2017 21:45:51 +0100
 
+systemd (235-3ubuntu3) bionic; urgency=medium
+
+  * netwokrd: add support for RequiredForOnline stanza. (LP: #1737570)
+  * resolved.service: set DefaultDependencies=no (LP: #1734167)
+  * systemd.postinst: enable persistent journal. (LP: #1618188)
+  * core: add support for non-writable unified cgroup hierarchy for container support.
+    (LP: #1734410)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 12 Dec 2017 13:25:32 +0000
+
+systemd (235-3ubuntu2) bionic; urgency=medium
+
+  * systemd-fsckd: Fix ADT tests to work on s390x too.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 21 Nov 2017 16:41:15 +0000
+
+systemd (235-3ubuntu1) bionic; urgency=medium
+
+  * Merge 235-3 from debian:
+    - Drop UBUNTU-CVE-2017-15908 included in Debian.
+
+  * Remaining delta from Debian:
+    - ship dhclient enter hook for dhclient integration with resolved
+    - ship resolvconf integration via stub-resolv.conf
+    - ship s390x virtio interface names migration
+    - do not disable systemd-resolved upon libnss-resolve removal
+    - do not remote fs in containers, for non-degrated boot
+    - CVE-2017-15908 in resolved fix loop on packets with pseudo dns types
+    - Unlink invocation id key, upon chown failure in containers
+    - Change default to UseDomains by default
+    - Do not treat failure to set Nice= setting as error in containers
+    - Add a condition to systemd-journald-audit.socet to not start in
+      containers (fails)
+    - Build without any built-in/fallback DNS server setting
+    - Enable resolved by default
+    - Update autopkgtests for reliability/raciness, and testing for typical
+      defaults
+    - Always upgrade udev, when running adt tests
+    - Skip test-execute on armhf
+    - Cherry-pick a few testsuite fixes
+
+  * UBUNTU Do not use nested kvm during ADT tests.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 21 Nov 2017 09:34:14 +0000
+
 systemd (235-3) unstable; urgency=medium
 
   [ Michael Biebl ]
@@ -4986,6 +11505,63 @@ systemd (235-3) unstable; urgency=medium
 
  -- Martin Pitt <mpitt@debian.org>  Wed, 15 Nov 2017 09:34:00 +0100
 
+systemd (235-2ubuntu3) bionic; urgency=medium
+
+  * Revert "Skip test-bpf in autopkgtest, currently is failing."
+    This reverts commit 75cf986e450e062a3d5780d1976e9efef41e6c4c.
+  * Fix test-bpf test case on ubuntu.
+  * Skip rename tests in containers, crude fix for now.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 13 Nov 2017 00:06:42 +0000
+
+systemd (235-2ubuntu2) bionic; urgency=medium
+
+  * Fix test-functions failing with Ubuntu units.
+  * tests: switch to using ext4 by default, instead of ext3.
+  * Skip test-bpf in autopkgtest, currently is failing.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 06 Nov 2017 18:33:39 +0000
+
+systemd (235-2ubuntu1) bionic; urgency=medium
+
+  [ Dimitri John Ledkov ]
+  * Merge 235-2 from debian:
+    - Drop all upstream cherry-picks
+    - Drop test-copy dh_strip size override, fixed upstream
+
+  * Remaining delta from Debian:
+    - ship dhclient enter hook for dhclient integration with resolved
+    - ship resolvconf integration via stub-resolv.conf
+    - ship s390x virtio interface names migration
+    - do not disable systemd-resolved upon libnss-resolve removal
+    - do not remote fs in containers, for non-degrated boot
+    - CVE-2017-15908 in resolved fix loop on packets with pseudo dns types
+    - Unlink invocation id key, upon chown failure in containers
+    - Change default to UseDomains by default
+    - Do not treat failure to set Nice= setting as error in containers
+    - Add a condition to systemd-journald-audit.socet to not start in
+      containers (fails)
+    - Build without any built-in/fallback DNS server setting
+    - Enable resolved by default
+    - Update autopkgtests for reliability/raciness, and testing for typical
+      defaults
+    - Always upgrade udev, when running adt tests
+    - Skip test-execute on armhf
+
+  * Fix up write_persistent_net_s390x for nullglob
+
+  * Ship systemd sysctl settings.
+    Patch systemd's default sysctl settings to drop things that are set
+    elsewhere already. The promote secondary IP addresses is required for
+    networkd to successfully renew DHCP leases with a change of an IP address.
+    Set default package scheduler to Fair Queue CoDel. (LP: #1721223)
+
+  [ Michael Biebl ]
+  * Install modprobe configuration file to /lib/modprobe.d.
+    Otherwise it is not read by kmod. (Closes: #879191)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 30 Oct 2017 17:20:54 +0000
+
 systemd (235-2) unstable; urgency=medium
 
   * Revert "tests: when running a manager object in a test, migrate to private
@@ -5095,6 +11671,187 @@ systemd (234-2.1) unstable; urgency=high
 
  -- Cyril Brulebois <kibi@debian.org>  Wed, 23 Aug 2017 20:41:33 +0200
 
+systemd (234-2ubuntu12.1) artful-security; urgency=medium
+
+  * SECURITY UPDATE: remote DoS in resolve (LP: #1725351)
+    - debian/patches/CVE-2017-15908.patch: fix loop on packets with pseudo
+      dns types in src/resolve/resolved-dns-packet.c.
+    - CVE-2017-15908
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Thu, 26 Oct 2017 07:56:42 -0400
+
+systemd (234-2ubuntu12) artful; urgency=medium
+
+  [ Dimitri John Ledkov ]
+  * debian/rules: do not strip test-copy.
+    This insures test-copy is large enough for test-copy tests to pass.
+    (LP: #1721203)
+
+  [ Michael Biebl ]
+  * Drop systemd-timesyncd.service.d/disable-with-time-daemon.conf.
+    All major NTP implementations ship a native service file nowadays with a
+    Conflicts=systemd-timesyncd.service so this drop-in is no longer
+    necessary. (Closes: #873185) (LP: #1721204)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 04 Oct 2017 13:28:34 +0100
+
+systemd (234-2ubuntu11) artful; urgency=medium
+
+  * Ubuntu/extra: ship dhclient-enter hook.
+    This allows isc-dhcp dhclient to set search domains and nameservers via
+    resolved.
+  * Disable systemd-networkd-wait-online by default.
+    Currently it is not fit for purpose, as it leads to long boot times when
+    networking is unplugged or not yet configured on boot. (LP: #1714301)
+  * networkd: change UseMTU default to true.
+    Cherry-pick upstream change. (LP: #1717471)
+  * postinst: drop empty/stock /etc/rc.local (LP: #1716979)
+  * Imporve resolvconf integration.
+    Make the .path|.service unit that feed resolved data into resolvconf not
+    generate failures if resolvconf is not installed.
+    Add a check to make sure that resolved does not read /etc/resolv.conf when that
+    is symlinked to stub-resolv.conf. (LP: #1717995)
+  * core: gracefully bail out keyring operations when chown fails (LP: #1691096)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 26 Sep 2017 11:38:02 -0400
+
+systemd (234-2ubuntu10) artful; urgency=medium
+
+  * Do not fail debootstrap if /etc/resolv.conf is immutable. (LP: #1713212)
+  * Revert "Create /etc/resolv.conf on resolved start, if it is an empty file."
+    As it is ineffective, and correct creation of /etc/resolv.conf has been fixed.
+    This reverts commit ccba42504f216f6ffbc54eb2c9af347355f8d86b.
+  * initramfs-tools: trigger udevadm add actions with subsystems first.
+    This updates the initramfs-tools init-top udev script to trigger udevadm
+    actions with type specified. This mimicks the
+    systemd-udev-trigger.service. Without type specified only devices are
+    triggered, but triggering subsystems may also be required and should happen
+    before triggering the devices. This is the case for example on s390x with zdev
+    generated udev rules. (LP: #1713536)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 30 Aug 2017 11:22:41 +0100
+
+systemd (234-2ubuntu9) artful; urgency=medium
+
+  * boot-and-services: skip gdm3 tests when absent, as it is on s390x.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 23 Aug 2017 11:58:57 +0100
+
+systemd (234-2ubuntu8) artful; urgency=medium
+
+  * Enable systemd-networkd by default.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 22 Aug 2017 17:50:59 +0100
+
+systemd (234-2ubuntu7) artful; urgency=medium
+
+  * Always setup /etc/resolv.conf on new installations.
+    On new installations, /etc/resolv.conf will always exist. Move it to /run
+    and replace it with the desired final symlink. (LP: #1712283)
+  * Create /etc/resolv.conf on resolved start, if it is an empty file.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 22 Aug 2017 16:13:35 +0100
+
+systemd (234-2ubuntu6) artful; urgency=medium
+
+  * Disable KillUserProcesses, yet again, with meson this time.
+  * Re-enable reboot tests.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 17 Aug 2017 15:22:35 +0100
+
+systemd (234-2ubuntu5) artful; urgency=medium
+
+  * debian/tests: disable i386 & amd64 systemd-fsck test, and add environment
+    overrides to allow force execution of those tests locally. LP: #1708051.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 16 Aug 2017 13:04:48 +0100
+
+systemd (234-2ubuntu4) artful; urgency=medium
+
+  * debian/tests: disable i386 & amd64 boot-smoke, passes locally. LP:
+    #1708051.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 15 Aug 2017 14:20:12 +0100
+
+systemd (234-2ubuntu3) artful; urgency=medium
+
+  * debian/tests: Switch to gdm, enforce udev upgrade.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 14 Aug 2017 12:02:37 +0100
+
+systemd (234-2ubuntu2) artful; urgency=medium
+
+  * Ignore failures to set Nice priority on services in containers.
+  * Disable execute test on armhf.
+  * units: set ConditionVirtualization=!private-users on journald audit socket.
+    It fails to start in unprivileged containers.
+  * boot-smoke: refactor ADT test.
+    Wait for system to settle down and get to either running or degraded state,
+    then collect all metrics, and exit with an error if any of the tests failed.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 02 Aug 2017 03:02:03 +0100
+
+systemd (234-2ubuntu1) artful; urgency=medium
+
+  [ Dimitri John Ledkov ]
+  * ubuntu: udev.postinst preserve virtio interfaces names on upgrades, on s390x.
+    New udev generates stable interface names on s390x kvm instances, however, upon
+    upgrades existing ethX names should be preserved to prevent breaking networking
+    and software configurations.
+    This patch only affects Ubuntu systems. (Closes: #860246) (LP: #1682437)
+  * Set UseDomains to true, by default, on Ubuntu.
+    On Ubuntu, fallback DNS servers are disabled, therefore we do not leak queries
+    to a preset 3rd party by default. In resolved, dnssec is also disabled by
+    default, as too much of the internet is broken and using Ubuntu users to debug
+    the internet is not very productive - most of the time the end-user cannot fix
+    or know how to notify the site owners about the dnssec mistakes. Inherintally
+    the DHCP acquired DNS servers are therefore trusted, and are free to spoof
+    records. Not trusting DNS search domains, in such scenario, provides limited
+    security or privacy benefits. From user point of view, this also appears to be
+    a regression from previous Ubuntu releases which do trust DHCP acquired search
+    domains by default.
+    Therefore we are enabling UseDomains by default on Ubuntu.
+    Users may override this setting in the .network files by specifying
+    [DHCP|IPv6AcceptRA] UseDomains=no|route options.
+  * resolved: create private stub resolve file for integration with resolvconf.
+    The stub-resolve.conf file points at resolved stub resolver, but also lists the
+    available search domains. This is required to correctly resolve domains without
+    using resolve nss module.
+  * Enable systemd-resolved by default
+  * Create /etc/resolv.conf at postinst, pointing at the stub resolver.
+    The stub resolver file is dynamically managed by systemd-resolved. It points at
+    the stub resolver as the nameserver, however it also dynamically updates the
+    search stanza, thus non-nss dns tools work correctly with unqualified names and
+    correctly use the DHCP acquired search domains.
+  * libnss-resolve: do not disable and stop systemd-resolved
+    resolved is always used by default on ubuntu via stub resolver, therefore it
+    should continue to operate without libnss-resolve module installed.
+  * modprobe.d: set max_bonds=0 for bonding module to prevent bond0 creation.
+    This prevents confusing networkd, and allows networkd to manage bond0.
+  * Cherrypick upstream networkd-test.py assertion/check fixes.
+    This resolves ADT test suite failures, when running tests under lxc/lxd
+    providers.
+  * Cherrypick arm* seccomp fixes.
+    This should resolve ADT test failures, on arm64, when running as root.
+  * Re-enable seccomp and execute tests on arm.
+
+  [ Balint Reczey ]
+  * Skip starting systemd-remount-fs.service in containers
+    even when /etc/fstab is present.
+    This allows entering fully running state even when /etc/fstab
+    lists / to be mounted from a device which is not present in the
+    container. (LP: #1576341)
+
+  [ Michael Biebl ]
+  * selinux: Enable labeling and access checks for unprivileged users.
+    Revert commit that inadvertently broke a lot of SELinux related
+    functionality for both unprivileged users and systemd instances running
+    as MANAGER_USER and instead deal with the auditd issue by checking for
+    the CAP_AUDIT_WRITE capability before opening an audit netlink socket.
+    (Closes: #863800)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 25 Jul 2017 13:30:58 +0100
+
 systemd (234-2) unstable; urgency=medium
 
   [ Martin Pitt ]
@@ -5115,6 +11872,64 @@ systemd (234-2) unstable; urgency=medium
 
  -- Michael Biebl <biebl@debian.org>  Thu, 20 Jul 2017 15:13:42 +0200
 
+systemd (234-1ubuntu2) artful; urgency=medium
+
+  * Set UseDomains to true, by default, on Ubuntu.
+    On Ubuntu, fallback DNS servers are disabled, therefore we do not leak queries
+    to a preset 3rd party by default. In resolved, dnssec is also disabled by
+    default, as too much of the internet is broken and using Ubuntu users to debug
+    the internet is not very productive - most of the time the end-user cannot fix
+    or know how to notify the site owners about the dnssec mistakes. Inherintally
+    the DHCP acquired DNS servers are therefore trusted, and are free to spoof
+    records. Not trusting DNS search domains, in such scenario, provides limited
+    security or privacy benefits. From user point of view, this also appears to be
+    a regression from previous Ubuntu releases which do trust DHCP acquired search
+    domains by default.
+    Therefore we are enabling UseDomains by default on Ubuntu.
+    Users may override this setting in the .network files by specifying
+    [DHCP|IPv6AcceptRA] UseDomains=no|route options.
+  * resolved: create private stub resolve file for integration with resolvconf.
+    The stub-resolve.conf file points at resolved stub resolver, but also lists the
+    available search domains. This is required to correctly resolve domains without
+    using resolve nss module.
+  * Enable systemd-resolved by default
+  * Create /etc/resolv.conf at postinst, pointing at the stub resolver.
+    The stub resolver file is dynamically managed by systemd-resolved. It points at
+    the stub resolver as the nameserver, however it also dynamically updates the
+    search stanza, thus non-nss dns tools work correctly with unqualified names and
+    correctly use the DHCP acquired search domains.
+  * libnss-resolve: do not disable and stop systemd-resolved
+    resolved is always used by default on ubuntu via stub resolver, therefore it
+    should continue to operate without libnss-resolve module installed.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 21 Jul 2017 17:07:17 +0100
+
+systemd (234-1ubuntu1) artful; urgency=medium
+
+  [ Dimitri John Ledkov ]
+  * Merge with debian, outstanding delta below.
+  * ubuntu: udev.postinst preserve virtio interfaces names on upgrades, on s390x.
+    New udev generates stable interface names on s390x kvm instances, however, upon
+    upgrades existing ethX names should be preserved to prevent breaking networking
+    and software configurations.
+    This patch only affects Ubuntu systems. (Closes: #860246) (LP: #1682437)
+  * debian/tests/root-unittests: disable execute and seccomp tests on arm
+    test-seccomp and test-execute fail on arm64 kernels. Marking both tests as
+    expected failures. An upstream bug report is filed to resolve these.
+    (LP: #1672499)
+  * Disable fallback DNS servers.
+    This causes resolved to call-home to google, attempt to access network when
+    none is available, and spams logs. (LP: #1449001, #1698734)
+
+  [ Balint Reczey ]
+  * Skip starting systemd-remount-fs.service in containers
+    even when /etc/fstab is present.
+    This allows entering fully running state even when /etc/fstab
+    lists / to be mounted from a device which is not present in the
+    container. (LP: #1576341)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 17 Jul 2017 10:59:34 +0100
+
 systemd (234-1) unstable; urgency=medium
 
   [ Michael Biebl ]
@@ -5196,6 +12011,52 @@ systemd (233-9) unstable; urgency=medium
 
  -- Michael Biebl <biebl@debian.org>  Mon, 19 Jun 2017 15:10:14 +0200
 
+systemd (233-8ubuntu2) artful; urgency=medium
+
+  * Disable fallback DNS servers.
+    This causes resolved to call-home to google, attempt to access network when
+    none is available, and spams logs. (LP: #1449001, #1698734)
+  * SECURITY UPDATE: Out-of-bounds write in systemd-resolved.
+    CVE-2017-9445 (LP: #1695546)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 28 Jun 2017 13:27:28 +0100
+
+systemd (233-8ubuntu1) artful; urgency=medium
+
+  Merge from experimental. Existing Ubuntu cherry-picks:
+  * TEST-12: cherry-pick upstream fix for compat with new netcat-openbsd.
+  * networkd: cherry-pick support for setting bridge port's priority.
+    This is a useful feature/bugfix to improve feature parity of networkd with
+    ifupdown. This matches netplan's expectations to be able to set bridge port's
+    priorities via networked. This featue is to be used by netplan/MAAS/OpenStack.
+  * Cherrypick upstream commit to enable system use kernel maximum limit for RLIMIT_NOFILE isntead of hard-coded (low) limit of 65536.
+  * debian/tests/root-unittests: disable execute and seccomp tests on arm
+    test-seccomp and test-execute fail on arm64 kernels. Marking both tests as
+    expected failures. An upstream bug report is filed to resolve these.
+  * Cherrypick upstream patch for vio predictable interface names.
+  * Cherrypick upstream patch for platform predictable interface names.
+
+  Ubuntu cherry-picks, now also applied in Debian:
+  * resolved: fix null pointer dereference crash
+
+  Remaining Ubuntu delta:
+  * ubuntu: udev.postinst preserve virtio interfaces names on upgrades, on s390x.
+    New udev generates stable interface names on s390x kvm instances, however, upon
+    upgrades existing ethX names should be preserved to prevent breaking networking
+    and software configurations.
+    This patch only affects Ubuntu systems.
+  * Skip starting systemd-remount-fs.service in containers
+    even when /etc/fstab is present.
+    This allows entering fully running state even when /etc/fstab
+    lists / to be mounted from a device which is not present in the
+    container.
+
+  New Ubuntu cherry-picks:
+  * loginctl: Chrerry-pick upstream fix to not ignore multiple session ids.
+    (LP: #1682154)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 19 Jun 2017 15:24:30 +0100
+
 systemd (233-8) experimental; urgency=medium
 
   * Bump debhelper compatibility level to 10
@@ -5234,6 +12095,57 @@ systemd (233-7) experimental; urgency=me
 
  -- Michael Biebl <biebl@debian.org>  Wed, 24 May 2017 12:26:18 +0200
 
+systemd (233-6ubuntu3) artful; urgency=medium
+
+  * resolved: fix null pointer dereference crash (LP: #1621396)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 22 May 2017 09:29:22 +0100
+
+systemd (233-6ubuntu2) artful; urgency=medium
+
+  [ Michael Biebl ]
+  * basic/journal-importer: Fix unaligned access in get_data_size()
+    (Closes: #862062)
+
+  [ Dimitri John Ledkov ]
+  * ubuntu: disable dnssec on any ubuntu releases (LP: #1690605)
+  * Cherrypick upstream patch for vio predictable interface names.
+  * Cherrypick upstream patch for platform predictable interface names.
+    (LP: #1686784)
+
+  [ Balint Reczey ]
+  * Skip starting systemd-remount-fs.service in containers
+    even when /etc/fstab is present.
+    This allows entering fully running state even when /etc/fstab
+    lists / to be mounted from a device which is not present in the
+    container. (LP: #1576341)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 17 May 2017 19:24:03 +0100
+
+systemd (233-6ubuntu1) artful; urgency=medium
+
+  Merge from Debian, existing changes:
+  * ubuntu: udev.postinst preserve virtio interfaces names on upgrades, on s390x.
+    New udev generates stable interface names on s390x kvm instances, however, upon
+    upgrades existing ethX names should be preserved to prevent breaking networking
+    and software configurations.
+    This patch only affects Ubuntu systems. (Closes: #860246) (LP: #1682437)
+  * TEST-12: cherry-pick upstream fix for compat with new netcat-openbsd.
+  * networkd: cherry-pick support for setting bridge port's priority.
+    This is a useful feature/bugfix to improve feature parity of networkd with
+    ifupdown. This matches netplan's expectations to be able to set bridge port's
+    priorities via networked. This featue is to be used by netplan/MAAS/OpenStack.
+
+  New changes:
+  * Cherrypick upstream commit to enable system use kernel maximum limit for
+    RLIMIT_NOFILE isntead of hard-coded (low) limit of 65536.  (LP: #1686361)
+  * debian/tests/root-unittests: disable execute and seccomp tests on arm
+    test-seccomp and test-execute fail on arm64 kernels. Marking both tests as
+    expected failures. An upstream bug report is filed to resolve these.
+    (LP: #1672499)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 02 May 2017 11:23:19 +0100
+
 systemd (233-6) experimental; urgency=medium
 
   [ Felipe Sateler ]
@@ -5274,6 +12186,52 @@ systemd (233-6) experimental; urgency=me
 
  -- Michael Biebl <biebl@debian.org>  Fri, 28 Apr 2017 21:47:14 +0200
 
+systemd (233-5ubuntu1) artful; urgency=medium
+
+  [ Felipe Sateler ]
+  * Backport upstream PR #5531.
+    This delays opening the mdns and llmnr sockets until a network has enabled them.
+    This silences annoying messages when networkd receives such packets without
+    expecting them:
+      Got mDNS UDP packet on unknown scope.
+
+  [ Martin Pitt ]
+  * resolved: Disable DNSSEC by default on stretch and zesty.
+    Both Debian stretch and Ubuntu zesty are close to releasing, switch to
+    DNSSEC=off by default for those. Users can still turn it back on with
+    DNSSEC=allow-downgrade (or even "yes").
+
+  [ Michael Biebl ]
+  * Add Conflicts against hal.
+    Since v183, udev no longer supports RUN+="socket:". This feature is
+    still used by hal, but now generates vast amounts of errors in the
+    journal. Thus force the removal of hal by adding a Conflicts to the udev
+    package. This is safe, as hal is long dead and no longer useful.
+  * Drop systemd-ui Suggests
+    systemd-ui is unmaintained upstream and not particularly useful anymore.
+  * journal: fix up syslog facility when forwarding native messages.
+    Native journal messages (_TRANSPORT=journal) typically don't have a
+    syslog facility attached to it. As a result when forwarding the
+    messages to syslog they ended up with facility 0 (LOG_KERN).
+    Apply syslog_fixup_facility() so we use LOG_USER instead. (Closes: #837893)
+  * Split upstream tests into systemd-tests binary package (Closes: #859152)
+  * Get PACKAGE_VERSION from config.h.
+    This also works with meson and is not autotools specific.
+
+  [ Dimitri John Ledkov ]
+  * ubuntu: udev.postinst preserve virtio interfaces names on upgrades, on s390x.
+    New udev generates stable interface names on s390x kvm instances, however, upon
+    upgrades existing ethX names should be preserved to prevent breaking networking
+    and software configurations.
+    This patch only affects Ubuntu systems. (Closes: #860246) (LP: #1682437)
+  * TEST-12: cherry-pick upstream fix for compat with new netcat-openbsd.
+  * networkd: cherry-pick support for setting bridge port's priority.
+    This is a useful feature/bugfix to improve feature parity of networkd with
+    ifupdown. This matches netplan's expectations to be able to set bridge port's
+    priorities via networked. This featue is to be used by netplan/MAAS/OpenStack.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 21 Apr 2017 14:36:34 +0100
+
 systemd (233-5) experimental; urgency=medium
 
   * Do not throw a warning in emergency and rescue mode if plymouth is not
diff -pruN 257.7-1/debian/control 257.9-0ubuntu2/debian/control
--- 257.7-1/debian/control	2025-06-02 17:16:43.000000000 +0000
+++ 257.9-0ubuntu2/debian/control	2025-09-23 20:31:05.000000000 +0000
@@ -1,7 +1,8 @@
 Source: systemd
 Section: admin
 Priority: optional
-Maintainer: Debian systemd Maintainers <pkg-systemd-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian systemd Maintainers <pkg-systemd-maintainers@lists.alioth.debian.org>
 Uploaders: Marco d'Itri <md@linux.it>,
            Sjoerd Simons <sjoerd@debian.org>,
            Martin Pitt <mpitt@debian.org>,
@@ -10,8 +11,8 @@ Uploaders: Marco d'Itri <md@linux.it>,
            Nick Rosbrook <enr0n@ubuntu.com>,
 Standards-Version: 4.7.2
 Rules-Requires-Root: no
-Vcs-Git: https://salsa.debian.org/systemd-team/systemd.git
-Vcs-Browser: https://salsa.debian.org/systemd-team/systemd
+Vcs-Git: https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd
+Vcs-Browser:  https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd
 Homepage: https://systemd.io
 Build-Depends: debhelper-compat (= 13),
                debhelper (>= 13.11.6),
@@ -26,10 +27,10 @@ Build-Depends: debhelper-compat (= 13),
                docbook-xml <!nodoc>,
                meson (>= 0.60.0),
                rsync | meson (>= 1.3.0~),
-               clang:native [amd64 arm64 ppc64el riscv64 s390x] <!pkg.systemd.nobpf !stage1>,
-               linux-bpf-dev [amd64 arm64 ppc64el riscv64 s390x] <!pkg.systemd.nobpf !stage1>,
-               libbpf-dev [amd64 arm64 ppc64el riscv64 s390x] <!pkg.systemd.nobpf !stage1>,
-               bpftool:native [amd64 arm64 ppc64el riscv64 s390x] <!pkg.systemd.nobpf !stage1 !pkg.systemd.upstream>,
+               clang:native [amd64 arm64 ppc64el s390x] <!pkg.systemd.nobpf !stage1>,
+               linux-bpf-dev [amd64 arm64 ppc64el s390x] <!pkg.systemd.nobpf !stage1>,
+               libbpf-dev [amd64 arm64 ppc64el s390x] <!pkg.systemd.nobpf !stage1>,
+               bpftool:native [amd64 arm64 ppc64el s390x] <!pkg.systemd.nobpf !stage1 !pkg.systemd.upstream>,
                linux-tools-generic <pkg.systemd.upstream> | bpftool <pkg.systemd.upstream>,
                gettext,
                gperf,
@@ -61,11 +62,11 @@ Build-Depends: debhelper-compat (= 13),
                libdw-dev (>= 0.158) <!stage1>,
                libpolkit-gobject-1-dev <!stage1>,
                libzstd-dev (>= 1.4.0),
-               libtss2-dev <!stage1>,
+               libtss2-dev [!i386] <!stage1>,
                libfido2-dev <!stage1>,
                libp11-kit-dev <!stage1>,
                libssl-dev <!stage1>,
-               libqrencode-dev <!stage1>,
+               libqrencode-dev [!i386] <!stage1>,
                libxen-dev [amd64 arm64] <!stage1>,
                libpwquality-dev <!stage1>,
                libarchive-dev <!stage1>,
@@ -92,14 +93,15 @@ Multi-Arch: foreign
 Priority: important
 Recommends: default-dbus-system-bus | dbus-system-bus,
             linux-sysctl-defaults,
+            networkd-dispatcher,
             systemd-timesyncd | time-daemon,
+            systemd-resolved,
             systemd-cryptsetup,
             ${dlopen:Recommends},
 Suggests: systemd-container,
           systemd-homed,
           systemd-userdbd,
           systemd-boot,
-          systemd-resolved,
           systemd-repart,
           libtss2-tcti-device0,
           polkitd,
@@ -387,6 +389,7 @@ Depends: ${shlibs:Depends},
          libudev1 (= ${binary:Version}),
          s390-tools [s390],
 Recommends: ${dlopen:Recommends},
+            systemd-hwe-hwdb,
 Suggests: ${dlopen:Suggests},
 # DEP17 M7: moving files between / and /usr, and between packages, so use Conflicts:
 Conflicts: systemd (<< 255~rc1-4~),
@@ -543,7 +546,7 @@ Description: simple UEFI boot manager -
 
 Package: systemd-boot-tools
 Build-Profiles: <!stage1>
-Architecture: amd64 i386 arm64 armhf loong64 riscv64
+Architecture: linux-any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
 Recommends: ${dlopen:Recommends},
@@ -572,22 +575,6 @@ Description: simple UEFI boot manager -
  .
  This package contains the EFI binaries.
 
-Package: systemd-boot-efi-amd64-signed-template
-Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends},
-Build-Profiles: <!stage1>
-Description: Template for signed systemd-boot-efi package (amd64)
- This package is used to control code signing by the Debian signing
- service (amd64 variant).
-
-Package: systemd-boot-efi-arm64-signed-template
-Architecture: arm64
-Depends: ${shlibs:Depends}, ${misc:Depends},
-Build-Profiles: <!stage1>
-Description: Template for signed systemd-boot-efi package (arm64)
- This package is used to control code signing by the Debian signing
- service (arm64 variant).
-
 Package: systemd-ukify
 Build-Profiles: <!stage1 !pkg.systemd.noukify>
 Architecture: all
@@ -610,22 +597,23 @@ Description: tool to build Unified Kerne
 
 Package: systemd-resolved
 Multi-Arch: foreign
+Priority: important
 Architecture: linux-any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          systemd (= ${binary:Version}),
          default-dbus-system-bus | dbus-system-bus
-Recommends: libnss-myhostname,
-            libnss-resolve,
+Recommends: ${dlopen:Recommends},
             libidn2-0,
-            ${dlopen:Recommends},
 Suggests: polkitd,
           ${dlopen:Suggests},
 Provides: resolvconf
 Conflicts: resolvconf,
            systemd (<< 257.4-4~),
+           systemd-resolved-dnssec,
 Replaces: resolvconf,
+          systemd-resolved-dnssec,
 Description: systemd DNS resolver
  This package provides systemd's DNS resolver and the command line tool to
  manage it.
@@ -667,6 +655,7 @@ Description: Provides the systemd-repart
  systemd-keyutil is a tool to manipulate X.509 certificates.
 
 Package: systemd-cryptsetup
+Priority: important
 Build-Profiles: <!stage1>
 Architecture: linux-any
 Depends: ${shlibs:Depends},
diff -pruN 257.7-1/debian/extra/dbus-1/system.d/systemd-localed-read-only.conf 257.9-0ubuntu2/debian/extra/dbus-1/system.d/systemd-localed-read-only.conf
--- 257.7-1/debian/extra/dbus-1/system.d/systemd-localed-read-only.conf	2025-06-02 17:16:43.000000000 +0000
+++ 257.9-0ubuntu2/debian/extra/dbus-1/system.d/systemd-localed-read-only.conf	2025-09-23 20:31:05.000000000 +0000
@@ -11,12 +11,10 @@ use it to modify the settings.
 
 <busconfig>
         <policy user="root">
-                <deny send_destination="org.freedesktop.locale1" send_interface="org.freedesktop.locale1" send_member="SetLocale"/>
                 <deny send_destination="org.freedesktop.locale1" send_interface="org.freedesktop.locale1" send_member="SetVConsoleKeyboard"/>
                 <deny send_destination="org.freedesktop.locale1" send_interface="org.freedesktop.locale1" send_member="SetX11Keyboard"/>
         </policy>
         <policy context="default">
-                <deny send_destination="org.freedesktop.locale1" send_interface="org.freedesktop.locale1" send_member="SetLocale"/>
                 <deny send_destination="org.freedesktop.locale1" send_interface="org.freedesktop.locale1" send_member="SetVConsoleKeyboard"/>
                 <deny send_destination="org.freedesktop.locale1" send_interface="org.freedesktop.locale1" send_member="SetX11Keyboard"/>
         </policy>
diff -pruN 257.7-1/debian/extra/initramfs-tools/hooks/udev 257.9-0ubuntu2/debian/extra/initramfs-tools/hooks/udev
--- 257.7-1/debian/extra/initramfs-tools/hooks/udev	2025-06-02 17:16:43.000000000 +0000
+++ 257.9-0ubuntu2/debian/extra/initramfs-tools/hooks/udev	2025-09-23 20:31:05.000000000 +0000
@@ -73,7 +73,11 @@ for rules in /etc/udev/rules.d/*.rules;
   # Skip rules generated by chzdev as they are handled by its own hook.
   # See LP: #2044104
   if [ $ZDEV_FILTERING -eq 1 ] && /usr/sbin/chzdev --is-owner "$rules"; then
-    continue;
+    # only skip/continue if rule is not configured as zdev_early (=0),
+    # but copy if zdev_early=1 or if zdev_early is not specified at all
+    if [ $(grep "ENV{zdev_early}=\"0\"" "$rules") ]; then
+      continue;
+    fi
   fi
 
   if [ ! -e "/usr/lib/${rules#/etc/}" ]; then
diff -pruN 257.7-1/debian/extra/polkit-1/10-systemd-logind-root-ignore-inhibitors.rules 257.9-0ubuntu2/debian/extra/polkit-1/10-systemd-logind-root-ignore-inhibitors.rules
--- 257.7-1/debian/extra/polkit-1/10-systemd-logind-root-ignore-inhibitors.rules	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/extra/polkit-1/10-systemd-logind-root-ignore-inhibitors.rules	2025-09-23 20:31:05.000000000 +0000
@@ -0,0 +1,12 @@
+// Allow the root user to ignore inhibitors when calling reboot etc.
+polkit.addRule(function(action, subject) {
+    if ((action.id == "org.freedesktop.login1.power-off-ignore-inhibit" ||
+         action.id == "org.freedesktop.login1.reboot-ignore-inhibit" ||
+         action.id == "org.freedesktop.login1.halt-ignore-inhibit" ||
+         action.id == "org.freedesktop.login1.suspend-ignore-inhibit" ||
+         action.id == "org.freedesktop.login1.hibernate-ignore-inhibit") &&
+        subject.user == "root") {
+
+	return polkit.Result.YES;
+    }
+});
diff -pruN 257.7-1/debian/extra/wrap_cl.py 257.9-0ubuntu2/debian/extra/wrap_cl.py
--- 257.7-1/debian/extra/wrap_cl.py	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/extra/wrap_cl.py	2025-09-23 20:31:05.000000000 +0000
@@ -0,0 +1,26 @@
+# Simple changelog entry formatter
+#
+# It simply uses the built in formatter and linewraps the text
+#
+# Use git-dch --customizations=/usr/share/doc/git-buildpackage/examples/wrap_cl.py
+# or set it via gbp.conf
+
+import gbp.dch
+import os
+from itertools import chain
+
+def format_changelog_entry(commit_info, options, last_commit=False):
+    entry = gbp.dch.format_changelog_entry(commit_info, options, last_commit)
+    if not entry:
+        return
+    if commit_info['author'].name != os.environ['DEBFULLNAME']:
+        entry.append(f"Author: {commit_info['author'].name}")
+
+    cfs = [i.decode() for i in chain.from_iterable(commit_info['files'].values()) if i != b'debian/patches/series']
+    if len(cfs) == 1:
+        entry.append(f"File: {cfs[0]}")
+    else:
+        entry.append("Files:")
+        [entry.append(f"- {i}") for i in cfs]
+    entry.append(f"https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id={commit_info['id']}")
+    return entry
diff -pruN 257.7-1/debian/gbp.conf 257.9-0ubuntu2/debian/gbp.conf
--- 257.7-1/debian/gbp.conf	2025-06-02 17:16:43.000000000 +0000
+++ 257.9-0ubuntu2/debian/gbp.conf	2025-09-23 20:31:05.000000000 +0000
@@ -2,8 +2,9 @@
 pristine-tar = True
 patch-numbers = False
 sign-tags = True
-debian-branch = debian/master
-upstream-branch = upstream/latest
+debian-branch = ubuntu-questing
+debian-tag = ubuntu/%(version)s
+upstream-branch = upstream/257.x
 
 [import-orig]
 upstream-vcs-tag = v%(version%~%-)s
diff -pruN 257.7-1/debian/libnss-systemd.nss 257.9-0ubuntu2/debian/libnss-systemd.nss
--- 257.7-1/debian/libnss-systemd.nss	2025-06-02 17:16:43.000000000 +0000
+++ 257.9-0ubuntu2/debian/libnss-systemd.nss	2025-09-24 18:57:11.000000000 +0000
@@ -1,4 +1,4 @@
-passwd	last	systemd
-group	last	systemd
-shadow	last	systemd
-gshadow	last	systemd
+passwd	after=files,compat	systemd
+group	after=files,compat	systemd
+shadow	after=files,compat	systemd
+gshadow	after=files,compat	systemd
diff -pruN 257.7-1/debian/libnss-systemd.preinst 257.9-0ubuntu2/debian/libnss-systemd.preinst
--- 257.7-1/debian/libnss-systemd.preinst	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/libnss-systemd.preinst	2025-09-24 18:57:11.000000000 +0000
@@ -0,0 +1,42 @@
+#!/bin/sh
+set -e
+
+#DEBHELPER#
+
+if { [ "$1" = install ] || [ "$1" = upgrade ]; } &&
+    dpkg --compare-versions "$2" lt-nl "257.9-0ubuntu2~"; then
+
+        # First drop all the systemd instances from nsswitch, to ensure that we're adding them back and in order.
+        # The code is the same that is generated for postrm, but we cannot call postrm
+        # directly here, since it relies on refcounting.
+        if [ -e "${DPKG_ROOT}/etc/nsswitch.conf" ]; then
+            sed -E -i "${DPKG_ROOT}/etc/nsswitch.conf" \
+                        -e ':a /^shadow:\s.*#/ s/(^[^#]+)\s(systemd)\s+\[!?[A-Za-z]+=[A-Za-z]+\](\s|#)/\1\3/g ; t a' \
+                        -e ':b /^shadow:\s.*#/ s/(^[^#]+)\s(systemd)(\s|#)/\1\3/g ; t b' \
+                        -e ':c /^shadow:\s[^#]*$/ s/\s(systemd)\s+\[!?[A-Za-z]+=[A-Za-z]+\](\s|$)/\2/g ; t c' \
+                        -e ':d /^shadow:\s[^#]*$/ s/\s(systemd)(\s|$)/\2/g ; t d'
+
+            sed -E -i "${DPKG_ROOT}/etc/nsswitch.conf" \
+                        -e ':a /^passwd:\s.*#/ s/(^[^#]+)\s(systemd)\s+\[!?[A-Za-z]+=[A-Za-z]+\](\s|#)/\1\3/g ; t a' \
+                        -e ':b /^passwd:\s.*#/ s/(^[^#]+)\s(systemd)(\s|#)/\1\3/g ; t b' \
+                        -e ':c /^passwd:\s[^#]*$/ s/\s(systemd)\s+\[!?[A-Za-z]+=[A-Za-z]+\](\s|$)/\2/g ; t c' \
+                        -e ':d /^passwd:\s[^#]*$/ s/\s(systemd)(\s|$)/\2/g ; t d'
+
+            sed -E -i "${DPKG_ROOT}/etc/nsswitch.conf" \
+                        -e ':a /^gshadow:\s.*#/ s/(^[^#]+)\s(systemd)\s+\[!?[A-Za-z]+=[A-Za-z]+\](\s|#)/\1\3/g ; t a' \
+                        -e ':b /^gshadow:\s.*#/ s/(^[^#]+)\s(systemd)(\s|#)/\1\3/g ; t b' \
+                        -e ':c /^gshadow:\s[^#]*$/ s/\s(systemd)\s+\[!?[A-Za-z]+=[A-Za-z]+\](\s|$)/\2/g ; t c' \
+                        -e ':d /^gshadow:\s[^#]*$/ s/\s(systemd)(\s|$)/\2/g ; t d'
+
+            sed -E -i "${DPKG_ROOT}/etc/nsswitch.conf" \
+                        -e ':a /^group:\s.*#/ s/(^[^#]+)\s(systemd)\s+\[!?[A-Za-z]+=[A-Za-z]+\](\s|#)/\1\3/g ; t a' \
+                        -e ':b /^group:\s.*#/ s/(^[^#]+)\s(systemd)(\s|#)/\1\3/g ; t b' \
+                        -e ':c /^group:\s[^#]*$/ s/\s(systemd)\s+\[!?[A-Za-z]+=[A-Za-z]+\](\s|$)/\2/g ; t c' \
+                        -e ':d /^group:\s[^#]*$/ s/\s(systemd)(\s|$)/\2/g ; t d'
+        fi
+
+        # Signal to postinst that the NSS services should be installed on
+        # recent upgraders, since the module is available starting from 232-7
+        # but users may not have a fully configured NSS switch (LP: #2121017).
+        touch "${DPKG_ROOT}/etc/nsswitch.conf.nss.${DPKG_MAINTSCRIPT_PACKAGE}-will-install"
+fi
diff -pruN 257.7-1/debian/patches/lp2064096-switch-root-use-MS_MOVE-for-run-when-switchig-from-initrd.patch 257.9-0ubuntu2/debian/patches/lp2064096-switch-root-use-MS_MOVE-for-run-when-switchig-from-initrd.patch
--- 257.7-1/debian/patches/lp2064096-switch-root-use-MS_MOVE-for-run-when-switchig-from-initrd.patch	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/patches/lp2064096-switch-root-use-MS_MOVE-for-run-when-switchig-from-initrd.patch	2025-09-23 20:31:05.000000000 +0000
@@ -0,0 +1,48 @@
+From: Nick Rosbrook <enr0n@ubuntu.com>
+Date: Fri, 17 May 2024 10:17:08 +0200
+Subject: switch-root: use MS_MOVE for /run when switchig from initrd
+
+Bug-Ubuntu: https://launchpad.net/bugs/2064096
+Forwarded: https://github.com/systemd/systemd/pull/32645
+
+Before commit 7c764d4599 ("switch-root: always use MS_BIND to move api vfs over"),
+when switching root from an initrd, the old procfs, sysfs, /dev/ and
+/run would be moved using MS_MOVE. According to that commit, this change
+was mostly a simplification because systemd already cleans up the old
+mount hierarchy before the switch root, and no longer needed to rely on
+the clean up side-effect of MS_MOVE.
+
+However, this change broke some systemd services that also have an
+associated AppArmor profile. For example, in Ubuntu, rsyslog has an
+AppArmor profile configured, and when it tries to access
+/run/systemd/notify during start up (after the switch root has
+occurred), we see the denial:
+
+ audit: type=1400 audit(1714740096.740:159): apparmor="DENIED" operation="sendmsg" class="file" info="Failed name lookup - disconnected path" error=-13 profile="rsyslogd" name="systemd/notify" [...]
+
+The difference in MS_BIND vs MS_MOVE affects the view that AppArmor has
+of the mount tree. With MS_BIND, AppArmor will not know that e.g.
+/run/systemd/notify is in the current mount tree after the pivot_root,
+because it is tracking this path from the old root. But with MS_MOVE,
+the original mount is preserved and does not affect AppArmor's view.
+
+Ultimately, this is most likely something that should be addressed in
+AppArmor, but that is not going to happen in the short term. For now,
+just go back to MS_MOVE when switching from the initrd.
+---
+ src/shared/switch-root.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/shared/switch-root.c b/src/shared/switch-root.c
+index 621161a..a1c53ba 100644
+--- a/src/shared/switch-root.c
++++ b/src/shared/switch-root.c
+@@ -42,7 +42,7 @@ int switch_root(const char *new_root,
+                 { "/dev",             MS_BIND|MS_REC,  MS_BIND|MS_REC }, /* Recursive, because we want to save the original /dev/shm/ + /dev/pts/ and similar */
+                 { "/sys",             MS_BIND|MS_REC,  MS_BIND|MS_REC }, /* Similar, we want to retain various API VFS, or the cgroupv1 /sys/fs/cgroup/ tree */
+                 { "/proc",            MS_BIND|MS_REC,  MS_BIND|MS_REC }, /* Similar */
+-                { "/run",             MS_BIND,         MS_BIND|MS_REC }, /* Recursive except on soft reboot, see above */
++                { "/run",             MS_BIND,         MS_MOVE        }, /* Recursive except on soft reboot, see above */
+                 { "/run/credentials", MS_BIND|MS_REC,  0 /* skip! */  }, /* Credential mounts should survive */
+                 { "/run/host",        MS_BIND|MS_REC,  0 /* skip! */  }, /* Host supplied hierarchy should also survive */
+         };
diff -pruN 257.7-1/debian/patches/lp2104943-test-network-add-handling-for-Ubuntu-FAN-patches.patch 257.9-0ubuntu2/debian/patches/lp2104943-test-network-add-handling-for-Ubuntu-FAN-patches.patch
--- 257.7-1/debian/patches/lp2104943-test-network-add-handling-for-Ubuntu-FAN-patches.patch	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/patches/lp2104943-test-network-add-handling-for-Ubuntu-FAN-patches.patch	2025-09-23 20:31:05.000000000 +0000
@@ -0,0 +1,31 @@
+From: Nick Rosbrook <enr0n@ubuntu.com>
+Date: Fri, 28 Mar 2025 11:42:36 -0400
+Subject: test-network: add handling for Ubuntu FAN patches
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/2104943
+---
+ test/test-network/systemd-networkd-tests.py | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
+index 1b5c4d5..a393dd8 100755
+--- a/test/test-network/systemd-networkd-tests.py
++++ b/test/test-network/systemd-networkd-tests.py
+@@ -3083,7 +3083,16 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
+ 
+         output = check_output('ip -d link show vxlan-slaac')
+         print(output)
+-        self.assertIn('vxlan id 4831584 local 2002:da8:1:0:1034:56ff:fe78:9abc dev veth99', output)
++        try:
++            self.assertIn('vxlan id 4831584 local 2002:da8:1:0:1034:56ff:fe78:9abc dev veth99', output)
++        except AssertionError:
++            # Ubuntu's kernel and iproute2 may have patches for "FAN". If the
++            # ip link output has 'fan-map', that is likely what's happening
++            # here. LP: #2064508
++            if 'fan-map' in output:
++                self.assertIn('vxlan id 4831584 fan-map local 2002:da8:1:0:1034:56ff:fe78:9abc dev veth99', output)
++            else:
++                raise
+ 
+         output = check_output('ip -6 address show veth99')
+         print(output)
diff -pruN 257.7-1/debian/patches/lp2125405-basic-validate-timezones-in-get_timezones.patch 257.9-0ubuntu2/debian/patches/lp2125405-basic-validate-timezones-in-get_timezones.patch
--- 257.7-1/debian/patches/lp2125405-basic-validate-timezones-in-get_timezones.patch	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/patches/lp2125405-basic-validate-timezones-in-get_timezones.patch	2025-09-23 20:31:05.000000000 +0000
@@ -0,0 +1,54 @@
+From: Nick Rosbrook <enr0n@ubuntu.com>
+Date: Thu, 18 Sep 2025 09:16:02 -0400
+Subject: basic: validate timezones in get_timezones()
+
+Origin: upstream, https://github.com/systemd/systemd/commit/9fe168a92c87d9b2def3a18d54b0b62c04c4aee0
+Bug-Ubuntu: https://launchpad.net/bugs/2125405
+
+Depending on the packaging of tzdata, /usr/share/zoneinfo/tzdata.zi may
+reference zones or links that are not actually present on the system.
+E.g. on Debian and Ubuntu, there is a tzdata-legacy package that
+contains "legacy" zones and links, but they are still referenced in
+/usr/share/zoneinfo/tzdata.zi shipped by the main tzdata package.
+
+Right now, get_timezoes() does not validate timezones when building the
+list, which makes the following possible:
+
+ $ timedatectl list-timezones | grep "US/Alaska"
+ US/Alaska
+
+ $ timedatectl set-timezone US/Alaska
+ Failed to set time zone: Invalid or not installed time zone 'US/Alaska'
+
+which feels buggy. Hence, simply validate timezones in get_timezones()
+to avoid listing timezones that are not installed.
+---
+ src/basic/time-util.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/basic/time-util.c b/src/basic/time-util.c
+index 29afb08..2425bc2 100644
+--- a/src/basic/time-util.c
++++ b/src/basic/time-util.c
+@@ -1443,6 +1443,10 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
+                 if (*cc == '#')
+                         continue;
+ 
++                if (!timezone_is_valid(tz, LOG_DEBUG))
++                        /* Don't list unusable timezones. */
++                        continue;
++
+                 r = strv_extend(&zones, tz);
+                 if (r < 0)
+                         return r;
+@@ -1495,6 +1499,10 @@ static int get_timezones_from_tzdata_zi(char ***ret) {
+                         /* Not a line we care about. */
+                         continue;
+ 
++                if (!timezone_is_valid(tz, LOG_DEBUG))
++                        /* Don't list unusable timezones. */
++                        continue;
++
+                 r = strv_extend(&zones, tz);
+                 if (r < 0)
+                         return r;
diff -pruN 257.7-1/debian/patches/meson.build-build-with-Wl-z-gcs-report-none-on-arm64.patch 257.9-0ubuntu2/debian/patches/meson.build-build-with-Wl-z-gcs-report-none-on-arm64.patch
--- 257.7-1/debian/patches/meson.build-build-with-Wl-z-gcs-report-none-on-arm64.patch	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/patches/meson.build-build-with-Wl-z-gcs-report-none-on-arm64.patch	2025-09-24 19:04:49.000000000 +0000
@@ -0,0 +1,34 @@
+From: Nick Rosbrook <enr0n@ubuntu.com>
+Date: Fri, 1 Aug 2025 10:44:24 -0400
+Subject: meson.build: build with -Wl,-z,gcs-report=none on arm64
+
+With GCC 15 on arm64, we get linker warnings that "GCS is required by -z gcs",
+but the dependency/shared library "lacks the necessary property note."
+To properly fix this, arm64 libraries need to be re-built, and the warning
+cannot be silenced with a fix in systemd alone. Until that is resolved,
+silence this linker warning.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/2119100
+Forwarded: no
+---
+ meson.build | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index a4730f0..2a22595 100644
+--- a/meson.build
++++ b/meson.build
+@@ -457,6 +457,13 @@ possible_link_flags = [
+         '-Wl,-z,relro',
+ ]
+ 
++# LP: #2119100
++if host_machine.cpu_family() == 'aarch64'
++        possible_link_flags += [
++                '-Wl,-z,gcs-report=none',
++        ]
++endif
++
+ if get_option('b_sanitize') == 'none'
+         possible_link_flags += '-Wl,--warn-common'
+ endif
diff -pruN 257.7-1/debian/patches/series 257.9-0ubuntu2/debian/patches/series
--- 257.7-1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/patches/series	2025-09-24 19:04:49.000000000 +0000
@@ -0,0 +1,15 @@
+lp2064096-switch-root-use-MS_MOVE-for-run-when-switchig-from-initrd.patch
+wait-online/resolve-rename-varlink_subscription-varlink_query_results.patch
+wait-online/varlink-util-add-varlink_many_notify.patch
+wait-online/resolved-add-a-helper-to-check-if-DNS-server-is-accessibl.patch
+wait-online/resolved-add-link_get_default_route-helper.patch
+wait-online/resolved-add-SubscribeDNSConfiguration-to-varlink-API.patch
+wait-online/wait-online-add-support-for-waiting-for-DNS-configuration.patch
+wait-online/test-add-test-for-resolved-SubscribeDNSConfiguration-API.patch
+wait-online/networkd-test-add-basic-tests-for-systemd-networkd-wait-o.patch
+lp2104943-test-network-add-handling-for-Ubuntu-FAN-patches.patch
+test-ignore-coredumps-for-gnusleep-in-addition-to-sleep-L.patch
+test-follow-usr-bin-sleep-symlink-when-checking-coredumps.patch
+meson.build-build-with-Wl-z-gcs-report-none-on-arm64.patch
+test-skip-TEST-50-DISSECT.dissect.patch
+lp2125405-basic-validate-timezones-in-get_timezones.patch
diff -pruN 257.7-1/debian/patches/test-follow-usr-bin-sleep-symlink-when-checking-coredumps.patch 257.9-0ubuntu2/debian/patches/test-follow-usr-bin-sleep-symlink-when-checking-coredumps.patch
--- 257.7-1/debian/patches/test-follow-usr-bin-sleep-symlink-when-checking-coredumps.patch	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/patches/test-follow-usr-bin-sleep-symlink-when-checking-coredumps.patch	2025-09-23 20:31:05.000000000 +0000
@@ -0,0 +1,35 @@
+From: Nick Rosbrook <enr0n@ubuntu.com>
+Date: Wed, 23 Jul 2025 09:37:47 -0400
+Subject: test: follow /usr/bin/sleep symlink when checking coredumps
+
+With the coreutils-from-gnu and coreutils-from-uutils logic, coreutils
+binaries are symlinked depending on the coreutils-from-* package
+installed. E.g., we may have /usr/bin/sleep -> /usr/bin/gnusleep.
+
+This causes TEST-87-AUX-UTILS-VM to fail thinking there are no matching
+coredumps.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/2116465
+---
+ test/units/TEST-87-AUX-UTILS-VM.coredump.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/units/TEST-87-AUX-UTILS-VM.coredump.sh b/test/units/TEST-87-AUX-UTILS-VM.coredump.sh
+index 23be2c4..2c7137d 100755
+--- a/test/units/TEST-87-AUX-UTILS-VM.coredump.sh
++++ b/test/units/TEST-87-AUX-UTILS-VM.coredump.sh
+@@ -98,12 +98,12 @@ EOF
+     machinectl start "$CONTAINER"
+     timeout "$TIMEOUT" bash -xec "until systemd-run -M '$CONTAINER' -q --wait --pipe true; do sleep .5; done"
+ 
+-    [[ "$(systemd-run -M "$CONTAINER" -q --wait --pipe coredumpctl list -q --no-legend /usr/bin/sleep | wc -l)" -eq 0 ]]
++    [[ "$(systemd-run -M "$CONTAINER" -q --wait --pipe coredumpctl list -q --no-legend $(readlink -f /usr/bin/sleep) | wc -l)" -eq 0 ]]
+     machinectl copy-to "$CONTAINER" "$MAKE_DUMP_SCRIPT"
+     systemd-run -M "$CONTAINER" -q --wait --pipe "$MAKE_DUMP_SCRIPT" "/usr/bin/sleep" "SIGABRT"
+     systemd-run -M "$CONTAINER" -q --wait --pipe "$MAKE_DUMP_SCRIPT" "/usr/bin/sleep" "SIGTRAP"
+     # Wait a bit for the coredumps to get processed
+-    timeout 30 bash -c "while [[ \$(systemd-run -M $CONTAINER -q --wait --pipe coredumpctl list -q --no-legend /usr/bin/sleep | wc -l) -lt 2 ]]; do sleep 1; done"
++    timeout 30 bash -c "while [[ \$(systemd-run -M $CONTAINER -q --wait --pipe coredumpctl list -q --no-legend $(readlink -f /usr/bin/sleep) | wc -l) -lt 2 ]]; do sleep 1; done"
+ 
+     machinectl stop "$CONTAINER"
+     rm -rf "/var/lib/machines/$CONTAINER"
diff -pruN 257.7-1/debian/patches/test-ignore-coredumps-for-gnusleep-in-addition-to-sleep-L.patch 257.9-0ubuntu2/debian/patches/test-ignore-coredumps-for-gnusleep-in-addition-to-sleep-L.patch
--- 257.7-1/debian/patches/test-ignore-coredumps-for-gnusleep-in-addition-to-sleep-L.patch	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/patches/test-ignore-coredumps-for-gnusleep-in-addition-to-sleep-L.patch	2025-09-23 20:31:05.000000000 +0000
@@ -0,0 +1,48 @@
+From: Nick Rosbrook <enr0n@ubuntu.com>
+Date: Tue, 22 Jul 2025 16:18:20 -0400
+Subject: test: ignore coredumps for gnusleep in addition to sleep (LP:
+ #2116459)
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2116459
+---
+ test/integration-tests/TEST-16-EXTEND-TIMEOUT/meson.build    | 2 +-
+ test/integration-tests/TEST-17-UDEV/meson.build              | 2 +-
+ test/integration-tests/TEST-59-RELOADING-RESTART/meson.build | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test/integration-tests/TEST-16-EXTEND-TIMEOUT/meson.build b/test/integration-tests/TEST-16-EXTEND-TIMEOUT/meson.build
+index a7eac12..0e24fd4 100644
+--- a/test/integration-tests/TEST-16-EXTEND-TIMEOUT/meson.build
++++ b/test/integration-tests/TEST-16-EXTEND-TIMEOUT/meson.build
+@@ -17,6 +17,6 @@ integration_tests += [
+                                 'StopWhenUnneeded' : 'yes',
+                         },
+                 },
+-                'coredump-exclude-regex' : '/(bash|sleep)$',
++                'coredump-exclude-regex' : '/(bash|gnusleep|sleep)$',
+         },
+ ]
+diff --git a/test/integration-tests/TEST-17-UDEV/meson.build b/test/integration-tests/TEST-17-UDEV/meson.build
+index 1d72c56..8bd82fd 100644
+--- a/test/integration-tests/TEST-17-UDEV/meson.build
++++ b/test/integration-tests/TEST-17-UDEV/meson.build
+@@ -4,6 +4,6 @@ integration_tests += [
+         integration_test_template + {
+                 'name' : fs.name(meson.current_source_dir()),
+                 'vm' : true,
+-                'coredump-exclude-regex' : '/(sleep|udevadm)$',
++                'coredump-exclude-regex' : '/(gnusleep|sleep|udevadm)$',
+         },
+ ]
+diff --git a/test/integration-tests/TEST-59-RELOADING-RESTART/meson.build b/test/integration-tests/TEST-59-RELOADING-RESTART/meson.build
+index 3d12024..cfd6a84 100644
+--- a/test/integration-tests/TEST-59-RELOADING-RESTART/meson.build
++++ b/test/integration-tests/TEST-59-RELOADING-RESTART/meson.build
+@@ -3,6 +3,6 @@
+ integration_tests += [
+         integration_test_template + {
+                 'name' : fs.name(meson.current_source_dir()),
+-                'coredump-exclude-regex' : '/(sleep|bash|systemd-notify)$',
++                'coredump-exclude-regex' : '/(gnusleep|sleep|bash|systemd-notify)$',
+         },
+ ]
diff -pruN 257.7-1/debian/patches/test-skip-TEST-50-DISSECT.dissect.patch 257.9-0ubuntu2/debian/patches/test-skip-TEST-50-DISSECT.dissect.patch
--- 257.7-1/debian/patches/test-skip-TEST-50-DISSECT.dissect.patch	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/patches/test-skip-TEST-50-DISSECT.dissect.patch	2025-09-24 19:04:49.000000000 +0000
@@ -0,0 +1,28 @@
+From: Nick Rosbrook <enr0n@ubuntu.com>
+Date: Mon, 25 Aug 2025 10:02:04 -0400
+Subject: test: skip TEST-50-DISSECT.dissect
+
+Low priority bug, not fixed before 25.10 freeze.
+Skip to allow resetting autopkgtest baseline to PASS.
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2116460
+Forwarded: no
+---
+ test/units/TEST-50-DISSECT.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/test/units/TEST-50-DISSECT.sh b/test/units/TEST-50-DISSECT.sh
+index 38bafa5..d53f505 100755
+--- a/test/units/TEST-50-DISSECT.sh
++++ b/test/units/TEST-50-DISSECT.sh
+@@ -3,6 +3,10 @@
+ set -eux
+ set -o pipefail
+ 
++# LP: 2116460 - Low priority bug, not fixed before 25.10 freeze.
++# Skip to allow resetting autopkgtest baseline to PASS.
++export TEST_SKIP_SUBTESTS="dissect"
++
+ # shellcheck source=test/units/test-control.sh
+ . "$(dirname "$0")"/test-control.sh
+ 
diff -pruN 257.7-1/debian/patches/wait-online/networkd-test-add-basic-tests-for-systemd-networkd-wait-o.patch 257.9-0ubuntu2/debian/patches/wait-online/networkd-test-add-basic-tests-for-systemd-networkd-wait-o.patch
--- 257.7-1/debian/patches/wait-online/networkd-test-add-basic-tests-for-systemd-networkd-wait-o.patch	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/patches/wait-online/networkd-test-add-basic-tests-for-systemd-networkd-wait-o.patch	2025-09-23 20:31:05.000000000 +0000
@@ -0,0 +1,166 @@
+From: Nick Rosbrook <enr0n@ubuntu.com>
+Date: Tue, 22 Oct 2024 10:00:49 -0400
+Subject: networkd-test: add basic tests for systemd-networkd-wait-online
+ --dns
+
+Origin: upstream, https://github.com/systemd/systemd/commit/d6608da1e6a5993f3161e4a150df23cf1a9fcbfc
+---
+ test/test-network/systemd-networkd-tests.py | 124 +++++++++++++++++++++++++++-
+ 1 file changed, 123 insertions(+), 1 deletion(-)
+
+diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
+index 1deff22..1b5c4d5 100755
+--- a/test/test-network/systemd-networkd-tests.py
++++ b/test/test-network/systemd-networkd-tests.py
+@@ -1179,7 +1179,7 @@ class Utilities():
+             self.fail(f'Timed out waiting for {link} to reach state {operstate}/{setup_state}')
+         return False
+ 
+-    def wait_online(self, *links_with_operstate, timeout='20s', bool_any=False, ipv4=False, ipv6=False, setup_state='configured', setup_timeout=5):
++    def wait_online(self, *links_with_operstate, timeout='20s', bool_any=False, ipv4=False, ipv6=False, setup_state='configured', setup_timeout=5, bool_dns=False):
+         """Wait for the links to reach the specified operstate and/or setup state.
+ 
+         This is similar to wait_operstate() but can be used for multiple links,
+@@ -1193,6 +1193,8 @@ class Utilities():
+         Set 'bool_any' to True to wait for any (instead of all) of the given links.
+         If this is set, no setup_state checks are done.
+ 
++        Set 'bool_dns' to True to wait for DNS servers to be accessible.
++
+         Set 'ipv4' or 'ipv6' to True to wait for IPv4 address or IPv6 address, respectively, of each of the given links.
+         This is applied only for the operational state 'degraded' or above.
+ 
+@@ -1205,6 +1207,8 @@ class Utilities():
+         args = wait_online_cmd + [f'--timeout={timeout}'] + [f'--interface={link}' for link in links_with_operstate] + [f'--ignore={link}' for link in protected_links]
+         if bool_any:
+             args += ['--any']
++        if bool_dns:
++            args += ['--dns']
+         if ipv4:
+             args += ['--ipv4']
+         if ipv6:
+@@ -1616,6 +1620,124 @@ class WaitOnlineTests(unittest.TestCase, Utilities):
+         self.wait_operstate('bridge99', '(off|no-carrier)', setup_state='configuring')
+         self.wait_operstate('test1', 'degraded')
+ 
++    def do_test_wait_online_dns(
++        self,
++        global_dns='',
++        fallback_dns='',
++        expect_timeout=False,
++        network_dropin=None,
++    ):
++        global wait_online_env
++
++        if network_dropin is not None:
++            network_dropin_path = os.path.join(
++                network_unit_dir,
++                '25-dhcp-client-use-dns-ipv4.network.d/test.conf'
++            )
++            mkdir_p(os.path.dirname(network_dropin_path))
++            with open(network_dropin_path, 'w') as f:
++                f.write(network_dropin)
++
++        copy_network_unit(
++            '25-veth.netdev',
++            '25-dhcp-client-use-dns-ipv4.network',
++            '25-dhcp-server.network'
++        )
++        start_networkd()
++        self.wait_online('veth-peer:routable')
++
++        # Unless given, clear global DNS configuration
++        resolved_dropin = '/run/systemd/resolved.conf.d/global-dns.conf'
++        mkdir_p(os.path.dirname(resolved_dropin))
++        with open(resolved_dropin, 'w') as f:
++            f.write((
++                '[Resolve]\n'
++                f'DNS={global_dns}\n'
++                f'FallbackDNS={fallback_dns}\n'
++            ))
++        self.addCleanup(os.remove, resolved_dropin)
++        check_output('systemctl reload systemd-resolved')
++
++        try:
++            wait_online_env_copy = wait_online_env.copy()
++
++            wait_online_env['SYSTEMD_LOG_LEVEL'] = 'debug'
++            wait_online_env['SYSTEMD_LOG_TARGET'] = 'console'
++
++            self.wait_online('veth99:routable', bool_dns=True)
++
++            if expect_timeout:
++                # The above should have thrown an exception.
++                self.fail(
++                    'Expected systemd-networkd-wait-online to time out'
++                )
++
++        except subprocess.CalledProcessError as e:
++            if expect_timeout:
++                self.assertRegex(
++                    e.output,
++                    f'veth99: No link-specific DNS server is accessible',
++                    f'Missing expected log message:\n{e.output}'
++                )
++            else:
++                self.fail(
++                    f'Command timed out:\n{e.output}'
++                )
++        finally:
++            wait_online_env = wait_online_env_copy
++
++    def test_wait_online_dns(self):
++        ''' test systemd-networkd-wait-online with --dns '''
++        self.do_test_wait_online_dns()
++
++    def test_wait_online_dns_global(self):
++        '''
++        test systemd-networkd-wait-online with --dns, expect pass due to global DNS
++        '''
++
++        # Set UseDNS=no, and allow global DNS to be used.
++        self.do_test_wait_online_dns(
++            global_dns='192.168.5.1',
++            network_dropin=(
++                '[DHCPv4]\n'
++                'UseDNS=no\n'
++            )
++        )
++
++    def test_wait_online_dns_expect_timeout(self):
++        ''' test systemd-networkd-wait-online with --dns, and expect timeout '''
++
++        # Explicitly set DNSDefaultRoute=yes, and require link-specific DNS to be used.
++        self.do_test_wait_online_dns(
++            expect_timeout=True,
++            network_dropin=(
++                '[Network]\n'
++                'DNSDefaultRoute=yes\n'
++                '[DHCPv4]\n'
++                'UseDNS=no\n'
++            )
++        )
++
++    def test_wait_online_dns_expect_timeout_global(self):
++        '''
++        test systemd-networkd-wait-online with --dns, and expect timeout
++        despite global DNS
++        '''
++
++        # Configure Domains=~., and expect timeout despite global DNS servers
++        # being available.
++        self.do_test_wait_online_dns(
++            expect_timeout=True,
++            global_dns='192.168.5.1',
++            network_dropin=(
++                '[Network]\n'
++                'Domains=~.\n'
++                '[DHCPv4]\n'
++                'UseDNS=no\n'
++            )
++        )
++
++
+ class NetworkdNetDevTests(unittest.TestCase, Utilities):
+ 
+     def setUp(self):
diff -pruN 257.7-1/debian/patches/wait-online/resolve-rename-varlink_subscription-varlink_query_results.patch 257.9-0ubuntu2/debian/patches/wait-online/resolve-rename-varlink_subscription-varlink_query_results.patch
--- 257.7-1/debian/patches/wait-online/resolve-rename-varlink_subscription-varlink_query_results.patch	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/patches/wait-online/resolve-rename-varlink_subscription-varlink_query_results.patch	2025-09-24 19:04:49.000000000 +0000
@@ -0,0 +1,83 @@
+From: Nick Rosbrook <enr0n@ubuntu.com>
+Date: Mon, 7 Oct 2024 11:39:57 -0400
+Subject: resolve: rename varlink_subscription ->
+ varlink_query_results_subscription
+
+Origin: upstream, https://github.com/systemd/systemd/commit/cf22b5c5ad6c879055ccbdc182897be1771cb676
+
+No functional change. Make it more clear that these varlink connections
+are subscribed to query results. This prepares for adding SubscribeDNS
+to the varlink API.
+---
+ src/resolve/resolved-manager.c | 4 ++--
+ src/resolve/resolved-manager.h | 2 +-
+ src/resolve/resolved-varlink.c | 8 ++++----
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
+index 5ca4072..f25ec5b 100644
+--- a/src/resolve/resolved-manager.c
++++ b/src/resolve/resolved-manager.c
+@@ -1195,7 +1195,7 @@ int manager_monitor_send(Manager *m, DnsQuery *q) {
+ 
+         assert(m);
+ 
+-        if (set_isempty(m->varlink_subscription))
++        if (set_isempty(m->varlink_query_results_subscription))
+                 return 0;
+ 
+         /* Merge all questions into one */
+@@ -1245,7 +1245,7 @@ int manager_monitor_send(Manager *m, DnsQuery *q) {
+         }
+ 
+         r = varlink_many_notifybo(
+-                        m->varlink_subscription,
++                        m->varlink_query_results_subscription,
+                         SD_JSON_BUILD_PAIR("state", SD_JSON_BUILD_STRING(dns_transaction_state_to_string(q->state))),
+                         SD_JSON_BUILD_PAIR_CONDITION(q->state == DNS_TRANSACTION_DNSSEC_FAILED,
+                                                      "result", SD_JSON_BUILD_STRING(dnssec_result_to_string(q->answer_dnssec_result))),
+diff --git a/src/resolve/resolved-manager.h b/src/resolve/resolved-manager.h
+index 337aa27..5d87011 100644
+--- a/src/resolve/resolved-manager.h
++++ b/src/resolve/resolved-manager.h
+@@ -152,7 +152,7 @@ struct Manager {
+         sd_varlink_server *varlink_server;
+         sd_varlink_server *varlink_monitor_server;
+ 
+-        Set *varlink_subscription;
++        Set *varlink_query_results_subscription;
+ 
+         sd_event_source *clock_change_event_source;
+ 
+diff --git a/src/resolve/resolved-varlink.c b/src/resolve/resolved-varlink.c
+index 107f722..c5ef565 100644
+--- a/src/resolve/resolved-varlink.c
++++ b/src/resolve/resolved-varlink.c
+@@ -130,10 +130,10 @@ static void vl_on_notification_disconnect(sd_varlink_server *s, sd_varlink *link
+         assert(s);
+         assert(link);
+ 
+-        sd_varlink *removed_link = set_remove(m->varlink_subscription, link);
++        sd_varlink *removed_link = set_remove(m->varlink_query_results_subscription, link);
+         if (removed_link) {
+                 sd_varlink_unref(removed_link);
+-                log_debug("%u monitor clients remain active", set_size(m->varlink_subscription));
++                log_debug("%u query result monitor clients remain active", set_size(m->varlink_query_results_subscription));
+         }
+ }
+ 
+@@ -1228,12 +1228,12 @@ static int vl_method_subscribe_query_results(sd_varlink *link, sd_json_variant *
+         if (r < 0)
+                 return log_error_errno(r, "Failed to report monitor to be established: %m");
+ 
+-        r = set_ensure_put(&m->varlink_subscription, NULL, link);
++        r = set_ensure_put(&m->varlink_query_results_subscription, NULL, link);
+         if (r < 0)
+                 return log_error_errno(r, "Failed to add subscription to set: %m");
+         sd_varlink_ref(link);
+ 
+-        log_debug("%u clients now attached for varlink notifications", set_size(m->varlink_subscription));
++        log_debug("%u clients now attached for query result varlink notifications", set_size(m->varlink_query_results_subscription));
+ 
+         return 1;
+ }
diff -pruN 257.7-1/debian/patches/wait-online/resolved-add-SubscribeDNSConfiguration-to-varlink-API.patch 257.9-0ubuntu2/debian/patches/wait-online/resolved-add-SubscribeDNSConfiguration-to-varlink-API.patch
--- 257.7-1/debian/patches/wait-online/resolved-add-SubscribeDNSConfiguration-to-varlink-API.patch	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/patches/wait-online/resolved-add-SubscribeDNSConfiguration-to-varlink-API.patch	2025-09-24 19:04:49.000000000 +0000
@@ -0,0 +1,642 @@
+From: Nick Rosbrook <enr0n@ubuntu.com>
+Date: Fri, 11 Oct 2024 14:44:44 -0400
+Subject: resolved: add SubscribeDNSConfiguration to varlink API
+
+Origin: upstream, https://github.com/systemd/systemd/commit/54401c6fdf5385d158ea8b91949b8b5391e0da95
+
+Add a new method to io.systemd.Resolve.Monitor that allows subscribing
+to changes in the systemd-resolved DNS configuration. The new method
+emits the full DNS configuration (one entry for global configuration,
+and one entry for each interface), any time the configuration is
+updated.
+---
+ src/resolve/org.freedesktop.resolve1.policy     |  11 ++
+ src/resolve/resolved-dns-search-domain.c        |  20 +++
+ src/resolve/resolved-dns-search-domain.h        |   4 +
+ src/resolve/resolved-dns-server.c               |  27 +++
+ src/resolve/resolved-dns-server.h               |   1 +
+ src/resolve/resolved-link-bus.c                 |   2 +
+ src/resolve/resolved-manager.c                  | 223 ++++++++++++++++++++++++
+ src/resolve/resolved-manager.h                  |  12 ++
+ src/resolve/resolved-varlink.c                  |  54 +++++-
+ src/shared/varlink-io.systemd.Resolve.Monitor.c |  56 +++++-
+ 10 files changed, 407 insertions(+), 3 deletions(-)
+
+diff --git a/src/resolve/org.freedesktop.resolve1.policy b/src/resolve/org.freedesktop.resolve1.policy
+index b96c8c0..097e78e 100644
+--- a/src/resolve/org.freedesktop.resolve1.policy
++++ b/src/resolve/org.freedesktop.resolve1.policy
+@@ -150,6 +150,17 @@
+                 <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>
+         </action>
+ 
++        <action id="org.freedesktop.resolve1.subscribe-dns-configuration">
++                <description gettext-domain="systemd">Subscribe to DNS configuration</description>
++                <message gettext-domain="systemd">Authentication is required to subscribe to DNS configuration.</message>
++                <defaults>
++                        <allow_any>auth_admin</allow_any>
++                        <allow_inactive>auth_admin</allow_inactive>
++                        <allow_active>auth_admin_keep</allow_active>
++                </defaults>
++                <annotate key="org.freedesktop.policykit.owner">unix-user:systemd-resolve</annotate>
++        </action>
++
+         <action id="org.freedesktop.resolve1.dump-cache">
+                 <description gettext-domain="systemd">Dump cache</description>
+                 <message gettext-domain="systemd">Authentication is required to dump cache.</message>
+diff --git a/src/resolve/resolved-dns-search-domain.c b/src/resolve/resolved-dns-search-domain.c
+index a11b213..642d52c 100644
+--- a/src/resolve/resolved-dns-search-domain.c
++++ b/src/resolve/resolved-dns-search-domain.c
+@@ -1,5 +1,7 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+ 
++#include "sd-json.h"
++
+ #include "alloc-util.h"
+ #include "dns-domain.h"
+ #include "resolved-dns-search-domain.h"
+@@ -197,3 +199,21 @@ int dns_search_domain_find(DnsSearchDomain *first, const char *name, DnsSearchDo
+         *ret = NULL;
+         return 0;
+ }
++
++int dns_search_domain_dump_to_json(DnsSearchDomain *domain, sd_json_variant **ret) {
++        int ifindex = 0;
++
++        assert(domain);
++        assert(ret);
++
++        if (domain->type == DNS_SEARCH_DOMAIN_LINK) {
++                assert(domain->link);
++                ifindex = domain->link->ifindex;
++        }
++
++        return sd_json_buildo(
++                        ret,
++                        SD_JSON_BUILD_PAIR_STRING("name", domain->name),
++                        SD_JSON_BUILD_PAIR_BOOLEAN("routeOnly", domain->route_only),
++                        SD_JSON_BUILD_PAIR_CONDITION(ifindex > 0, "ifindex", SD_JSON_BUILD_UNSIGNED(ifindex)));
++}
+diff --git a/src/resolve/resolved-dns-search-domain.h b/src/resolve/resolved-dns-search-domain.h
+index f0d96ac..3e5229c 100644
+--- a/src/resolve/resolved-dns-search-domain.h
++++ b/src/resolve/resolved-dns-search-domain.h
+@@ -1,6 +1,8 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+ #pragma once
+ 
++#include "sd-json.h"
++
+ #include "list.h"
+ #include "macro.h"
+ 
+@@ -54,3 +56,5 @@ static inline const char* DNS_SEARCH_DOMAIN_NAME(DnsSearchDomain *d) {
+ }
+ 
+ DEFINE_TRIVIAL_CLEANUP_FUNC(DnsSearchDomain*, dns_search_domain_unref);
++
++int dns_search_domain_dump_to_json(DnsSearchDomain *domain, sd_json_variant **ret);
+diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c
+index 1702866..54d0d32 100644
+--- a/src/resolve/resolved-dns-server.c
++++ b/src/resolve/resolved-dns-server.c
+@@ -7,6 +7,7 @@
+ #include "alloc-util.h"
+ #include "errno-util.h"
+ #include "fd-util.h"
++#include "json-util.h"
+ #include "resolved-bus.h"
+ #include "resolved-dns-server.h"
+ #include "resolved-dns-stub.h"
+@@ -881,6 +882,7 @@ DnsServer *manager_set_dns_server(Manager *m, DnsServer *s) {
+                 dns_cache_flush(&m->unicast_scope->cache);
+ 
+         (void) manager_send_changed(m, "CurrentDNSServer");
++        (void) manager_send_dns_configuration_changed(m, NULL, /* reset= */ false);
+ 
+         return s;
+ }
+@@ -1180,3 +1182,28 @@ void dns_server_reset_accessible_all(DnsServer *first) {
+         LIST_FOREACH(servers, s, first)
+                 dns_server_reset_accessible(s);
+ }
++
++int dns_server_dump_configuration_to_json(DnsServer *server, sd_json_variant **ret) {
++        bool accessible = false;
++        int ifindex, r;
++
++        assert(server);
++        assert(ret);
++
++        ifindex = dns_server_ifindex(server);
++
++        r = dns_server_is_accessible(server);
++        if (r < 0)
++                log_debug_errno(r, "Failed to check if %s is accessible, assume not: %m", dns_server_string_full(server));
++        else
++                accessible = r;
++
++        return sd_json_buildo(
++                        ret,
++                        JSON_BUILD_PAIR_IN_ADDR("address", &server->address, server->family),
++                        SD_JSON_BUILD_PAIR_INTEGER("family", server->family),
++                        SD_JSON_BUILD_PAIR_UNSIGNED("port", dns_server_port(server)),
++                        SD_JSON_BUILD_PAIR_CONDITION(ifindex > 0, "ifindex", SD_JSON_BUILD_UNSIGNED(ifindex)),
++                        JSON_BUILD_PAIR_STRING_NON_EMPTY("name", server->server_name),
++                        SD_JSON_BUILD_PAIR_BOOLEAN("accessible", accessible));
++}
+diff --git a/src/resolve/resolved-dns-server.h b/src/resolve/resolved-dns-server.h
+index 8915b87..0f066b1 100644
+--- a/src/resolve/resolved-dns-server.h
++++ b/src/resolve/resolved-dns-server.h
+@@ -190,6 +190,7 @@ static inline bool dns_server_is_fallback(DnsServer *s) {
+ }
+ 
+ int dns_server_dump_state_to_json(DnsServer *server, sd_json_variant **ret);
++int dns_server_dump_configuration_to_json(DnsServer *server, sd_json_variant **ret);
+ 
+ int dns_server_is_accessible(DnsServer *s);
+ static inline void dns_server_reset_accessible(DnsServer *s) {
+diff --git a/src/resolve/resolved-link-bus.c b/src/resolve/resolved-link-bus.c
+index b0c4b83..77d2663 100644
+--- a/src/resolve/resolved-link-bus.c
++++ b/src/resolve/resolved-link-bus.c
+@@ -272,6 +272,7 @@ static int bus_link_method_set_dns_servers_internal(sd_bus_message *message, voi
+                 (void) link_save_user(l);
+                 (void) manager_write_resolv_conf(l->manager);
+                 (void) manager_send_changed(l->manager, "DNS");
++                (void) manager_send_dns_configuration_changed(l->manager, l, /* reset= */ true);
+ 
+                 if (j)
+                         log_link_info(l, "Bus client set DNS server list to: %s", j);
+@@ -751,6 +752,7 @@ int bus_link_method_revert(sd_bus_message *message, void *userdata, sd_bus_error
+         (void) link_save_user(l);
+         (void) manager_write_resolv_conf(l->manager);
+         (void) manager_send_changed(l->manager, "DNS");
++        (void) manager_send_dns_configuration_changed(l->manager, l, /* reset= */ true);
+ 
+         manager_llmnr_maybe_stop(l->manager);
+         manager_mdns_maybe_stop(l->manager);
+diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
+index f25ec5b..06635a8 100644
+--- a/src/resolve/resolved-manager.c
++++ b/src/resolve/resolved-manager.c
+@@ -22,6 +22,7 @@
+ #include "idn-util.h"
+ #include "io-util.h"
+ #include "iovec-util.h"
++#include "json-util.h"
+ #include "memstream-util.h"
+ #include "missing_network.h"
+ #include "missing_socket.h"
+@@ -108,6 +109,11 @@ static int manager_process_link(sd_netlink *rtnl, sd_netlink_message *mm, void *
+         /* Now check all the links, and if mDNS/llmr are disabled everywhere, stop them globally too. */
+         manager_llmnr_maybe_stop(m);
+         manager_mdns_maybe_stop(m);
++
++        /* The accessible flag on link DNS servers will have been reset by
++         * link_update(). Just reset the global DNS servers. */
++        (void) manager_send_dns_configuration_changed(m, NULL, /* reset= */ true);
++
+         return 0;
+ 
+ fail:
+@@ -192,6 +198,8 @@ static int manager_process_address(sd_netlink *rtnl, sd_netlink_message *mm, voi
+                 break;
+         }
+ 
++        (void) manager_send_dns_configuration_changed(m, l, /* reset= */ true);
++
+         return 0;
+ 
+ fail:
+@@ -199,6 +207,38 @@ fail:
+         return 0;
+ }
+ 
++static int manager_process_route(sd_netlink *rtnl, sd_netlink_message *mm, void *userdata) {
++        Manager *m = ASSERT_PTR(userdata);
++        Link *l = NULL;
++        uint16_t type;
++        uint32_t ifindex = 0;
++        int r;
++
++        assert(rtnl);
++        assert(mm);
++
++        r = sd_netlink_message_get_type(mm, &type);
++        if (r < 0) {
++                log_warning_errno(r, "Failed not get message type, ignoring: %m");
++                return 0;
++        }
++
++        if (!IN_SET(type, RTM_NEWROUTE, RTM_DELROUTE)) {
++                log_warning("Unexpected message type %u when processing route, ignoring.", type);
++                return 0;
++        }
++
++        r = sd_netlink_message_read_u32(mm, RTA_OIF, &ifindex);
++        if (r < 0)
++                log_full_errno(r == -ENODATA ? LOG_DEBUG : LOG_WARNING, r, "Failed to get route ifindex, ignoring: %m");
++        else
++                l = hashmap_get(m->links, INT_TO_PTR(ifindex));
++
++        (void) manager_send_dns_configuration_changed(m, l, /* reset= */ true);
++
++        return 0;
++}
++
+ static int manager_rtnl_listen(Manager *m) {
+         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL, *reply = NULL;
+         int r;
+@@ -289,6 +329,7 @@ static int on_network_event(sd_event_source *s, int fd, uint32_t revents, void *
+ 
+         (void) manager_write_resolv_conf(m);
+         (void) manager_send_changed(m, "DNS");
++        (void) manager_send_dns_configuration_changed(m, NULL, /* reset= */ true);
+ 
+         /* Now check all the links, and if mDNS/llmr are disabled everywhere, stop them globally too. */
+         manager_llmnr_maybe_stop(m);
+@@ -813,10 +854,14 @@ Manager *manager_free(Manager *m) {
+         sd_event_source_unref(m->network_event_source);
+         sd_network_monitor_unref(m->network_monitor);
+ 
++        sd_netlink_slot_unref(m->netlink_new_route_slot);
++        sd_netlink_slot_unref(m->netlink_del_route_slot);
+         sd_netlink_unref(m->rtnl);
+         sd_event_source_unref(m->rtnl_event_source);
+         sd_event_source_unref(m->clock_change_event_source);
+ 
++        sd_json_variant_unref(m->dns_configuration_json);
++
+         manager_llmnr_stop(m);
+         manager_mdns_stop(m);
+         manager_dns_stub_stop(m);
+@@ -1943,3 +1988,181 @@ void dns_manager_reset_statistics(Manager *m) {
+         m->n_failure_responses_served_stale_total = 0;
+         zero(m->n_dnssec_verdict);
+ }
++
++static int dns_configuration_json_append(
++                const char *ifname,
++                int ifindex,
++                int default_route,
++                DnsServer *current_dns_server,
++                DnsServer *dns_servers,
++                DnsSearchDomain *search_domains,
++                sd_json_variant **configuration) {
++
++        _cleanup_(sd_json_variant_unrefp) sd_json_variant *dns_servers_json = NULL,
++                                                          *search_domains_json = NULL,
++                                                          *current_dns_server_json = NULL;
++        int r;
++
++        assert(configuration);
++
++        if (dns_servers) {
++                r = sd_json_variant_new_array(&dns_servers_json, NULL, 0);
++                if (r < 0)
++                        return r;
++        }
++
++        if (search_domains) {
++                r = sd_json_variant_new_array(&search_domains_json, NULL, 0);
++                if (r < 0)
++                        return r;
++        }
++
++        if (current_dns_server) {
++                r = dns_server_dump_configuration_to_json(current_dns_server, &current_dns_server_json);
++                if (r < 0)
++                        return r;
++        }
++
++        LIST_FOREACH(servers, s, dns_servers) {
++                _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
++
++                assert(dns_servers_json);
++
++                r = dns_server_dump_configuration_to_json(s, &v);
++                if (r < 0)
++                        return r;
++
++                r = sd_json_variant_append_array(&dns_servers_json, v);
++                if (r < 0)
++                        return r;
++        }
++
++        LIST_FOREACH(domains, d, search_domains) {
++                _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
++
++                assert(search_domains_json);
++
++                r = dns_search_domain_dump_to_json(d, &v);
++                if (r < 0)
++                        return r;
++
++                r = sd_json_variant_append_array(&search_domains_json, v);
++                if (r < 0)
++                        return r;
++        }
++
++        return sd_json_variant_append_arraybo(
++                        configuration,
++                        JSON_BUILD_PAIR_STRING_NON_EMPTY("ifname", ifname),
++                        SD_JSON_BUILD_PAIR_CONDITION(ifindex > 0, "ifindex", SD_JSON_BUILD_UNSIGNED(ifindex)),
++                        SD_JSON_BUILD_PAIR_CONDITION(ifindex > 0, "defaultRoute", SD_JSON_BUILD_BOOLEAN(default_route > 0)),
++                        JSON_BUILD_PAIR_VARIANT_NON_NULL("currentServer", current_dns_server_json),
++                        JSON_BUILD_PAIR_VARIANT_NON_NULL("servers", dns_servers_json),
++                        JSON_BUILD_PAIR_VARIANT_NON_NULL("searchDomains", search_domains_json));
++}
++
++int manager_dump_dns_configuration_json(Manager *m, sd_json_variant **ret) {
++        _cleanup_(sd_json_variant_unrefp) sd_json_variant *configuration = NULL;
++        Link *l;
++        int r;
++
++        assert(m);
++        assert(ret);
++
++        /* Global DNS configuration */
++        r = dns_configuration_json_append(
++                        /* ifname = */ NULL,
++                        /* ifindex = */ 0,
++                        /* default_route = */ 0,
++                        manager_get_dns_server(m),
++                        m->dns_servers,
++                        m->search_domains,
++                        &configuration);
++        if (r < 0)
++                return r;
++
++        /* Append configuration for each link */
++        HASHMAP_FOREACH(l, m->links) {
++                r = dns_configuration_json_append(
++                                l->ifname,
++                                l->ifindex,
++                                link_get_default_route(l),
++                                link_get_dns_server(l),
++                                l->dns_servers,
++                                l->search_domains,
++                                &configuration);
++                if (r < 0)
++                        return r;
++        }
++
++        return sd_json_buildo(ret, SD_JSON_BUILD_PAIR_VARIANT("configuration", configuration));
++}
++
++int manager_send_dns_configuration_changed(Manager *m, Link *l, bool reset) {
++        _cleanup_(sd_json_variant_unrefp) sd_json_variant *configuration = NULL;
++        int r;
++
++        assert(m);
++
++        if (set_isempty(m->varlink_dns_configuration_subscription))
++                return 0;
++
++        if (reset) {
++                dns_server_reset_accessible_all(m->dns_servers);
++
++                if (l)
++                        dns_server_reset_accessible_all(l->dns_servers);
++        }
++
++        r = manager_dump_dns_configuration_json(m, &configuration);
++        if (r < 0)
++                return log_warning_errno(r, "Failed to dump DNS configuration json: %m");
++
++        if (sd_json_variant_equal(configuration, m->dns_configuration_json))
++                return 0;
++
++        JSON_VARIANT_REPLACE(m->dns_configuration_json, TAKE_PTR(configuration));
++
++        r = varlink_many_notify(m->varlink_dns_configuration_subscription, m->dns_configuration_json);
++        if (r < 0)
++                return log_warning_errno(r, "Failed to send DNS configuration event: %m");
++
++        return 0;
++}
++
++int manager_start_dns_configuration_monitor(Manager *m) {
++        Link *l;
++        int r;
++
++        assert(m);
++        assert(!m->dns_configuration_json);
++        assert(!m->netlink_new_route_slot);
++        assert(!m->netlink_del_route_slot);
++
++        dns_server_reset_accessible_all(m->dns_servers);
++
++        HASHMAP_FOREACH(l, m->links)
++                dns_server_reset_accessible_all(l->dns_servers);
++
++        r = manager_dump_dns_configuration_json(m, &m->dns_configuration_json);
++        if (r < 0)
++                return r;
++
++        r = sd_netlink_add_match(m->rtnl, &m->netlink_new_route_slot, RTM_NEWROUTE, manager_process_route, NULL, m, "resolve-NEWROUTE");
++        if (r < 0)
++                return r;
++
++        r = sd_netlink_add_match(m->rtnl, &m->netlink_del_route_slot, RTM_DELROUTE, manager_process_route, NULL, m, "resolve-DELROUTE");
++        if (r < 0)
++                return r;
++
++        return 0;
++}
++
++void manager_stop_dns_configuration_monitor(Manager *m) {
++        assert(m);
++
++        m->dns_configuration_json = sd_json_variant_unref(m->dns_configuration_json);
++        m->netlink_new_route_slot = sd_netlink_slot_unref(m->netlink_new_route_slot);
++        m->netlink_del_route_slot = sd_netlink_slot_unref(m->netlink_del_route_slot);
++}
+diff --git a/src/resolve/resolved-manager.h b/src/resolve/resolved-manager.h
+index 5d87011..3481a88 100644
+--- a/src/resolve/resolved-manager.h
++++ b/src/resolve/resolved-manager.h
+@@ -153,6 +153,12 @@ struct Manager {
+         sd_varlink_server *varlink_monitor_server;
+ 
+         Set *varlink_query_results_subscription;
++        Set *varlink_dns_configuration_subscription;
++
++        sd_json_variant *dns_configuration_json;
++
++        sd_netlink_slot *netlink_new_route_slot;
++        sd_netlink_slot *netlink_del_route_slot;
+ 
+         sd_event_source *clock_change_event_source;
+ 
+@@ -225,3 +231,9 @@ int socket_disable_pmtud(int fd, int af);
+ int dns_manager_dump_statistics_json(Manager *m, sd_json_variant **ret);
+ 
+ void dns_manager_reset_statistics(Manager *m);
++
++int manager_dump_dns_configuration_json(Manager *m, sd_json_variant **ret);
++int manager_send_dns_configuration_changed(Manager *m, Link *l, bool reset);
++
++int manager_start_dns_configuration_monitor(Manager *m);
++void manager_stop_dns_configuration_monitor(Manager *m);
+diff --git a/src/resolve/resolved-varlink.c b/src/resolve/resolved-varlink.c
+index c5ef565..75a641b 100644
+--- a/src/resolve/resolved-varlink.c
++++ b/src/resolve/resolved-varlink.c
+@@ -126,15 +126,25 @@ static void vl_on_disconnect(sd_varlink_server *s, sd_varlink *link, void *userd
+ 
+ static void vl_on_notification_disconnect(sd_varlink_server *s, sd_varlink *link, void *userdata) {
+         Manager *m = ASSERT_PTR(userdata);
++        sd_varlink *removed_link = NULL;
+ 
+         assert(s);
+         assert(link);
+ 
+-        sd_varlink *removed_link = set_remove(m->varlink_query_results_subscription, link);
++        removed_link = set_remove(m->varlink_query_results_subscription, link);
+         if (removed_link) {
+                 sd_varlink_unref(removed_link);
+                 log_debug("%u query result monitor clients remain active", set_size(m->varlink_query_results_subscription));
+         }
++
++        removed_link = set_remove(m->varlink_dns_configuration_subscription, link);
++        if (removed_link) {
++                sd_varlink_unref(removed_link);
++                log_debug("%u DNS monitor clients remain active", set_size(m->varlink_dns_configuration_subscription));
++
++                if (set_isempty(m->varlink_dns_configuration_subscription))
++                        manager_stop_dns_configuration_monitor(m);
++        }
+ }
+ 
+ static bool validate_and_mangle_flags(
+@@ -1353,6 +1363,45 @@ static int vl_method_reset_statistics(sd_varlink *link, sd_json_variant *paramet
+         return sd_varlink_replyb(link, SD_JSON_BUILD_EMPTY_OBJECT);
+ }
+ 
++static int vl_method_subscribe_dns_configuration(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata) {
++        Manager *m = ASSERT_PTR(sd_varlink_get_userdata(ASSERT_PTR(link)));
++        int r;
++
++        /* if the client didn't set the more flag, it is using us incorrectly */
++        if (!FLAGS_SET(flags, SD_VARLINK_METHOD_MORE))
++                return sd_varlink_error(link, SD_VARLINK_ERROR_EXPECTED_MORE, NULL);
++
++        r = verify_polkit(link, parameters, "org.freedesktop.resolve1.subscribe-dns-configuration");
++        if (r <= 0)
++                return r;
++
++        if (set_isempty(m->varlink_dns_configuration_subscription)) {
++                r = manager_start_dns_configuration_monitor(m);
++                if (r < 0)
++                        return log_error_errno(r, "Failed to start DNS configuration monitor: %m");
++        }
++
++        r = sd_varlink_notify(link, m->dns_configuration_json);
++        if (r < 0)
++                goto fail;
++
++        r = set_ensure_put(&m->varlink_dns_configuration_subscription, NULL, link);
++        if (r < 0)
++                goto fail;
++        sd_varlink_ref(link);
++
++        log_debug("%u clients now attached for link configuration varlink notifications",
++                  set_size(m->varlink_dns_configuration_subscription));
++
++        return 1;
++fail:
++        if (set_isempty(m->varlink_dns_configuration_subscription))
++                manager_stop_dns_configuration_monitor(m);
++
++
++        return log_debug_errno(r, "Failed to subscribe client to DNS configuration monitor: %m");
++}
++
+ static int varlink_monitor_server_init(Manager *m) {
+         _cleanup_(sd_varlink_server_unrefp) sd_varlink_server *server = NULL;
+         int r;
+@@ -1376,7 +1425,8 @@ static int varlink_monitor_server_init(Manager *m) {
+                         "io.systemd.Resolve.Monitor.DumpCache", vl_method_dump_cache,
+                         "io.systemd.Resolve.Monitor.DumpServerState", vl_method_dump_server_state,
+                         "io.systemd.Resolve.Monitor.DumpStatistics", vl_method_dump_statistics,
+-                        "io.systemd.Resolve.Monitor.ResetStatistics", vl_method_reset_statistics);
++                        "io.systemd.Resolve.Monitor.ResetStatistics", vl_method_reset_statistics,
++                        "io.systemd.Resolve.Monitor.SubscribeDNSConfiguration", vl_method_subscribe_dns_configuration);
+         if (r < 0)
+                 return log_error_errno(r, "Failed to register varlink methods: %m");
+ 
+diff --git a/src/shared/varlink-io.systemd.Resolve.Monitor.c b/src/shared/varlink-io.systemd.Resolve.Monitor.c
+index bc8907d..18d4eaf 100644
+--- a/src/shared/varlink-io.systemd.Resolve.Monitor.c
++++ b/src/shared/varlink-io.systemd.Resolve.Monitor.c
+@@ -112,6 +112,52 @@ static SD_VARLINK_DEFINE_METHOD(
+                 ResetStatistics,
+                 VARLINK_DEFINE_POLKIT_INPUT);
+ 
++static SD_VARLINK_DEFINE_STRUCT_TYPE(
++                DNSServer,
++                SD_VARLINK_FIELD_COMMENT("IPv4 or IPv6 address of the server."),
++                SD_VARLINK_DEFINE_FIELD(address, SD_VARLINK_INT, SD_VARLINK_ARRAY),
++                SD_VARLINK_FIELD_COMMENT("Address family of the server, one of AF_INET or AF_INET6."),
++                SD_VARLINK_DEFINE_FIELD(family, SD_VARLINK_INT, 0),
++                SD_VARLINK_FIELD_COMMENT("Port number of the server."),
++                SD_VARLINK_DEFINE_FIELD(port, SD_VARLINK_INT, 0),
++                SD_VARLINK_FIELD_COMMENT("Interface index for which this server is configured."),
++                SD_VARLINK_DEFINE_FIELD(ifindex, SD_VARLINK_INT, SD_VARLINK_NULLABLE),
++                SD_VARLINK_FIELD_COMMENT("Server Name Indication (SNI) of the server."),
++                SD_VARLINK_DEFINE_FIELD(name, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),
++                SD_VARLINK_FIELD_COMMENT("Indicates if the DNS server is accessible or not."),
++                SD_VARLINK_DEFINE_FIELD(accessible, SD_VARLINK_BOOL, 0));
++
++static SD_VARLINK_DEFINE_STRUCT_TYPE(
++                SearchDomain,
++                SD_VARLINK_FIELD_COMMENT("Domain name."),
++                SD_VARLINK_DEFINE_FIELD(name, SD_VARLINK_STRING, 0),
++                SD_VARLINK_FIELD_COMMENT("Indicates whether or not this is a routing-only domain."),
++                SD_VARLINK_DEFINE_FIELD(routeOnly, SD_VARLINK_BOOL, 0),
++                SD_VARLINK_FIELD_COMMENT("Interface index for which this search domain is configured."),
++                SD_VARLINK_DEFINE_FIELD(ifindex, SD_VARLINK_INT, SD_VARLINK_NULLABLE));
++
++static SD_VARLINK_DEFINE_STRUCT_TYPE(
++                DNSConfiguration,
++                SD_VARLINK_FIELD_COMMENT("Interface name, if any, associated with this configuration. Empty for global configuration."),
++                SD_VARLINK_DEFINE_FIELD(ifname, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),
++                SD_VARLINK_FIELD_COMMENT("Interface index, if any, associated with this configuration. Empty for global configuration."),
++                SD_VARLINK_DEFINE_FIELD(ifindex, SD_VARLINK_INT, SD_VARLINK_NULLABLE),
++                SD_VARLINK_FIELD_COMMENT("Indicates whether or not this link's DNS servers will be used for resolving domain names that do not match any link's configured domains."),
++                SD_VARLINK_DEFINE_FIELD(defaultRoute, SD_VARLINK_BOOL, SD_VARLINK_NULLABLE),
++                SD_VARLINK_FIELD_COMMENT("DNS server currently selected to use for lookups."),
++                SD_VARLINK_DEFINE_FIELD_BY_TYPE(currentServer, DNSServer, SD_VARLINK_NULLABLE),
++                SD_VARLINK_FIELD_COMMENT("Array of configured DNS servers."),
++                SD_VARLINK_DEFINE_FIELD_BY_TYPE(servers, DNSServer, SD_VARLINK_ARRAY|SD_VARLINK_NULLABLE),
++                SD_VARLINK_FIELD_COMMENT("Array of configured search domains."),
++                SD_VARLINK_DEFINE_FIELD_BY_TYPE(searchDomains, SearchDomain, SD_VARLINK_ARRAY|SD_VARLINK_NULLABLE));
++
++static SD_VARLINK_DEFINE_METHOD_FULL(
++                SubscribeDNSConfiguration,
++                SD_VARLINK_REQUIRES_MORE,
++                SD_VARLINK_DEFINE_INPUT(allowInteractiveAuthentication, SD_VARLINK_BOOL, SD_VARLINK_NULLABLE),
++                SD_VARLINK_FIELD_COMMENT("The current global and per-interface DNS configurations"),
++                SD_VARLINK_DEFINE_OUTPUT_BY_TYPE(configuration, DNSConfiguration, SD_VARLINK_ARRAY));
++
+ SD_VARLINK_DEFINE_INTERFACE(
+                 io_systemd_Resolve_Monitor,
+                 "io.systemd.Resolve.Monitor",
+@@ -129,4 +175,12 @@ SD_VARLINK_DEFINE_INTERFACE(
+                 &vl_type_TransactionStatistics,
+                 &vl_type_CacheStatistics,
+                 &vl_type_DnssecStatistics,
+-                &vl_type_ServerState);
++                &vl_type_ServerState,
++                SD_VARLINK_SYMBOL_COMMENT("Encapsulates a DNS server address specification."),
++                &vl_type_DNSServer,
++                SD_VARLINK_SYMBOL_COMMENT("Encapsulates a search domain specification."),
++                &vl_type_SearchDomain,
++                SD_VARLINK_SYMBOL_COMMENT("Encapsulates a global or per-link DNS configuration, including configured DNS servers, search domains, and more."),
++                &vl_type_DNSConfiguration,
++                SD_VARLINK_SYMBOL_COMMENT("Sends the complete global and per-link DNS configurations when any changes are made to them. The current configurations are given immediately when this method is invoked."),
++                &vl_method_SubscribeDNSConfiguration);
diff -pruN 257.7-1/debian/patches/wait-online/resolved-add-a-helper-to-check-if-DNS-server-is-accessibl.patch 257.9-0ubuntu2/debian/patches/wait-online/resolved-add-a-helper-to-check-if-DNS-server-is-accessibl.patch
--- 257.7-1/debian/patches/wait-online/resolved-add-a-helper-to-check-if-DNS-server-is-accessibl.patch	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/patches/wait-online/resolved-add-a-helper-to-check-if-DNS-server-is-accessibl.patch	2025-09-23 20:31:05.000000000 +0000
@@ -0,0 +1,137 @@
+From: Nick Rosbrook <enr0n@ubuntu.com>
+Date: Tue, 15 Oct 2024 16:30:52 -0400
+Subject: resolved: add a helper to check if DNS server is accessible
+
+Origin: upstream, https://github.com/systemd/systemd/commit/b9335a329db0ea7e2aa4aa9ca1853abb770cdb93
+
+We check this by opening a UDP socket and attempting to connect. We do
+not send any traffic on it, but this will tell us if there are routes to
+the DNS server.
+
+This will be used in a later commit.
+---
+ src/resolve/resolved-dns-server.c | 52 +++++++++++++++++++++++++++++++++++++++
+ src/resolve/resolved-dns-server.h |  9 +++++++
+ src/resolve/resolved-link.c       |  3 +++
+ 3 files changed, 64 insertions(+)
+
+diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c
+index b48d8e1..1702866 100644
+--- a/src/resolve/resolved-dns-server.c
++++ b/src/resolve/resolved-dns-server.c
+@@ -1,14 +1,19 @@
+ /* SPDX-License-Identifier: LGPL-2.1-or-later */
+ 
++#include <net/if_arp.h>
++
+ #include "sd-messages.h"
+ 
+ #include "alloc-util.h"
++#include "errno-util.h"
++#include "fd-util.h"
+ #include "resolved-bus.h"
+ #include "resolved-dns-server.h"
+ #include "resolved-dns-stub.h"
+ #include "resolved-manager.h"
+ #include "resolved-resolv-conf.h"
+ #include "siphash24.h"
++#include "socket-util.h"
+ #include "string-table.h"
+ #include "string-util.h"
+ 
+@@ -69,6 +74,7 @@ int dns_server_new(
+                 .ifindex = ifindex,
+                 .server_name = TAKE_PTR(name),
+                 .config_source = config_source,
++                .accessible = -1,
+         };
+ 
+         dns_server_reset_features(s);
+@@ -1128,3 +1134,49 @@ int dns_server_dump_state_to_json(DnsServer *server, sd_json_variant **ret) {
+                         SD_JSON_BUILD_PAIR_BOOLEAN("PacketInvalid", server->packet_invalid),
+                         SD_JSON_BUILD_PAIR_BOOLEAN("PacketDoOff", server->packet_do_off));
+ }
++
++int dns_server_is_accessible(DnsServer *s) {
++        _cleanup_close_ int fd = -EBADF;
++        union sockaddr_union sa;
++        int r;
++
++        assert(s);
++
++        if (s->accessible >= 0)
++                return s->accessible;
++
++        r = sockaddr_set_in_addr(&sa, s->family, &s->address, dns_server_port(s));
++        if (r < 0)
++                return r;
++
++        fd = socket(s->family, SOCK_DGRAM|SOCK_CLOEXEC, 0);
++        if (fd < 0)
++                return -errno;
++
++        if (s->family == AF_INET6 && in_addr_is_link_local(AF_INET6, &s->address)) {
++                /* Connecting to ipv6 link-local requires binding to an interface. */
++                r = socket_bind_to_ifindex(fd, dns_server_ifindex(s));
++                if (r < 0)
++                        return r;
++        }
++
++        r = RET_NERRNO(connect(fd, &sa.sa, SOCKADDR_LEN(sa)));
++        if (!IN_SET(r,
++                    0,
++                    -ENETUNREACH,
++                    -EHOSTDOWN,
++                    -EHOSTUNREACH,
++                    -ENETDOWN,
++                    -ENETRESET,
++                    -ENONET))
++                /* If we did not receive one of the expected return values,
++                 * then leave the accessible flag untouched. */
++                return r;
++
++        return (s->accessible = r >= 0);
++}
++
++void dns_server_reset_accessible_all(DnsServer *first) {
++        LIST_FOREACH(servers, s, first)
++                dns_server_reset_accessible(s);
++}
+diff --git a/src/resolve/resolved-dns-server.h b/src/resolve/resolved-dns-server.h
+index 7d7d294..8915b87 100644
+--- a/src/resolve/resolved-dns-server.h
++++ b/src/resolve/resolved-dns-server.h
+@@ -106,6 +106,9 @@ struct DnsServer {
+ 
+         /* Servers registered via D-Bus are not removed on reload */
+         ResolveConfigSource config_source;
++
++        /* Tri-state to indicate if the DNS server is accessible. */
++        int accessible;
+ };
+ 
+ int dns_server_new(
+@@ -187,3 +190,9 @@ static inline bool dns_server_is_fallback(DnsServer *s) {
+ }
+ 
+ int dns_server_dump_state_to_json(DnsServer *server, sd_json_variant **ret);
++
++int dns_server_is_accessible(DnsServer *s);
++static inline void dns_server_reset_accessible(DnsServer *s) {
++        s->accessible = -1;
++}
++void dns_server_reset_accessible_all(DnsServer *first);
+diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c
+index 7d57263..08ab240 100644
+--- a/src/resolve/resolved-link.c
++++ b/src/resolve/resolved-link.c
+@@ -299,6 +299,9 @@ static int link_update_dns_servers(Link *l) {
+         }
+ 
+         dns_server_unlink_marked(l->dns_servers);
++
++        dns_server_reset_accessible_all(l->dns_servers);
++
+         return 0;
+ 
+ clear:
diff -pruN 257.7-1/debian/patches/wait-online/resolved-add-link_get_default_route-helper.patch 257.9-0ubuntu2/debian/patches/wait-online/resolved-add-link_get_default_route-helper.patch
--- 257.7-1/debian/patches/wait-online/resolved-add-link_get_default_route-helper.patch	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/patches/wait-online/resolved-add-link_get_default_route-helper.patch	2025-09-23 20:31:05.000000000 +0000
@@ -0,0 +1,107 @@
+From: Nick Rosbrook <enr0n@ubuntu.com>
+Date: Thu, 14 Nov 2024 14:31:07 -0500
+Subject: resolved: add link_get_default_route helper
+
+Origin: upstream, https://github.com/systemd/systemd/commit/f63acba4adad4e6f100a50ebc2873282ab9e8f4c
+
+The dbus property getter for DefaultRoute does not simply check
+link->default_route. Instead, if l->default_route is not explicitly
+configured, it checks dns_scope_is_default_route(l->unicast_scope).
+
+Add a link_get_default_route() helper with this logic so that it can be
+used for consistency.
+---
+ src/resolve/resolved-link-bus.c | 25 +------------------------
+ src/resolve/resolved-link.c     | 15 +++++++++++++++
+ src/resolve/resolved-link.h     |  2 ++
+ 3 files changed, 18 insertions(+), 24 deletions(-)
+
+diff --git a/src/resolve/resolved-link-bus.c b/src/resolve/resolved-link-bus.c
+index 1c26dcb..b0c4b83 100644
+--- a/src/resolve/resolved-link-bus.c
++++ b/src/resolve/resolved-link-bus.c
+@@ -26,6 +26,7 @@ static BUS_DEFINE_PROPERTY_GET(property_get_dnssec_supported, "b", Link, link_dn
+ static BUS_DEFINE_PROPERTY_GET2(property_get_dnssec_mode, "s", Link, link_get_dnssec_mode, dnssec_mode_to_string);
+ static BUS_DEFINE_PROPERTY_GET2(property_get_llmnr_support, "s", Link, link_get_llmnr_support, resolve_support_to_string);
+ static BUS_DEFINE_PROPERTY_GET2(property_get_mdns_support, "s", Link, link_get_mdns_support, resolve_support_to_string);
++static BUS_DEFINE_PROPERTY_GET(property_get_default_route, "b", Link, link_get_default_route);
+ 
+ static int property_get_dns_over_tls_mode(
+                 sd_bus *bus,
+@@ -162,30 +163,6 @@ static int property_get_domains(
+         return sd_bus_message_close_container(reply);
+ }
+ 
+-static int property_get_default_route(
+-                sd_bus *bus,
+-                const char *path,
+-                const char *interface,
+-                const char *property,
+-                sd_bus_message *reply,
+-                void *userdata,
+-                sd_bus_error *error) {
+-
+-        Link *l = ASSERT_PTR(userdata);
+-
+-        assert(reply);
+-
+-        /* Return what is configured, if there's something configured */
+-        if (l->default_route >= 0)
+-                return sd_bus_message_append(reply, "b", l->default_route);
+-
+-        /* Otherwise report what is in effect */
+-        if (l->unicast_scope)
+-                return sd_bus_message_append(reply, "b", dns_scope_is_default_route(l->unicast_scope));
+-
+-        return sd_bus_message_append(reply, "b", false);
+-}
+-
+ static int property_get_scopes_mask(
+                 sd_bus *bus,
+                 const char *path,
+diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c
+index 08ab240..8594d90 100644
+--- a/src/resolve/resolved-link.c
++++ b/src/resolve/resolved-link.c
+@@ -14,6 +14,7 @@
+ #include "mkdir.h"
+ #include "netif-util.h"
+ #include "parse-util.h"
++#include "resolved-dns-scope.h"
+ #include "resolved-link.h"
+ #include "resolved-llmnr.h"
+ #include "resolved-mdns.h"
+@@ -858,6 +859,20 @@ ResolveSupport link_get_mdns_support(Link *link) {
+         return MIN(link->mdns_support, link->manager->mdns_support);
+ }
+ 
++bool link_get_default_route(Link *l) {
++        assert(l);
++
++        /* Return what is configured, if there's something configured */
++        if (l->default_route >= 0)
++                return l->default_route;
++
++        /* Otherwise report what is in effect */
++        if (l->unicast_scope)
++                return dns_scope_is_default_route(l->unicast_scope);
++
++        return false;
++}
++
+ int link_address_new(Link *l,
+                 LinkAddress **ret,
+                 int family,
+diff --git a/src/resolve/resolved-link.h b/src/resolve/resolved-link.h
+index e101ca1..7726e09 100644
+--- a/src/resolve/resolved-link.h
++++ b/src/resolve/resolved-link.h
+@@ -109,6 +109,8 @@ DnsOverTlsMode link_get_dns_over_tls_mode(Link *l);
+ ResolveSupport link_get_llmnr_support(Link *link);
+ ResolveSupport link_get_mdns_support(Link *link);
+ 
++bool link_get_default_route(Link *l);
++
+ int link_save_user(Link *l);
+ int link_load_user(Link *l);
+ void link_remove_user(Link *l);
diff -pruN 257.7-1/debian/patches/wait-online/test-add-test-for-resolved-SubscribeDNSConfiguration-API.patch 257.9-0ubuntu2/debian/patches/wait-online/test-add-test-for-resolved-SubscribeDNSConfiguration-API.patch
--- 257.7-1/debian/patches/wait-online/test-add-test-for-resolved-SubscribeDNSConfiguration-API.patch	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/patches/wait-online/test-add-test-for-resolved-SubscribeDNSConfiguration-API.patch	2025-09-24 19:04:49.000000000 +0000
@@ -0,0 +1,97 @@
+From: Nick Rosbrook <enr0n@ubuntu.com>
+Date: Tue, 22 Oct 2024 10:06:11 -0400
+Subject: test: add test for resolved SubscribeDNSConfiguration API
+
+Origin: upstream, https://github.com/systemd/systemd/commit/5ee20919a2f2b2168d2fcf92021afe92eb6d8d1d
+---
+ test/units/TEST-75-RESOLVED.sh | 77 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 77 insertions(+)
+
+diff --git a/test/units/TEST-75-RESOLVED.sh b/test/units/TEST-75-RESOLVED.sh
+index fe8f22a..062d1d4 100755
+--- a/test/units/TEST-75-RESOLVED.sh
++++ b/test/units/TEST-75-RESOLVED.sh
+@@ -1038,6 +1038,83 @@ testcase_12_resolvectl2() {
+     restart_resolved
+ }
+ 
++# Test io.systemd.Resolve.Monitor.SubscribeDNSConfiguration
++testcase_13_varlink_subscribe_dns_configuration() {
++    # Cleanup
++    # shellcheck disable=SC2317
++    cleanup() {
++        echo "===== io.systemd.Resolve.Monitor.SubscribeDNSConfiguration output: ====="
++        cat "$tmpfile"
++        echo "=========="
++        rm -f /run/systemd/resolved.conf.d/global-dns.conf
++        restart_resolved
++    }
++
++    trap cleanup RETURN ERR
++
++    local unit
++    local tmpfile
++
++    unit="subscribe-dns-configuration-$(systemd-id128 new -u).service"
++    tmpfile=$(mktemp)
++
++    # Clear global and per-interface DNS before monitoring the configuration change.
++    mkdir -p /run/systemd/resolved.conf.d/
++    {
++        echo "[Resolve]"
++        echo "DNS="
++    } > /run/systemd/resolved.conf.d/global-dns.conf
++    systemctl reload systemd-resolved.service
++    resolvectl dns dns0 ""
++    resolvectl domain dns0 ""
++
++    # Start the call to io.systemd.Resolve.Monitor.SubscribeDNSConfiguration
++    systemd-run -u "$unit" -p "Type=exec" -p "StandardOutput=truncate:$tmpfile" \
++        varlinkctl call --more --timeout=5 --graceful=io.systemd.TimedOut /run/systemd/resolve/io.systemd.Resolve.Monitor io.systemd.Resolve.Monitor.SubscribeDNSConfiguration '{}'
++
++    # Wait until the initial configuration has been received.
++    timeout 5 bash -c "until [[ -s $tmpfile ]]; do sleep 0.1; done"
++
++    # Update the global configuration.
++    mkdir -p /run/systemd/resolved.conf.d/
++    {
++        echo "[Resolve]"
++        echo "DNS=8.8.8.8"
++        echo "Domains=lan"
++    } > /run/systemd/resolved.conf.d/global-dns.conf
++    systemctl reload systemd-resolved.service
++
++    # Update a link configuration.
++    resolvectl dns dns0 8.8.4.4 1.1.1.1
++    resolvectl domain dns0 ~.
++
++    # Wait for the monitor to exit gracefully.
++    while systemctl --quiet is-active "$unit"; do
++        sleep 0.5
++    done
++
++    # Hack to remove the "Method call returned expected error" line from the output.
++    sed -i '/^Method call.*returned expected error/d' "$tmpfile"
++
++    # Check that an initial reply was given with the settings applied BEFORE the monitor started.
++    grep -qF \
++        '{"global":{"servers":null,"domains":null}}' \
++        <(jq -cr --seq  '.configuration[] | select(.ifname == null) | {"global": {servers: .servers, domains: .searchDomains}}' "$tmpfile")
++    grep -qF \
++        '{"dns0":{"servers":null,"domains":null}}' \
++        <(jq -cr --seq  '.configuration[] | select(.ifname == "dns0") | {"dns0": {servers: .servers, domains: .searchDomains}}' "$tmpfile")
++
++    # Check that the global configuration change was reflected.
++    grep -qF \
++        '{"global":{"servers":[[8,8,8,8]],"domains":["lan"]}}' \
++        <(jq -cr --seq  '.configuration[] | select(.ifname == null and .servers != null and .searchDomains != null) | {"global":{servers: [.servers[] | .address], domains: [.searchDomains[] | .name]}}' "$tmpfile")
++
++    # Check that the link configuration change was reflected.
++    grep -qF \
++        '{"dns0":{"servers":[[8,8,4,4],[1,1,1,1]],"domains":["."]}}' \
++        <(jq -cr --seq  '.configuration[] | select(.ifname == "dns0" and .servers != null and .searchDomains != null) | {"dns0":{servers: [.servers[] | .address], domains: [.searchDomains[] | .name]}}' "$tmpfile")
++}
++
+ # PRE-SETUP
+ systemctl unmask systemd-resolved.service
+ systemctl enable --now systemd-resolved.service
diff -pruN 257.7-1/debian/patches/wait-online/varlink-util-add-varlink_many_notify.patch 257.9-0ubuntu2/debian/patches/wait-online/varlink-util-add-varlink_many_notify.patch
--- 257.7-1/debian/patches/wait-online/varlink-util-add-varlink_many_notify.patch	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/patches/wait-online/varlink-util-add-varlink_many_notify.patch	2025-09-23 20:31:05.000000000 +0000
@@ -0,0 +1,63 @@
+From: Nick Rosbrook <enr0n@ubuntu.com>
+Date: Tue, 8 Oct 2024 10:19:42 -0400
+Subject: varlink-util: add varlink_many_notify
+
+Origin: upstream, https://github.com/systemd/systemd/commit/428c99997d19a132e231313ed09625ddcebbd38c
+
+We already have varlink_many_notifyb. Just re-factor it slightly and add
+a plain varlink_many_notify.
+---
+ src/libsystemd/sd-varlink/varlink-util.c | 20 ++++++++++++++------
+ src/libsystemd/sd-varlink/varlink-util.h |  1 +
+ 2 files changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/src/libsystemd/sd-varlink/varlink-util.c b/src/libsystemd/sd-varlink/varlink-util.c
+index 7651085..fa73756 100644
+--- a/src/libsystemd/sd-varlink/varlink-util.c
++++ b/src/libsystemd/sd-varlink/varlink-util.c
+@@ -89,6 +89,19 @@ int varlink_callb_and_log(
+         return varlink_call_and_log(v, method, parameters, ret_parameters);
+ }
+ 
++int varlink_many_notify(Set *s, sd_json_variant *parameters) {
++        sd_varlink *link;
++        int r = 1;
++
++        if (set_isempty(s))
++                return 0;
++
++        SET_FOREACH(link, s)
++                RET_GATHER(r, sd_varlink_notify(link, parameters));
++
++        return r;
++}
++
+ int varlink_many_notifyb(Set *s, ...) {
+         int r;
+ 
+@@ -105,12 +118,7 @@ int varlink_many_notifyb(Set *s, ...) {
+         if (r < 0)
+                 return r;
+ 
+-        r = 1;
+-        sd_varlink *link;
+-        SET_FOREACH(link, s)
+-                RET_GATHER(r, sd_varlink_notify(link, parameters));
+-
+-        return r;
++        return varlink_many_notify(s, parameters);
+ }
+ 
+ int varlink_many_reply(Set *s, sd_json_variant *parameters) {
+diff --git a/src/libsystemd/sd-varlink/varlink-util.h b/src/libsystemd/sd-varlink/varlink-util.h
+index 351f395..124b162 100644
+--- a/src/libsystemd/sd-varlink/varlink-util.h
++++ b/src/libsystemd/sd-varlink/varlink-util.h
+@@ -13,6 +13,7 @@ int varlink_callb_and_log(sd_varlink *v, const char *method, sd_json_variant **r
+ #define varlink_callbo_and_log(v, method, ret_parameters, ...)          \
+         varlink_callb_and_log((v), (method), (ret_parameters), SD_JSON_BUILD_OBJECT(__VA_ARGS__))
+ 
++int varlink_many_notify(Set *s, sd_json_variant *parameters);
+ int varlink_many_notifyb(Set *s, ...);
+ #define varlink_many_notifybo(s, ...)                                   \
+         varlink_many_notifyb((s), SD_JSON_BUILD_OBJECT(__VA_ARGS__))
diff -pruN 257.7-1/debian/patches/wait-online/wait-online-add-support-for-waiting-for-DNS-configuration.patch 257.9-0ubuntu2/debian/patches/wait-online/wait-online-add-support-for-waiting-for-DNS-configuration.patch
--- 257.7-1/debian/patches/wait-online/wait-online-add-support-for-waiting-for-DNS-configuration.patch	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/debian/patches/wait-online/wait-online-add-support-for-waiting-for-DNS-configuration.patch	2025-09-24 19:04:49.000000000 +0000
@@ -0,0 +1,721 @@
+From: Nick Rosbrook <enr0n@ubuntu.com>
+Date: Thu, 19 Sep 2024 15:59:50 -0400
+Subject: wait-online: add support for waiting for DNS configuration
+
+Origin: upstream, https://github.com/systemd/systemd/commit/359db7e9b9908a89dd7d94170f0bafdc3fe11fc7
+
+Add a new flag to systemd-networkd-wait-online, --dns, to allow waiting
+for DNS to be configured.
+
+DNS is considered configured when at least one DNS server is accessible.
+If a link has the property DefaultRoute=yes (either by explicit
+configuration, or because there are no routing-only domains), or if the
+search domain '.' is configured, wait for link-specific DNS to be
+configured. Otherwise, global DNS servers may be considered.
+---
+ man/systemd-networkd-wait-online.service.xml |  16 ++
+ src/network/meson.build                      |   1 +
+ src/network/wait-online/dns-configuration.c  | 233 +++++++++++++++++++++++++++
+ src/network/wait-online/dns-configuration.h  |  52 ++++++
+ src/network/wait-online/link.c               |   4 +
+ src/network/wait-online/link.h               |   2 +
+ src/network/wait-online/manager.c            | 141 +++++++++++++++-
+ src/network/wait-online/manager.h            |   9 +-
+ src/network/wait-online/wait-online.c        |  20 ++-
+ 9 files changed, 475 insertions(+), 3 deletions(-)
+ create mode 100644 src/network/wait-online/dns-configuration.c
+ create mode 100644 src/network/wait-online/dns-configuration.h
+
+diff --git a/man/systemd-networkd-wait-online.service.xml b/man/systemd-networkd-wait-online.service.xml
+index e696a2b..2daeabf 100644
+--- a/man/systemd-networkd-wait-online.service.xml
++++ b/man/systemd-networkd-wait-online.service.xml
+@@ -144,6 +144,22 @@
+         <xi:include href="version-info.xml" xpointer="v249"/></listitem>
+       </varlistentry>
+ 
++      <varlistentry>
++        <term><option>--dns</option></term>
++
++        <listitem><para>Waiting for DNS servers to be accessible on each interface. If this
++        option is specified with <option>--any</option>, then
++        <command>systemd-networkd-wait-online</command> exits with success when at least one interface
++        becomes online and has an accessible DNS server.</para>
++        <para>If a link has the property <varname>DefaultRoute=yes</varname> (either because the
++        <varname>DNSDefaultRoute=</varname> network property is explicitly configured, or
++        because the link does not have any "routing-only" domains), or if the search domain "." is
++        configured, then wait for link-specific DNS servers to be accessible. Otherwise, allow global
++        DNS servers to satisfy the condition.</para>
++
++        <xi:include href="version-info.xml" xpointer="v258"/></listitem>
++      </varlistentry>
++
+       <varlistentry>
+         <term><option>--any</option></term>
+ 
+diff --git a/src/network/meson.build b/src/network/meson.build
+index 8247759..c78dbbb 100644
+--- a/src/network/meson.build
++++ b/src/network/meson.build
+@@ -114,6 +114,7 @@ sources = files(
+ systemd_networkd_sources = files('networkd.c')
+ 
+ systemd_networkd_wait_online_sources = files(
++        'wait-online/dns-configuration.c',
+         'wait-online/link.c',
+         'wait-online/manager.c',
+         'wait-online/wait-online.c',
+diff --git a/src/network/wait-online/dns-configuration.c b/src/network/wait-online/dns-configuration.c
+new file mode 100644
+index 0000000..c369cc1
+--- /dev/null
++++ b/src/network/wait-online/dns-configuration.c
+@@ -0,0 +1,233 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++
++#include "sd-json.h"
++
++#include "af-list.h"
++#include "alloc-util.h"
++#include "dns-configuration.h"
++#include "hash-funcs.h"
++#include "in-addr-util.h"
++#include "iovec-util.h"
++#include "json-util.h"
++#include "set.h"
++#include "strv.h"
++
++DNSServer* dns_server_free(DNSServer *s) {
++        if (!s)
++                return NULL;
++
++        free(s->server_name);
++        iovec_done(&s->addr);
++
++        return mfree(s);
++}
++
++DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(
++        dns_server_hash_ops,
++        void,
++        trivial_hash_func,
++        trivial_compare_func,
++        DNSServer,
++        dns_server_free);
++
++static int dispatch_dns_server(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
++        static const sd_json_dispatch_field dns_server_dispatch_table[] = {
++                { "address",    SD_JSON_VARIANT_ARRAY,    json_dispatch_byte_array_iovec, offsetof(DNSServer, addr),        SD_JSON_MANDATORY },
++                { "family",     SD_JSON_VARIANT_UNSIGNED, sd_json_dispatch_uint,          offsetof(DNSServer, family),      SD_JSON_MANDATORY },
++                { "port",       SD_JSON_VARIANT_UNSIGNED, sd_json_dispatch_uint16,        offsetof(DNSServer, port),        0                 },
++                { "ifindex",    SD_JSON_VARIANT_UNSIGNED, json_dispatch_ifindex,          offsetof(DNSServer, ifindex),     SD_JSON_RELAX     },
++                { "name",       SD_JSON_VARIANT_STRING,   sd_json_dispatch_string,        offsetof(DNSServer, server_name), 0                 },
++                { "accessible", SD_JSON_VARIANT_BOOLEAN,  sd_json_dispatch_stdbool,       offsetof(DNSServer, accessible),  SD_JSON_MANDATORY },
++                {},
++        };
++        DNSServer **ret = ASSERT_PTR(userdata);
++        _cleanup_(dns_server_freep) DNSServer *s = NULL;
++        int r;
++
++        s = new0(DNSServer, 1);
++        if (!s)
++                return log_oom();
++
++        r = sd_json_dispatch(variant, dns_server_dispatch_table, flags, s);
++        if (r < 0)
++                return r;
++
++        if (s->addr.iov_len != FAMILY_ADDRESS_SIZE_SAFE(s->family))
++                return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL),
++                                "Dispatched address size (%zu) is incompatible with the family (%s).",
++                                s->addr.iov_len, af_to_ipv4_ipv6(s->family));
++
++        *ret = TAKE_PTR(s);
++
++        return 0;
++}
++
++static int dispatch_dns_server_array(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
++        Set **ret = ASSERT_PTR(userdata);
++        _cleanup_set_free_ Set *dns_servers = NULL;
++        sd_json_variant *v;
++        int r;
++
++        JSON_VARIANT_ARRAY_FOREACH(v, variant) {
++                _cleanup_(dns_server_freep) DNSServer *s = NULL;
++
++                r = dispatch_dns_server(name, v, flags, &s);
++                if (r < 0)
++                        return json_log(v, flags, r, "JSON array element is not a valid DNSServer.");
++
++                r = set_ensure_consume(&dns_servers, &dns_server_hash_ops, TAKE_PTR(s));
++                if (r < 0)
++                        return r;
++        }
++
++        set_free_and_replace(*ret, dns_servers);
++
++        return 0;
++}
++
++SearchDomain* search_domain_free(SearchDomain *d) {
++        if (!d)
++                return NULL;
++
++        free(d->name);
++
++        return mfree(d);
++}
++
++DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(
++        search_domain_hash_ops,
++        void,
++        trivial_hash_func,
++        trivial_compare_func,
++        SearchDomain,
++        search_domain_free);
++
++static int dispatch_search_domain(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
++        static const sd_json_dispatch_field search_domain_dispatch_table[] = {
++                { "name",      SD_JSON_VARIANT_STRING,   sd_json_dispatch_string,  offsetof(SearchDomain, name),       SD_JSON_MANDATORY },
++                { "routeOnly", SD_JSON_VARIANT_BOOLEAN,  sd_json_dispatch_stdbool, offsetof(SearchDomain, route_only), SD_JSON_MANDATORY },
++                { "ifindex",   SD_JSON_VARIANT_UNSIGNED, json_dispatch_ifindex,    offsetof(SearchDomain, ifindex),    SD_JSON_RELAX     },
++                {},
++        };
++        SearchDomain **ret = ASSERT_PTR(userdata);
++        _cleanup_(search_domain_freep) SearchDomain *d = NULL;
++        int r;
++
++        d = new0(SearchDomain, 1);
++        if (!d)
++                return log_oom();
++
++        r = sd_json_dispatch(variant, search_domain_dispatch_table, flags, d);
++        if (r < 0)
++                return r;
++
++        *ret = TAKE_PTR(d);
++
++        return 0;
++}
++
++static int dispatch_search_domain_array(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
++        Set **ret = ASSERT_PTR(userdata);
++        _cleanup_set_free_ Set *search_domains = NULL;
++        sd_json_variant *v;
++        int r;
++
++        JSON_VARIANT_ARRAY_FOREACH(v, variant) {
++                _cleanup_(search_domain_freep) SearchDomain *d = NULL;
++
++                r = dispatch_search_domain(name, v, flags, &d);
++                if (r < 0)
++                        return json_log(v, flags, r, "JSON array element is not a valid SearchDomain.");
++
++                r = set_ensure_consume(&search_domains, &search_domain_hash_ops, TAKE_PTR(d));
++                if (r < 0)
++                        return r;
++        }
++
++        set_free_and_replace(*ret, search_domains);
++
++        return 0;
++}
++
++DNSConfiguration* dns_configuration_free(DNSConfiguration *c) {
++        if (!c)
++                return NULL;
++
++        dns_server_free(c->current_dns_server);
++        set_free(c->dns_servers);
++        set_free(c->search_domains);
++        free(c->ifname);
++
++        return mfree(c);
++}
++
++DEFINE_HASH_OPS_WITH_VALUE_DESTRUCTOR(
++        dns_configuration_hash_ops,
++        void,
++        trivial_hash_func,
++        trivial_compare_func,
++        DNSConfiguration,
++        dns_configuration_free);
++
++static int dispatch_dns_configuration(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
++        static const sd_json_dispatch_field dns_configuration_dispatch_table[] = {
++                { "ifname",        SD_JSON_VARIANT_STRING,   sd_json_dispatch_string,      offsetof(DNSConfiguration, ifname),             0             },
++                { "ifindex",       SD_JSON_VARIANT_UNSIGNED, json_dispatch_ifindex,        offsetof(DNSConfiguration, ifindex),            SD_JSON_RELAX },
++                { "defaultRoute",  SD_JSON_VARIANT_BOOLEAN,  sd_json_dispatch_stdbool,     offsetof(DNSConfiguration, default_route),      0             },
++                { "currentServer", SD_JSON_VARIANT_OBJECT,   dispatch_dns_server,          offsetof(DNSConfiguration, current_dns_server), 0             },
++                { "servers",       SD_JSON_VARIANT_ARRAY,    dispatch_dns_server_array,    offsetof(DNSConfiguration, dns_servers),        0             },
++                { "searchDomains", SD_JSON_VARIANT_ARRAY,    dispatch_search_domain_array, offsetof(DNSConfiguration, search_domains),     0             },
++                {},
++
++        };
++        DNSConfiguration **ret = ASSERT_PTR(userdata);
++        _cleanup_(dns_configuration_freep) DNSConfiguration *c = NULL;
++        int r;
++
++        c = new0(DNSConfiguration, 1);
++        if (!c)
++                return log_oom();
++
++        r = sd_json_dispatch(variant, dns_configuration_dispatch_table, flags, c);
++        if (r < 0)
++                return r;
++
++        *ret = TAKE_PTR(c);
++
++        return 0;
++}
++
++int dns_configuration_from_json(sd_json_variant *variant, DNSConfiguration **ret) {
++        return dispatch_dns_configuration(NULL, variant, SD_JSON_LOG, ret);
++}
++
++bool dns_is_accessible(DNSConfiguration *c) {
++        DNSServer *s = NULL;
++
++        if (!c)
++                return false;
++
++        if (c->current_dns_server && c->current_dns_server->accessible)
++                return true;
++
++        SET_FOREACH(s, c->dns_servers)
++                if (s->accessible)
++                        return true;
++
++        return false;
++}
++
++bool dns_configuration_contains_search_domain(DNSConfiguration *c, const char *domain) {
++        SearchDomain *d = NULL;
++
++        assert(domain);
++
++        if (!c)
++                return false;
++
++        SET_FOREACH(d, c->search_domains)
++                if (streq(d->name, domain))
++                        return true;
++
++        return false;
++}
+diff --git a/src/network/wait-online/dns-configuration.h b/src/network/wait-online/dns-configuration.h
+new file mode 100644
+index 0000000..6e6890d
+--- /dev/null
++++ b/src/network/wait-online/dns-configuration.h
+@@ -0,0 +1,52 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include "sd-json.h"
++
++#include "hash-funcs.h"
++#include "iovec-util.h"
++#include "macro-fundamental.h"
++#include "set.h"
++
++typedef struct DNSServer DNSServer;
++typedef struct SearchDomain SearchDomain;
++typedef struct DNSConfiguration DNSConfiguration;
++
++struct DNSServer {
++        struct iovec addr;
++        int family;
++        uint16_t port;
++        int ifindex;
++        char *server_name;
++        bool accessible;
++};
++
++DNSServer* dns_server_free(DNSServer *s);
++DEFINE_TRIVIAL_CLEANUP_FUNC(DNSServer*, dns_server_free);
++
++struct SearchDomain {
++        char *name;
++        bool route_only;
++        int ifindex;
++};
++
++SearchDomain* search_domain_free(SearchDomain *d);
++DEFINE_TRIVIAL_CLEANUP_FUNC(SearchDomain*, search_domain_free);
++
++struct DNSConfiguration {
++        char *ifname;
++        int ifindex;
++        bool default_route;
++        DNSServer *current_dns_server;
++        Set *dns_servers;
++        Set *search_domains;
++};
++
++DNSConfiguration* dns_configuration_free(DNSConfiguration *c);
++DEFINE_TRIVIAL_CLEANUP_FUNC(DNSConfiguration*, dns_configuration_free);
++
++int dns_configuration_from_json(sd_json_variant *variant, DNSConfiguration **ret);
++bool dns_is_accessible(DNSConfiguration *c);
++bool dns_configuration_contains_search_domain(DNSConfiguration *c, const char *domain);
++
++extern const struct hash_ops dns_configuration_hash_ops;
+diff --git a/src/network/wait-online/link.c b/src/network/wait-online/link.c
+index 3097611..a4a6446 100644
+--- a/src/network/wait-online/link.c
++++ b/src/network/wait-online/link.c
+@@ -3,6 +3,7 @@
+ #include "sd-network.h"
+ 
+ #include "alloc-util.h"
++#include "dns-configuration.h"
+ #include "format-ifname.h"
+ #include "hashmap.h"
+ #include "link.h"
+@@ -32,6 +33,7 @@ int link_new(Manager *m, Link **ret, int ifindex, const char *ifname) {
+                 .ifname = TAKE_PTR(n),
+                 .ifindex = ifindex,
+                 .required_operstate = LINK_OPERSTATE_RANGE_DEFAULT,
++                .dns_configuration = hashmap_remove(m->dns_configuration_by_link_index, INT_TO_PTR(ifindex)),
+         };
+ 
+         r = hashmap_ensure_put(&m->links_by_index, NULL, INT_TO_PTR(ifindex), l);
+@@ -62,6 +64,8 @@ Link *link_free(Link *l) {
+                         hashmap_remove(l->manager->links_by_name, *n);
+         }
+ 
++        dns_configuration_free(l->dns_configuration);
++
+         free(l->state);
+         free(l->ifname);
+         strv_free(l->altnames);
+diff --git a/src/network/wait-online/link.h b/src/network/wait-online/link.h
+index 5dc26d9..ec352c4 100644
+--- a/src/network/wait-online/link.h
++++ b/src/network/wait-online/link.h
+@@ -3,6 +3,7 @@
+ 
+ #include "sd-netlink.h"
+ 
++#include "dns-configuration.h"
+ #include "log-link.h"
+ #include "network-util.h"
+ 
+@@ -24,6 +25,7 @@ struct Link {
+         LinkAddressState ipv4_address_state;
+         LinkAddressState ipv6_address_state;
+         char *state;
++        DNSConfiguration *dns_configuration;
+ };
+ 
+ int link_new(Manager *m, Link **ret, int ifindex, const char *ifname);
+diff --git a/src/network/wait-online/manager.c b/src/network/wait-online/manager.c
+index 47f5df6..4bad0f9 100644
+--- a/src/network/wait-online/manager.c
++++ b/src/network/wait-online/manager.c
+@@ -4,7 +4,13 @@
+ #include <linux/if.h>
+ #include <fnmatch.h>
+ 
++#include "sd-event.h"
++#include "sd-json.h"
++#include "sd-varlink.h"
++
+ #include "alloc-util.h"
++#include "dns-configuration.h"
++#include "json-util.h"
+ #include "link.h"
+ #include "manager.h"
+ #include "netlink-util.h"
+@@ -133,6 +139,26 @@ static int manager_link_is_online(Manager *m, Link *l, const LinkOperationalStat
+                                                     "No routable IPv6 address is configured.");
+         }
+ 
++        if (m->requires_dns) {
++                if (!l->dns_configuration)
++                        return log_link_debug_errno(l, SYNTHETIC_ERRNO(EADDRNOTAVAIL),
++                                                    "No DNS configuration yet");
++
++                /* If a link is configured with DNSDefaultRoute=yes, or is configured with the
++                 * search domain '.', then require link-specific DNS servers to be available.
++                 * Otherwise, we check the global DNS configuration. */
++                if (l->dns_configuration->default_route ||
++                    dns_configuration_contains_search_domain(l->dns_configuration, ".")) {
++
++                        if (!dns_is_accessible(l->dns_configuration))
++                                return log_link_debug_errno(l, SYNTHETIC_ERRNO(EADDRNOTAVAIL),
++                                                            "No link-specific DNS server is accessible.");
++
++                } else if (!dns_is_accessible(m->dns_configuration))
++                        return log_link_debug_errno(l, SYNTHETIC_ERRNO(EADDRNOTAVAIL),
++                                                    "No DNS server is accessible.");
++        }
++
+         log_link_debug(l, "link is configured by networkd and online.");
+         return true;
+ }
+@@ -381,13 +407,117 @@ static int manager_network_monitor_listen(Manager *m) {
+         return 0;
+ }
+ 
++static int on_dns_configuration_event(
++                sd_varlink *link,
++                sd_json_variant *parameters,
++                const char *error_id,
++                sd_varlink_reply_flags_t flags,
++                void *userdata) {
++
++        Manager *m = ASSERT_PTR(userdata);
++        sd_json_variant *configurations = NULL, *v = NULL;
++        int r;
++
++        assert(link);
++
++        if (error_id) {
++                log_warning("DNS configuration event error, ignoring: %s", error_id);
++                return 0;
++        }
++
++        configurations = sd_json_variant_by_key(parameters, "configuration");
++        if (!sd_json_variant_is_array(configurations)) {
++                log_warning("DNS configuration JSON data does not have configuration key, ignoring.");
++                return 0;
++        }
++
++        /* Clear any existing link DNS configuration saved by the manager. */
++        hashmap_clear(m->dns_configuration_by_link_index);
++
++        JSON_VARIANT_ARRAY_FOREACH(v, configurations) {
++                _cleanup_(dns_configuration_freep) DNSConfiguration *c = NULL;
++
++                r = dns_configuration_from_json(v, &c);
++                if (r < 0) {
++                        log_warning_errno(r, "Failed to get DNS configuration JSON, ignoring: %m");
++                        continue;
++                }
++
++                if (c->ifindex > 0) {
++                        Link *l = hashmap_get(m->links_by_index, INT_TO_PTR(c->ifindex));
++                        if (l)
++                                free_and_replace_full(l->dns_configuration, c, dns_configuration_free);
++                        else {
++                                r = hashmap_ensure_put(
++                                                &m->dns_configuration_by_link_index,
++                                                &dns_configuration_hash_ops,
++                                                INT_TO_PTR(c->ifindex),
++                                                c);
++                                if (r < 0) {
++                                        log_warning_errno(r, "Failed to save DNS configuration for link %i, ignoring: %m", c->ifindex);
++                                        continue;
++                                }
++                                TAKE_PTR(c);
++                        }
++                } else
++                        /* Global DNS configuration */
++                        free_and_replace_full(m->dns_configuration, c, dns_configuration_free);
++        }
++
++        if (manager_configured(m))
++                sd_event_exit(m->event, 0);
++
++        return 0;
++}
++
++static int manager_dns_configuration_listen(Manager *m) {
++        _cleanup_(sd_varlink_unrefp) sd_varlink *vl = NULL;
++        int r;
++
++        assert(m);
++        assert(m->event);
++
++        if (!m->requires_dns)
++                return 0;
++
++        r = sd_varlink_connect_address(&vl, "/run/systemd/resolve/io.systemd.Resolve.Monitor");
++        if (r < 0)
++                return log_error_errno(r, "Failed to connect to io.systemd.Resolve.Monitor: %m");
++
++        r = sd_varlink_set_relative_timeout(vl, USEC_INFINITY);
++        if (r < 0)
++                return log_error_errno(r, "Failed to set varlink timeout: %m");
++
++        r = sd_varlink_attach_event(vl, m->event, SD_EVENT_PRIORITY_NORMAL);
++        if (r < 0)
++                return log_error_errno(r, "Failed to attach varlink connection to event loop: %m");
++
++        (void) sd_varlink_set_userdata(vl, m);
++
++        r = sd_varlink_bind_reply(vl, on_dns_configuration_event);
++        if (r < 0)
++                return log_error_errno(r, "Failed to bind varlink reply callback: %m");
++
++        r = sd_varlink_observebo(
++                        vl,
++                        "io.systemd.Resolve.Monitor.SubscribeDNSConfiguration",
++                        SD_JSON_BUILD_PAIR_BOOLEAN("allowInteractiveAuthentication", false));
++        if (r < 0)
++                return log_error_errno(r, "Failed to issue SubscribeDNSConfiguration: %m");
++
++        m->varlink_client = TAKE_PTR(vl);
++
++        return 0;
++}
++
+ int manager_new(Manager **ret,
+                 Hashmap *command_line_interfaces_by_name,
+                 char **ignored_interfaces,
+                 LinkOperationalStateRange required_operstate,
+                 AddressFamily required_family,
+                 bool any,
+-                usec_t timeout) {
++                usec_t timeout,
++                bool requires_dns) {
+ 
+         _cleanup_(manager_freep) Manager *m = NULL;
+         int r;
+@@ -404,6 +534,7 @@ int manager_new(Manager **ret,
+                 .required_operstate = required_operstate,
+                 .required_family = required_family,
+                 .any = any,
++                .requires_dns = requires_dns,
+         };
+ 
+         r = sd_event_default(&m->event);
+@@ -428,6 +559,10 @@ int manager_new(Manager **ret,
+         if (r < 0)
+                 return r;
+ 
++        r = manager_dns_configuration_listen(m);
++        if (r < 0)
++                return r;
++
+         *ret = TAKE_PTR(m);
+ 
+         return 0;
+@@ -445,6 +580,10 @@ Manager* manager_free(Manager *m) {
+         sd_event_source_unref(m->rtnl_event_source);
+         sd_netlink_unref(m->rtnl);
+         sd_event_unref(m->event);
++        sd_varlink_unref(m->varlink_client);
++
++        dns_configuration_free(m->dns_configuration);
++        hashmap_free(m->dns_configuration_by_link_index);
+ 
+         return mfree(m);
+ }
+diff --git a/src/network/wait-online/manager.h b/src/network/wait-online/manager.h
+index 01ad18f..e5ff8c2 100644
+--- a/src/network/wait-online/manager.h
++++ b/src/network/wait-online/manager.h
+@@ -4,7 +4,9 @@
+ #include "sd-event.h"
+ #include "sd-netlink.h"
+ #include "sd-network.h"
++#include "sd-varlink.h"
+ 
++#include "dns-configuration.h"
+ #include "hashmap.h"
+ #include "network-util.h"
+ #include "time-util.h"
+@@ -23,6 +25,7 @@ struct Manager {
+         LinkOperationalStateRange required_operstate;
+         AddressFamily required_family;
+         bool any;
++        bool requires_dns;
+ 
+         sd_netlink *rtnl;
+         sd_event_source *rtnl_event_source;
+@@ -31,13 +34,17 @@ struct Manager {
+         sd_event_source *network_monitor_event_source;
+ 
+         sd_event *event;
++
++        sd_varlink *varlink_client;
++        DNSConfiguration *dns_configuration;
++        Hashmap *dns_configuration_by_link_index;
+ };
+ 
+ Manager* manager_free(Manager *m);
+ int manager_new(Manager **ret, Hashmap *command_line_interfaces_by_name, char **ignored_interfaces,
+                 LinkOperationalStateRange required_operstate,
+                 AddressFamily required_family,
+-                bool any, usec_t timeout);
++                bool any, usec_t timeout, bool requires_dns);
+ 
+ DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
+ 
+diff --git a/src/network/wait-online/wait-online.c b/src/network/wait-online/wait-online.c
+index 6f5aef9..1870c97 100644
+--- a/src/network/wait-online/wait-online.c
++++ b/src/network/wait-online/wait-online.c
+@@ -10,6 +10,7 @@
+ #include "daemon-util.h"
+ #include "main-func.h"
+ #include "manager.h"
++#include "parse-argument.h"
+ #include "pretty-print.h"
+ #include "signal-util.h"
+ #include "socket-util.h"
+@@ -22,6 +23,7 @@ static char **arg_ignore = NULL;
+ static LinkOperationalStateRange arg_required_operstate = LINK_OPERSTATE_RANGE_INVALID;
+ static AddressFamily arg_required_family = ADDRESS_FAMILY_NO;
+ static bool arg_any = false;
++static bool arg_requires_dns = false;
+ 
+ STATIC_DESTRUCTOR_REGISTER(arg_interfaces, hashmap_free_free_freep);
+ STATIC_DESTRUCTOR_REGISTER(arg_ignore, strv_freep);
+@@ -48,6 +50,7 @@ static int help(void) {
+                "  -6 --ipv6                 Requires at least one IPv6 address\n"
+                "     --any                  Wait until at least one of the interfaces is online\n"
+                "     --timeout=SECS         Maximum time to wait for network connectivity\n"
++               "     --dns                  Requires at least one DNS server to be accessible\n"
+                "\nSee the %s for details.\n",
+                program_invocation_short_name,
+                link);
+@@ -106,6 +109,7 @@ static int parse_argv(int argc, char *argv[]) {
+                 ARG_IGNORE,
+                 ARG_ANY,
+                 ARG_TIMEOUT,
++                ARG_DNS,
+         };
+ 
+         static const struct option options[] = {
+@@ -119,6 +123,7 @@ static int parse_argv(int argc, char *argv[]) {
+                 { "ipv6",              no_argument,       NULL, '6'         },
+                 { "any",               no_argument,       NULL, ARG_ANY     },
+                 { "timeout",           required_argument, NULL, ARG_TIMEOUT },
++                { "dns",               optional_argument, NULL, ARG_DNS     },
+                 {}
+         };
+ 
+@@ -178,6 +183,12 @@ static int parse_argv(int argc, char *argv[]) {
+                                 return r;
+                         break;
+ 
++                case ARG_DNS:
++                        r = parse_boolean_argument("--dns", optarg, &arg_requires_dns);
++                        if (r < 0)
++                                return r;
++                        break;
++
+                 case '?':
+                         return -EINVAL;
+ 
+@@ -204,7 +215,14 @@ static int run(int argc, char *argv[]) {
+         if (arg_quiet)
+                 log_set_max_level(LOG_ERR);
+ 
+-        r = manager_new(&m, arg_interfaces, arg_ignore, arg_required_operstate, arg_required_family, arg_any, arg_timeout);
++        r = manager_new(&m,
++                        arg_interfaces,
++                        arg_ignore,
++                        arg_required_operstate,
++                        arg_required_family,
++                        arg_any,
++                        arg_timeout,
++                        arg_requires_dns);
+         if (r < 0)
+                 return log_error_errno(r, "Could not create manager: %m");
+ 
diff -pruN 257.7-1/debian/rules 257.9-0ubuntu2/debian/rules
--- 257.7-1/debian/rules	2025-06-02 17:16:43.000000000 +0000
+++ 257.9-0ubuntu2/debian/rules	2025-09-23 20:31:05.000000000 +0000
@@ -139,9 +139,9 @@ CONFFLAGS += \
 	-Dcryptolib=openssl \
 	-Ddns-over-tls=openssl \
 	-Dlibfido2=enabled \
-	-Dtpm2=enabled \
+	-Dtpm2=$(if $(filter i386,$(DEB_HOST_ARCH)),disabled,enabled) \
 	-Dp11kit=enabled \
-	-Dqrencode=enabled \
+	-Dqrencode=$(if $(filter i386,$(DEB_HOST_ARCH)),disabled,enabled) \
 	-Dpwquality=enabled \
 	-Dhomed=enabled \
 	-Duserdb=true \
@@ -178,38 +178,13 @@ endif
 
 # BPF/BTF are only enabled and usable on a few architectures
 ifeq (, $(filter $(DEB_BUILD_PROFILES), stage1 pkg.systemd.nobpf))
-ifneq (,$(filter $(DEB_TARGET_ARCH), amd64 arm64 ppc64el riscv64 s390x))
+ifneq (,$(filter $(DEB_TARGET_ARCH), amd64 arm64 ppc64el s390x))
 CONFFLAGS += \
 	-Dvmlinux-h=provided \
 	-Dbpf-framework=enabled \
-	-Dbpf-compiler=clang
+	-Dbpf-compiler=clang \
+	-Dvmlinux-h-path=/usr/include/$(DEB_HOST_MULTIARCH)/linux/bpf/vmlinux.h
 
-ifneq ($(DEB_VENDOR),Ubuntu)
-CONFFLAGS += -Dvmlinux-h-path=/usr/include/$(DEB_HOST_MULTIARCH)/linux/bpf/vmlinux.h
-else
-CONFFLAGS += -Dvmlinux-h-path=/usr/include/$(DEB_HOST_MULTIARCH)/linux/vmlinux.h
-# TODO: drop this and the alternative build dep once support for Noble is dropped
-#
-# Source: https://git.launchpad.net/ubuntu/+source/xdp-tools/tree/debian/rules
-# On Ubuntu, the `bpftool` in path is a shell wrapper pointing at
-# the binary corresponding to runtime kernel version.
-#
-# We do not know the kernel version being used on the system building
-# this package, and in sbuild/container environments uname might not
-# even match anything available to the build.
-# Gladly for the build we only need the tool to generate skeleton code.
-#
-# If any /usr/lib/linux-tools/*/bpftool exists, locate the most recent
-# version and point to that, otherwise `bpftool` from PATH will be
-# used.
-#
-# Newer versions of linux-tools-* ship the binaries in /usr/lib/linux-tools-$(uname -r).
-# Check there too.
-bpftool_binary := $(shell find /usr/lib/linux-tools/ /usr/lib/linux-tools-* -name 'bpftool' -perm /u=x 2>/dev/null | sort -r | head -n1)
-ifneq ($(bpftool_binary),)
-export PATH := $(shell dirname $(bpftool_binary)):$(PATH)
-endif
-endif
 endif
 endif
 
@@ -265,6 +240,12 @@ ifeq ($(DEB_VENDOR),Ubuntu)
 	cp -a debian/extra/units-ubuntu/* debian/systemd/usr/lib/systemd/system/
 endif
 
+	# Remove unneeded file that produces errors in debugedit (LP: #1950445)
+ifeq ($(DEB_HOST_ARCH),i386)
+	rm -f debian/systemd/usr/lib/systemd/boot/efi/linuxia32.elf.stub
+	rm -f debian/systemd-boot-efi/usr/lib/systemd/boot/efi/linuxia32.elf.stub
+endif
+
 ifeq (,$(filter stage1, $(DEB_BUILD_PROFILES)))
 ifeq ($(DEB_VENDOR),Debian)
 ifneq ($(TEMPLATE_EFI_ARCH),)
diff -pruN 257.7-1/debian/systemd.install 257.9-0ubuntu2/debian/systemd.install
--- 257.7-1/debian/systemd.install	2025-06-14 19:26:30.000000000 +0000
+++ 257.9-0ubuntu2/debian/systemd.install	2025-09-23 20:31:05.000000000 +0000
@@ -63,7 +63,7 @@ usr/lib/kernel/install.d/50-depmod.insta
 usr/lib/kernel/install.d/90-loaderentry.install
 usr/lib/kernel/install.d/90-uki-copy.install
 usr/lib/modprobe.d/systemd.conf
-<!stage1> usr/lib/pcrlock.d/
+[!i386] <!stage1> usr/lib/pcrlock.d/
 [alpha amd64 arm64 ia64 loong64 mips64el ppc64 ppc64el riscv64 loong64 s390x sparc64] usr/lib/sysctl.d/50-pid-max.conf
 usr/lib/systemd/catalog/
 usr/lib/systemd/network/80-6rd-tunnel.link
@@ -100,7 +100,7 @@ usr/lib/systemd/systemd-backlight
 usr/lib/systemd/systemd-battery-check
 usr/lib/systemd/systemd-binfmt
 usr/lib/systemd/systemd-boot-check-no-failures
-<!stage1> usr/lib/systemd/systemd-bsod
+[!i386] <!stage1> usr/lib/systemd/systemd-bsod
 usr/lib/systemd/system/dbus-org.freedesktop.hostname1.service
 usr/lib/systemd/system/dbus-org.freedesktop.locale1.service
 usr/lib/systemd/system/dbus-org.freedesktop.login1.service
@@ -121,13 +121,13 @@ usr/lib/systemd/systemd-journald
 usr/lib/systemd/systemd-localed
 usr/lib/systemd/systemd-logind
 usr/lib/systemd/systemd-makefs
-<!stage1> usr/lib/systemd/systemd-measure
+[!i386] <!stage1> usr/lib/systemd/systemd-measure
 usr/lib/systemd/systemd-modules-load
 usr/lib/systemd/systemd-networkd
 usr/lib/systemd/systemd-networkd-wait-online
 usr/lib/systemd/systemd-network-generator
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/systemd-pcrextend
-<!stage1> usr/lib/systemd/systemd-pcrlock
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/systemd-pcrextend
+[!i386] <!stage1> usr/lib/systemd/systemd-pcrlock
 usr/lib/systemd/systemd-pstore
 usr/lib/systemd/systemd-quotacheck
 usr/lib/systemd/systemd-random-seed
@@ -143,8 +143,8 @@ usr/lib/systemd/systemd-sulogin-shell
 usr/lib/systemd/systemd-sysctl
 usr/lib/systemd/systemd-sysroot-fstab-check
 usr/lib/systemd/systemd-timedated
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1 pkg.systemd.upstream> usr/lib/systemd/systemd-tpm2-clear
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/systemd-tpm2-setup
+[amd64 arm64 armhf riscv64 loong64] <!stage1 pkg.systemd.upstream> usr/lib/systemd/systemd-tpm2-clear
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/systemd-tpm2-setup
 usr/lib/systemd/systemd-update-done
 usr/lib/systemd/systemd-user-runtime-dir
 usr/lib/systemd/systemd-user-sessions
@@ -194,9 +194,9 @@ usr/lib/systemd/system/initrd-switch-roo
 usr/lib/systemd/system/initrd-switch-root.target
 usr/lib/systemd/system/initrd.target
 usr/lib/systemd/system/initrd.target.wants/systemd-battery-check.service
-<!stage1> usr/lib/systemd/system/initrd.target.wants/systemd-bsod.service
+[!i386] <!stage1> usr/lib/systemd/system/initrd.target.wants/systemd-bsod.service
 <pkg.systemd.upstream> usr/lib/systemd/system/initrd.target.wants/systemd-confext-initrd.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/initrd.target.wants/systemd-pcrphase-initrd.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/initrd.target.wants/systemd-pcrphase-initrd.service
 <pkg.systemd.upstream> usr/lib/systemd/system/initrd.target.wants/systemd-sysext-initrd.service
 usr/lib/systemd/system/initrd-udevadm-cleanup-db.service
 usr/lib/systemd/system/initrd-usr-fs.target
@@ -253,8 +253,8 @@ usr/lib/systemd/system/sockets.target.wa
 usr/lib/systemd/system/sockets.target.wants/systemd-hostnamed.socket
 usr/lib/systemd/system/sockets.target.wants/systemd-journald-dev-log.socket
 usr/lib/systemd/system/sockets.target.wants/systemd-journald.socket
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/sockets.target.wants/systemd-pcrextend.socket
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/sockets.target.wants/systemd-pcrlock.socket
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/sockets.target.wants/systemd-pcrextend.socket
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/sockets.target.wants/systemd-pcrlock.socket
 usr/lib/systemd/system/sockets.target.wants/systemd-sysext.socket
 usr/lib/systemd/system/soft-reboot.target
 usr/lib/systemd/system/sound.target
@@ -284,17 +284,17 @@ usr/lib/systemd/system/sysinit.target.wa
 usr/lib/systemd/system/sysinit.target.wants/systemd-journal-flush.service
 usr/lib/systemd/system/sysinit.target.wants/systemd-machine-id-commit.service
 usr/lib/systemd/system/sysinit.target.wants/systemd-modules-load.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/sysinit.target.wants/systemd-pcrmachine.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/sysinit.target.wants/systemd-pcrphase.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/sysinit.target.wants/systemd-pcrphase-sysinit.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/sysinit.target.wants/systemd-pcrmachine.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/sysinit.target.wants/systemd-pcrphase.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/sysinit.target.wants/systemd-pcrphase-sysinit.service
 usr/lib/systemd/system/sysinit.target.wants/systemd-random-seed.service
 usr/lib/systemd/system/sysinit.target.wants/systemd-sysctl.service
 usr/lib/systemd/system/sysinit.target.wants/systemd-sysusers.service
 usr/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev-early.service
 usr/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service
 usr/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/sysinit.target.wants/systemd-tpm2-setup-early.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/sysinit.target.wants/systemd-tpm2-setup.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/sysinit.target.wants/systemd-tpm2-setup-early.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/sysinit.target.wants/systemd-tpm2-setup.service
 usr/lib/systemd/system/sysinit.target.wants/systemd-update-done.service
 <pkg.systemd.upstream> usr/lib/systemd/system/sysinit.target.wants/imports.target
 usr/lib/systemd/system/sys-kernel-config.mount
@@ -311,7 +311,7 @@ usr/lib/systemd/system/systemd-backlight
 usr/lib/systemd/system/systemd-battery-check.service
 usr/lib/systemd/system/systemd-binfmt.service
 usr/lib/systemd/system/systemd-boot-check-no-failures.service
-<!stage1> usr/lib/systemd/system/systemd-bsod.service
+[!i386] <!stage1> usr/lib/systemd/system/systemd-bsod.service
 usr/lib/systemd/system/systemd-confext.service
 <pkg.systemd.upstream> usr/lib/systemd/system/systemd-confext-initrd.service
 usr/lib/systemd/system/systemd-creds.socket
@@ -355,25 +355,25 @@ usr/lib/systemd/system/systemd-modules-l
 usr/lib/systemd/system/systemd-networkd*.service
 usr/lib/systemd/system/systemd-networkd.socket
 usr/lib/systemd/system/systemd-network-generator.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrextend@.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrextend.socket
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrfs-root.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrfs@.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock.socket
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock@.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-file-system.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-firmware-code.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-firmware-config.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-machine-id.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-make-policy.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-secureboot-authority.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-secureboot-policy.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrmachine.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1 pkg.systemd.upstream> usr/lib/systemd/system/systemd-pcrphase-factory-reset.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrphase-initrd.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrphase.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1 pkg.systemd.upstream> usr/lib/systemd/system/systemd-pcrphase-storage-target-mode.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrphase-sysinit.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrextend@.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrextend.socket
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrfs-root.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrfs@.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock.socket
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock@.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-file-system.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-firmware-code.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-firmware-config.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-machine-id.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-make-policy.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-secureboot-authority.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrlock-secureboot-policy.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrmachine.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1 pkg.systemd.upstream> usr/lib/systemd/system/systemd-pcrphase-factory-reset.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrphase-initrd.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrphase.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1 pkg.systemd.upstream> usr/lib/systemd/system/systemd-pcrphase-storage-target-mode.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-pcrphase-sysinit.service
 usr/lib/systemd/system/systemd-poweroff.service
 usr/lib/systemd/system/systemd-pstore.service
 usr/lib/systemd/system/systemd-quotacheck*.service
@@ -398,9 +398,9 @@ usr/lib/systemd/system/systemd-tmpfiles-
 usr/lib/systemd/system/systemd-tmpfiles-setup-dev-early.service
 usr/lib/systemd/system/systemd-tmpfiles-setup-dev.service
 usr/lib/systemd/system/systemd-tmpfiles-setup.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1 pkg.systemd.upstream> usr/lib/systemd/system/systemd-tpm2-clear.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-tpm2-setup-early.service
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-tpm2-setup.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1 pkg.systemd.upstream> usr/lib/systemd/system/systemd-tpm2-clear.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-tpm2-setup-early.service
+[amd64 arm64 armhf riscv64 loong64] <!stage1> usr/lib/systemd/system/systemd-tpm2-setup.service
 usr/lib/systemd/system/systemd-update-done.service
 usr/lib/systemd/system/systemd-user-sessions.service
 <pkg.systemd.upstream> usr/lib/systemd/system/systemd-validatefs@.service
@@ -568,3 +568,4 @@ var/lib/systemd/
 ../extra/sysctl.d/10-coredump-debian.conf usr/lib/sysctl.d/
 ../extra/limits.d/10-coredump-debian.conf etc/security/limits.d/
 ../extra/dbus-1/system.d/systemd-localed-read-only.conf usr/share/dbus-1/system.d/
+../extra/polkit-1/10-systemd-logind-root-ignore-inhibitors.rules usr/share/polkit-1/rules.d/
diff -pruN 257.7-1/debian/systemd.manpages 257.9-0ubuntu2/debian/systemd.manpages
--- 257.7-1/debian/systemd.manpages	2025-06-02 17:16:43.000000000 +0000
+++ 257.9-0ubuntu2/debian/systemd.manpages	2025-09-23 20:31:05.000000000 +0000
@@ -23,7 +23,7 @@ debian/tmp/usr/share/man/man1/systemd-fi
 debian/tmp/usr/share/man/man1/systemd-id128.1
 debian/tmp/usr/share/man/man1/systemd-inhibit.1
 debian/tmp/usr/share/man/man1/systemd-machine-id-setup.1
-<!stage1> debian/tmp/usr/share/man/man1/systemd-measure.1
+[!i386] <!stage1> debian/tmp/usr/share/man/man1/systemd-measure.1
 debian/tmp/usr/share/man/man1/systemd-mount.1
 debian/tmp/usr/share/man/man1/systemd-notify.1
 debian/tmp/usr/share/man/man1/systemd-path.1
@@ -135,8 +135,8 @@ debian/tmp/usr/share/man/man8/systemd-bi
 debian/tmp/usr/share/man/man8/systemd-binfmt.service.8
 debian/tmp/usr/share/man/man8/systemd-boot-check-no-failures.8
 debian/tmp/usr/share/man/man8/systemd-boot-check-no-failures.service.8
-<!stage1> debian/tmp/usr/share/man/man8/systemd-bsod.8
-<!stage1> debian/tmp/usr/share/man/man8/systemd-bsod.service.8
+[!i386] <!stage1> debian/tmp/usr/share/man/man8/systemd-bsod.8
+[!i386] <!stage1> debian/tmp/usr/share/man/man8/systemd-bsod.service.8
 debian/tmp/usr/share/man/man8/systemd-confext.8
 debian/tmp/usr/share/man/man8/systemd-confext.service.8
 <pkg.systemd.upstream> debian/tmp/usr/share/man/man8/systemd-confext-initrd.service.8
@@ -197,21 +197,21 @@ debian/tmp/usr/share/man/man8/systemd-ne
 debian/tmp/usr/share/man/man8/systemd-networkd-wait-online@.service.8
 debian/tmp/usr/share/man/man8/systemd-network-generator.8
 debian/tmp/usr/share/man/man8/systemd-network-generator.service.8
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrextend.8
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrfs-root.service.8
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrfs@.service.8
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrlock.8
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrlock-file-system.service.8
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrlock-firmware-code.service.8
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrlock-firmware-config.service.8
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrlock-machine-id.service.8
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrlock-make-policy.service.8
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrlock-secureboot-authority.service.8
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrlock-secureboot-policy.service.8
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrmachine.service.8
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrphase-initrd.service.8
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrphase.service.8
-[amd64 i386 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrphase-sysinit.service.8
+[amd64 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrextend.8
+[amd64 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrfs-root.service.8
+[amd64 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrfs@.service.8
+[amd64 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrlock.8
+[amd64 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrlock-file-system.service.8
+[amd64 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrlock-firmware-code.service.8
+[amd64 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrlock-firmware-config.service.8
+[amd64 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrlock-machine-id.service.8
+[amd64 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrlock-make-policy.service.8
+[amd64 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrlock-secureboot-authority.service.8
+[amd64 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrlock-secureboot-policy.service.8
+[amd64 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrmachine.service.8
+[amd64 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrphase-initrd.service.8
+[amd64 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrphase.service.8
+[amd64 arm64 armhf riscv64 loong64] <!stage1> debian/tmp/usr/share/man/man8/systemd-pcrphase-sysinit.service.8
 debian/tmp/usr/share/man/man8/systemd-poweroff.service.8
 debian/tmp/usr/share/man/man8/systemd-pstore.8
 debian/tmp/usr/share/man/man8/systemd-pstore.service.8
diff -pruN 257.7-1/debian/systemd.postinst 257.9-0ubuntu2/debian/systemd.postinst
--- 257.7-1/debian/systemd.postinst	2025-06-02 17:16:43.000000000 +0000
+++ 257.9-0ubuntu2/debian/systemd.postinst	2025-09-23 20:31:05.000000000 +0000
@@ -81,15 +81,14 @@ _update_catalog
 if [ -f "$DPKG_ROOT/etc/default/locale" ] && [ ! -L "$DPKG_ROOT/etc/default/locale" ] && [ ! -f "$DPKG_ROOT/etc/locale.conf" ]; then
     mv "$DPKG_ROOT/etc/default/locale" "$DPKG_ROOT/etc/locale.conf"
 fi
-
-# On upgrade for now keep the current tmpfiles.d (as it used to be after patches),
-# drop in Forky
-if [ -n "$2" ] && dpkg --compare-versions "$2" lt 256~rc3-3 && [ ! -f "$DPKG_ROOT/etc/tmpfiles.d/tmp.conf" ]; then
-    mkdir -p "$DPKG_ROOT/etc/tmpfiles.d/"
-    echo 'D /tmp 1777 root root -' > "$DPKG_ROOT/etc/tmpfiles.d/tmp.conf"
-fi
 # end-remove-after
 
+# Process all tmpfiles that we ship, including any overrides in
+# runtime-dir/sysadmin-dir/other packages (e.g. rsyslog)
+#
+# Ignore if this fails, because e.g. %b will fail on WSL
+systemd-tmpfiles --create || :
+
 #DEBHELPER#
 
 # skip daemon-reexec and try-restarts during shutdown to avoid hitting LP: #1803391
diff -pruN 257.7-1/debian/tests/boot-and-services 257.9-0ubuntu2/debian/tests/boot-and-services
--- 257.7-1/debian/tests/boot-and-services	2025-06-02 17:16:43.000000000 +0000
+++ 257.9-0ubuntu2/debian/tests/boot-and-services	2025-09-24 18:57:34.000000000 +0000
@@ -3,6 +3,7 @@
 # (C) 2014 Canonical Ltd.
 # Author: Martin Pitt <martin.pitt@ubuntu.com>
 
+import platform
 import sys
 import os
 import unittest
@@ -87,9 +88,9 @@ class ServicesTest(unittest.TestCase):
             # has kernel messages
             self.assertRegex(log, 'kernel:.*')
         # has init messages
-        self.assertRegex(log, 'systemd.*Reached target(?: graphical.target -)? Graphical Interface')
+        self.assertRegex(log, 'systemd.*Reached target')
         # has other services
-        self.assertRegex(log, 'NetworkManager.*:')
+        self.assertRegex(log, 'systemd-resolved.*:')
 
     @unittest.skipIf(is_container, 'udev does not work in containers')
     def test_udev(self):
@@ -222,6 +223,7 @@ poweroff\n''')
 
 @unittest.skipUnless(os.path.exists('/sys/kernel/security/apparmor'),
                      'AppArmor not enabled')
+@unittest.skipIf(is_container and platform.machine().startswith('arm'), 'fails on armhf testbeds, see LP: #1842352')
 class AppArmorTest(unittest.TestCase):
     def test_profile(self):
         '''AppArmor confined unit'''
@@ -234,6 +236,7 @@ profile "violator-test" {
   #include <abstractions/base>
 
   /{usr/,}bin/** rix,
+  file @{coreutil_dirs}* ix,
   /etc/machine-id r,
 }
 ''')
diff -pruN 257.7-1/debian/tests/control 257.9-0ubuntu2/debian/tests/control
--- 257.7-1/debian/tests/control	2025-06-02 17:16:43.000000000 +0000
+++ 257.9-0ubuntu2/debian/tests/control	2025-09-23 20:31:05.000000000 +0000
@@ -10,6 +10,7 @@ Restrictions: needs-root, allow-stderr,
 
 Tests: unit-config
 Depends: systemd,
+  udev,
   systemd-dev,
   libpam-systemd,
   libnss-systemd,
@@ -22,6 +23,7 @@ Restrictions: needs-root, allow-stderr
 
 Tests: storage
 Depends: systemd,
+  udev,
   systemd-cryptsetup,
   libpam-systemd,
   libnss-systemd,
@@ -36,6 +38,7 @@ Restrictions: needs-root, isolation-mach
 Tests: networkd-test.py
 Tests-Directory: test
 Depends: systemd,
+  udev,
   systemd-resolved,
   systemd-cryptsetup,
   libpam-systemd,
@@ -54,6 +57,7 @@ Restrictions: needs-root, isolation-cont
 
 Tests: build-login
 Depends: systemd,
+  udev,
   systemd-cryptsetup,
   libpam-systemd,
   libnss-systemd,
@@ -72,6 +76,8 @@ Restrictions: isolation-container
 
 Tests: boot-and-services
 Depends: systemd-sysv,
+  systemd,
+  udev,
   systemd-container,
   systemd-coredump,
   systemd-dev,
@@ -80,7 +86,7 @@ Depends: systemd-sysv,
   libelf-dev,
   xserver-xorg-video-dummy,
   xserver-xorg,
-  gdm3 [!s390x !riscv64 !armel !loong64],
+  gdm3 [amd64],
   cron,
   network-manager,
   busybox-static,
@@ -114,10 +120,10 @@ Depends: systemd-tests,
   iputils-ping,
   dbus-user-session,
   zstd,
-  libtss2-dev,
+  libtss2-dev [!i386],
   libfido2-dev,
   libdw-dev,
-  libqrencode-dev,
+  libqrencode-dev [!i386],
   libpwquality-dev,
   libarchive-dev,
   libgcrypt20-dev,
diff -pruN 257.7-1/debian/tests/upstream 257.9-0ubuntu2/debian/tests/upstream
--- 257.7-1/debian/tests/upstream	2025-06-24 18:01:35.000000000 +0000
+++ 257.9-0ubuntu2/debian/tests/upstream	2025-09-24 18:59:15.000000000 +0000
@@ -37,6 +37,12 @@ cleanup () {
     fi
 }
 
+# Force use of gnucp (LP: #2122363)
+if [ "$(readlink -f /usr/bin/cp)" = "/usr/lib/cargo/bin/coreutils/cp" ]; then
+    rm /usr/bin/cp
+    ln -s /usr/bin/gnucp /usr/bin/cp
+fi
+
 # apparmor is not compatible with swtpm
 aa-teardown >/dev/null 2>&1 || true
 # we need user namespaces for some tests running in nspawn
diff -pruN 257.7-1/docs/ENVIRONMENT.md 257.9-0ubuntu2/docs/ENVIRONMENT.md
--- 257.7-1/docs/ENVIRONMENT.md	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/docs/ENVIRONMENT.md	2025-09-03 18:35:40.000000000 +0000
@@ -351,12 +351,13 @@ All tools:
   default is not appropriate for a given system. Defaults to `5`, accepts
   positive integers.
 
-* `$SYSTEMD_DEFAULT_MOUNT_RATE_LIMIT_INTERVAL_SEC` — can be set to override the mount
-  units interval rate limit for parsing `/proc/self/mountinfo`. Similar to
-  `$SYSTEMD_DEFAULT_MOUNT_RATE_LIMIT_BURST`, the interval limit maybe adjusted when
-  the default is not appropriate for a given system. The default value is 1 and the
-  default application time unit is second, and the time unit can beoverriden as usual
-  by specifying it explicitly, see the systemd.time(7) man page.
+* `$SYSTEMD_DEFAULT_MOUNT_RATE_LIMIT_INTERVAL_SEC` — can be set to override the
+  mount units interval rate limit for parsing `/proc/self/mountinfo`. Similar
+  to `$SYSTEMD_DEFAULT_MOUNT_RATE_LIMIT_BURST`, the interval limit maybe
+  adjusted when the default is not appropriate for a given system. The default
+  value is 1, the default application time unit is second, and the time unit
+  can be overridden as usual by specifying it explicitly, see the
+  systemd.time(7) man page.
 
 `systemd-remount-fs`:
 
diff -pruN 257.7-1/docs/NETWORK_ONLINE.md 257.9-0ubuntu2/docs/NETWORK_ONLINE.md
--- 257.7-1/docs/NETWORK_ONLINE.md	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/docs/NETWORK_ONLINE.md	2025-09-03 18:35:40.000000000 +0000
@@ -243,7 +243,7 @@ that matches various links, but also by
 [systemd.network(5)](https://www.freedesktop.org/software/systemd/man/systemd.network.html).
 
 It is also possible to plug in additional checks for network state. For
-example, to delay `network-online.target` until some a specific host is
+example, to delay `network-online.target` until a specific host is
 reachable (the name can be resolved over DNS and the appropriate route has been
 established), the following simple service could be used:
 
diff -pruN 257.7-1/docs/TPM2_PCR_MEASUREMENTS.md 257.9-0ubuntu2/docs/TPM2_PCR_MEASUREMENTS.md
--- 257.7-1/docs/TPM2_PCR_MEASUREMENTS.md	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/docs/TPM2_PCR_MEASUREMENTS.md	2025-09-03 18:35:40.000000000 +0000
@@ -16,6 +16,10 @@ measurements listed below are (by defaul
 to systemd's UEFI-mode measurements, and if the latter are not done the former
 aren't made either.
 
+See
+[Linux TPM PCR Registry](https://uapi-group.org/specifications/specs/linux_tpm_pcr_registry/)
+for an overview of PCRs.
+
 systemd will measure to PCRs 5 (`boot-loader-config`), 11 (`kernel-boot`),
 12 (`kernel-config`), 13 (`sysexts`), 15 (`system-identity`).
 
@@ -41,7 +45,7 @@ used for new, additional measurements.
 
 ## PCR Measurements Made by `systemd-boot` (UEFI)
 
-### PCS 5, `EV_EVENT_TAG`, `loader.conf`
+### PCR 5, `EV_EVENT_TAG`, `loader.conf`
 
 The content of `systemd-boot`'s configuration file, `loader/loader.conf`, is
 measured as a tagged event.
diff -pruN 257.7-1/docs/sysvinit/meson.build 257.9-0ubuntu2/docs/sysvinit/meson.build
--- 257.7-1/docs/sysvinit/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/docs/sysvinit/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 custom_target(
-        'README',
         input : 'README.in',
         output : 'README',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/factory/templates/meson.build 257.9-0ubuntu2/factory/templates/meson.build
--- 257.7-1/factory/templates/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/factory/templates/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -3,7 +3,6 @@
 factory_etc_dir = factorydir / 'etc'
 
 custom_target(
-        'locale.conf',
         input : 'locale.conf.in',
         output : 'locale.conf',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
@@ -11,7 +10,6 @@ custom_target(
         install_dir : factory_etc_dir)
 
 custom_target(
-        'vconsole.conf',
         input : 'vconsole.conf.in',
         output : 'vconsole.conf',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/hwdb.d/20-OUI.hwdb 257.9-0ubuntu2/hwdb.d/20-OUI.hwdb
--- 257.7-1/hwdb.d/20-OUI.hwdb	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/20-OUI.hwdb	2025-09-03 18:35:40.000000000 +0000
@@ -987,7 +987,7 @@ OUI:000146*
  ID_OUI_FROM_DATABASE=Tesco Controls, Inc.
 
 OUI:000147*
- ID_OUI_FROM_DATABASE=DZS Inc.
+ ID_OUI_FROM_DATABASE=Zhone Technologies, Inc.
 
 OUI:000148*
  ID_OUI_FROM_DATABASE=X-traWeb Inc.
@@ -1419,7 +1419,7 @@ OUI:0001D6*
  ID_OUI_FROM_DATABASE=manroland AG
 
 OUI:0001D7*
- ID_OUI_FROM_DATABASE=F5 Networks, Inc.
+ ID_OUI_FROM_DATABASE=F5 Inc.
 
 OUI:0001D8*
  ID_OUI_FROM_DATABASE=Teltronics, Inc.
@@ -1881,7 +1881,7 @@ OUI:000270*
  ID_OUI_FROM_DATABASE=Crewave Co., Ltd.
 
 OUI:000271*
- ID_OUI_FROM_DATABASE=DZS Inc.
+ ID_OUI_FROM_DATABASE=Zhone Technologies, Inc.
 
 OUI:000272*
  ID_OUI_FROM_DATABASE=CC&C Technologies, Inc.
@@ -7821,7 +7821,7 @@ OUI:000A48*
  ID_OUI_FROM_DATABASE=Albatron Technology
 
 OUI:000A49*
- ID_OUI_FROM_DATABASE=F5 Networks, Inc.
+ ID_OUI_FROM_DATABASE=F5 Inc.
 
 OUI:000A4A*
  ID_OUI_FROM_DATABASE=Targa Systems Ltd.
@@ -16815,7 +16815,7 @@ OUI:0015FE*
  ID_OUI_FROM_DATABASE=SCHILLING ROBOTICS LLC
 
 OUI:0015FF*
- ID_OUI_FROM_DATABASE=Novatel Wireless Solutions, Inc.
+ ID_OUI_FROM_DATABASE=Inseego Wireless, Inc
 
 OUI:001600*
  ID_OUI_FROM_DATABASE=CelleBrite Mobile Synchronization
@@ -18390,7 +18390,7 @@ OUI:00180B*
  ID_OUI_FROM_DATABASE=Brilliant Telecommunications
 
 OUI:00180C*
- ID_OUI_FROM_DATABASE=DZS Inc.
+ ID_OUI_FROM_DATABASE=Zhone Technologies, Inc.
 
 OUI:00180D*
  ID_OUI_FROM_DATABASE=Terabytes Server Storage Tech Corp
@@ -28101,7 +28101,7 @@ OUI:0023E8*
  ID_OUI_FROM_DATABASE=Demco Corp.
 
 OUI:0023E9*
- ID_OUI_FROM_DATABASE=F5 Networks, Inc.
+ ID_OUI_FROM_DATABASE=F5 Inc.
 
 OUI:0023EA*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
@@ -30590,6 +30590,9 @@ OUI:002B67*
 OUI:002B70*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:002B90*
+ ID_OUI_FROM_DATABASE=Zelus(Shenzhen) Technology Ltd.
+
 OUI:002BF5*
  ID_OUI_FROM_DATABASE=BUFFALO.INC
 
@@ -30858,7 +30861,7 @@ OUI:003051*
  ID_OUI_FROM_DATABASE=ORBIT AVIONIC & COMMUNICATION
 
 OUI:003052*
- ID_OUI_FROM_DATABASE=DZS Inc.
+ ID_OUI_FROM_DATABASE=Zhone Technologies, Inc.
 
 OUI:003053*
  ID_OUI_FROM_DATABASE=Basler AG
@@ -31400,6 +31403,9 @@ OUI:003358*
 OUI:00336C*
  ID_OUI_FROM_DATABASE=SynapSense Corporation
 
+OUI:00337A*
+ ID_OUI_FROM_DATABASE=Tuya Smart Inc.
+
 OUI:0034A1*
  ID_OUI_FROM_DATABASE=RF-LAMBDA USA INC.
 
@@ -32312,6 +32318,9 @@ OUI:00464B*
 OUI:004A77*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:004B0D*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:004B12*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
@@ -32904,7 +32913,7 @@ OUI:0050C9*
  ID_OUI_FROM_DATABASE=MASPRO DENKOH CORP.
 
 OUI:0050CA*
- ID_OUI_FROM_DATABASE=DZS Inc.
+ ID_OUI_FROM_DATABASE=Zhone Technologies, Inc.
 
 OUI:0050CB*
  ID_OUI_FROM_DATABASE=Bucher Automation AG
@@ -34067,6 +34076,51 @@ OUI:006967D*
 OUI:006967E*
  ID_OUI_FROM_DATABASE=Tianjin Lianwu Technology Co., Ltd.
 
+OUI:006A5E0*
+ ID_OUI_FROM_DATABASE=TRULY ELECTRONICS MFG.,LTD
+
+OUI:006A5E1*
+ ID_OUI_FROM_DATABASE=BroadMaster Biotech Corp
+
+OUI:006A5E2*
+ ID_OUI_FROM_DATABASE=Creative Communication
+
+OUI:006A5E3*
+ ID_OUI_FROM_DATABASE=Shenzhen yeahmoo Technology Co., Ltd.
+
+OUI:006A5E4*
+ ID_OUI_FROM_DATABASE=Evercomm (Pty) Ltd
+
+OUI:006A5E5*
+ ID_OUI_FROM_DATABASE=Rayneo (wuxi) ltd
+
+OUI:006A5E6*
+ ID_OUI_FROM_DATABASE=Shenzhen Lightx Technology Co., Ltd
+
+OUI:006A5E7*
+ ID_OUI_FROM_DATABASE=Jiangsu Alstom NUG Propulsion System Co., Ltd
+
+OUI:006A5E8*
+ ID_OUI_FROM_DATABASE=Hilti Corporation
+
+OUI:006A5E9*
+ ID_OUI_FROM_DATABASE=Annapurna labs
+
+OUI:006A5EA*
+ ID_OUI_FROM_DATABASE=Annapurna labs
+
+OUI:006A5EB*
+ ID_OUI_FROM_DATABASE=Continental Brasil Indústria Automotiva Ltda.
+
+OUI:006A5EC*
+ ID_OUI_FROM_DATABASE=CYBERTEL BRIDGE
+
+OUI:006A5ED*
+ ID_OUI_FROM_DATABASE=Beijing Lingji Innovations technology Co,LTD.
+
+OUI:006A5EE*
+ ID_OUI_FROM_DATABASE=Oppermann Regelgeräte GmbH
+
 OUI:006B6F*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -34106,6 +34160,9 @@ OUI:006F64*
 OUI:006FF2*
  ID_OUI_FROM_DATABASE=MITSUMI ELECTRIC CO.,LTD.
 
+OUI:007007*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:0070B0*
  ID_OUI_FROM_DATABASE=M/A-COM INC. COMPANIES
 
@@ -34982,9 +35039,15 @@ OUI:008320*
 OUI:00841E*
  ID_OUI_FROM_DATABASE=Cisco Meraki
 
+OUI:008497*
+ ID_OUI_FROM_DATABASE=Shenzhen MiaoMing Intelligent Technology Co.,Ltd
+
 OUI:0084ED*
  ID_OUI_FROM_DATABASE=LEXMARK INTERNATIONAL, INC.
 
+OUI:008621*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
 OUI:008667*
  ID_OUI_FROM_DATABASE=LG Innotek
 
@@ -35886,7 +35949,7 @@ OUI:009363*
  ID_OUI_FROM_DATABASE=Uni-Link Technology Co., Ltd.
 
 OUI:0094A1*
- ID_OUI_FROM_DATABASE=F5 Networks, Inc.
+ ID_OUI_FROM_DATABASE=F5 Inc.
 
 OUI:0094EC*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
@@ -36021,7 +36084,7 @@ OUI:00A01A*
  ID_OUI_FROM_DATABASE=BINAR ELEKTRONIK AB
 
 OUI:00A01B*
- ID_OUI_FROM_DATABASE=DZS Inc.
+ ID_OUI_FROM_DATABASE=Zhone Technologies, Inc.
 
 OUI:00A01C*
  ID_OUI_FROM_DATABASE=NASCENT NETWORKS CORPORATION
@@ -37871,6 +37934,9 @@ OUI:00C610*
 OUI:00C711*
  ID_OUI_FROM_DATABASE=ITEL MOBILE LIMITED
 
+OUI:00C84E*
+ ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
+
 OUI:00C88B*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -38711,6 +38777,9 @@ OUI:00D49E*
 OUI:00D598*
  ID_OUI_FROM_DATABASE=BOPEL MOBILE TECHNOLOGY CO.,LIMITED
 
+OUI:00D626*
+ ID_OUI_FROM_DATABASE=Mist Systems, Inc.
+
 OUI:00D632*
  ID_OUI_FROM_DATABASE=GE Energy
 
@@ -39486,7 +39555,7 @@ OUI:00E0DE*
  ID_OUI_FROM_DATABASE=DATAX NV
 
 OUI:00E0DF*
- ID_OUI_FROM_DATABASE=DZS Inc.
+ ID_OUI_FROM_DATABASE=Zhone Technologies, Inc.
 
 OUI:00E0E0*
  ID_OUI_FROM_DATABASE=SI ELECTRONICS, LTD.
@@ -39983,6 +40052,9 @@ OUI:041E7A*
 OUI:041EFA*
  ID_OUI_FROM_DATABASE=BISSELL Homecare, Inc.
 
+OUI:041FB8*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
 OUI:042084*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -40157,6 +40229,9 @@ OUI:04495D*
 OUI:044A50*
  ID_OUI_FROM_DATABASE=Ramaxel Technology (Shenzhen) limited company
 
+OUI:044A69*
+ ID_OUI_FROM_DATABASE=Shenzhen Phaten Tech. LTD
+
 OUI:044A6A*
  ID_OUI_FROM_DATABASE=niliwi nanjing big data Co,.Ltd
 
@@ -40223,6 +40298,9 @@ OUI:0453D5*
 OUI:045453*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:0455B2*
+ ID_OUI_FROM_DATABASE=Huaqin Technology Co.,Ltd
+
 OUI:0455B8*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -40247,6 +40325,51 @@ OUI:045747*
 OUI:045791*
  ID_OUI_FROM_DATABASE=Shenzhenshi Xinzhongxin Technology Co.Ltd
 
+OUI:04585D0*
+ ID_OUI_FROM_DATABASE=Wetatronics Limited
+
+OUI:04585D1*
+ ID_OUI_FROM_DATABASE=Research Laboratory of Design Automation, Ltd.
+
+OUI:04585D2*
+ ID_OUI_FROM_DATABASE=Foxconn Brasil Industria e Comercio Ltda
+
+OUI:04585D3*
+ ID_OUI_FROM_DATABASE=REXXON GmbH
+
+OUI:04585D4*
+ ID_OUI_FROM_DATABASE=Integrated Technical Vision Ltd
+
+OUI:04585D5*
+ ID_OUI_FROM_DATABASE=Sercomm Japan Corporation
+
+OUI:04585D6*
+ ID_OUI_FROM_DATABASE=VERTE Elektronik San. Ve Tic. A.Ş.
+
+OUI:04585D7*
+ ID_OUI_FROM_DATABASE=HKC Security Ltd.
+
+OUI:04585D8*
+ ID_OUI_FROM_DATABASE=JRK VISION
+
+OUI:04585D9*
+ ID_OUI_FROM_DATABASE=Dron Edge India Private Limited
+
+OUI:04585DA*
+ ID_OUI_FROM_DATABASE=TELEPLATFORMS
+
+OUI:04585DB*
+ ID_OUI_FROM_DATABASE=Chengdu Juxun Electronic Technology Co.,Ltd
+
+OUI:04585DC*
+ ID_OUI_FROM_DATABASE=Rexon Technology
+
+OUI:04585DD*
+ ID_OUI_FROM_DATABASE=HDS Otomasyon Güvenlik ve Yazılım Teknolojileri Sanayi Ticaret Limited Şirketi
+
+OUI:04585DE*
+ ID_OUI_FROM_DATABASE=Shenzhen C & D Electronics Co., Ltd.
+
 OUI:04586F*
  ID_OUI_FROM_DATABASE=Sichuan Whayer information industry Co.,LTD
 
@@ -40394,6 +40517,9 @@ OUI:047153*
 OUI:047295*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:04749E*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:0474A1*
  ID_OUI_FROM_DATABASE=Aligera Equipamentos Digitais Ltda
 
@@ -40505,6 +40631,9 @@ OUI:048C9A*
 OUI:048D38*
  ID_OUI_FROM_DATABASE=Netis Technology Co., Ltd.
 
+OUI:048F00*
+ ID_OUI_FROM_DATABASE=Rong-Paisa Electronics Co., Ltd.
+
 OUI:049081*
  ID_OUI_FROM_DATABASE=Pensando Systems, Inc.
 
@@ -40655,6 +40784,9 @@ OUI:04A82A*
 OUI:04A85A*
  ID_OUI_FROM_DATABASE=SZ DJI TECHNOLOGY CO.,LTD
 
+OUI:04A924*
+ ID_OUI_FROM_DATABASE=Mist Systems, Inc.
+
 OUI:04A959*
  ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
 
@@ -40673,6 +40805,9 @@ OUI:04AB6A*
 OUI:04AC44*
  ID_OUI_FROM_DATABASE=Holtek Semiconductor Inc.
 
+OUI:04AE47*
+ ID_OUI_FROM_DATABASE=Beijing Xiaomi Mobile Software Co., Ltd
+
 OUI:04AEC7*
  ID_OUI_FROM_DATABASE=Marquardt
 
@@ -40700,6 +40835,9 @@ OUI:04B466*
 OUI:04B4FE*
  ID_OUI_FROM_DATABASE=AVM Audiovisuelles Marketing und Computersysteme GmbH
 
+OUI:04B5C1*
+ ID_OUI_FROM_DATABASE=ITEL MOBILE LIMITED
+
 OUI:04B648*
  ID_OUI_FROM_DATABASE=ZENNER
 
@@ -42320,6 +42458,9 @@ OUI:087158*
 OUI:087190*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:08736F*
+ ID_OUI_FROM_DATABASE=EM Microelectronic
+
 OUI:087402*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -42335,6 +42476,9 @@ OUI:087572*
 OUI:087618*
  ID_OUI_FROM_DATABASE=ViE Technologies Sdn. Bhd.
 
+OUI:087671*
+ ID_OUI_FROM_DATABASE=Juniper Networks
+
 OUI:087695*
  ID_OUI_FROM_DATABASE=Auto Industrial Co., Ltd.
 
@@ -42452,6 +42596,9 @@ OUI:0891A3*
 OUI:089204*
  ID_OUI_FROM_DATABASE=Dell Inc.
 
+OUI:089272*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:089356*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -42581,6 +42728,9 @@ OUI:08B2A3*
 OUI:08B3AF*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
+OUI:08B3D6*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:08B49D*
  ID_OUI_FROM_DATABASE=TECNO MOBILE LIMITED
 
@@ -42743,6 +42893,9 @@ OUI:08D5C0*
 OUI:08D833*
  ID_OUI_FROM_DATABASE=Shenzhen RF Technology Co., Ltd
 
+OUI:08D945*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:08DA330*
  ID_OUI_FROM_DATABASE=Smart and connective
 
@@ -42839,6 +42992,9 @@ OUI:08EA40*
 OUI:08EA44*
  ID_OUI_FROM_DATABASE=Extreme Networks Headquarters
 
+OUI:08EB21*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:08EB29*
  ID_OUI_FROM_DATABASE=Jiangsu Huitong Group Co.,Ltd.
 
@@ -43130,6 +43286,9 @@ OUI:0C19F8*
 OUI:0C1A10*
  ID_OUI_FROM_DATABASE=Acoustic Stream
 
+OUI:0C1A61*
+ ID_OUI_FROM_DATABASE=Neox FZCO
+
 OUI:0C1BCC*
  ID_OUI_FROM_DATABASE=IFLYTEK CO.,LTD.
 
@@ -43184,6 +43343,9 @@ OUI:0C2755*
 OUI:0C2756*
  ID_OUI_FROM_DATABASE=RONGCHEENG GOER TECHNOLOGY CO.,LTD.
 
+OUI:0C2779*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:0C298F*
  ID_OUI_FROM_DATABASE=Tesla,Inc.
 
@@ -43226,6 +43388,9 @@ OUI:0C31DC*
 OUI:0C323A*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:0C331B*
+ ID_OUI_FROM_DATABASE=TydenBrooks
+
 OUI:0C3526*
  ID_OUI_FROM_DATABASE=Microsoft Corporation
 
@@ -43262,6 +43427,9 @@ OUI:0C3C65*
 OUI:0C3CCD*
  ID_OUI_FROM_DATABASE=Universal Global Scientific Industrial Co., Ltd.
 
+OUI:0C3D5E*
+ ID_OUI_FROM_DATABASE=Nanjing Qinheng Microelectronics Co., Ltd.
+
 OUI:0C3E9F*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -43418,6 +43586,9 @@ OUI:0C57EB*
 OUI:0C5842*
  ID_OUI_FROM_DATABASE=DME Micro
 
+OUI:0C587B*
+ ID_OUI_FROM_DATABASE=Quectel Wireless Solutions Co.,Ltd.
+
 OUI:0C599C*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
@@ -43694,6 +43865,9 @@ OUI:0C7FEDD*
 OUI:0C7FEDE*
  ID_OUI_FROM_DATABASE=environmental systems corporation
 
+OUI:0C802F*
+ ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
+
 OUI:0C8063*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
@@ -43913,6 +44087,9 @@ OUI:0C9A3C*
 OUI:0C9A42*
  ID_OUI_FROM_DATABASE=FN-LINK TECHNOLOGY LIMITED
 
+OUI:0C9AE6*
+ ID_OUI_FROM_DATABASE=SZ DJI TECHNOLOGY CO.,LTD
+
 OUI:0C9B13*
  ID_OUI_FROM_DATABASE=Shanghai Magic Mobile Telecommunication Co.Ltd.
 
@@ -44174,6 +44351,9 @@ OUI:0CCC47D*
 OUI:0CCC47E*
  ID_OUI_FROM_DATABASE=Foxconn Brasil Industria e Comercio Ltda
 
+OUI:0CCC5D*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:0CCDB4*
  ID_OUI_FROM_DATABASE=Sichuan AI-Link Technology Co., Ltd.
 
@@ -44327,6 +44507,9 @@ OUI:0CED71*
 OUI:0CEDC8*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
+OUI:0CEE20*
+ ID_OUI_FROM_DATABASE=FBC
+
 OUI:0CEE99*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 
@@ -44486,6 +44669,9 @@ OUI:0CFE5DD*
 OUI:0CFE5DE*
  ID_OUI_FROM_DATABASE=NEWGREEN TECH CO., LTD.
 
+OUI:0CFE7B*
+ ID_OUI_FROM_DATABASE=Vantiva USA LLC
+
 OUI:100000*
  ID_OUI_FROM_DATABASE=Private
 
@@ -44735,6 +44921,9 @@ OUI:101C0C*
 OUI:101D51*
  ID_OUI_FROM_DATABASE=8Mesh Networks Limited
 
+OUI:101D6E*
+ ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
+
 OUI:101DC0*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -44756,6 +44945,9 @@ OUI:102381*
 OUI:102407*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:1025CE*
+ ID_OUI_FROM_DATABASE=ELKA - Torantriebe GmbH u. Co. Betriebs KG
+
 OUI:102779*
  ID_OUI_FROM_DATABASE=Sadel S.p.A.
 
@@ -44786,6 +44978,9 @@ OUI:102AB3*
 OUI:102B41*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:102BAA*
+ ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
+
 OUI:102C6B*
  ID_OUI_FROM_DATABASE=AMPAK Technology, Inc.
 
@@ -44820,7 +45015,7 @@ OUI:102F6B*
  ID_OUI_FROM_DATABASE=Microsoft Corporation
 
 OUI:102F6E*
- ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies Company Limited
+ ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies company Limited
 
 OUI:102FA3*
  ID_OUI_FROM_DATABASE=Shenzhen Uvision-tech Technology Co.Ltd
@@ -44915,6 +45110,9 @@ OUI:104121*
 OUI:10417F*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:104210*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:104369*
  ID_OUI_FROM_DATABASE=Soundmax Electronic Limited
 
@@ -45068,6 +45266,9 @@ OUI:105932*
 OUI:105A17*
  ID_OUI_FROM_DATABASE=Tuya Smart Inc.
 
+OUI:105A95*
+ ID_OUI_FROM_DATABASE=TP-Link Systems Inc.
+
 OUI:105AF7*
  ID_OUI_FROM_DATABASE=ADB Italia
 
@@ -45083,6 +45284,9 @@ OUI:105CBF*
 OUI:105DDC*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:105EAE*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:105F02*
  ID_OUI_FROM_DATABASE=Ruijie Networks Co.,LTD
 
@@ -45170,6 +45374,9 @@ OUI:1063C8*
 OUI:1064E2*
  ID_OUI_FROM_DATABASE=ADFweb.com s.r.l.
 
+OUI:106519*
+ ID_OUI_FROM_DATABASE=Shenzhen iComm Semiconductor CO.,LTD
+
 OUI:106530*
  ID_OUI_FROM_DATABASE=Dell Inc.
 
@@ -45440,6 +45647,9 @@ OUI:10A13B*
 OUI:10A145*
  ID_OUI_FROM_DATABASE=nexzo india pvt ltd
 
+OUI:10A1DA*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:10A24E*
  ID_OUI_FROM_DATABASE=GOLD3LINK ELECTRONICS CO., LTD
 
@@ -45710,6 +45920,9 @@ OUI:10D680*
 OUI:10D7B0*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
+OUI:10D9A2*
+ ID_OUI_FROM_DATABASE=Google, Inc.
+
 OUI:10DA43*
  ID_OUI_FROM_DATABASE=NETGEAR
 
@@ -45806,6 +46019,9 @@ OUI:10E4AF*
 OUI:10E4C2*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:10E66B*
+ ID_OUI_FROM_DATABASE=Kaon Broadband CO., LTD.
+
 OUI:10E68F*
  ID_OUI_FROM_DATABASE=KWANGSUNG ELECTRONICS KOREA CO.,LTD.
 
@@ -45938,6 +46154,9 @@ OUI:1402EC*
 OUI:140467*
  ID_OUI_FROM_DATABASE=SNK Technologies Co.,Ltd.
 
+OUI:140589*
+ ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
+
 OUI:14064C*
  ID_OUI_FROM_DATABASE=Vogl Electronic GmbH
 
@@ -45953,6 +46172,9 @@ OUI:1407E0*
 OUI:140805*
  ID_OUI_FROM_DATABASE=SKY UK LIMITED
 
+OUI:140808*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:1409B4*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -46007,6 +46229,9 @@ OUI:141357*
 OUI:1413FB*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:141416*
+ ID_OUI_FROM_DATABASE=Hui Zhou Gaoshengda Technology Co.,LTD
+
 OUI:14144B*
  ID_OUI_FROM_DATABASE=Ruijie Networks Co.,LTD
 
@@ -46532,6 +46757,9 @@ OUI:14755B*
 OUI:147590*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
+OUI:1475E5*
+ ID_OUI_FROM_DATABASE=ELMAX Srl
+
 OUI:147740*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -46640,6 +46868,9 @@ OUI:148F21*
 OUI:148F34*
  ID_OUI_FROM_DATABASE=TECNO MOBILE LIMITED
 
+OUI:148F79*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:148FC6*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -46770,7 +47001,7 @@ OUI:14A86B*
  ID_OUI_FROM_DATABASE=ShenZhen Telacom Science&Technology Co., Ltd
 
 OUI:14A9D0*
- ID_OUI_FROM_DATABASE=F5 Networks, Inc.
+ ID_OUI_FROM_DATABASE=F5 Inc.
 
 OUI:14A9E3*
  ID_OUI_FROM_DATABASE=MST CORPORATION
@@ -46892,6 +47123,9 @@ OUI:14BAAF*
 OUI:14BB6E*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:14BC68*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:14BD61*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -46925,6 +47159,9 @@ OUI:14C213*
 OUI:14C21D*
  ID_OUI_FROM_DATABASE=Sabtech Industries
 
+OUI:14C24D*
+ ID_OUI_FROM_DATABASE=ATW TECHNOLOGY, INC.
+
 OUI:14C35E*
  ID_OUI_FROM_DATABASE=FibRSol Global Network Limited
 
@@ -46994,9 +47231,15 @@ OUI:14D424*
 OUI:14D4FE*
  ID_OUI_FROM_DATABASE=Commscope
 
+OUI:14D5C6*
+ ID_OUI_FROM_DATABASE=slash dev slash agents, inc
+
 OUI:14D64D*
  ID_OUI_FROM_DATABASE=D-Link International
 
+OUI:14D725*
+ ID_OUI_FROM_DATABASE=Barrot Technology Co.,Ltd.
+
 OUI:14D76E*
  ID_OUI_FROM_DATABASE=CONCH ELECTRONIC Co.,Ltd
 
@@ -47222,6 +47465,9 @@ OUI:18146C*
 OUI:1814AE*
  ID_OUI_FROM_DATABASE=Nokia
 
+OUI:181628*
+ ID_OUI_FROM_DATABASE=SharkNinja Operating LLC
+
 OUI:1816C9*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -47760,7 +48006,7 @@ OUI:186D99*
  ID_OUI_FROM_DATABASE=Adanis Inc.
 
 OUI:186F2D*
- ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies Company Limited
+ ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies company Limited
 
 OUI:18703B*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
@@ -47909,6 +48155,9 @@ OUI:18863A*
 OUI:1886AC*
  ID_OUI_FROM_DATABASE=Nokia Danmark A/S
 
+OUI:1886C3*
+ ID_OUI_FROM_DATABASE=Nokia
+
 OUI:188740*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
@@ -47985,7 +48234,7 @@ OUI:189552*
  ID_OUI_FROM_DATABASE=1MORE
 
 OUI:189578*
- ID_OUI_FROM_DATABASE=DENSO Corporation
+ ID_OUI_FROM_DATABASE=DENSO CORPORATION
 
 OUI:1897F1*
  ID_OUI_FROM_DATABASE=KOSTAL (Shanghai) Management Co., Ltd.
@@ -48266,6 +48515,9 @@ OUI:18C086*
 OUI:18C19D*
  ID_OUI_FROM_DATABASE=Integrated Device Technology (Malaysia) Sdn. Bhd.
 
+OUI:18C1E2*
+ ID_OUI_FROM_DATABASE=Qolsys Inc.
+
 OUI:18C23C*
  ID_OUI_FROM_DATABASE=Lumi United Technology Co., Ltd
 
@@ -48348,11 +48600,14 @@ OUI:18CC23*
  ID_OUI_FROM_DATABASE=Philio Technology Corporation
 
 OUI:18CC88*
- ID_OUI_FROM_DATABASE=Hitachi Johnson Controls Air
+ ID_OUI_FROM_DATABASE=Hitachi Air Conditioning Shimizu, Inc.
 
 OUI:18CE94*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:18CEDF*
+ ID_OUI_FROM_DATABASE=Quectel Wireless Solutions Co.,Ltd.
+
 OUI:18CF24*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -48491,6 +48746,9 @@ OUI:18E2C2*
 OUI:18E3BC*
  ID_OUI_FROM_DATABASE=TCT mobile ltd
 
+OUI:18E671*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:18E728*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -48521,6 +48779,9 @@ OUI:18E8EC*
 OUI:18E91D*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:18EBD4*
+ ID_OUI_FROM_DATABASE=Shenzhen Skyworth Digital  Technology  CO., Ltd
+
 OUI:18ECE7*
  ID_OUI_FROM_DATABASE=BUFFALO.INC
 
@@ -48528,7 +48789,7 @@ OUI:18EE69*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
 OUI:18EE86*
- ID_OUI_FROM_DATABASE=Novatel Wireless Solutions, Inc.
+ ID_OUI_FROM_DATABASE=Inseego Wireless, Inc
 
 OUI:18EF3A*
  ID_OUI_FROM_DATABASE=Sichuan AI-Link Technology Co., Ltd.
@@ -48689,6 +48950,9 @@ OUI:1C0B8B*
 OUI:1C0D7D*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:1C0EAF*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:1C0EC2*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -50126,6 +50390,9 @@ OUI:1CD1D7*
 OUI:1CD1E0*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:1CD3AF*
+ ID_OUI_FROM_DATABASE=LG Innotek
+
 OUI:1CD40C*
  ID_OUI_FROM_DATABASE=Kriwan Industrie-Elektronik GmbH
 
@@ -50141,6 +50408,9 @@ OUI:1CD6BE*
 OUI:1CDA27*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
+OUI:1CDBD4*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:1CDDEA*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
@@ -50408,6 +50678,9 @@ OUI:200A0DE*
 OUI:200A5E*
  ID_OUI_FROM_DATABASE=Xiangshan Giant Eagle Technology Developing Co., Ltd.
 
+OUI:200A87*
+ ID_OUI_FROM_DATABASE=Guangzhou On-Bright Electronics Co., Ltd.
+
 OUI:200B16*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -50432,6 +50705,9 @@ OUI:200CC8*
 OUI:200DB0*
  ID_OUI_FROM_DATABASE=Shenzhen Four Seas Global Link Network Technology Co., Ltd.
 
+OUI:200E0F*
+ ID_OUI_FROM_DATABASE=Panasonic Marketing Middle East & Africa FZE
+
 OUI:200E2B*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -50450,6 +50726,9 @@ OUI:20107A*
 OUI:20108A*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:2010B1*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
 OUI:20114E*
  ID_OUI_FROM_DATABASE=MeteRSit S.R.L.
 
@@ -50535,7 +50814,7 @@ OUI:201F54*
  ID_OUI_FROM_DATABASE=Raisecom Technology CO., LTD
 
 OUI:202027*
- ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies Company Limited
+ ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies company Limited
 
 OUI:202051*
  ID_OUI_FROM_DATABASE=zte corporation
@@ -50555,6 +50834,9 @@ OUI:202564*
 OUI:202598*
  ID_OUI_FROM_DATABASE=Teleview
 
+OUI:2025CC*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:2025D2*
  ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 
@@ -50648,6 +50930,9 @@ OUI:203956*
 OUI:203A07*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:203A0C*
+ ID_OUI_FROM_DATABASE=eero inc.
+
 OUI:203A43*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -50738,6 +51023,9 @@ OUI:204C6D*
 OUI:204C9E*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:204D52*
+ ID_OUI_FROM_DATABASE=Mellanox Technologies, Inc.
+
 OUI:204E6B*
  ID_OUI_FROM_DATABASE=Axxana(israel) ltd
 
@@ -50900,6 +51188,9 @@ OUI:206D31*
 OUI:206E9C*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:206EF1*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:206FEC*
  ID_OUI_FROM_DATABASE=Braemac CA LLC
 
@@ -51086,6 +51377,9 @@ OUI:20968A*
 OUI:209727*
  ID_OUI_FROM_DATABASE=TELTONIKA NETWORKS UAB
 
+OUI:20988E*
+ ID_OUI_FROM_DATABASE=Shenzhen Feasycom Co., Ltd
+
 OUI:2098D8*
  ID_OUI_FROM_DATABASE=Shenzhen Yingdakang Technology CO., LTD
 
@@ -51143,6 +51437,9 @@ OUI:20A680*
 OUI:20A6CD*
  ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
 
+OUI:20A716*
+ ID_OUI_FROM_DATABASE=Silicon Laboratories
+
 OUI:20A766*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -51443,6 +51740,9 @@ OUI:20E791*
 OUI:20E7B6*
  ID_OUI_FROM_DATABASE=Universal Electronics, Inc.
 
+OUI:20E7C8*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:20E874*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -51503,6 +51803,9 @@ OUI:20F452*
 OUI:20F478*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
+OUI:20F4D4*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:20F510*
  ID_OUI_FROM_DATABASE=Codex Digital Limited
 
@@ -51815,9 +52118,15 @@ OUI:2429FE*
 OUI:242A04*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:242BD6*
+ ID_OUI_FROM_DATABASE=Ring LLC
+
 OUI:242CFE*
  ID_OUI_FROM_DATABASE=Zhejiang Tmall Technology Co., Ltd.
 
+OUI:242D4B*
+ ID_OUI_FROM_DATABASE=F5 Inc.
+
 OUI:242D6C*
  ID_OUI_FROM_DATABASE=eero inc.
 
@@ -51848,6 +52157,9 @@ OUI:2432AE*
 OUI:24336C*
  ID_OUI_FROM_DATABASE=Private
 
+OUI:243408*
+ ID_OUI_FROM_DATABASE=Edgecore Americas Networking Corporation
+
 OUI:2435CC*
  ID_OUI_FROM_DATABASE=Zhongshan Scinan Internet of Things Co.,Ltd.
 
@@ -52106,6 +52418,9 @@ OUI:245F9F*
 OUI:245FDF*
  ID_OUI_FROM_DATABASE=KYOCERA CORPORATION
 
+OUI:246078*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:246081*
  ID_OUI_FROM_DATABASE=razberi technologies
 
@@ -52211,6 +52526,9 @@ OUI:2475FC*
 OUI:247625*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:247645*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:247656*
  ID_OUI_FROM_DATABASE=Shanghai Net Miles Fiber Optics Technology Co., LTD.
 
@@ -52532,6 +52850,9 @@ OUI:24B2DE*
 OUI:24B339*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:24B5B9*
+ ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
+
 OUI:24B5F2*
  ID_OUI_FROM_DATABASE=Shanghai Ingeek Technology Co., Ltd
 
@@ -52652,6 +52973,9 @@ OUI:24D0DF*
 OUI:24D13F*
  ID_OUI_FROM_DATABASE=MEXUS CO.,LTD
 
+OUI:24D1A1*
+ ID_OUI_FROM_DATABASE=Shenzhen Cultraview Digital Technology Co., Ltd
+
 OUI:24D208*
  ID_OUI_FROM_DATABASE=Sensata Technologies Inc.
 
@@ -52853,6 +53177,9 @@ OUI:24F306*
 OUI:24F3E3*
  ID_OUI_FROM_DATABASE=eero inc.
 
+OUI:24F40A*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:24F57E*
  ID_OUI_FROM_DATABASE=HWH CO., LTD.
 
@@ -52907,6 +53234,9 @@ OUI:2800AF*
 OUI:28011C*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:2801CD*
+ ID_OUI_FROM_DATABASE=Mellanox Technologies, Inc.
+
 OUI:28022E*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -52928,6 +53258,9 @@ OUI:2804E0*
 OUI:28052E*
  ID_OUI_FROM_DATABASE=Dematic Corp
 
+OUI:2805A5*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:28061E*
  ID_OUI_FROM_DATABASE=NINGBO GLOBAL USEFUL ELECTRIC CO.,LTD
 
@@ -53054,6 +53387,9 @@ OUI:2824FF*
 OUI:282536*
  ID_OUI_FROM_DATABASE=SHENZHEN HOLATEK CO.,LTD
 
+OUI:28255F*
+ ID_OUI_FROM_DATABASE=HUMAX NETWORKS
+
 OUI:2826A6*
  ID_OUI_FROM_DATABASE=PBR electronics GmbH
 
@@ -53180,6 +53516,9 @@ OUI:2834A2*
 OUI:2834FF*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:28353A*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:283545*
  ID_OUI_FROM_DATABASE=SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LTD
 
@@ -53426,6 +53765,9 @@ OUI:28565A*
 OUI:2856C1*
  ID_OUI_FROM_DATABASE=Harman/Becker Automotive Systems GmbH
 
+OUI:28575D*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:285767*
  ID_OUI_FROM_DATABASE=Dish Technologies Corp
 
@@ -53558,6 +53900,9 @@ OUI:2877F1*
 OUI:287994*
  ID_OUI_FROM_DATABASE=Realplay Digital Technology(Shenzhen) Co.,Ltd
 
+OUI:287AB4*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:287AEE*
  ID_OUI_FROM_DATABASE=Commscope
 
@@ -53586,7 +53931,7 @@ OUI:28808A*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
 OUI:2880A2*
- ID_OUI_FROM_DATABASE=Novatel Wireless Solutions, Inc.
+ ID_OUI_FROM_DATABASE=Inseego Wireless, Inc
 
 OUI:28827C*
  ID_OUI_FROM_DATABASE=Bosch Automative products(Suzhou)Co.,Ltd Changzhou Branch
@@ -53609,6 +53954,9 @@ OUI:28852D*
 OUI:2885BB*
  ID_OUI_FROM_DATABASE=Zen Exim Pvt. Ltd.
 
+OUI:288761*
+ ID_OUI_FROM_DATABASE=LG Innotek
+
 OUI:2887BA*
  ID_OUI_FROM_DATABASE=TP-Link Systems Inc
 
@@ -53945,6 +54293,9 @@ OUI:28C87C*
 OUI:28C914*
  ID_OUI_FROM_DATABASE=Taimag Corporation
 
+OUI:28C97A*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:28CA09*
  ID_OUI_FROM_DATABASE=ThyssenKrupp Elevators (Shanghai) Co.,Ltd
 
@@ -53975,6 +54326,9 @@ OUI:28CDC1*
 OUI:28CDC4*
  ID_OUI_FROM_DATABASE=CHONGQING FUGUI ELECTRONICS CO.,LTD.
 
+OUI:28CE15*
+ ID_OUI_FROM_DATABASE=Shenzhen Xinwei Intelligent Co., Ltd
+
 OUI:28CF08*
  ID_OUI_FROM_DATABASE=ESSYS
 
@@ -54020,12 +54374,18 @@ OUI:28D25A*
 OUI:28D3EA*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:28D41E*
+ ID_OUI_FROM_DATABASE=Barrot Technology Co.,Ltd.
+
 OUI:28D436*
  ID_OUI_FROM_DATABASE=Jiangsu dewosi electric co., LTD
 
 OUI:28D576*
  ID_OUI_FROM_DATABASE=Premier Wireless, Inc.
 
+OUI:28D5B1*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:28D93E*
  ID_OUI_FROM_DATABASE=Telecor Inc.
 
@@ -54395,6 +54755,9 @@ OUI:2C01B5*
 OUI:2C029F*
  ID_OUI_FROM_DATABASE=3ALogics
 
+OUI:2C0369*
+ ID_OUI_FROM_DATABASE=ACCTON TECHNOLOGY CORPORATION
+
 OUI:2C0547*
  ID_OUI_FROM_DATABASE=Shenzhen Phaten Tech. LTD
 
@@ -54443,6 +54806,9 @@ OUI:2C0D27*
 OUI:2C0DA7*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:2C0DCF*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:2C0E3D*
  ID_OUI_FROM_DATABASE=SAMSUNG ELECTRO-MECHANICS(THAILAND)
 
@@ -54452,6 +54818,9 @@ OUI:2C10C1*
 OUI:2C1165*
  ID_OUI_FROM_DATABASE=Silicon Laboratories
 
+OUI:2C157E*
+ ID_OUI_FROM_DATABASE=RADIODATA GmbH
+
 OUI:2C15BF*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -54887,6 +55256,9 @@ OUI:2C4A11*
 OUI:2C4C15*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
+OUI:2C4C7D*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:2C4CC6*
  ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
 
@@ -54965,6 +55337,9 @@ OUI:2C58B9*
 OUI:2C58E8*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:2C5917*
+ ID_OUI_FROM_DATABASE=Arcadyan Corporation
+
 OUI:2C598A*
  ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
 
@@ -55328,6 +55703,9 @@ OUI:2C9452*
 OUI:2C9464*
  ID_OUI_FROM_DATABASE=Cincoze Co., Ltd.
 
+OUI:2C9520*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:2C9569*
  ID_OUI_FROM_DATABASE=Commscope
 
@@ -55368,7 +55746,10 @@ OUI:2C9D1E*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
 OUI:2C9D4B*
- ID_OUI_FROM_DATABASE=Lavelle Network Private Limited
+ ID_OUI_FROM_DATABASE=Lavelle Networks Private Limited
+
+OUI:2C9D5A*
+ ID_OUI_FROM_DATABASE=Flaircomm Microelectronics,Inc.
 
 OUI:2C9D65*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
@@ -55539,7 +55920,7 @@ OUI:2CBEEE*
  ID_OUI_FROM_DATABASE=Nothing Technology Limited
 
 OUI:2CC1F4*
- ID_OUI_FROM_DATABASE=Nokia Solution and Networks Pvt Ltd
+ ID_OUI_FROM_DATABASE=Nokia Solutions and Networks India Private Limited
 
 OUI:2CC253*
  ID_OUI_FROM_DATABASE=Apple, Inc.
@@ -55634,6 +56015,9 @@ OUI:2CCC15*
 OUI:2CCC44*
  ID_OUI_FROM_DATABASE=Sony Interactive Entertainment Inc.
 
+OUI:2CCC7A*
+ ID_OUI_FROM_DATABASE=AltoBeam Inc.
+
 OUI:2CCCE6*
  ID_OUI_FROM_DATABASE=Skyworth Digital Technology(Shenzhen) Co.,Ltd
 
@@ -55760,6 +56144,9 @@ OUI:2CDC78*
 OUI:2CDCAD*
  ID_OUI_FROM_DATABASE=Wistron Neweb Corporation
 
+OUI:2CDCC1*
+ ID_OUI_FROM_DATABASE=EM Microelectronic
+
 OUI:2CDCD7*
  ID_OUI_FROM_DATABASE=AzureWave Technology Inc.
 
@@ -55871,6 +56258,9 @@ OUI:2CF4C5*
 OUI:2CF7F1*
  ID_OUI_FROM_DATABASE=Seeed Technology Inc.
 
+OUI:2CF814*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:2CF89B*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -56186,6 +56576,9 @@ OUI:3023CD*
 OUI:302432*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:302450*
+ ID_OUI_FROM_DATABASE=Hangzhou Huacheng Network Technology Co.,Ltd
+
 OUI:302478*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
@@ -56219,6 +56612,9 @@ OUI:302F1E*
 OUI:302FAC*
  ID_OUI_FROM_DATABASE=Zhejiang HuaRay Technology Co.,Ltd
 
+OUI:30305F*
+ ID_OUI_FROM_DATABASE=Valeo Schalter und Sensoren GmbH
+
 OUI:3030D0*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -56291,6 +56687,9 @@ OUI:303A64*
 OUI:303ABA*
  ID_OUI_FROM_DATABASE=Guangzhou BaoLun Electronics Co., Ltd
 
+OUI:303B49*
+ ID_OUI_FROM_DATABASE=Cisco Meraki
+
 OUI:303B7C*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -56489,6 +56888,9 @@ OUI:30499E*
 OUI:304A26*
  ID_OUI_FROM_DATABASE=Shenzhen Trolink Technology CO, LTD
 
+OUI:304AC4*
+ ID_OUI_FROM_DATABASE=Barrot Technology Co.,LTD
+
 OUI:304B07*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
@@ -56505,7 +56907,7 @@ OUI:304F00*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
 OUI:304F75*
- ID_OUI_FROM_DATABASE=DZS Inc.
+ ID_OUI_FROM_DATABASE=Zhone Technologies, Inc.
 
 OUI:305075*
  ID_OUI_FROM_DATABASE=GN Audio A/S
@@ -56597,6 +56999,9 @@ OUI:306112*
 OUI:306118*
  ID_OUI_FROM_DATABASE=Paradom Inc.
 
+OUI:3061A2*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:30636B*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -56978,6 +57383,9 @@ OUI:30BE3B*
 OUI:30C01B*
  ID_OUI_FROM_DATABASE=Shenzhen Jingxun Software Telecommunication Technology Co.,Ltd
 
+OUI:30C0AE*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:30C3D9*
  ID_OUI_FROM_DATABASE=ALPSALPINE CO,.LTD
 
@@ -56987,6 +57395,9 @@ OUI:30C507*
 OUI:30C50F*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:30C599*
+ ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
+
 OUI:30C6AB*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -57014,6 +57425,9 @@ OUI:30C922*
 OUI:30C9AB*
  ID_OUI_FROM_DATABASE=CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
 
+OUI:30C9CC*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:30CB36*
  ID_OUI_FROM_DATABASE=Belden Singapore Pte. Ltd.
 
@@ -57224,6 +57638,9 @@ OUI:30F7C5*
 OUI:30F7D7*
  ID_OUI_FROM_DATABASE=Thread Technology Co., Ltd
 
+OUI:30F856*
+ ID_OUI_FROM_DATABASE=Extreme Networks Headquarters
+
 OUI:30F947*
  ID_OUI_FROM_DATABASE=Shenzhen Skyworth Digital  Technology  CO., Ltd
 
@@ -57272,6 +57689,9 @@ OUI:30FE31*
 OUI:30FE6C*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:30FEFA*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:30FFF6*
  ID_OUI_FROM_DATABASE=HangZhou KuoHeng Technology Co.,ltd
 
@@ -57404,6 +57824,9 @@ OUI:3408E1*
 OUI:340962*
  ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
 
+OUI:3409C9*
+ ID_OUI_FROM_DATABASE=Dongguan Huayin Electronic Technology Co., Ltd.
+
 OUI:340A22*
  ID_OUI_FROM_DATABASE=TOP-ACCESS ELECTRONICS CO LTD
 
@@ -57422,12 +57845,18 @@ OUI:340B40*
 OUI:340CED*
  ID_OUI_FROM_DATABASE=Moduel AB
 
+OUI:340E22*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:340F66*
  ID_OUI_FROM_DATABASE=Web Sensing LLC
 
 OUI:34105D*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:3410BE*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:3410F4*
  ID_OUI_FROM_DATABASE=Silicon Laboratories
 
@@ -57533,6 +57962,9 @@ OUI:342792*
 OUI:342840*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:342865*
+ ID_OUI_FROM_DATABASE=Juniper Networks
+
 OUI:3428F0*
  ID_OUI_FROM_DATABASE=ATN International Limited
 
@@ -57662,6 +58094,9 @@ OUI:3438AF*
 OUI:3438B7*
  ID_OUI_FROM_DATABASE=HUMAX Co., Ltd.
 
+OUI:343916*
+ ID_OUI_FROM_DATABASE=Google, Inc.
+
 OUI:343A20*
  ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
 
@@ -57818,6 +58253,9 @@ OUI:3453D2*
 OUI:34543C*
  ID_OUI_FROM_DATABASE=TAKAOKA TOKO CO.,LTD.
 
+OUI:345506*
+ ID_OUI_FROM_DATABASE=GUANGDONG GENIUS TECHNOLOGY CO., LTD.
+
 OUI:345594*
  ID_OUI_FROM_DATABASE=FUJIAN STAR-NET COMMUNICATION CO.,LTD
 
@@ -58292,6 +58730,51 @@ OUI:34B571*
 OUI:34B5A3*
  ID_OUI_FROM_DATABASE=CIG SHANGHAI CO LTD
 
+OUI:34B5F30*
+ ID_OUI_FROM_DATABASE=ADDSOFT TECHNOLOGIES LIMITED
+
+OUI:34B5F31*
+ ID_OUI_FROM_DATABASE=Satco Europe GmbH
+
+OUI:34B5F32*
+ ID_OUI_FROM_DATABASE=Inspired Flight
+
+OUI:34B5F33*
+ ID_OUI_FROM_DATABASE=WEAD GmbH
+
+OUI:34B5F34*
+ ID_OUI_FROM_DATABASE=LAUMAS Elettronica s.r.l.
+
+OUI:34B5F35*
+ ID_OUI_FROM_DATABASE=Kyokuto Solutions Inc.
+
+OUI:34B5F36*
+ ID_OUI_FROM_DATABASE=JENESIS(SHEN ZHEN)CO.,LTD.
+
+OUI:34B5F37*
+ ID_OUI_FROM_DATABASE=Hyatta Digital Technology Co., Ltd.
+
+OUI:34B5F38*
+ ID_OUI_FROM_DATABASE=Shanghai Sigen New Energy Technology Co., Ltd
+
+OUI:34B5F39*
+ ID_OUI_FROM_DATABASE=Shenzhen PeakVic Technology Co.,Ltd
+
+OUI:34B5F3A*
+ ID_OUI_FROM_DATABASE=Bethlabs(Tianjin)Technology Co.,Ltd.
+
+OUI:34B5F3B*
+ ID_OUI_FROM_DATABASE=Aeterlink Corp.
+
+OUI:34B5F3C*
+ ID_OUI_FROM_DATABASE=Shenzhen Mifasuolla Smart Co.,Ltd
+
+OUI:34B5F3D*
+ ID_OUI_FROM_DATABASE=Digicom
+
+OUI:34B5F3E*
+ ID_OUI_FROM_DATABASE=Viettel Manufacturing Corporation One Member Limited Liability Company
+
 OUI:34B7DA*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
@@ -58568,6 +59051,9 @@ OUI:34D868*
 OUI:34D954*
  ID_OUI_FROM_DATABASE=WiBotic Inc.
 
+OUI:34DAA1*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:34DAB7*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -58610,6 +59096,9 @@ OUI:34E0D7*
 OUI:34E12D*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:34E1A9*
+ ID_OUI_FROM_DATABASE=AVM Audiovisuelles Marketing und Computersysteme GmbH
+
 OUI:34E1D10*
  ID_OUI_FROM_DATABASE=Tianjin Sublue Ocean Science & Technology Co., Ltd
 
@@ -58775,6 +59264,9 @@ OUI:34F8E7*
 OUI:34F968*
  ID_OUI_FROM_DATABASE=ATEK Products, LLC
 
+OUI:34FA1C*
+ ID_OUI_FROM_DATABASE=Beijing Xiaomi Mobile Software Co., Ltd
+
 OUI:34FA40*
  ID_OUI_FROM_DATABASE=Guangzhou Robustel Technologies Co., Limited
 
@@ -58799,6 +59291,9 @@ OUI:34FCEF*
 OUI:34FD6A*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:34FD70*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:34FE1C*
  ID_OUI_FROM_DATABASE=CHOUNG HWA TECH CO.,LTD
 
@@ -59450,12 +59945,18 @@ OUI:386E88*
 OUI:386EA2*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
+OUI:386EB2*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:386F6B*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
 OUI:38700C*
  ID_OUI_FROM_DATABASE=Commscope
 
+OUI:3870F2*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:3871DE*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -59636,6 +60137,9 @@ OUI:3891D5*
 OUI:3891FB*
  ID_OUI_FROM_DATABASE=Xenox Holding BV
 
+OUI:389201*
+ ID_OUI_FROM_DATABASE=Tianyi Telecom Terminals Company Limited
+
 OUI:38922E*
  ID_OUI_FROM_DATABASE=ArrayComm
 
@@ -59945,6 +60449,9 @@ OUI:38B8EBD*
 OUI:38B8EBE*
  ID_OUI_FROM_DATABASE=WT-Consulting SAS
 
+OUI:38B9AF*
+ ID_OUI_FROM_DATABASE=NXP Semiconductors Taiwan Ltd.
+
 OUI:38BAB0*
  ID_OUI_FROM_DATABASE=Broadcom
 
@@ -59996,6 +60503,9 @@ OUI:38C4E8*
 OUI:38C6BD*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
+OUI:38C6CE*
+ ID_OUI_FROM_DATABASE=Nintendo Co.,Ltd
+
 OUI:38C70A*
  ID_OUI_FROM_DATABASE=WiFiSong
 
@@ -60095,6 +60605,9 @@ OUI:38E1F4*
 OUI:38E26E*
  ID_OUI_FROM_DATABASE=ShenZhen Sweet Rain Electronics Co.,Ltd.
 
+OUI:38E2C4*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:38E2CA*
  ID_OUI_FROM_DATABASE=Katun Corporation
 
@@ -60107,6 +60620,9 @@ OUI:38E39F*
 OUI:38E3C5*
  ID_OUI_FROM_DATABASE=Taicang T&W Electronics
 
+OUI:38E563*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
 OUI:38E595*
  ID_OUI_FROM_DATABASE=SHENZHEN GONGJIN ELECTRONICS CO.,LT
 
@@ -60482,6 +60998,9 @@ OUI:3C15EA*
 OUI:3C15FB*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:3C1640*
+ ID_OUI_FROM_DATABASE=Qingdao Haier Technology Co.,Ltd
+
 OUI:3C1710*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
@@ -60773,6 +61292,9 @@ OUI:3C3BAD*
 OUI:3C3F51*
  ID_OUI_FROM_DATABASE=2CRSI
 
+OUI:3C4015*
+ ID_OUI_FROM_DATABASE=12mm Health Technology (Hainan) Co., Ltd.
+
 OUI:3C404F*
  ID_OUI_FROM_DATABASE=GUANGDONG PISEN ELECTRONICS CO.,LTD
 
@@ -61085,6 +61607,9 @@ OUI:3C754A*
 OUI:3C7625*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:3C7787*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:3C77E6*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
@@ -61094,6 +61619,9 @@ OUI:3C7843*
 OUI:3C7873*
  ID_OUI_FROM_DATABASE=Airsonics
 
+OUI:3C7895*
+ ID_OUI_FROM_DATABASE=TP-Link Systems Inc.
+
 OUI:3C792B*
  ID_OUI_FROM_DATABASE=Dongguan Auklink TechnologyCo.,Ltd
 
@@ -61289,6 +61817,9 @@ OUI:3C9FCD*
 OUI:3CA067*
  ID_OUI_FROM_DATABASE=Liteon Technology Corporation
 
+OUI:3CA070*
+ ID_OUI_FROM_DATABASE=Blink by Amazon
+
 OUI:3CA10D*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -61388,6 +61919,9 @@ OUI:3CB53D*
 OUI:3CB6B7*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
+OUI:3CB6E7*
+ ID_OUI_FROM_DATABASE=Handheld Scientific, Inc.
+
 OUI:3CB72B*
  ID_OUI_FROM_DATABASE=PLUMgrid Inc
 
@@ -61457,6 +61991,9 @@ OUI:3CC243*
 OUI:3CC2E1*
  ID_OUI_FROM_DATABASE=XINHUA CONTROL ENGINEERING CO.,LTD
 
+OUI:3CC5C7*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:3CC5DD*
  ID_OUI_FROM_DATABASE=Hui Zhou Gaoshengda Technology Co.,LTD
 
@@ -61592,6 +62129,9 @@ OUI:3CDC03D*
 OUI:3CDC03E*
  ID_OUI_FROM_DATABASE=JP Morgan Chase Bank, N.A.
 
+OUI:3CDC75*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:3CDCBC*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -61850,6 +62390,9 @@ OUI:400EF3*
 OUI:400FC1*
  ID_OUI_FROM_DATABASE=Vantiva USA LLC
 
+OUI:4010ED*
+ ID_OUI_FROM_DATABASE=G.Tech Technology Ltd.
+
 OUI:4011750*
  ID_OUI_FROM_DATABASE=Lexi Devices, Inc.
 
@@ -61952,6 +62495,9 @@ OUI:401B5F*
 OUI:401C83*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:401CD4*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:401D59*
  ID_OUI_FROM_DATABASE=Biometric Associates, LP
 
@@ -61970,6 +62516,9 @@ OUI:402343*
 OUI:4024B2*
  ID_OUI_FROM_DATABASE=Sichuan AI-Link Technology Co., Ltd.
 
+OUI:4024D2*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:402508*
  ID_OUI_FROM_DATABASE=Highway 9 Networks, Inc.
 
@@ -61979,6 +62528,9 @@ OUI:4025C2*
 OUI:402619*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:40268E*
+ ID_OUI_FROM_DATABASE=Shenzhen Photon Leap Technology Co., Ltd.
+
 OUI:40270B*
  ID_OUI_FROM_DATABASE=Mobileeco Co., Ltd
 
@@ -62213,6 +62765,9 @@ OUI:4048FDE*
 OUI:40490F*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
+OUI:40497C*
+ ID_OUI_FROM_DATABASE=eero inc.
+
 OUI:40498A*
  ID_OUI_FROM_DATABASE=Synapticon GmbH
 
@@ -62546,6 +63101,9 @@ OUI:409505*
 OUI:409558*
  ID_OUI_FROM_DATABASE=Aisino Corporation
 
+OUI:409595*
+ ID_OUI_FROM_DATABASE=TP-Link Systems Inc.
+
 OUI:4095BD*
  ID_OUI_FROM_DATABASE=NTmore.Co.,Ltd
 
@@ -62681,6 +63239,9 @@ OUI:40A6D9*
 OUI:40A6E8*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:40A786*
+ ID_OUI_FROM_DATABASE=TECNO MOBILE LIMITED
+
 OUI:40A8F0*
  ID_OUI_FROM_DATABASE=Hewlett Packard
 
@@ -62990,6 +63551,9 @@ OUI:40E99B*
 OUI:40EACE*
  ID_OUI_FROM_DATABASE=FOUNDER BROADBAND NETWORK SERVICE CO.,LTD
 
+OUI:40EB21*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:40EC99*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -63075,7 +63639,7 @@ OUI:40F201*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
 OUI:40F21C*
- ID_OUI_FROM_DATABASE=DZS Inc.
+ ID_OUI_FROM_DATABASE=Zhone Technologies, Inc.
 
 OUI:40F2E9*
  ID_OUI_FROM_DATABASE=IBM
@@ -63272,6 +63836,9 @@ OUI:44070B*
 OUI:4409B8*
  ID_OUI_FROM_DATABASE=Salcomp (Shenzhen) CO., LTD.
 
+OUI:4409C6*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:4409DA*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -63458,6 +64025,9 @@ OUI:44356F*
 OUI:443583*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:4435B9*
+ ID_OUI_FROM_DATABASE=NetComm Wireless Pty Ltd
+
 OUI:4435D3*
  ID_OUI_FROM_DATABASE=GD Midea Air-Conditioning Equipment Co.,Ltd.
 
@@ -63485,9 +64055,15 @@ OUI:4437E6*
 OUI:443839*
  ID_OUI_FROM_DATABASE=Cumulus Networks, inc
 
+OUI:44388C*
+ ID_OUI_FROM_DATABASE=Sumitomo Electric Industries, Ltd
+
 OUI:4438E8*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:4438F3*
+ ID_OUI_FROM_DATABASE=EM Microelectronic
+
 OUI:4439C4*
  ID_OUI_FROM_DATABASE=Universal Global Scientific Industrial Co., Ltd.
 
@@ -63896,6 +64472,9 @@ OUI:448CAB*
 OUI:448DBF*
  ID_OUI_FROM_DATABASE=Rhino Mobility LLC
 
+OUI:448DD5*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:448E12*
  ID_OUI_FROM_DATABASE=DT Research, Inc.
 
@@ -63959,6 +64538,9 @@ OUI:449F46*
 OUI:449F7F*
  ID_OUI_FROM_DATABASE=DataCore Software Corporation
 
+OUI:449FDA*
+ ID_OUI_FROM_DATABASE=Silicon Laboratories
+
 OUI:44A038*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -64199,6 +64781,9 @@ OUI:44C9A2*
 OUI:44CB8B*
  ID_OUI_FROM_DATABASE=LG Innotek
 
+OUI:44CBAD*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:44CD0E*
  ID_OUI_FROM_DATABASE=FLEXTRONICS MANUFACTURING(ZHUHAI)CO.,LTD.
 
@@ -64538,6 +65123,27 @@ OUI:48062B*
 OUI:48066A*
  ID_OUI_FROM_DATABASE=Tempered Networks, Inc.
 
+OUI:4808EB0*
+ ID_OUI_FROM_DATABASE=ELOC8 SRO
+
+OUI:4808EB1*
+ ID_OUI_FROM_DATABASE=Tianjin Jinmu Intelligent Control Technology Co., Ltd
+
+OUI:4808EB2*
+ ID_OUI_FROM_DATABASE=Guangdong Three Link Technology Co., Ltd
+
+OUI:4808EB4*
+ ID_OUI_FROM_DATABASE=Quanta Storage Inc.
+
+OUI:4808EB5*
+ ID_OUI_FROM_DATABASE=Hangzhou Jianan Technology Co.,Ltd
+
+OUI:4808EBC*
+ ID_OUI_FROM_DATABASE=ZHEJIANG AIKE INTELLIGENTTECHNOLOGY CO.LTD
+
+OUI:4808EBD*
+ ID_OUI_FROM_DATABASE=Silicon Dynamic Networks
+
 OUI:480BB20*
  ID_OUI_FROM_DATABASE=Ridango AS
 
@@ -64586,6 +65192,9 @@ OUI:480BB2E*
 OUI:480C49*
  ID_OUI_FROM_DATABASE=NAKAYO Inc
 
+OUI:480E13*
+ ID_OUI_FROM_DATABASE=ittim
+
 OUI:480EEC*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
@@ -65360,6 +65969,9 @@ OUI:48A3BD*
 OUI:48A472*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:48A48C*
+ ID_OUI_FROM_DATABASE=Shanghai Zenchant Electornics Co.,LTD
+
 OUI:48A493*
  ID_OUI_FROM_DATABASE=TAIYO YUDEN CO.,LTD
 
@@ -65525,6 +66137,9 @@ OUI:48C8B6*
 OUI:48CA43*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
+OUI:48CA68*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:48CAC6*
  ID_OUI_FROM_DATABASE=UNION MAN TECHNOLOGY CO.,LTD
 
@@ -65540,6 +66155,9 @@ OUI:48CFA9*
 OUI:48D017*
  ID_OUI_FROM_DATABASE=Telecom Infra Project
 
+OUI:48D01C*
+ ID_OUI_FROM_DATABASE=AltoBeam Inc.
+
 OUI:48D0CF*
  ID_OUI_FROM_DATABASE=Universal Electronics, Inc.
 
@@ -65666,6 +66284,9 @@ OUI:48DF1C*
 OUI:48DF37*
  ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
 
+OUI:48E150*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:48E15C*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -65861,6 +66482,9 @@ OUI:48F3F3*
 OUI:48F47D*
  ID_OUI_FROM_DATABASE=TechVision Holding  Internation Limited
 
+OUI:48F6EE*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:48F7BC*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -66191,6 +66815,9 @@ OUI:4C445B*
 OUI:4C4576*
  ID_OUI_FROM_DATABASE=China Mobile(Hangzhou) Information Technology Co.,Ltd.
 
+OUI:4C46D1*
+ ID_OUI_FROM_DATABASE=Guangzhou V-Solution Telecommunication Technology Co.,Ltd.
+
 OUI:4C48DA*
  ID_OUI_FROM_DATABASE=Beijing Autelan Technology Co.,Ltd
 
@@ -66347,6 +66974,9 @@ OUI:4C5F70*
 OUI:4C5FD2*
  ID_OUI_FROM_DATABASE=Alcatel-Lucent
 
+OUI:4C60AD*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
 OUI:4C60BA*
  ID_OUI_FROM_DATABASE=AltoBeam Inc.
 
@@ -66605,6 +67235,9 @@ OUI:4C8120*
 OUI:4C8125*
  ID_OUI_FROM_DATABASE=ZOWEE TECHNOLOGY(HEYUAN)Co.,Ltd
 
+OUI:4C820C*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:4C8237*
  ID_OUI_FROM_DATABASE=Telink Micro LLC
 
@@ -66641,6 +67274,9 @@ OUI:4C8D53*
 OUI:4C8D79*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:4C8E19*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:4C8ECC*
  ID_OUI_FROM_DATABASE=SILKAN SA
 
@@ -66827,6 +67463,9 @@ OUI:4CA919*
 OUI:4CA928*
  ID_OUI_FROM_DATABASE=Insensi
 
+OUI:4CA954*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:4CAA16*
  ID_OUI_FROM_DATABASE=AzureWave Technologies (Shanghai) Inc.
 
@@ -66836,6 +67475,9 @@ OUI:4CAB33*
 OUI:4CAB4F*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:4CABF3*
+ ID_OUI_FROM_DATABASE=Universal Electronics, Inc.
+
 OUI:4CABF8*
  ID_OUI_FROM_DATABASE=ASKEY COMPUTER CORP
 
@@ -66845,9 +67487,15 @@ OUI:4CABFC*
 OUI:4CAC0A*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:4CAD35*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:4CADA8*
  ID_OUI_FROM_DATABASE=PANOPTICS CORP.
 
+OUI:4CADDF*
+ ID_OUI_FROM_DATABASE=Công ty Cổ phần Thiết bị Công nghiệp GEIC
+
 OUI:4CAE13*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -66932,6 +67580,9 @@ OUI:4CBAA3*
 OUI:4CBAD7*
  ID_OUI_FROM_DATABASE=LG Innotek
 
+OUI:4CBB47*
+ ID_OUI_FROM_DATABASE=NVIDIA Corporation
+
 OUI:4CBB58*
  ID_OUI_FROM_DATABASE=Chicony Electronics Co., Ltd.
 
@@ -67025,6 +67676,9 @@ OUI:4CC452*
 OUI:4CC53E*
  ID_OUI_FROM_DATABASE=Zyxel Communications Corporation
 
+OUI:4CC5D9*
+ ID_OUI_FROM_DATABASE=Dell Inc.
+
 OUI:4CC602*
  ID_OUI_FROM_DATABASE=Radios, Inc.
 
@@ -67070,6 +67724,9 @@ OUI:4CCDB6*
 OUI:4CCE2D*
  ID_OUI_FROM_DATABASE=Danlaw Inc
 
+OUI:4CCF7C*
+ ID_OUI_FROM_DATABASE=HP Inc.
+
 OUI:4CD08A*
  ID_OUI_FROM_DATABASE=HUMAX Co., Ltd.
 
@@ -67091,6 +67748,9 @@ OUI:4CD2FB*
 OUI:4CD3AF*
  ID_OUI_FROM_DATABASE=HMD Global Oy
 
+OUI:4CD546*
+ ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
+
 OUI:4CD577*
  ID_OUI_FROM_DATABASE=CHONGQING FUGUI ELECTRONICS CO.,LTD.
 
@@ -67296,7 +67956,7 @@ OUI:4CEEB0*
  ID_OUI_FROM_DATABASE=SHC Netzwerktechnik GmbH
 
 OUI:4CEF56*
- ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies Company Limited
+ ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies company Limited
 
 OUI:4CEFC0*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
@@ -67337,6 +67997,9 @@ OUI:4CF95D*
 OUI:4CFA9A*
  ID_OUI_FROM_DATABASE=Shenzhen Quanxing Technology Co., Ltd
 
+OUI:4CFAC9*
+ ID_OUI_FROM_DATABASE=BWS IoT
+
 OUI:4CFACA*
  ID_OUI_FROM_DATABASE=Cambridge Industries(Group) Co.,Ltd.
 
@@ -67643,6 +68306,9 @@ OUI:502E5C*
 OUI:502E66*
  ID_OUI_FROM_DATABASE=CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
 
+OUI:502E91*
+ ID_OUI_FROM_DATABASE=AzureWave Technology Inc.
+
 OUI:502ECE*
  ID_OUI_FROM_DATABASE=Asahi Electronics Co.,Ltd
 
@@ -67874,6 +68540,9 @@ OUI:5050A4*
 OUI:5050CE*
  ID_OUI_FROM_DATABASE=Hangzhou Dianyixia Communication Technology Co. Ltd.
 
+OUI:50514F*
+ ID_OUI_FROM_DATABASE=Sapphire Brands Limited
+
 OUI:5051A9*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -67970,6 +68639,9 @@ OUI:5061D6*
 OUI:5061F6*
  ID_OUI_FROM_DATABASE=Universal Electronics, Inc.
 
+OUI:506245*
+ ID_OUI_FROM_DATABASE=Annapurna labs
+
 OUI:5062550*
  ID_OUI_FROM_DATABASE=Ufanet SC
 
@@ -68216,6 +68888,9 @@ OUI:508CC9*
 OUI:508CF5*
  ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
 
+OUI:508D62*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:508D6F*
  ID_OUI_FROM_DATABASE=CHAHOO Limited
 
@@ -68261,6 +68936,9 @@ OUI:5098B8*
 OUI:5098F3*
  ID_OUI_FROM_DATABASE=Rheem Australia Pty Ltd
 
+OUI:509903*
+ ID_OUI_FROM_DATABASE=Meta Platforms, Inc.
+
 OUI:50995A*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 
@@ -68432,6 +69110,9 @@ OUI:50AB3E*
 OUI:50ABBF*
  ID_OUI_FROM_DATABASE=Hoseo Telecom
 
+OUI:50ACB9*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:50AD71*
  ID_OUI_FROM_DATABASE=Tessolve Semiconductor Private Limited
 
@@ -69317,6 +69998,9 @@ OUI:544E45*
 OUI:544E90*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:544EF0*
+ ID_OUI_FROM_DATABASE=Roku, Inc
+
 OUI:54511B*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -69476,6 +70160,9 @@ OUI:547885*
 OUI:5478C9*
  ID_OUI_FROM_DATABASE=AMPAK Technology,Inc.
 
+OUI:5478F0*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:547975*
  ID_OUI_FROM_DATABASE=Nokia Corporation
 
@@ -69530,6 +70217,9 @@ OUI:54847B*
 OUI:5484DC*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:5485C1*
+ ID_OUI_FROM_DATABASE=Siliconwaves Technologies Co.,Ltd
+
 OUI:5486BC*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -69605,9 +70295,15 @@ OUI:5491AFD*
 OUI:5491AFE*
  ID_OUI_FROM_DATABASE=Jiangxi Anbaichuan Electric Co.(ABC),Ltd
 
+OUI:5491E1*
+ ID_OUI_FROM_DATABASE=Vitalacy Inc.
+
 OUI:549209*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:54926A*
+ ID_OUI_FROM_DATABASE=GD Midea Air-Conditioning Equipment Co.,Ltd.
+
 OUI:5492BE*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -69680,6 +70376,9 @@ OUI:549A8F*
 OUI:549B12*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:549B24*
+ ID_OUI_FROM_DATABASE=Mellanox Technologies, Inc.
+
 OUI:549B49*
  ID_OUI_FROM_DATABASE=NEC Platforms, Ltd.
 
@@ -69785,6 +70484,9 @@ OUI:54A552*
 OUI:54A619*
  ID_OUI_FROM_DATABASE=Alcatel-Lucent Shanghai Bell Co., Ltd
 
+OUI:54A637*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:54A65C*
  ID_OUI_FROM_DATABASE=Vantiva USA LLC
 
@@ -69854,6 +70556,9 @@ OUI:54B80A*
 OUI:54B874*
  ID_OUI_FROM_DATABASE=GD Midea Air-Conditioning Equipment Co.,Ltd.
 
+OUI:54B8DB*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:54BAD6*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -69968,6 +70673,9 @@ OUI:54DC1D*
 OUI:54DCE9*
  ID_OUI_FROM_DATABASE=Silicon Laboratories
 
+OUI:54DD21*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:54DD4F*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -70052,6 +70760,9 @@ OUI:54E7D5*
 OUI:54EAA8*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:54EAE1*
+ ID_OUI_FROM_DATABASE=Honor Device Co., Ltd.
+
 OUI:54EBE9*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -70139,6 +70850,9 @@ OUI:54FB58*
 OUI:54FB5A*
  ID_OUI_FROM_DATABASE=Optomind Inc.
 
+OUI:54FB66*
+ ID_OUI_FROM_DATABASE=ASRock Incorporation
+
 OUI:54FCF0*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -70739,6 +71453,9 @@ OUI:58707F*
 OUI:5870C6*
  ID_OUI_FROM_DATABASE=Shanghai Xiaoyi Technology Co., Ltd.
 
+OUI:5872C9*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:5873D1*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -70763,6 +71480,9 @@ OUI:5876B3*
 OUI:5876C5*
  ID_OUI_FROM_DATABASE=DIGI I'S LTD
 
+OUI:587961*
+ ID_OUI_FROM_DATABASE=Microsoft Corporation
+
 OUI:5879E0*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -70775,6 +71495,9 @@ OUI:587A62*
 OUI:587A6A*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
+OUI:587AB1*
+ ID_OUI_FROM_DATABASE=Shanghai Lixun Information Technology Co., Ltd.
+
 OUI:587BE9*
  ID_OUI_FROM_DATABASE=AirPro Technology India Pvt. Ltd
 
@@ -70826,6 +71549,9 @@ OUI:588694*
 OUI:58874C*
  ID_OUI_FROM_DATABASE=LITE-ON CLEAN ENERGY TECHNOLOGY CORP.
 
+OUI:588785*
+ ID_OUI_FROM_DATABASE=Adtran Inc
+
 OUI:58879F*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -71312,12 +72038,18 @@ OUI:58E476*
 OUI:58E488*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 
+OUI:58E4EB*
+ ID_OUI_FROM_DATABASE=FN-LINK TECHNOLOGY Ltd.
+
 OUI:58E636*
  ID_OUI_FROM_DATABASE=EVRsafe Technologies
 
 OUI:58E6BA*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:58E6C5*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:58E747*
  ID_OUI_FROM_DATABASE=Deltanet AG
 
@@ -71564,6 +72296,9 @@ OUI:5C0979*
 OUI:5C0A5B*
  ID_OUI_FROM_DATABASE=SAMSUNG ELECTRO MECHANICS CO., LTD.
 
+OUI:5C0B3B*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:5C0BCA*
  ID_OUI_FROM_DATABASE=Tunstall Nordic AB
 
@@ -72017,6 +72752,9 @@ OUI:5C666C*
 OUI:5C6776*
  ID_OUI_FROM_DATABASE=IDS Imaging Development Systems GmbH
 
+OUI:5C6783*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:5C68D0*
  ID_OUI_FROM_DATABASE=Aurora Innovation Inc.
 
@@ -72131,6 +72869,9 @@ OUI:5C78F8*
 OUI:5C7B5C*
  ID_OUI_FROM_DATABASE=Shenzhen SDMC Technology CO.,Ltd.
 
+OUI:5C7B6C*
+ ID_OUI_FROM_DATABASE=Tradit Co., Ltd
+
 OUI:5C7D5E*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -72686,6 +73427,9 @@ OUI:5CE0F6*
 OUI:5CE176*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:5CE1A4*
+ ID_OUI_FROM_DATABASE=Pleneo
+
 OUI:5CE223*
  ID_OUI_FROM_DATABASE=Delphin Technology AG
 
@@ -72716,6 +73460,9 @@ OUI:5CE688*
 OUI:5CE747*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:5CE753*
+ ID_OUI_FROM_DATABASE=Private
+
 OUI:5CE7A0*
  ID_OUI_FROM_DATABASE=Nokia
 
@@ -72989,6 +73736,9 @@ OUI:600837*
 OUI:6009C3*
  ID_OUI_FROM_DATABASE=u-blox AG
 
+OUI:600A8C*
+ ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies company Limited
+
 OUI:600B03*
  ID_OUI_FROM_DATABASE=Hangzhou H3C Technologies Co., Limited
 
@@ -73187,6 +73937,9 @@ OUI:602D74*
 OUI:602E20*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:6030B3*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:6030D4*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -73355,6 +74108,9 @@ OUI:605375*
 OUI:605464*
  ID_OUI_FROM_DATABASE=Eyedro Green Solutions Inc.
 
+OUI:605556*
+ ID_OUI_FROM_DATABASE=Jiangxi Risound Electronics Co.,LTD
+
 OUI:6055F9*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
@@ -73400,6 +74156,9 @@ OUI:605E4F*
 OUI:605F8D*
  ID_OUI_FROM_DATABASE=eero inc.
 
+OUI:605FAA*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:60601F*
  ID_OUI_FROM_DATABASE=SZ DJI TECHNOLOGY CO.,LTD
 
@@ -73505,6 +74264,9 @@ OUI:60735C*
 OUI:6073BC*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:6073C8*
+ ID_OUI_FROM_DATABASE=Voyetra Turtle Beach, Inc.
+
 OUI:60748D*
  ID_OUI_FROM_DATABASE=Atmaca Elektronik
 
@@ -73514,6 +74276,9 @@ OUI:6074B1*
 OUI:6074F4*
  ID_OUI_FROM_DATABASE=Private
 
+OUI:60756C*
+ ID_OUI_FROM_DATABASE=LG Electronics
+
 OUI:607623*
  ID_OUI_FROM_DATABASE=Shenzhen E-Superlink Technology Co., Ltd
 
@@ -73710,7 +74475,7 @@ OUI:609813*
  ID_OUI_FROM_DATABASE=Shanghai Visking Digital Technology Co. LTD
 
 OUI:609849*
- ID_OUI_FROM_DATABASE=Nokia solutions and networks Pvt Ltd
+ ID_OUI_FROM_DATABASE=Nokia Solutions and Networks India Private Limited
 
 OUI:609866*
  ID_OUI_FROM_DATABASE=Texas Instruments
@@ -74507,6 +75272,9 @@ OUI:642CAC*
 OUI:642DB7*
  ID_OUI_FROM_DATABASE=SEUNGIL ELECTRONICS
 
+OUI:642E41*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:642FC7*
  ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
 
@@ -74675,6 +75443,9 @@ OUI:644842*
 OUI:64497D*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:644A7D*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:644BC3*
  ID_OUI_FROM_DATABASE=Shanghai WOASiS Telecommunications Ltd., Co.
 
@@ -74888,6 +75659,9 @@ OUI:6467CD*
 OUI:64680C*
  ID_OUI_FROM_DATABASE=Comtrend Corporation
 
+OUI:64681A*
+ ID_OUI_FROM_DATABASE=DASAN Network Solutions
+
 OUI:646876*
  ID_OUI_FROM_DATABASE=Edifier International
 
@@ -74957,6 +75731,12 @@ OUI:6473E2*
 OUI:6474F6*
  ID_OUI_FROM_DATABASE=Shooter Detection Systems
 
+OUI:647520*
+ ID_OUI_FROM_DATABASE=zte corporation
+
+OUI:6475DA*
+ ID_OUI_FROM_DATABASE=Arcadyan Corporation
+
 OUI:647657*
  ID_OUI_FROM_DATABASE=Innovative Security Designs
 
@@ -75170,6 +75950,9 @@ OUI:64A837*
 OUI:64A965*
  ID_OUI_FROM_DATABASE=Linkflow Co., Ltd.
 
+OUI:64AC2B*
+ ID_OUI_FROM_DATABASE=Juniper Networks
+
 OUI:64AE0C*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -75317,6 +76100,9 @@ OUI:64CC22*
 OUI:64CC2E*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
+OUI:64CDC2*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
 OUI:64CDF1*
  ID_OUI_FROM_DATABASE=KO & AL Co., Ltd
 
@@ -75377,6 +76163,9 @@ OUI:64D954*
 OUI:64D989*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:64D9C2*
+ ID_OUI_FROM_DATABASE=eero inc.
+
 OUI:64DAA0*
  ID_OUI_FROM_DATABASE=Robert Bosch Smart Home GmbH
 
@@ -75740,6 +76529,9 @@ OUI:6823B0*
 OUI:6823F4*
  ID_OUI_FROM_DATABASE=Shenzhen Jinlangxin Technology Co., Ltd
 
+OUI:682499*
+ ID_OUI_FROM_DATABASE=Quectel Wireless Solutions Co.,Ltd.
+
 OUI:6825DD*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
@@ -75869,6 +76661,9 @@ OUI:684352*
 OUI:6843D7*
  ID_OUI_FROM_DATABASE=Agilecom Photonics Solutions Guangdong Limited
 
+OUI:684406*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:684465*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -75899,6 +76694,9 @@ OUI:684992*
 OUI:6849B2*
  ID_OUI_FROM_DATABASE=CARLO GAVAZZI LTD
 
+OUI:684A5F*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:684A76*
  ID_OUI_FROM_DATABASE=eero inc.
 
@@ -76010,6 +76808,9 @@ OUI:685E1C*
 OUI:685E6B*
  ID_OUI_FROM_DATABASE=PowerRay Co., Ltd.
 
+OUI:685EDD*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:68628A*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
@@ -76316,6 +77117,9 @@ OUI:689423*
 OUI:68944A*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:68951B*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:689575*
  ID_OUI_FROM_DATABASE=Zhejiang Bodyguard Electronic Co., Ltd
 
@@ -76403,6 +77207,9 @@ OUI:68A46A*
 OUI:68A47D*
  ID_OUI_FROM_DATABASE=Sun Cupid Technology (HK) LTD
 
+OUI:68A593*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:68A682*
  ID_OUI_FROM_DATABASE=Shenzhen YOUHUA Technology Co., Ltd
 
@@ -76589,6 +77396,9 @@ OUI:68D927*
 OUI:68D93C*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:68D972*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:68D976*
  ID_OUI_FROM_DATABASE=EM Microelectronic
 
@@ -76769,6 +77579,9 @@ OUI:68F0D0*
 OUI:68F125*
  ID_OUI_FROM_DATABASE=Data Controls Inc.
 
+OUI:68F21F*
+ ID_OUI_FROM_DATABASE=Bose Corporation
+
 OUI:68F38E*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
@@ -76787,6 +77600,9 @@ OUI:68F63B*
 OUI:68F728*
  ID_OUI_FROM_DATABASE=LCFC(Hefei) Electronics Technology co., ltd
 
+OUI:68F7D8*
+ ID_OUI_FROM_DATABASE=Microsoft Corporation
+
 OUI:68F895*
  ID_OUI_FROM_DATABASE=Redflow Limited
 
@@ -76808,6 +77624,9 @@ OUI:68FCB6*
 OUI:68FCCA*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:68FE71*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:68FEDA*
  ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 
@@ -76991,6 +77810,9 @@ OUI:6C19C0*
 OUI:6C1A75*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:6C1AEA*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:6C1B3F*
  ID_OUI_FROM_DATABASE=MiraeSignal Co., Ltd
 
@@ -77183,6 +78005,9 @@ OUI:6C2E72*
 OUI:6C2E85*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
+OUI:6C2F1C*
+ ID_OUI_FROM_DATABASE=Nexus Raytek Pty Ltd
+
 OUI:6C2F2C*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -77333,6 +78158,9 @@ OUI:6C4EF6*
 OUI:6C4F89*
  ID_OUI_FROM_DATABASE=Zyxel Communications Corporation
 
+OUI:6C4FA1*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:6C504D*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -77921,6 +78749,9 @@ OUI:6CC242*
 OUI:6CC26B*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:6CC36A*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
 OUI:6CC374*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -78522,7 +79353,7 @@ OUI:703A51*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
 OUI:703A73*
- ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies Company Limited
+ ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies company Limited
 
 OUI:703AA6*
  ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
@@ -78596,6 +79427,9 @@ OUI:704AAE*
 OUI:704AE4*
  ID_OUI_FROM_DATABASE=Rinstrum Pty Ltd
 
+OUI:704CA2*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:704CA5*
  ID_OUI_FROM_DATABASE=Fortinet, Inc.
 
@@ -79007,6 +79841,9 @@ OUI:707CE3*
 OUI:707D95*
  ID_OUI_FROM_DATABASE=Shenzhen City LinwlanTechnology Co. Ltd.
 
+OUI:707DA1*
+ ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
+
 OUI:707DAF*
  ID_OUI_FROM_DATABASE=Plucent AB
 
@@ -79040,6 +79877,9 @@ OUI:70828E*
 OUI:708540*
  ID_OUI_FROM_DATABASE=Skyworth Digital Technology(Shenzhen) Co.,Ltd
 
+OUI:70856C*
+ ID_OUI_FROM_DATABASE=Ruijie Networks Co.,LTD
+
 OUI:7085C2*
  ID_OUI_FROM_DATABASE=ASRock Incorporation
 
@@ -79205,6 +80045,9 @@ OUI:70A191*
 OUI:70A2B3*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:70A3A4*
+ ID_OUI_FROM_DATABASE=Beijing Guming Communication Technology Co., Ltd.
+
 OUI:70A41C*
  ID_OUI_FROM_DATABASE=Advanced Wireless Dynamics S.L.
 
@@ -79274,6 +80117,9 @@ OUI:70B13D*
 OUI:70B14E*
  ID_OUI_FROM_DATABASE=Commscope
 
+OUI:70B258*
+ ID_OUI_FROM_DATABASE=Ruckus Wireless
+
 OUI:70B265*
  ID_OUI_FROM_DATABASE=Hiltron s.r.l.
 
@@ -82611,7 +83457,7 @@ OUI:70B3D5455*
  ID_OUI_FROM_DATABASE=Heartlandmicropayments
 
 OUI:70B3D5456*
- ID_OUI_FROM_DATABASE=Technological Application and Production One Member Liability Company (Tecapro company)
+ ID_OUI_FROM_DATABASE=Technological Application And Production One Member Liability Company (Tecapro Company)
 
 OUI:70B3D5457*
  ID_OUI_FROM_DATABASE=Vivaldi Clima Srl
@@ -91559,6 +92405,9 @@ OUI:70B3D5FFE*
 OUI:70B3D5FFF*
  ID_OUI_FROM_DATABASE=Private
 
+OUI:70B51A*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:70B599*
  ID_OUI_FROM_DATABASE=Embedded Technologies s.r.o.
 
@@ -92150,6 +92999,9 @@ OUI:74238D*
 OUI:74249F*
  ID_OUI_FROM_DATABASE=TIBRO Corp.
 
+OUI:7424CA*
+ ID_OUI_FROM_DATABASE=Guangzhou Shiyuan Electronic Technology Company Limited
+
 OUI:7425840*
  ID_OUI_FROM_DATABASE=Alcon Wireless Private Limited
 
@@ -92288,6 +93140,9 @@ OUI:743400*
 OUI:74342B*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:743491*
+ ID_OUI_FROM_DATABASE=Shenzhen Kings IoT Co., Ltd
+
 OUI:7434AE*
  ID_OUI_FROM_DATABASE=this is engineering Inc.
 
@@ -92555,9 +93410,15 @@ OUI:7465D1*
 OUI:746630*
  ID_OUI_FROM_DATABASE=T:mi Ytti
 
+OUI:74675F*
+ ID_OUI_FROM_DATABASE=COMPAL INFORMATION(KUNSHAN)CO.,LTD.
+
 OUI:7467F7*
  ID_OUI_FROM_DATABASE=Extreme Networks Headquarters
 
+OUI:746859*
+ ID_OUI_FROM_DATABASE=SUNITEC TECHNOLOGY CO.,LIMITED
+
 OUI:74694A*
  ID_OUI_FROM_DATABASE=Sichuan Tianyi Comheart Telecom Co.,LTD
 
@@ -92645,6 +93506,9 @@ OUI:74765B*
 OUI:74767D*
  ID_OUI_FROM_DATABASE=shenzhen kexint technology co.,ltd
 
+OUI:747786*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:747818*
  ID_OUI_FROM_DATABASE=Jurumani Solutions
 
@@ -92801,6 +93665,9 @@ OUI:7493DA*
 OUI:74943D*
  ID_OUI_FROM_DATABASE=AgJunction
 
+OUI:749533*
+ ID_OUI_FROM_DATABASE=Westala Technologies Inc.
+
 OUI:749552*
  ID_OUI_FROM_DATABASE=Xuzhou WIKA Electronics Control Technology Co., Ltd.
 
@@ -92933,6 +93800,9 @@ OUI:74B00C*
 OUI:74B059*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
+OUI:74B3EA*
+ ID_OUI_FROM_DATABASE=EK INC.
+
 OUI:74B472*
  ID_OUI_FROM_DATABASE=CIESSE
 
@@ -93317,6 +94187,9 @@ OUI:74F2FA*
 OUI:74F413*
  ID_OUI_FROM_DATABASE=Maxwell Forest
 
+OUI:74F441*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:74F612*
  ID_OUI_FROM_DATABASE=Commscope
 
@@ -93482,6 +94355,9 @@ OUI:780AC7*
 OUI:780B8C*
  ID_OUI_FROM_DATABASE=Private
 
+OUI:780C71*
+ ID_OUI_FROM_DATABASE=Inseego Wireless, Inc
+
 OUI:780CB8*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -93494,6 +94370,9 @@ OUI:780ED1*
 OUI:780F77*
  ID_OUI_FROM_DATABASE=HangZhou Gubei Electronics Technology Co.,Ltd
 
+OUI:780F81*
+ ID_OUI_FROM_DATABASE=Cisco Meraki
+
 OUI:781053*
  ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
 
@@ -93692,6 +94571,9 @@ OUI:782AF8*
 OUI:782B46*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:782B60*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:782B64*
  ID_OUI_FROM_DATABASE=Bose Corporation
 
@@ -93743,6 +94625,9 @@ OUI:78321B*
 OUI:78324F*
  ID_OUI_FROM_DATABASE=Millennium Group, Inc.
 
+OUI:7833C6*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:783409*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -94208,6 +95093,51 @@ OUI:787689*
 OUI:7876D9*
  ID_OUI_FROM_DATABASE=EXARA Group
 
+OUI:7878350*
+ ID_OUI_FROM_DATABASE=ATsens
+
+OUI:7878351*
+ ID_OUI_FROM_DATABASE=ENQT GmbH
+
+OUI:7878352*
+ ID_OUI_FROM_DATABASE=EHTech (Beijing)Co., Ltd.
+
+OUI:7878353*
+ ID_OUI_FROM_DATABASE=SHENZHEN CHUANGWEI ELECTRONIC APPLIANCE TECH CO., LTD.
+
+OUI:7878354*
+ ID_OUI_FROM_DATABASE=Jiaxing Cyber Sensor Intelligent Technology Co., Ltd.
+
+OUI:7878355*
+ ID_OUI_FROM_DATABASE=IRISS Inc.
+
+OUI:7878356*
+ ID_OUI_FROM_DATABASE=MAICUN Information Technology(Shanghai)Co.,Ltd
+
+OUI:7878357*
+ ID_OUI_FROM_DATABASE=Ambient Life Inc.
+
+OUI:7878358*
+ ID_OUI_FROM_DATABASE=Shandong Xintong Electronics Co., Ltd
+
+OUI:7878359*
+ ID_OUI_FROM_DATABASE=BLOOM VIEW LIMITED
+
+OUI:787835A*
+ ID_OUI_FROM_DATABASE=Skylight
+
+OUI:787835B*
+ ID_OUI_FROM_DATABASE=Shanghai Intchains Technology Co., Ltd.
+
+OUI:787835C*
+ ID_OUI_FROM_DATABASE=DBG Communications Technology Co.,Ltd.
+
+OUI:787835D*
+ ID_OUI_FROM_DATABASE=Suzhou Chena Information Technology Co., Ltd.
+
+OUI:787835E*
+ ID_OUI_FROM_DATABASE=NEOARK Corporation
+
 OUI:787A6F*
  ID_OUI_FROM_DATABASE=Juice Technology AG
 
@@ -94313,6 +95243,9 @@ OUI:788DF7*
 OUI:788E33*
  ID_OUI_FROM_DATABASE=Jiangsu SEUIC Technology Co.,Ltd
 
+OUI:788E45*
+ ID_OUI_FROM_DATABASE=Jizaie inc.
+
 OUI:7890A2*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -94418,6 +95351,9 @@ OUI:78A13E*
 OUI:78A183*
  ID_OUI_FROM_DATABASE=Advidia
 
+OUI:78A1D8*
+ ID_OUI_FROM_DATABASE=ShenzhenEnjoyTechnologyCo.,Ltd
+
 OUI:78A2A0*
  ID_OUI_FROM_DATABASE=Nintendo Co., Ltd.
 
@@ -94559,6 +95495,9 @@ OUI:78BEB6*
 OUI:78BEBD*
  ID_OUI_FROM_DATABASE=STULZ GmbH
 
+OUI:78C11D*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:78C1A7*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -94649,6 +95588,9 @@ OUI:78C6BB*
 OUI:78C881*
  ID_OUI_FROM_DATABASE=Sony Interactive Entertainment Inc.
 
+OUI:78C884*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:78C95E*
  ID_OUI_FROM_DATABASE=Midmark RTLS
 
@@ -94724,6 +95666,9 @@ OUI:78CD55*
 OUI:78CD8E*
  ID_OUI_FROM_DATABASE=SMC Networks Inc
 
+OUI:78CEA5*
+ ID_OUI_FROM_DATABASE=Vital link vietnam company limited
+
 OUI:78CF2F*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -94898,6 +95843,9 @@ OUI:78DAB3*
 OUI:78DB2F*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:78DC87*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:78DD08*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
@@ -95195,6 +96143,9 @@ OUI:7C131D*
 OUI:7C1476*
  ID_OUI_FROM_DATABASE=Damall Technologies SAS
 
+OUI:7C152D*
+ ID_OUI_FROM_DATABASE=Renesas Electronics (Penang) Sdn. Bhd.
+
 OUI:7C160D*
  ID_OUI_FROM_DATABASE=Saia-Burgess Controls AG
 
@@ -95330,6 +96281,9 @@ OUI:7C310E*
 OUI:7C3180*
  ID_OUI_FROM_DATABASE=SMK corporation
 
+OUI:7C31FA*
+ ID_OUI_FROM_DATABASE=Silicon Laboratories
+
 OUI:7C336E*
  ID_OUI_FROM_DATABASE=MEG Electronics Inc.
 
@@ -95624,6 +96578,9 @@ OUI:7C67AB*
 OUI:7C68B9*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:7C692B*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:7C696B*
  ID_OUI_FROM_DATABASE=Atmosic Technologies
 
@@ -95801,9 +96758,15 @@ OUI:7C7B68*
 OUI:7C7B8B*
  ID_OUI_FROM_DATABASE=Control Concepts, Inc.
 
+OUI:7C7BBF*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:7C7BE4*
  ID_OUI_FROM_DATABASE=Z'SEDAI KENKYUSHO CORPORATION
 
+OUI:7C7D21*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:7C7D3D*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -96230,6 +97193,9 @@ OUI:7CC0AA*
 OUI:7CC177*
  ID_OUI_FROM_DATABASE=INGRAM MICRO SERVICES
 
+OUI:7CC178*
+ ID_OUI_FROM_DATABASE=Ericsson AB
+
 OUI:7CC180*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -96254,6 +97220,9 @@ OUI:7CC3A1*
 OUI:7CC4EF*
  ID_OUI_FROM_DATABASE=Devialet
 
+OUI:7CC518*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
 OUI:7CC537*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -96275,6 +97244,9 @@ OUI:7CC77E*
 OUI:7CC790*
  ID_OUI_FROM_DATABASE=Palo Alto Networks
 
+OUI:7CC882*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:7CC8AB*
  ID_OUI_FROM_DATABASE=Acro Associates, Inc.
 
@@ -96674,6 +97646,9 @@ OUI:8002F4D*
 OUI:8002F4E*
  ID_OUI_FROM_DATABASE=Alfred Systems Inc
 
+OUI:80030D*
+ ID_OUI_FROM_DATABASE=CANON INC.
+
 OUI:800384*
  ID_OUI_FROM_DATABASE=Ruckus Wireless
 
@@ -96755,6 +97730,9 @@ OUI:800E24*
 OUI:800EA9*
  ID_OUI_FROM_DATABASE=TCL Yuxin Zhixing Technology (Huizhou) Co.,Ltd
 
+OUI:801242*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:8012DF*
  ID_OUI_FROM_DATABASE=Shenzhen SuperElectron Technology Co.,Ltd.
 
@@ -96830,6 +97808,9 @@ OUI:8022A7*
 OUI:8022FA*
  ID_OUI_FROM_DATABASE=ITEL MOBILE LIMITED
 
+OUI:802395*
+ ID_OUI_FROM_DATABASE=AVM Audiovisuelles Marketing und Computersysteme GmbH
+
 OUI:80248F*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -96962,6 +97943,9 @@ OUI:803F5D*
 OUI:803FD6*
  ID_OUI_FROM_DATABASE=bytes at work AG
 
+OUI:804005*
+ ID_OUI_FROM_DATABASE=Guangdong COROS Sports Technology Co.,Ltd
+
 OUI:804126*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -97148,6 +98132,9 @@ OUI:806A00*
 OUI:806A10*
  ID_OUI_FROM_DATABASE=Whisker Labs - Ting
 
+OUI:806A34*
+ ID_OUI_FROM_DATABASE=Bouffalo Lab (Nanjing) Co., Ltd.
+
 OUI:806AB0*
  ID_OUI_FROM_DATABASE=Shenzhen TINNO Mobile Technology Corp.
 
@@ -97322,6 +98309,9 @@ OUI:808287*
 OUI:8082F5*
  ID_OUI_FROM_DATABASE=STMicrolectronics International NV
 
+OUI:8082FE*
+ ID_OUI_FROM_DATABASE=Arcadyan Corporation
+
 OUI:8083F6*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -97532,6 +98522,9 @@ OUI:80AD16*
 OUI:80AD67*
  ID_OUI_FROM_DATABASE=Kasda Networks Inc
 
+OUI:80AE3C*
+ ID_OUI_FROM_DATABASE=Taicang T&W Electronics
+
 OUI:80AE54*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
@@ -97715,6 +98708,9 @@ OUI:80D160*
 OUI:80D18B*
  ID_OUI_FROM_DATABASE=Hangzhou I'converge Technology Co.,Ltd
 
+OUI:80D1CE*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:80D21D*
  ID_OUI_FROM_DATABASE=AzureWave Technology Inc.
 
@@ -97826,6 +98822,9 @@ OUI:80E540*
 OUI:80E650*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:80E769*
+ ID_OUI_FROM_DATABASE=Realme Chongqing Mobile Telecommunications Corp.,Ltd.
+
 OUI:80E82C*
  ID_OUI_FROM_DATABASE=Hewlett Packard
 
@@ -97868,6 +98867,9 @@ OUI:80F0CF*
 OUI:80F1A4*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:80F1B2*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:80F1F1*
  ID_OUI_FROM_DATABASE=Tech4home, Lda
 
@@ -97967,6 +98969,9 @@ OUI:840B7C*
 OUI:840BBB*
  ID_OUI_FROM_DATABASE=MitraStar Technology Corp.
 
+OUI:840C6D*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:840D8E*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
@@ -98360,6 +99365,9 @@ OUI:845181*
 OUI:845234*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
+OUI:8453CD*
+ ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
+
 OUI:8454DF*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -98451,7 +99459,7 @@ OUI:846EB1*
  ID_OUI_FROM_DATABASE=Park Assist LLC
 
 OUI:846EBC*
- ID_OUI_FROM_DATABASE=Nokia solutions and networks Pvt Ltd
+ ID_OUI_FROM_DATABASE=Nokia Solutions and Networks India Private Limited
 
 OUI:846FCE*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
@@ -98729,6 +99737,9 @@ OUI:8493B2*
 OUI:849437*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:849459*
+ ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
+
 OUI:84948C*
  ID_OUI_FROM_DATABASE=Hitron Technologies. Inc
 
@@ -98759,6 +99770,9 @@ OUI:849CA4*
 OUI:849CA6*
  ID_OUI_FROM_DATABASE=Arcadyan Technology Corporation
 
+OUI:849D4B*
+ ID_OUI_FROM_DATABASE=Shenzhen Boomtech Industrial Corporation
+
 OUI:849D64*
  ID_OUI_FROM_DATABASE=SMC Corporation
 
@@ -98780,6 +99794,9 @@ OUI:84A06E*
 OUI:84A134*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:84A1B7*
+ ID_OUI_FROM_DATABASE=Honor Device Co., Ltd.
+
 OUI:84A1D1*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
@@ -99035,6 +100052,9 @@ OUI:84CD62*
 OUI:84CFBF*
  ID_OUI_FROM_DATABASE=Fairphone
 
+OUI:84D0DB*
+ ID_OUI_FROM_DATABASE=Guangdong Juan Intelligent Technology Joint Stock Co., Ltd.
+
 OUI:84D15A*
  ID_OUI_FROM_DATABASE=TCT mobile ltd
 
@@ -99392,6 +100412,9 @@ OUI:88123D*
 OUI:88124E*
  ID_OUI_FROM_DATABASE=Qualcomm Inc.
 
+OUI:88127D*
+ ID_OUI_FROM_DATABASE=Shenzhen Melon Electronics Co.,Ltd
+
 OUI:8812AC*
  ID_OUI_FROM_DATABASE=HUNAN FN-LINK TECHNOLOGY LIMITED
 
@@ -99527,6 +100550,9 @@ OUI:882E5A*
 OUI:882F64*
  ID_OUI_FROM_DATABASE=BCOM Networks Limited
 
+OUI:882F92*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:883037*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
@@ -99539,6 +100565,9 @@ OUI:88329B*
 OUI:883314*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:883374*
+ ID_OUI_FROM_DATABASE=ASKEY COMPUTER CORP
+
 OUI:8833BE*
  ID_OUI_FROM_DATABASE=Ivenix, Inc.
 
@@ -99734,12 +100763,21 @@ OUI:8853D4*
 OUI:88541F*
  ID_OUI_FROM_DATABASE=Google, Inc.
 
+OUI:88546B*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:88548E*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
+OUI:8856A6*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:88571D*
  ID_OUI_FROM_DATABASE=Seongji Industry Company
 
+OUI:885721*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:88576D*
  ID_OUI_FROM_DATABASE=XTA Electronics Ltd
 
@@ -100139,6 +101177,9 @@ OUI:8897DF*
 OUI:889821*
  ID_OUI_FROM_DATABASE=TERAON
 
+OUI:889AFF*
+ ID_OUI_FROM_DATABASE=SystemX Co.,Ltd.
+
 OUI:889B39*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -100385,6 +101426,9 @@ OUI:88B8D0*
 OUI:88B945*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:88B951*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:88BA7F*
  ID_OUI_FROM_DATABASE=Qfiednet Co., Ltd.
 
@@ -100574,6 +101618,9 @@ OUI:88D962*
 OUI:88D98F*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
+OUI:88DA04*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:88DA18*
  ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
 
@@ -100583,6 +101630,9 @@ OUI:88DA1A*
 OUI:88DA33*
  ID_OUI_FROM_DATABASE=Beijing Xiaoyuer Network Technology Co., Ltd
 
+OUI:88DA36*
+ ID_OUI_FROM_DATABASE=Calix Inc.
+
 OUI:88DC96*
  ID_OUI_FROM_DATABASE=EnGenius Technologies, Inc.
 
@@ -100736,6 +101786,9 @@ OUI:8C04FF*
 OUI:8C0551*
  ID_OUI_FROM_DATABASE=Koubachi AG
 
+OUI:8C0572*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:8C06CB*
  ID_OUI_FROM_DATABASE=Toradex AG
 
@@ -101003,6 +102056,9 @@ OUI:8C1F64001*
 OUI:8C1F64003*
  ID_OUI_FROM_DATABASE=Brighten Controls LLP
 
+OUI:8C1F64006*
+ ID_OUI_FROM_DATABASE=DUNASYS INGENIERIE
+
 OUI:8C1F64009*
  ID_OUI_FROM_DATABASE=Converging Systems Inc.
 
@@ -101039,6 +102095,9 @@ OUI:8C1F6401D*
 OUI:8C1F6401E*
  ID_OUI_FROM_DATABASE=SCIREQ Scientific Respiratory Equipment  Inc
 
+OUI:8C1F6401F*
+ ID_OUI_FROM_DATABASE=Dualcomm Technology, Inc.
+
 OUI:8C1F64020*
  ID_OUI_FROM_DATABASE=Utthunga Techologies Pvt Ltd
 
@@ -101129,6 +102188,9 @@ OUI:8C1F64055*
 OUI:8C1F64056*
  ID_OUI_FROM_DATABASE=DONG GUAN YUNG FU ELECTRONICS LTD.
 
+OUI:8C1F64057*
+ ID_OUI_FROM_DATABASE=Shenzhen Broadradio RFID Technology Co., Ltd
+
 OUI:8C1F64058*
  ID_OUI_FROM_DATABASE=MECT SRL
 
@@ -101150,6 +102212,9 @@ OUI:8C1F64061*
 OUI:8C1F64062*
  ID_OUI_FROM_DATABASE=ATON GREEN STORAGE SPA
 
+OUI:8C1F64063*
+ ID_OUI_FROM_DATABASE=Efftronics Systems (P) Ltd
+
 OUI:8C1F64066*
  ID_OUI_FROM_DATABASE=Siemens Energy Global GmbH & Co. KG
 
@@ -101174,8 +102239,11 @@ OUI:8C1F6406D*
 OUI:8C1F64071*
  ID_OUI_FROM_DATABASE=DORLET SAU
 
+OUI:8C1F64072*
+ ID_OUI_FROM_DATABASE=Eyecloud, Inc
+
 OUI:8C1F64073*
- ID_OUI_FROM_DATABASE=Potter Electric Signal Company
+ ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
 
 OUI:8C1F64076*
  ID_OUI_FROM_DATABASE=PACK'R
@@ -101309,6 +102377,9 @@ OUI:8C1F640B7*
 OUI:8C1F640B8*
  ID_OUI_FROM_DATABASE=Signatrol Ltd
 
+OUI:8C1F640B9*
+ ID_OUI_FROM_DATABASE=Newin Tech
+
 OUI:8C1F640BB*
  ID_OUI_FROM_DATABASE=InfraChen Technology Co., Ltd.
 
@@ -101342,6 +102413,9 @@ OUI:8C1F640CC*
 OUI:8C1F640CD*
  ID_OUI_FROM_DATABASE=DEUTA Werke GmbH
 
+OUI:8C1F640CE*
+ ID_OUI_FROM_DATABASE=Digitella Inc.
+
 OUI:8C1F640D2*
  ID_OUI_FROM_DATABASE=biosilver .co.,ltd
 
@@ -101486,6 +102560,9 @@ OUI:8C1F6411F*
 OUI:8C1F64121*
  ID_OUI_FROM_DATABASE=Hefei EverACQ Technology Co., LTD
 
+OUI:8C1F64123*
+ ID_OUI_FROM_DATABASE=GeneSys Elektronik GmbH
+
 OUI:8C1F64125*
  ID_OUI_FROM_DATABASE=Hangzhou Sciener Smart Technology Co., Ltd.
 
@@ -101549,8 +102626,11 @@ OUI:8C1F64148*
 OUI:8C1F64149*
  ID_OUI_FROM_DATABASE=Clock-O-Matic
 
+OUI:8C1F6414A*
+ ID_OUI_FROM_DATABASE=Richie Ltd
+
 OUI:8C1F6414B*
- ID_OUI_FROM_DATABASE=Potter Electric Signal Company
+ ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
 
 OUI:8C1F6414D*
  ID_OUI_FROM_DATABASE=Vertesz Elektronika Kft.
@@ -101603,6 +102683,9 @@ OUI:8C1F6416D*
 OUI:8C1F6416E*
  ID_OUI_FROM_DATABASE=Benchmark Electronics BV
 
+OUI:8C1F6416F*
+ ID_OUI_FROM_DATABASE=Codasip s.r.o.
+
 OUI:8C1F64170*
  ID_OUI_FROM_DATABASE=Fracarro Radioindustrie Srl
 
@@ -101669,6 +102752,9 @@ OUI:8C1F64197*
 OUI:8C1F64198*
  ID_OUI_FROM_DATABASE=REO AG
 
+OUI:8C1F64199*
+ ID_OUI_FROM_DATABASE=Shenzhen Arctec Innovation Technology Co.,Ltd
+
 OUI:8C1F6419B*
  ID_OUI_FROM_DATABASE=FeedFlo
 
@@ -101684,6 +102770,9 @@ OUI:8C1F641A5*
 OUI:8C1F641A7*
  ID_OUI_FROM_DATABASE=aelettronica group srl
 
+OUI:8C1F641A8*
+ ID_OUI_FROM_DATABASE=Private
+
 OUI:8C1F641AD*
  ID_OUI_FROM_DATABASE=Nexxto Servicos Em Tecnologia da Informacao SA
 
@@ -101753,6 +102842,9 @@ OUI:8C1F641D3*
 OUI:8C1F641D4*
  ID_OUI_FROM_DATABASE=Integer.pl S.A.
 
+OUI:8C1F641D5*
+ ID_OUI_FROM_DATABASE=Beijing Diwei Shuangxing Communication Technology Co., Ltd.
+
 OUI:8C1F641D6*
  ID_OUI_FROM_DATABASE=ZHEJIANG QIAN INFORMATION & TECHNOLOGIES
 
@@ -101810,6 +102902,12 @@ OUI:8C1F641F5*
 OUI:8C1F641F7*
  ID_OUI_FROM_DATABASE=Sicon srl
 
+OUI:8C1F641F9*
+ ID_OUI_FROM_DATABASE=TelecomWadi
+
+OUI:8C1F641FC*
+ ID_OUI_FROM_DATABASE=Yu Heng Electric CO. TD
+
 OUI:8C1F641FE*
  ID_OUI_FROM_DATABASE=Burk Technology
 
@@ -101828,6 +102926,9 @@ OUI:8C1F64206*
 OUI:8C1F64208*
  ID_OUI_FROM_DATABASE=Sichuan AnSphere Technology Co. Ltd.
 
+OUI:8C1F6420A*
+ ID_OUI_FROM_DATABASE=Oriux
+
 OUI:8C1F6420C*
  ID_OUI_FROM_DATABASE=Shanghai Stairmed Technology Co.,ltd
 
@@ -101873,6 +102974,9 @@ OUI:8C1F6422D*
 OUI:8C1F6422E*
  ID_OUI_FROM_DATABASE=Jide Car Rastreamento e Monitoramento LTDA
 
+OUI:8C1F64231*
+ ID_OUI_FROM_DATABASE=Shenzhen zhushida Technology lnformation Co.,Ltd
+
 OUI:8C1F64232*
  ID_OUI_FROM_DATABASE=Monnit Corporation
 
@@ -101915,6 +103019,9 @@ OUI:8C1F6424C*
 OUI:8C1F6424D*
  ID_OUI_FROM_DATABASE=XI'AN JIAODA KAIDA NEW TECHNOLOGY CO.LTD
 
+OUI:8C1F6424E*
+ ID_OUI_FROM_DATABASE=YUYAMA MFG Co.,Ltd
+
 OUI:8C1F64250*
  ID_OUI_FROM_DATABASE=ACCURATE OPTOELECTRONICS PVT. LTD.
 
@@ -101963,6 +103070,9 @@ OUI:8C1F64267*
 OUI:8C1F64268*
  ID_OUI_FROM_DATABASE=Astro Machine Corporation
 
+OUI:8C1F64269*
+ ID_OUI_FROM_DATABASE=Sicon srl
+
 OUI:8C1F6426B*
  ID_OUI_FROM_DATABASE=Profcon AB
 
@@ -101975,6 +103085,9 @@ OUI:8C1F6426F*
 OUI:8C1F64270*
  ID_OUI_FROM_DATABASE=Xi‘an Hangguang Satellite and Control Technology Co.,Ltd
 
+OUI:8C1F64271*
+ ID_OUI_FROM_DATABASE=Wuhan YiValley Opto-electric technology Co.,Ltd
+
 OUI:8C1F64272*
  ID_OUI_FROM_DATABASE=Comminent Pvt Ltd
 
@@ -101984,6 +103097,12 @@ OUI:8C1F64273*
 OUI:8C1F64274*
  ID_OUI_FROM_DATABASE=INVIXIUM ACCESS INC
 
+OUI:8C1F64275*
+ ID_OUI_FROM_DATABASE=IDA North America Inc.
+
+OUI:8C1F64277*
+ ID_OUI_FROM_DATABASE=Shenzhen Angstrom Excellence Technology Co., Ltd
+
 OUI:8C1F6427B*
  ID_OUI_FROM_DATABASE=Oriux
 
@@ -102041,6 +103160,9 @@ OUI:8C1F64295*
 OUI:8C1F64296*
  ID_OUI_FROM_DATABASE=Roog zhi tong Technology(Beijing) Co.,Ltd
 
+OUI:8C1F64297*
+ ID_OUI_FROM_DATABASE=IGEMA GmbH
+
 OUI:8C1F64298*
  ID_OUI_FROM_DATABASE=Megger Germany GmbH
 
@@ -102068,6 +103190,9 @@ OUI:8C1F642A1*
 OUI:8C1F642A2*
  ID_OUI_FROM_DATABASE=SERAP
 
+OUI:8C1F642A3*
+ ID_OUI_FROM_DATABASE=NSK Co.,Ltd.
+
 OUI:8C1F642A4*
  ID_OUI_FROM_DATABASE=YUYAMA MFG Co.,Ltd
 
@@ -102119,6 +103244,9 @@ OUI:8C1F642C2*
 OUI:8C1F642C3*
  ID_OUI_FROM_DATABASE=TeraDiode / Panasonic
 
+OUI:8C1F642C4*
+ ID_OUI_FROM_DATABASE=Xylon
+
 OUI:8C1F642C5*
  ID_OUI_FROM_DATABASE=SYSN
 
@@ -102170,6 +103298,9 @@ OUI:8C1F642E2*
 OUI:8C1F642E3*
  ID_OUI_FROM_DATABASE=Erba Lachema s.r.o.
 
+OUI:8C1F642E4*
+ ID_OUI_FROM_DATABASE=Vision Systems Safety Tech
+
 OUI:8C1F642E5*
  ID_OUI_FROM_DATABASE=GS Elektromedizinsiche Geräte G. Stemple GmbH
 
@@ -102258,7 +103389,7 @@ OUI:8C1F64314*
  ID_OUI_FROM_DATABASE=Cedel BV
 
 OUI:8C1F64316*
- ID_OUI_FROM_DATABASE=Potter Electric Signal Company
+ ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
 
 OUI:8C1F64317*
  ID_OUI_FROM_DATABASE=Bacancy Systems LLP
@@ -102434,6 +103565,12 @@ OUI:8C1F64377*
 OUI:8C1F64378*
  ID_OUI_FROM_DATABASE=spar Power Technologies Inc.
 
+OUI:8C1F6437B*
+ ID_OUI_FROM_DATABASE=MITSUBISHI ELECTRIC INDIA PVT. LTD.
+
+OUI:8C1F6437D*
+ ID_OUI_FROM_DATABASE=Season Electronics Ltd
+
 OUI:8C1F6437E*
  ID_OUI_FROM_DATABASE=SIDUS Solutions, LLC
 
@@ -102605,6 +103742,9 @@ OUI:8C1F643D4*
 OUI:8C1F643D5*
  ID_OUI_FROM_DATABASE=FRAKO Kondensatoren- und Anlagenbau GmbH
 
+OUI:8C1F643D7*
+ ID_OUI_FROM_DATABASE=Eiden Co.,Ltd.
+
 OUI:8C1F643D9*
  ID_OUI_FROM_DATABASE=Unlimited Bandwidth LLC
 
@@ -102635,12 +103775,18 @@ OUI:8C1F643E9*
 OUI:8C1F643EA*
  ID_OUI_FROM_DATABASE=CHIPSCAPE SECURITY SYSTEMS
 
+OUI:8C1F643EB*
+ ID_OUI_FROM_DATABASE=Samwell International Inc
+
 OUI:8C1F643ED*
  ID_OUI_FROM_DATABASE=The Exploration Company
 
 OUI:8C1F643EE*
  ID_OUI_FROM_DATABASE=BnB Information Technology
 
+OUI:8C1F643F2*
+ ID_OUI_FROM_DATABASE=SURYA ELECTRONICS
+
 OUI:8C1F643F3*
  ID_OUI_FROM_DATABASE=Cambrian Works, Inc.
 
@@ -102695,6 +103841,9 @@ OUI:8C1F64412*
 OUI:8C1F64414*
  ID_OUI_FROM_DATABASE=INSEVIS GmbH
 
+OUI:8C1F64415*
+ ID_OUI_FROM_DATABASE=OnAsset Intelligence
+
 OUI:8C1F64417*
  ID_OUI_FROM_DATABASE=Fracarro srl
 
@@ -102737,6 +103886,9 @@ OUI:8C1F6442A*
 OUI:8C1F6442B*
  ID_OUI_FROM_DATABASE=Gamber Johnson-LLC
 
+OUI:8C1F6442D*
+ ID_OUI_FROM_DATABASE=Jemac Sweden AB
+
 OUI:8C1F6442F*
  ID_OUI_FROM_DATABASE=Tomorrow Companies Inc
 
@@ -102765,7 +103917,7 @@ OUI:8C1F64441*
  ID_OUI_FROM_DATABASE=Novanta IMS
 
 OUI:8C1F64442*
- ID_OUI_FROM_DATABASE=Potter Electric Signal Co LLC
+ ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
 
 OUI:8C1F64444*
  ID_OUI_FROM_DATABASE=Contrive Srl
@@ -102794,12 +103946,21 @@ OUI:8C1F64454*
 OUI:8C1F64457*
  ID_OUI_FROM_DATABASE=SHANGHAI ANGWEI INFORMATION TECHNOLOGY CO.,LTD.
 
+OUI:8C1F64459*
+ ID_OUI_FROM_DATABASE=GreenTally LLC
+
+OUI:8C1F6445A*
+ ID_OUI_FROM_DATABASE=Inspur Digital Enterprise Technology Co., Ltd.
+
 OUI:8C1F6445B*
  ID_OUI_FROM_DATABASE=Beijing Aoxing Technology Co.,Ltd
 
 OUI:8C1F6445D*
  ID_OUI_FROM_DATABASE=Fuzhou Tucsen Photonics Co.,Ltd
 
+OUI:8C1F6445E*
+ ID_OUI_FROM_DATABASE=Hangzhou Zhongchuan Digital Equipment Co., Ltd.
+
 OUI:8C1F6445F*
  ID_OUI_FROM_DATABASE=Toshniwal Security Solutions Pvt Ltd
 
@@ -102878,6 +104039,9 @@ OUI:8C1F64489*
 OUI:8C1F6448B*
  ID_OUI_FROM_DATABASE=Monnit Corporation
 
+OUI:8C1F6448C*
+ ID_OUI_FROM_DATABASE=Electronic Equipment Company Pvt. Ltd.
+
 OUI:8C1F6448D*
  ID_OUI_FROM_DATABASE=Private
 
@@ -102893,6 +104057,9 @@ OUI:8C1F64495*
 OUI:8C1F64496*
  ID_OUI_FROM_DATABASE=QUALSEN(GUANGZHOU)TECHNOLOGIES CO.,LTD
 
+OUI:8C1F64497*
+ ID_OUI_FROM_DATABASE=Primalucelab S.p.A.
+
 OUI:8C1F64498*
  ID_OUI_FROM_DATABASE=YUYAMA MFG Co.,Ltd
 
@@ -102917,6 +104084,9 @@ OUI:8C1F644A1*
 OUI:8C1F644A2*
  ID_OUI_FROM_DATABASE=Bludigit SpA
 
+OUI:8C1F644A4*
+ ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
+
 OUI:8C1F644A6*
  ID_OUI_FROM_DATABASE=Alaire Technologies Inc
 
@@ -102944,6 +104114,9 @@ OUI:8C1F644AF*
 OUI:8C1F644B0*
  ID_OUI_FROM_DATABASE=U -MEI-DAH INT'L ENTERPRISE CO.,LTD.
 
+OUI:8C1F644B2*
+ ID_OUI_FROM_DATABASE=GV Technology Co.,Ltd.
+
 OUI:8C1F644B4*
  ID_OUI_FROM_DATABASE=Point One Navigation
 
@@ -103004,6 +104177,9 @@ OUI:8C1F644DC*
 OUI:8C1F644DD*
  ID_OUI_FROM_DATABASE=Griffyn Robotech Private Limited
 
+OUI:8C1F644DF*
+ ID_OUI_FROM_DATABASE=EMRI
+
 OUI:8C1F644E0*
  ID_OUI_FROM_DATABASE=PuS GmbH und Co. KG
 
@@ -103040,6 +104216,9 @@ OUI:8C1F644F0*
 OUI:8C1F644F1*
  ID_OUI_FROM_DATABASE=Abbott Diagnostics Technologies AS
 
+OUI:8C1F644F2*
+ ID_OUI_FROM_DATABASE=Automation Displays Inc.
+
 OUI:8C1F644F4*
  ID_OUI_FROM_DATABASE=Staco Energy Products
 
@@ -103073,6 +104252,12 @@ OUI:8C1F64503*
 OUI:8C1F64504*
  ID_OUI_FROM_DATABASE=EA Elektroautomatik GmbH & Co. KG
 
+OUI:8C1F64506*
+ ID_OUI_FROM_DATABASE=UrbanChain Group Co., Ltd
+
+OUI:8C1F64508*
+ ID_OUI_FROM_DATABASE=Kite Rise Technologies GmbH
+
 OUI:8C1F64509*
  ID_OUI_FROM_DATABASE=Season Electronics Ltd
 
@@ -103130,6 +104315,9 @@ OUI:8C1F64524*
 OUI:8C1F64525*
  ID_OUI_FROM_DATABASE=United States Technologies Inc.
 
+OUI:8C1F64526*
+ ID_OUI_FROM_DATABASE=CAITRON GmbH
+
 OUI:8C1F64527*
  ID_OUI_FROM_DATABASE=PDW
 
@@ -103145,6 +104333,9 @@ OUI:8C1F6452E*
 OUI:8C1F64530*
  ID_OUI_FROM_DATABASE=SIPazon AB
 
+OUI:8C1F64533*
+ ID_OUI_FROM_DATABASE=Boeing India Private Limited
+
 OUI:8C1F64534*
  ID_OUI_FROM_DATABASE=SURYA ELECTRONICS
 
@@ -103269,23 +104460,29 @@ OUI:8C1F64574*
  ID_OUI_FROM_DATABASE=Flock Audio Inc.
 
 OUI:8C1F64575*
- ID_OUI_FROM_DATABASE=Yu-Heng Electric Co., LTD
+ ID_OUI_FROM_DATABASE=Yu Heng Electric CO. TD
 
 OUI:8C1F6457A*
  ID_OUI_FROM_DATABASE=NPO ECO-INTECH Ltd.
 
 OUI:8C1F6457B*
- ID_OUI_FROM_DATABASE=Potter Electric Signal Company
+ ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
 
 OUI:8C1F6457D*
  ID_OUI_FROM_DATABASE=ISDI Ltd
 
+OUI:8C1F6457E*
+ ID_OUI_FROM_DATABASE=Guoqing (shangdong) Information Technology Co.,Ltd
+
 OUI:8C1F64580*
  ID_OUI_FROM_DATABASE=SAKURA SEIKI Co., Ltd.
 
 OUI:8C1F64581*
  ID_OUI_FROM_DATABASE=SpectraDynamics, Inc.
 
+OUI:8C1F64583*
+ ID_OUI_FROM_DATABASE=3Egreen tech. Co. Ltd.
+
 OUI:8C1F64585*
  ID_OUI_FROM_DATABASE=Shanghai DIDON Industry Co,. Ltd.
 
@@ -103307,6 +104504,9 @@ OUI:8C1F64591*
 OUI:8C1F64593*
  ID_OUI_FROM_DATABASE=Brillian Network & Automation Integrated System Co., Ltd.
 
+OUI:8C1F64595*
+ ID_OUI_FROM_DATABASE=Inspinia Technology s.r.o.
+
 OUI:8C1F64596*
  ID_OUI_FROM_DATABASE=RF Code
 
@@ -103325,6 +104525,9 @@ OUI:8C1F6459F*
 OUI:8C1F645A0*
  ID_OUI_FROM_DATABASE=SEONGWON ENG CO.,LTD
 
+OUI:8C1F645A1*
+ ID_OUI_FROM_DATABASE=Breas Medical AB
+
 OUI:8C1F645A4*
  ID_OUI_FROM_DATABASE=DAVE SRL
 
@@ -103469,6 +104672,9 @@ OUI:8C1F645EB*
 OUI:8C1F645EC*
  ID_OUI_FROM_DATABASE=NV BEKAERT SA
 
+OUI:8C1F645ED*
+ ID_OUI_FROM_DATABASE=DEUTA Werke GmbH
+
 OUI:8C1F645F1*
  ID_OUI_FROM_DATABASE=HD Link Co., Ltd.
 
@@ -103505,6 +104711,9 @@ OUI:8C1F64603*
 OUI:8C1F64605*
  ID_OUI_FROM_DATABASE=Xacti Corporation
 
+OUI:8C1F64607*
+ ID_OUI_FROM_DATABASE=Nanjing Aotong Intelligent Technology Co.,Ltd
+
 OUI:8C1F64608*
  ID_OUI_FROM_DATABASE=CONG TY CO PHAN KY THUAT MOI TRUONG VIET AN
 
@@ -103559,6 +104768,9 @@ OUI:8C1F64625*
 OUI:8C1F64626*
  ID_OUI_FROM_DATABASE=CSIRO
 
+OUI:8C1F64627*
+ ID_OUI_FROM_DATABASE=ibg Prüfcomputer GmbH
+
 OUI:8C1F6462C*
  ID_OUI_FROM_DATABASE=Hangzhou EasyXR Advanced Technology Co., Ltd.
 
@@ -103709,12 +104921,18 @@ OUI:8C1F64683*
 OUI:8C1F64685*
  ID_OUI_FROM_DATABASE=Sanchar Wireless Communications Ltd
 
+OUI:8C1F64686*
+ ID_OUI_FROM_DATABASE=Pazzk
+
 OUI:8C1F64687*
  ID_OUI_FROM_DATABASE=Lamontec
 
 OUI:8C1F6468C*
  ID_OUI_FROM_DATABASE=GuangZhou HOKO Electric CO.,LTD
 
+OUI:8C1F6468E*
+ ID_OUI_FROM_DATABASE=Oriental Electronics, Inc.
+
 OUI:8C1F64691*
  ID_OUI_FROM_DATABASE=Wende Tan
 
@@ -103757,6 +104975,9 @@ OUI:8C1F646A3*
 OUI:8C1F646A4*
  ID_OUI_FROM_DATABASE=Automata Spa
 
+OUI:8C1F646A6*
+ ID_OUI_FROM_DATABASE=Q (Cue), Inc.
+
 OUI:8C1F646A8*
  ID_OUI_FROM_DATABASE=Bulwark
 
@@ -103764,7 +104985,7 @@ OUI:8C1F646AB*
  ID_OUI_FROM_DATABASE=Toho System Co., Ltd.
 
 OUI:8C1F646AD*
- ID_OUI_FROM_DATABASE=Potter Electric Signal Company
+ ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
 
 OUI:8C1F646AE*
  ID_OUI_FROM_DATABASE=Bray International
@@ -103802,12 +105023,18 @@ OUI:8C1F646BD*
 OUI:8C1F646BF*
  ID_OUI_FROM_DATABASE=Automata GmbH & Co. KG
 
+OUI:8C1F646C1*
+ ID_OUI_FROM_DATABASE=Guangzhou Vannove Technology Co., Ltd
+
 OUI:8C1F646C6*
  ID_OUI_FROM_DATABASE=FIT
 
 OUI:8C1F646C8*
  ID_OUI_FROM_DATABASE=Taiko Audio B.V.
 
+OUI:8C1F646CA*
+ ID_OUI_FROM_DATABASE=Melissa Climate Jsc
+
 OUI:8C1F646CB*
  ID_OUI_FROM_DATABASE=GJD Manufacturing
 
@@ -103818,7 +105045,7 @@ OUI:8C1F646CD*
  ID_OUI_FROM_DATABASE=Wuhan Xingtuxinke ELectronic Co.,Ltd
 
 OUI:8C1F646CE*
- ID_OUI_FROM_DATABASE=Potter Electric Signal Company
+ ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
 
 OUI:8C1F646CF*
  ID_OUI_FROM_DATABASE=Italora
@@ -103826,6 +105053,9 @@ OUI:8C1F646CF*
 OUI:8C1F646D0*
  ID_OUI_FROM_DATABASE=ABB
 
+OUI:8C1F646D1*
+ ID_OUI_FROM_DATABASE=Smith meter Inc
+
 OUI:8C1F646D2*
  ID_OUI_FROM_DATABASE=VectorNav Technologies
 
@@ -103868,6 +105098,9 @@ OUI:8C1F646E4*
 OUI:8C1F646E7*
  ID_OUI_FROM_DATABASE=WiTricity Corporation
 
+OUI:8C1F646E9*
+ ID_OUI_FROM_DATABASE=SHENZHEN sunforest Co.LTD
+
 OUI:8C1F646EA*
  ID_OUI_FROM_DATABASE=KMtronic ltd
 
@@ -103937,6 +105170,9 @@ OUI:8C1F64715*
 OUI:8C1F64718*
  ID_OUI_FROM_DATABASE=ABB
 
+OUI:8C1F64719*
+ ID_OUI_FROM_DATABASE=delResearch, LLC
+
 OUI:8C1F6471A*
  ID_OUI_FROM_DATABASE=Chell Instruments Ltd
 
@@ -104015,6 +105251,9 @@ OUI:8C1F6473F*
 OUI:8C1F64740*
  ID_OUI_FROM_DATABASE=Norvento Tecnología, S.L.
 
+OUI:8C1F64741*
+ ID_OUI_FROM_DATABASE=TRATON AB
+
 OUI:8C1F64743*
  ID_OUI_FROM_DATABASE=Rosenxt Technology USA
 
@@ -104039,6 +105278,9 @@ OUI:8C1F6474B*
 OUI:8C1F6474E*
  ID_OUI_FROM_DATABASE=OpenPark Technologies Kft
 
+OUI:8C1F64750*
+ ID_OUI_FROM_DATABASE=Coral Infratel Pvt Ltd
+
 OUI:8C1F64751*
  ID_OUI_FROM_DATABASE=CITSA Technologies Private Limited
 
@@ -104063,6 +105305,9 @@ OUI:8C1F6475F*
 OUI:8C1F64760*
  ID_OUI_FROM_DATABASE=Q-Light AS
 
+OUI:8C1F64761*
+ ID_OUI_FROM_DATABASE=BOE Smart IoT Technology Co.,Ltd
+
 OUI:8C1F64762*
  ID_OUI_FROM_DATABASE=Support Professionals B.V.
 
@@ -104135,6 +105380,9 @@ OUI:8C1F6477F*
 OUI:8C1F64780*
  ID_OUI_FROM_DATABASE=HME Co.,ltd
 
+OUI:8C1F64781*
+ ID_OUI_FROM_DATABASE=Druck Ltd.
+
 OUI:8C1F64782*
  ID_OUI_FROM_DATABASE=ATM LLC
 
@@ -104181,7 +105429,7 @@ OUI:8C1F647A4*
  ID_OUI_FROM_DATABASE=Hirotech inc.
 
 OUI:8C1F647A5*
- ID_OUI_FROM_DATABASE=Potter Electric Signal Company
+ ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
 
 OUI:8C1F647A6*
  ID_OUI_FROM_DATABASE=OTMetric
@@ -104228,9 +105476,15 @@ OUI:8C1F647BB*
 OUI:8C1F647BC*
  ID_OUI_FROM_DATABASE=GO development GmbH
 
+OUI:8C1F647BE*
+ ID_OUI_FROM_DATABASE=inomatic GmbH
+
 OUI:8C1F647C2*
  ID_OUI_FROM_DATABASE=CTI Intl Solutions
 
+OUI:8C1F647C4*
+ ID_OUI_FROM_DATABASE=MB connect line GmbH
+
 OUI:8C1F647C6*
  ID_OUI_FROM_DATABASE=Flextronics International Kft
 
@@ -104249,6 +105503,9 @@ OUI:8C1F647CE*
 OUI:8C1F647CF*
  ID_OUI_FROM_DATABASE=Transdigital Pty Ltd
 
+OUI:8C1F647D0*
+ ID_OUI_FROM_DATABASE=Tecsys do Brasil Industrial Ltda
+
 OUI:8C1F647D2*
  ID_OUI_FROM_DATABASE=Enlaps
 
@@ -104273,6 +105530,9 @@ OUI:8C1F647D9*
 OUI:8C1F647DA*
  ID_OUI_FROM_DATABASE=Xpti Tecnologias em Segurança Ltda
 
+OUI:8C1F647DB*
+ ID_OUI_FROM_DATABASE=Raco Universal Technology Co., Ltd.
+
 OUI:8C1F647DC*
  ID_OUI_FROM_DATABASE=LINEAGE POWER PVT LTD.,
 
@@ -104330,6 +105590,9 @@ OUI:8C1F647F4*
 OUI:8C1F647F8*
  ID_OUI_FROM_DATABASE=FleetSafe India Private Limited
 
+OUI:8C1F647F9*
+ ID_OUI_FROM_DATABASE=COPELION INTERNATIONAL INC
+
 OUI:8C1F647FC*
  ID_OUI_FROM_DATABASE=Mitsubishi Electric Klimat Transportation Systems S.p.A.
 
@@ -104390,6 +105653,9 @@ OUI:8C1F64819*
 OUI:8C1F6481A*
  ID_OUI_FROM_DATABASE=Gemini Electronics B.V.
 
+OUI:8C1F6481B*
+ ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
+
 OUI:8C1F6481D*
  ID_OUI_FROM_DATABASE=Gogo BA
 
@@ -104483,6 +105749,9 @@ OUI:8C1F64857*
 OUI:8C1F64858*
  ID_OUI_FROM_DATABASE=SFERA srl
 
+OUI:8C1F6485A*
+ ID_OUI_FROM_DATABASE=ENBIK Technology Co., Ltd
+
 OUI:8C1F6485B*
  ID_OUI_FROM_DATABASE=Atlantic Pumps Ltd
 
@@ -104492,6 +105761,9 @@ OUI:8C1F6485C*
 OUI:8C1F6485E*
  ID_OUI_FROM_DATABASE=Apen Group S.p.A.  (VAT IT08767740155)
 
+OUI:8C1F6485F*
+ ID_OUI_FROM_DATABASE=NEC Asia Pacific Pte Ltd
+
 OUI:8C1F64863*
  ID_OUI_FROM_DATABASE=EngiNe srl
 
@@ -104519,6 +105791,9 @@ OUI:8C1F6486C*
 OUI:8C1F6486F*
  ID_OUI_FROM_DATABASE=NewEdge Signal Solutions LLC
 
+OUI:8C1F64870*
+ ID_OUI_FROM_DATABASE=Chengdu Xiuwei TechnologyDevelopment Co., Ltd
+
 OUI:8C1F64871*
  ID_OUI_FROM_DATABASE=ENTE Sp. z o.o.
 
@@ -104553,7 +105828,7 @@ OUI:8C1F64883*
  ID_OUI_FROM_DATABASE=DEUTA-WERKE GmbH
 
 OUI:8C1F64888*
- ID_OUI_FROM_DATABASE=HWASUNG
+ ID_OUI_FROM_DATABASE=NARI TECH Co., Ltd
 
 OUI:8C1F64889*
  ID_OUI_FROM_DATABASE=Private
@@ -104624,6 +105899,9 @@ OUI:8C1F648AE*
 OUI:8C1F648AF*
  ID_OUI_FROM_DATABASE=Ibeos
 
+OUI:8C1F648B1*
+ ID_OUI_FROM_DATABASE=Viewpixel Pvt. Ltd.
+
 OUI:8C1F648B2*
  ID_OUI_FROM_DATABASE=Abbott Diagnostics Technologies AS
 
@@ -104699,6 +105977,9 @@ OUI:8C1F648D9*
 OUI:8C1F648DA*
  ID_OUI_FROM_DATABASE=Dart Systems Ltd
 
+OUI:8C1F648DB*
+ ID_OUI_FROM_DATABASE=Taesung Media
+
 OUI:8C1F648DE*
  ID_OUI_FROM_DATABASE=Iconet Services
 
@@ -104735,6 +106016,9 @@ OUI:8C1F648EC*
 OUI:8C1F648EE*
  ID_OUI_FROM_DATABASE=Abbott Diagnostics Technologies AS
 
+OUI:8C1F648F0*
+ ID_OUI_FROM_DATABASE=IGL
+
 OUI:8C1F648F4*
  ID_OUI_FROM_DATABASE=Loadrite (Auckland) Limited
 
@@ -104751,7 +106035,7 @@ OUI:8C1F648FB*
  ID_OUI_FROM_DATABASE=Televic Rail GmbH
 
 OUI:8C1F648FE*
- ID_OUI_FROM_DATABASE=Potter Electric Signal Company
+ ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
 
 OUI:8C1F648FF*
  ID_OUI_FROM_DATABASE=Kruger DB Series Indústria Eletrônica ltda
@@ -104804,6 +106088,9 @@ OUI:8C1F64913*
 OUI:8C1F64914*
  ID_OUI_FROM_DATABASE=MITOMI GIKEN CO.,LTD
 
+OUI:8C1F64916*
+ ID_OUI_FROM_DATABASE=Sept-S
+
 OUI:8C1F64918*
  ID_OUI_FROM_DATABASE=Abbott Diagnostics Technologies AS
 
@@ -104925,7 +106212,7 @@ OUI:8C1F64964*
  ID_OUI_FROM_DATABASE=Power Electronics Espana, S.L.
 
 OUI:8C1F64965*
- ID_OUI_FROM_DATABASE=Potter Electric Signal Company
+ ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
 
 OUI:8C1F64966*
  ID_OUI_FROM_DATABASE=Raster Images Pvt. Ltd
@@ -104939,6 +106226,9 @@ OUI:8C1F64968*
 OUI:8C1F6496A*
  ID_OUI_FROM_DATABASE=EA Elektro-Automatik GmbH
 
+OUI:8C1F6496B*
+ ID_OUI_FROM_DATABASE=Vantageo Private Limited
+
 OUI:8C1F64970*
  ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
 
@@ -105017,6 +106307,9 @@ OUI:8C1F649A1*
 OUI:8C1F649A2*
  ID_OUI_FROM_DATABASE=LadyBug Technologies, LLC
 
+OUI:8C1F649A3*
+ ID_OUI_FROM_DATABASE=Fortus
+
 OUI:8C1F649A4*
  ID_OUI_FROM_DATABASE=LabLogic Systems
 
@@ -105104,6 +106397,9 @@ OUI:8C1F649D4*
 OUI:8C1F649D8*
  ID_OUI_FROM_DATABASE=Integer.pl S.A.
 
+OUI:8C1F649D9*
+ ID_OUI_FROM_DATABASE=EPC Power Corporation
+
 OUI:8C1F649DB*
  ID_OUI_FROM_DATABASE=HD Renewable Energy Co.,Ltd
 
@@ -105227,6 +106523,9 @@ OUI:8C1F64A1C*
 OUI:8C1F64A1F*
  ID_OUI_FROM_DATABASE=Hitachi Energy  India Limited
 
+OUI:8C1F64A20*
+ ID_OUI_FROM_DATABASE=Intenseye Inc.
+
 OUI:8C1F64A26*
  ID_OUI_FROM_DATABASE=Automatic Pty Ltd
 
@@ -105242,6 +106541,12 @@ OUI:8C1F64A2B*
 OUI:8C1F64A2D*
  ID_OUI_FROM_DATABASE=ACSL Ltd.
 
+OUI:8C1F64A2E*
+ ID_OUI_FROM_DATABASE=EA Elektro-Automatik GmbH
+
+OUI:8C1F64A2F*
+ ID_OUI_FROM_DATABASE=AMC Europe Kft.
+
 OUI:8C1F64A30*
  ID_OUI_FROM_DATABASE=TMP Srl
 
@@ -105284,6 +106589,9 @@ OUI:8C1F64A42*
 OUI:8C1F64A44*
  ID_OUI_FROM_DATABASE=Rapidev Pvt Ltd
 
+OUI:8C1F64A45*
+ ID_OUI_FROM_DATABASE=U -MEI-DAH INT'L ENTERPRISE CO.,LTD.
+
 OUI:8C1F64A47*
  ID_OUI_FROM_DATABASE=Saarni Cloud Oy
 
@@ -105422,6 +106730,9 @@ OUI:8C1F64A9B*
 OUI:8C1F64A9C*
  ID_OUI_FROM_DATABASE=Upstart Power
 
+OUI:8C1F64A9D*
+ ID_OUI_FROM_DATABASE=Aegex Technologies LLC Magyarországi Fióktelepe
+
 OUI:8C1F64A9E*
  ID_OUI_FROM_DATABASE=Optimum Instruments Inc.
 
@@ -105623,6 +106934,9 @@ OUI:8C1F64B13*
 OUI:8C1F64B14*
  ID_OUI_FROM_DATABASE=Murata Manufacturing CO., Ltd.
 
+OUI:8C1F64B15*
+ ID_OUI_FROM_DATABASE=Pneumax Spa
+
 OUI:8C1F64B17*
  ID_OUI_FROM_DATABASE=DAT Informatics Pvt Ltd
 
@@ -105638,6 +106952,9 @@ OUI:8C1F64B1B*
 OUI:8C1F64B1D*
  ID_OUI_FROM_DATABASE=Tocho Marking Systems America, Inc
 
+OUI:8C1F64B1F*
+ ID_OUI_FROM_DATABASE=wincker international enterprise co., ltd
+
 OUI:8C1F64B20*
  ID_OUI_FROM_DATABASE=Lechpol Electronics Spółka z o.o. Sp.k.
 
@@ -105665,6 +106982,9 @@ OUI:8C1F64B2B*
 OUI:8C1F64B2C*
  ID_OUI_FROM_DATABASE=SANMINA ISRAEL MEDICAL SYSTEMS LTD
 
+OUI:8C1F64B2D*
+ ID_OUI_FROM_DATABASE=wonder meditec
+
 OUI:8C1F64B2F*
  ID_OUI_FROM_DATABASE=Mtechnology - Gamma Commerciale Srl
 
@@ -105692,6 +107012,9 @@ OUI:8C1F64B3D*
 OUI:8C1F64B3F*
  ID_OUI_FROM_DATABASE=Fell Technology AS
 
+OUI:8C1F64B41*
+ ID_OUI_FROM_DATABASE=STATE GRID INTELLIGENCE TECHNOLOGY CO.,LTD.
+
 OUI:8C1F64B46*
  ID_OUI_FROM_DATABASE=PHYGITALL SOLUÇÕES EM INTERNET DAS COISAS
 
@@ -105743,6 +107066,9 @@ OUI:8C1F64B68*
 OUI:8C1F64B69*
  ID_OUI_FROM_DATABASE=Quanxing Tech Co.,LTD
 
+OUI:8C1F64B6A*
+ ID_OUI_FROM_DATABASE=Mobileye Vision Technologies LTD
+
 OUI:8C1F64B6B*
  ID_OUI_FROM_DATABASE=KELC Electronics System Co., LTD.
 
@@ -105821,6 +107147,9 @@ OUI:8C1F64B92*
 OUI:8C1F64B93*
  ID_OUI_FROM_DATABASE=Modern Server Solutions LLP
 
+OUI:8C1F64B96*
+ ID_OUI_FROM_DATABASE=Observable Space
+
 OUI:8C1F64B97*
  ID_OUI_FROM_DATABASE=Gemini Electronics B.V.
 
@@ -105860,6 +107189,9 @@ OUI:8C1F64BA7*
 OUI:8C1F64BA8*
  ID_OUI_FROM_DATABASE=AvMap srlu
 
+OUI:8C1F64BA9*
+ ID_OUI_FROM_DATABASE=Beijing Fuzheng Transportation Technology Co., Ltd
+
 OUI:8C1F64BAA*
  ID_OUI_FROM_DATABASE=Mine Vision Systems
 
@@ -105902,6 +107234,9 @@ OUI:8C1F64BB8*
 OUI:8C1F64BB9*
  ID_OUI_FROM_DATABASE=SmartD Technologies Inc
 
+OUI:8C1F64BBA*
+ ID_OUI_FROM_DATABASE=elysia GmbH
+
 OUI:8C1F64BBC*
  ID_OUI_FROM_DATABASE=Liberator Pty Ltd
 
@@ -106052,6 +107387,9 @@ OUI:8C1F64C07*
 OUI:8C1F64C08*
  ID_OUI_FROM_DATABASE=Triamec Motion AG
 
+OUI:8C1F64C09*
+ ID_OUI_FROM_DATABASE=S.E.I. CO.,LTD.
+
 OUI:8C1F64C0A*
  ID_OUI_FROM_DATABASE=ACROLABS,INC
 
@@ -106076,6 +107414,9 @@ OUI:8C1F64C16*
 OUI:8C1F64C17*
  ID_OUI_FROM_DATABASE=Metreg Technologies GmbH
 
+OUI:8C1F64C19*
+ ID_OUI_FROM_DATABASE=OOO Mig Trading
+
 OUI:8C1F64C1A*
  ID_OUI_FROM_DATABASE=ViewSonic Corp
 
@@ -106091,6 +107432,9 @@ OUI:8C1F64C1E*
 OUI:8C1F64C1F*
  ID_OUI_FROM_DATABASE=Esys Srl
 
+OUI:8C1F64C22*
+ ID_OUI_FROM_DATABASE=Pulcro.io LLC
+
 OUI:8C1F64C24*
  ID_OUI_FROM_DATABASE=Alifax S.r.l.
 
@@ -106112,9 +107456,15 @@ OUI:8C1F64C2D*
 OUI:8C1F64C2F*
  ID_OUI_FROM_DATABASE=Power Electronics Espana, S.L.
 
+OUI:8C1F64C31*
+ ID_OUI_FROM_DATABASE=Ambarella Inc.
+
 OUI:8C1F64C35*
  ID_OUI_FROM_DATABASE=Peter Huber Kaeltemaschinenbau SE
 
+OUI:8C1F64C36*
+ ID_OUI_FROM_DATABASE=ODTech Co., Ltd.
+
 OUI:8C1F64C38*
  ID_OUI_FROM_DATABASE=ECO-ADAPT
 
@@ -106175,6 +107525,9 @@ OUI:8C1F64C56*
 OUI:8C1F64C57*
  ID_OUI_FROM_DATABASE=Strategic Robotic Systems
 
+OUI:8C1F64C58*
+ ID_OUI_FROM_DATABASE=Kitagawa Corporation
+
 OUI:8C1F64C59*
  ID_OUI_FROM_DATABASE=Tunstall A/S
 
@@ -106217,6 +107570,15 @@ OUI:8C1F64C6E*
 OUI:8C1F64C71*
  ID_OUI_FROM_DATABASE=Yaviar LLC
 
+OUI:8C1F64C74*
+ ID_OUI_FROM_DATABASE=Nippon Techno Lab Inc
+
+OUI:8C1F64C75*
+ ID_OUI_FROM_DATABASE=Abbott Diagnostics Technologies AS
+
+OUI:8C1F64C78*
+ ID_OUI_FROM_DATABASE=POLON-ALFA S.A.
+
 OUI:8C1F64C79*
  ID_OUI_FROM_DATABASE=P3LAB
 
@@ -106259,6 +107621,9 @@ OUI:8C1F64C96*
 OUI:8C1F64C97*
  ID_OUI_FROM_DATABASE=Magnet-Physik Dr. Steingroever GmbH
 
+OUI:8C1F64C99*
+ ID_OUI_FROM_DATABASE=Vinfast Trading and Production JSC
+
 OUI:8C1F64C9A*
  ID_OUI_FROM_DATABASE=Infosoft Digital Design and Services P L
 
@@ -106271,6 +107636,9 @@ OUI:8C1F64C9E*
 OUI:8C1F64C9F*
  ID_OUI_FROM_DATABASE=PeachCreek
 
+OUI:8C1F64CA0*
+ ID_OUI_FROM_DATABASE=SARV WEBS PRIVATE LIMITED
+
 OUI:8C1F64CA1*
  ID_OUI_FROM_DATABASE=Pantherun Technologies Pvt Ltd
 
@@ -106301,6 +107669,9 @@ OUI:8C1F64CAE*
 OUI:8C1F64CAF*
  ID_OUI_FROM_DATABASE=BRS Sistemas Eletrônicos
 
+OUI:8C1F64CB1*
+ ID_OUI_FROM_DATABASE=Xi’an Sunway Communication Co., Ltd.
+
 OUI:8C1F64CB2*
  ID_OUI_FROM_DATABASE=Dyncir Soluções Tecnológicas Ltda
 
@@ -106346,6 +107717,12 @@ OUI:8C1F64CCB*
 OUI:8C1F64CCE*
  ID_OUI_FROM_DATABASE=Tesollo
 
+OUI:8C1F64CCF*
+ ID_OUI_FROM_DATABASE=Tiptop Platform P. Ltd
+
+OUI:8C1F64CD0*
+ ID_OUI_FROM_DATABASE=REO AG
+
 OUI:8C1F64CD1*
  ID_OUI_FROM_DATABASE=Flextronics International Kft
 
@@ -106364,6 +107741,9 @@ OUI:8C1F64CD8*
 OUI:8C1F64CD9*
  ID_OUI_FROM_DATABASE=Fingoti Limited
 
+OUI:8C1F64CDA*
+ ID_OUI_FROM_DATABASE=SPX Flow Technology BV
+
 OUI:8C1F64CDB*
  ID_OUI_FROM_DATABASE=EUROPEAN TELECOMMUNICATION INTERNATIONAL KFT
 
@@ -106374,7 +107754,7 @@ OUI:8C1F64CDF*
  ID_OUI_FROM_DATABASE=Canway Technology GmbH
 
 OUI:8C1F64CE0*
- ID_OUI_FROM_DATABASE=Potter Electric Signal Company
+ ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
 
 OUI:8C1F64CE3*
  ID_OUI_FROM_DATABASE=Pixel Design & Manufacturing Sdn. Bhd.
@@ -106382,6 +107762,9 @@ OUI:8C1F64CE3*
 OUI:8C1F64CE4*
  ID_OUI_FROM_DATABASE=SL USA, LLC
 
+OUI:8C1F64CE5*
+ ID_OUI_FROM_DATABASE=Private
+
 OUI:8C1F64CEB*
  ID_OUI_FROM_DATABASE=EUREKA FOR SMART PROPERTIES CO. W.L.L
 
@@ -106457,6 +107840,9 @@ OUI:8C1F64D0F*
 OUI:8C1F64D11*
  ID_OUI_FROM_DATABASE=Benetel
 
+OUI:8C1F64D12*
+ ID_OUI_FROM_DATABASE=QUANZHOU RADIOBOSS TECHNOLOGY CO., LTD
+
 OUI:8C1F64D13*
  ID_OUI_FROM_DATABASE=EYatsko Individual
 
@@ -106529,6 +107915,9 @@ OUI:8C1F64D38*
 OUI:8C1F64D3A*
  ID_OUI_FROM_DATABASE=Applied Materials
 
+OUI:8C1F64D3B*
+ ID_OUI_FROM_DATABASE=Gogo BA
+
 OUI:8C1F64D3C*
  ID_OUI_FROM_DATABASE=KIB Energo LLC
 
@@ -106602,7 +107991,7 @@ OUI:8C1F64D63*
  ID_OUI_FROM_DATABASE=Mobileye
 
 OUI:8C1F64D64*
- ID_OUI_FROM_DATABASE=Potter Electric Signal Company
+ ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
 
 OUI:8C1F64D69*
  ID_OUI_FROM_DATABASE=ADiCo Corporation
@@ -106610,6 +107999,9 @@ OUI:8C1F64D69*
 OUI:8C1F64D6C*
  ID_OUI_FROM_DATABASE=Packetalk LLC
 
+OUI:8C1F64D71*
+ ID_OUI_FROM_DATABASE=Computech International
+
 OUI:8C1F64D73*
  ID_OUI_FROM_DATABASE=BRS Sistemas Eletrônicos
 
@@ -106643,9 +108035,15 @@ OUI:8C1F64D81*
 OUI:8C1F64D88*
  ID_OUI_FROM_DATABASE=University of Geneva - Department of Particle Physics
 
+OUI:8C1F64D8A*
+ ID_OUI_FROM_DATABASE=Boon Arthur Engineering Pte Ltd
+
 OUI:8C1F64D8C*
  ID_OUI_FROM_DATABASE=SMRI
 
+OUI:8C1F64D8D*
+ ID_OUI_FROM_DATABASE=Wi-Tronix, LLC
+
 OUI:8C1F64D8E*
  ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
 
@@ -106664,6 +108062,9 @@ OUI:8C1F64D92*
 OUI:8C1F64D93*
  ID_OUI_FROM_DATABASE=Algodue Elettronica Srl
 
+OUI:8C1F64D95*
+ ID_OUI_FROM_DATABASE=TECZZ LLC
+
 OUI:8C1F64D96*
  ID_OUI_FROM_DATABASE=Smart Cabling & Transmission Corp.
 
@@ -106739,6 +108140,9 @@ OUI:8C1F64DC2*
 OUI:8C1F64DC3*
  ID_OUI_FROM_DATABASE=Packet Digital, LLC
 
+OUI:8C1F64DC4*
+ ID_OUI_FROM_DATABASE=Amazon Robotics MTAC Matrix NPI
+
 OUI:8C1F64DC6*
  ID_OUI_FROM_DATABASE=R&K
 
@@ -106760,6 +108164,12 @@ OUI:8C1F64DCB*
 OUI:8C1F64DCF*
  ID_OUI_FROM_DATABASE=REO AG
 
+OUI:8C1F64DD2*
+ ID_OUI_FROM_DATABASE=SHIELD-CCTV CO.,LTD.
+
+OUI:8C1F64DD3*
+ ID_OUI_FROM_DATABASE=CHUGOKU ELECTRICAL INSTRUMENTS Co.,LTD.
+
 OUI:8C1F64DD4*
  ID_OUI_FROM_DATABASE=Midlands Technical Co., Ltd.
 
@@ -106808,6 +108218,9 @@ OUI:8C1F64DED*
 OUI:8C1F64DF5*
  ID_OUI_FROM_DATABASE=Concept Pro Surveillance
 
+OUI:8C1F64DF6*
+ ID_OUI_FROM_DATABASE=Micronova srl
+
 OUI:8C1F64DF8*
  ID_OUI_FROM_DATABASE=Wittra Networks AB
 
@@ -106835,6 +108248,9 @@ OUI:8C1F64E02*
 OUI:8C1F64E04*
  ID_OUI_FROM_DATABASE=新川センサテクノロジ株式会社
 
+OUI:8C1F64E05*
+ ID_OUI_FROM_DATABASE=Mitsubishi Electric System & Service Co., Ltd.
+
 OUI:8C1F64E08*
  ID_OUI_FROM_DATABASE=Imagenet Co.,Ltd
 
@@ -107087,6 +108503,9 @@ OUI:8C1F64E99*
 OUI:8C1F64E9A*
  ID_OUI_FROM_DATABASE=SiFive Inc
 
+OUI:8C1F64E9B*
+ ID_OUI_FROM_DATABASE=Discover Energy Systems Corp.
+
 OUI:8C1F64E9F*
  ID_OUI_FROM_DATABASE=Lumiplan Duhamel
 
@@ -107126,6 +108545,9 @@ OUI:8C1F64EB9*
 OUI:8C1F64EBA*
  ID_OUI_FROM_DATABASE=Hyve Solutions
 
+OUI:8C1F64EBB*
+ ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
+
 OUI:8C1F64EBC*
  ID_OUI_FROM_DATABASE=Project92.com
 
@@ -107147,6 +108569,9 @@ OUI:8C1F64ECC*
 OUI:8C1F64ECF*
  ID_OUI_FROM_DATABASE=Monnit Corporation
 
+OUI:8C1F64ED0*
+ ID_OUI_FROM_DATABASE=Shanghai Jupper Technology Co.Ltd
+
 OUI:8C1F64ED3*
  ID_OUI_FROM_DATABASE=SENSO2ME NV
 
@@ -107159,6 +108584,9 @@ OUI:8C1F64ED5*
 OUI:8C1F64ED6*
  ID_OUI_FROM_DATABASE=PowTechnology Limited
 
+OUI:8C1F64ED7*
+ ID_OUI_FROM_DATABASE=CS-Tech s.r.o.
+
 OUI:8C1F64ED8*
  ID_OUI_FROM_DATABASE=MCS INNOVATION PVT LTD
 
@@ -107219,6 +108647,9 @@ OUI:8C1F64EFB*
 OUI:8C1F64EFD*
  ID_OUI_FROM_DATABASE=Novatera(Shenzhen)Technologies Co.,Ltd.
 
+OUI:8C1F64F03*
+ ID_OUI_FROM_DATABASE=Faust ApS
+
 OUI:8C1F64F04*
  ID_OUI_FROM_DATABASE=IoTSecure, LLC
 
@@ -107267,6 +108698,9 @@ OUI:8C1F64F1C*
 OUI:8C1F64F1D*
  ID_OUI_FROM_DATABASE=MB connect line GmbH Fernwartungssysteme
 
+OUI:8C1F64F20*
+ ID_OUI_FROM_DATABASE=Thermaco Incorporated
+
 OUI:8C1F64F22*
  ID_OUI_FROM_DATABASE=Voyage Audio LLC
 
@@ -107336,6 +108770,9 @@ OUI:8C1F64F46*
 OUI:8C1F64F49*
  ID_OUI_FROM_DATABASE=CenterClick LLC
 
+OUI:8C1F64F4A*
+ ID_OUI_FROM_DATABASE=In-lite Design BV
+
 OUI:8C1F64F4B*
  ID_OUI_FROM_DATABASE=JOREX LOREX INDIA PRIVATE LIMITED
 
@@ -107357,6 +108794,9 @@ OUI:8C1F64F52*
 OUI:8C1F64F53*
  ID_OUI_FROM_DATABASE=Beckman Coulter Inc
 
+OUI:8C1F64F54*
+ ID_OUI_FROM_DATABASE=Rowan Tools Office
+
 OUI:8C1F64F56*
  ID_OUI_FROM_DATABASE=KC5 International Sdn Bhd
 
@@ -107393,6 +108833,9 @@ OUI:8C1F64F67*
 OUI:8C1F64F68*
  ID_OUI_FROM_DATABASE=YUYAMA MFG Co.,Ltd
 
+OUI:8C1F64F69*
+ ID_OUI_FROM_DATABASE=SUS Corporation
+
 OUI:8C1F64F6C*
  ID_OUI_FROM_DATABASE=Sonatronic
 
@@ -107450,6 +108893,9 @@ OUI:8C1F64F87*
 OUI:8C1F64F88*
  ID_OUI_FROM_DATABASE=LAMTEC Mess- und Regeltechnik für Feuerungen GmbH & Co. KG
 
+OUI:8C1F64F8C*
+ ID_OUI_FROM_DATABASE=BK LAB
+
 OUI:8C1F64F90*
  ID_OUI_FROM_DATABASE=Enfabrica
 
@@ -107483,6 +108929,9 @@ OUI:8C1F64F9C*
 OUI:8C1F64F9E*
  ID_OUI_FROM_DATABASE=DREAMSWELL Technology CO.,Ltd
 
+OUI:8C1F64FA0*
+ ID_OUI_FROM_DATABASE=Pneumax Spa
+
 OUI:8C1F64FA2*
  ID_OUI_FROM_DATABASE=AZD Praha s.r.o., ZOZ Olomouc
 
@@ -107519,6 +108968,9 @@ OUI:8C1F64FB4*
 OUI:8C1F64FB5*
  ID_OUI_FROM_DATABASE=Bavaria Digital Technik GmbH
 
+OUI:8C1F64FB6*
+ ID_OUI_FROM_DATABASE=Racelogic Ltd
+
 OUI:8C1F64FB7*
  ID_OUI_FROM_DATABASE=Grace Design/Lunatec LLC
 
@@ -107546,6 +108998,9 @@ OUI:8C1F64FC4*
 OUI:8C1F64FC5*
  ID_OUI_FROM_DATABASE=SUMICO
 
+OUI:8C1F64FC6*
+ ID_OUI_FROM_DATABASE=Invertek Drives Ltd
+
 OUI:8C1F64FCC*
  ID_OUI_FROM_DATABASE=GREDMANN TAIWAN LTD.
 
@@ -107583,10 +109038,10 @@ OUI:8C1F64FDC*
  ID_OUI_FROM_DATABASE=Nuphoton Technologies
 
 OUI:8C1F64FDF*
- ID_OUI_FROM_DATABASE=Potter Electric Signal Company
+ ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
 
 OUI:8C1F64FE0*
- ID_OUI_FROM_DATABASE=Potter Electric Signal Company
+ ID_OUI_FROM_DATABASE=Potter Electric Signal Co. LLC
 
 OUI:8C1F64FE1*
  ID_OUI_FROM_DATABASE=SOREL GmbH
@@ -107615,12 +109070,18 @@ OUI:8C1F64FEC*
 OUI:8C1F64FED*
  ID_OUI_FROM_DATABASE=Televic Rail GmbH
 
+OUI:8C1F64FEE*
+ ID_OUI_FROM_DATABASE=Leap Info Systems Pvt. Ltd.
+
 OUI:8C1F64FF3*
  ID_OUI_FROM_DATABASE=Fuzhou Tucsen Photonics Co.,Ltd
 
 OUI:8C1F64FF4*
  ID_OUI_FROM_DATABASE=SMS group GmbH
 
+OUI:8C1F64FF5*
+ ID_OUI_FROM_DATABASE=IQ Tools LLC
+
 OUI:8C1F64FF6*
  ID_OUI_FROM_DATABASE=Ascon Tecnologic S.r.l.
 
@@ -107630,6 +109091,9 @@ OUI:8C1F64FF8*
 OUI:8C1F64FF9*
  ID_OUI_FROM_DATABASE=Vtron Pty Ltd
 
+OUI:8C1F64FFB*
+ ID_OUI_FROM_DATABASE=Taicang T&W Electronics
+
 OUI:8C1F64FFC*
  ID_OUI_FROM_DATABASE=Invendis Technologies India Pvt Ltd
 
@@ -107666,6 +109130,9 @@ OUI:8C2A8E*
 OUI:8C2DAA*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:8C2E72*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:8C2F39*
  ID_OUI_FROM_DATABASE=IBA Dosimetry GmbH
 
@@ -107732,6 +109199,9 @@ OUI:8C3C07*
 OUI:8C3C4A*
  ID_OUI_FROM_DATABASE=NAKAYO Inc
 
+OUI:8C3D16*
+ ID_OUI_FROM_DATABASE=Shenzhen Four Seas Global Link Network Technology Co.,Ltd
+
 OUI:8C3DB1*
  ID_OUI_FROM_DATABASE=Beijing H-IoT Technology Co., Ltd.
 
@@ -107759,6 +109229,9 @@ OUI:8C444F*
 OUI:8C44A5*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:8C44BB*
+ ID_OUI_FROM_DATABASE=SHEN ZHEN TENDA TECHNOLOGY CO.,LTD
+
 OUI:8C4500*
  ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
 
@@ -107984,6 +109457,9 @@ OUI:8C579B*
 OUI:8C57FD*
  ID_OUI_FROM_DATABASE=LVX Western
 
+OUI:8C5823*
+ ID_OUI_FROM_DATABASE=SZ DJI TECHNOLOGY CO.,LTD
+
 OUI:8C5877*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -108062,6 +109538,9 @@ OUI:8C5BF0*
 OUI:8C5C20*
  ID_OUI_FROM_DATABASE=Vantiva USA LLC
 
+OUI:8C5C53*
+ ID_OUI_FROM_DATABASE=AltoBeam Inc.
+
 OUI:8C5CA1*
  ID_OUI_FROM_DATABASE=d-broad,INC
 
@@ -108215,6 +109694,9 @@ OUI:8C736E*
 OUI:8C73A0*
  ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 
+OUI:8C73DA*
+ ID_OUI_FROM_DATABASE=Silicon Laboratories
+
 OUI:8C763F*
  ID_OUI_FROM_DATABASE=Commscope
 
@@ -108251,6 +109733,9 @@ OUI:8C7A3D*
 OUI:8C7AAA*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:8C7AB3*
+ ID_OUI_FROM_DATABASE=Guangzhou Shiyuan Electronic Technology Company Limited
+
 OUI:8C7B9D*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -108362,6 +109847,9 @@ OUI:8C8ACD*
 OUI:8C8B48*
  ID_OUI_FROM_DATABASE=Silicon Laboratories
 
+OUI:8C8B5B*
+ ID_OUI_FROM_DATABASE=Wistron Neweb Corporation
+
 OUI:8C8B83*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -108398,6 +109886,12 @@ OUI:8C90D3*
 OUI:8C9109*
  ID_OUI_FROM_DATABASE=Toyoshima Electric Technoeogy(Suzhou) Co.,Ltd.
 
+OUI:8C913A*
+ ID_OUI_FROM_DATABASE=Mellanox Technologies, Inc.
+
+OUI:8C91A4*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:8C9236*
  ID_OUI_FROM_DATABASE=Aus.Linx Technology Co., Ltd.
 
@@ -108428,6 +109922,9 @@ OUI:8C94CF*
 OUI:8C965F*
  ID_OUI_FROM_DATABASE=Shandong Zhongan Technology Co., Ltd.
 
+OUI:8C96A5*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:8C97EA*
  ID_OUI_FROM_DATABASE=FREEBOX SAS
 
@@ -108845,6 +110342,9 @@ OUI:8CE38E*
 OUI:8CE468*
  ID_OUI_FROM_DATABASE=Guangzhou Sageran Technology Co., Ltd.
 
+OUI:8CE4DB*
+ ID_OUI_FROM_DATABASE=Shenzhen MiaoMing Intelligent Technology Co.,Ltd
+
 OUI:8CE5C0*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -109082,6 +110582,9 @@ OUI:9012A1*
 OUI:9013DA*
  ID_OUI_FROM_DATABASE=Athom B.V.
 
+OUI:9014AF*
+ ID_OUI_FROM_DATABASE=Cambium Networks Limited
+
 OUI:901506*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
@@ -109220,6 +110723,9 @@ OUI:9027E4*
 OUI:9028F6*
  ID_OUI_FROM_DATABASE=Wuhan Yangtze Optical Technology CO.,Ltd.
 
+OUI:902962*
+ ID_OUI_FROM_DATABASE=Linkpower Microelectronics Co., Ltd.
+
 OUI:902AEE*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
@@ -109328,6 +110834,9 @@ OUI:903E7F*
 OUI:903EAB*
  ID_OUI_FROM_DATABASE=Commscope
 
+OUI:903FC3*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:903FEA*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -109370,6 +110879,9 @@ OUI:904992*
 OUI:9049FA*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:904C02*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
 OUI:904C81*
  ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
 
@@ -110357,6 +111869,9 @@ OUI:90EF4A*
 OUI:90EF68*
  ID_OUI_FROM_DATABASE=Zyxel Communications Corporation
 
+OUI:90F005*
+ ID_OUI_FROM_DATABASE=Xi'an Molead Technology Co., Ltd
+
 OUI:90F052*
  ID_OUI_FROM_DATABASE=MEIZU Technology Co., Ltd.
 
@@ -110631,7 +112146,7 @@ OUI:9411DA*
  ID_OUI_FROM_DATABASE=ITF Fröschl GmbH
 
 OUI:941457*
- ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies Company Limited
+ ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies company Limited
 
 OUI:94147A*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
@@ -110927,6 +112442,9 @@ OUI:944E5B*
 OUI:944F4C*
  ID_OUI_FROM_DATABASE=Sound United LLC
 
+OUI:944FDB*
+ ID_OUI_FROM_DATABASE=Nokia
+
 OUI:945044*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -110945,6 +112463,9 @@ OUI:94513D*
 OUI:9451BF*
  ID_OUI_FROM_DATABASE=Hyundai ESG
 
+OUI:9451DC*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:945244*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -111125,6 +112646,9 @@ OUI:948854*
 OUI:94885E*
  ID_OUI_FROM_DATABASE=Surfilter Network Technology Co., Ltd.
 
+OUI:948978*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:948AC6*
  ID_OUI_FROM_DATABASE=Realme Chongqing Mobile Telecommunications Corp.,Ltd.
 
@@ -111146,6 +112670,9 @@ OUI:948D50*
 OUI:948DEF*
  ID_OUI_FROM_DATABASE=Oetiker Schweiz AG
 
+OUI:948E6D*
+ ID_OUI_FROM_DATABASE=Nintendo Co.,Ltd
+
 OUI:948E89*
  ID_OUI_FROM_DATABASE=INDUSTRIAS UNIDAS SA DE CV
 
@@ -111185,6 +112712,9 @@ OUI:94944A*
 OUI:9495A0*
  ID_OUI_FROM_DATABASE=Google, Inc.
 
+OUI:94974F*
+ ID_OUI_FROM_DATABASE=Liteon Technology Corporation
+
 OUI:9497AE*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
@@ -111356,6 +112886,9 @@ OUI:94B97E*
 OUI:94B9B4*
  ID_OUI_FROM_DATABASE=Aptos Technology
 
+OUI:94BA06*
+ ID_OUI_FROM_DATABASE=SHENZHEN BILIAN ELECTRONIC CO.，LTD
+
 OUI:94BA31*
  ID_OUI_FROM_DATABASE=Visiontec da Amazônia Ltda.
 
@@ -111551,6 +113084,9 @@ OUI:94CCB9*
 OUI:94CDAC*
  ID_OUI_FROM_DATABASE=Creowave Oy
 
+OUI:94CDFD*
+ ID_OUI_FROM_DATABASE=eero inc.
+
 OUI:94CE0F*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -111755,6 +113291,12 @@ OUI:94EE9F*
 OUI:94EF49*
  ID_OUI_FROM_DATABASE=BDR Thermea Group B.V
 
+OUI:94EF50*
+ ID_OUI_FROM_DATABASE=TP-Link Systems Inc.
+
+OUI:94EF97*
+ ID_OUI_FROM_DATABASE=Edgecore Americas Networking Corporation
+
 OUI:94F128*
  ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
 
@@ -111890,6 +113432,9 @@ OUI:94FF3C*
 OUI:94FF61*
  ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
 
+OUI:94FF7D*
+ ID_OUI_FROM_DATABASE=AltoBeam Inc.
+
 OUI:98006A*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -112094,6 +113639,9 @@ OUI:9816CD*
 OUI:9816EC*
  ID_OUI_FROM_DATABASE=IC Intracom
 
+OUI:98171A*
+ ID_OUI_FROM_DATABASE=Beijing Xiaomi Mobile Software Co., Ltd
+
 OUI:98173C*
  ID_OUI_FROM_DATABASE=Private
 
@@ -112259,6 +113807,9 @@ OUI:983000*
 OUI:983071*
  ID_OUI_FROM_DATABASE=DAIKYUNG VASCOM
 
+OUI:983268*
+ ID_OUI_FROM_DATABASE=Silicon Laboratories
+
 OUI:98348C*
  ID_OUI_FROM_DATABASE=Great Talent Technology Limited
 
@@ -112289,6 +113840,9 @@ OUI:98398E*
 OUI:9839C0*
  ID_OUI_FROM_DATABASE=FLEXTRONICS
 
+OUI:983A1F*
+ ID_OUI_FROM_DATABASE=Google, Inc.
+
 OUI:983B16*
  ID_OUI_FROM_DATABASE=AMPAK Technology, Inc.
 
@@ -112475,6 +114029,9 @@ OUI:986022*
 OUI:9860CA*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:986110*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:986297*
  ID_OUI_FROM_DATABASE=Shenzhen Techwinsemi Technology Co., Ltd.
 
@@ -112646,6 +114203,9 @@ OUI:987DDD*
 OUI:987E46*
  ID_OUI_FROM_DATABASE=Emizon Networks Limited
 
+OUI:987EB5*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:987ECA*
  ID_OUI_FROM_DATABASE=Inventus Power Eletronica do Brasil LTDA
 
@@ -112856,6 +114416,9 @@ OUI:989C57*
 OUI:989D39*
  ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
 
+OUI:989D40*
+ ID_OUI_FROM_DATABASE=MIWA LOCK CO.,LTD.
+
 OUI:989D5D*
  ID_OUI_FROM_DATABASE=Vantiva USA LLC
 
@@ -113174,6 +114737,9 @@ OUI:98DED0*
 OUI:98DF82*
  ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
 
+OUI:98E081*
+ ID_OUI_FROM_DATABASE=Beijing Xiaomi Mobile Software Co., Ltd
+
 OUI:98E0D9*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -113267,6 +114833,9 @@ OUI:98F217*
 OUI:98F2B3*
  ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
 
+OUI:98F3F6*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:98F428*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -113285,6 +114854,9 @@ OUI:98F5A9*
 OUI:98F621*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
+OUI:98F67A*
+ ID_OUI_FROM_DATABASE=Chipsea Technologies (Shenzhen) Crop.
+
 OUI:98F781*
  ID_OUI_FROM_DATABASE=Commscope
 
@@ -113504,6 +115076,9 @@ OUI:9C0E51*
 OUI:9C1221*
  ID_OUI_FROM_DATABASE=Sichuan AI-Link Technology Co., Ltd.
 
+OUI:9C139E*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:9C13AB*
  ID_OUI_FROM_DATABASE=Chanson Water Co., Ltd.
 
@@ -113679,11 +115254,14 @@ OUI:9C3928*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
 OUI:9C3A9A*
- ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies Company Limited
+ ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies company Limited
 
 OUI:9C3AAF*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:9C3B91*
+ ID_OUI_FROM_DATABASE=VSSL
+
 OUI:9C3DCF*
  ID_OUI_FROM_DATABASE=NETGEAR
 
@@ -113858,6 +115436,9 @@ OUI:9C5636*
 OUI:9C5711*
  ID_OUI_FROM_DATABASE=Feitian Xunda(Beijing) Aeronautical Information Technology Co., Ltd.
 
+OUI:9C5766*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:9C57AD*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -113946,7 +115527,7 @@ OUI:9C65EB*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
 OUI:9C65EE*
- ID_OUI_FROM_DATABASE=DZS Inc.
+ ID_OUI_FROM_DATABASE=Zhone Technologies, Inc.
 
 OUI:9C65F9*
  ID_OUI_FROM_DATABASE=AcSiP Technology Corp.
@@ -114098,6 +115679,9 @@ OUI:9C7BEF*
 OUI:9C7DA3*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:9C7DC0*
+ ID_OUI_FROM_DATABASE=Tech4home, Lda
+
 OUI:9C7F57*
  ID_OUI_FROM_DATABASE=UNIC Memory Technology Co Ltd
 
@@ -114215,6 +115799,9 @@ OUI:9C95F8*
 OUI:9C9613*
  ID_OUI_FROM_DATABASE=Lenovo Future Communication Technology (Chongqing) Company Limited
 
+OUI:9C971B*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:9C9726*
  ID_OUI_FROM_DATABASE=Technicolor Delivery Technologies Belgium NV
 
@@ -114413,6 +116000,9 @@ OUI:9CC172*
 OUI:9CC2C4*
  ID_OUI_FROM_DATABASE=IEIT SYSTEMS Co., Ltd.
 
+OUI:9CC394*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:9CC7A6*
  ID_OUI_FROM_DATABASE=AVM GmbH
 
@@ -114971,6 +116561,12 @@ OUI:A01AE3*
 OUI:A01B29*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
+OUI:A01B9E*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
+OUI:A01BD6*
+ ID_OUI_FROM_DATABASE=Nautitech Mining Systems Pty. Ltd.
+
 OUI:A01C05*
  ID_OUI_FROM_DATABASE=NIMAX TELECOM CO.,LTD.
 
@@ -115130,6 +116726,9 @@ OUI:A02942*
 OUI:A029BD*
  ID_OUI_FROM_DATABASE=Team Group Inc
 
+OUI:A02B44*
+ ID_OUI_FROM_DATABASE=WaveGo Tech LLC
+
 OUI:A02BB8*
  ID_OUI_FROM_DATABASE=Hewlett Packard
 
@@ -115193,6 +116792,9 @@ OUI:A039EE*
 OUI:A039F7*
  ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
 
+OUI:A039F9*
+ ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
+
 OUI:A03A75*
  ID_OUI_FROM_DATABASE=PSS Belgium N.V.
 
@@ -115205,6 +116807,9 @@ OUI:A03B1B*
 OUI:A03BE3*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:A03C20*
+ ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
+
 OUI:A03C31*
  ID_OUI_FROM_DATABASE=Shenzhen Belon Technology CO.,LTD
 
@@ -115547,6 +117152,9 @@ OUI:A078BA*
 OUI:A07D9C*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:A07E16*
+ ID_OUI_FROM_DATABASE=EM Microelectronic
+
 OUI:A07F8A*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
@@ -115571,6 +117179,9 @@ OUI:A083B4*
 OUI:A084CB*
  ID_OUI_FROM_DATABASE=SonicSensory,Inc.
 
+OUI:A08527*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:A085E3*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
@@ -116567,6 +118178,9 @@ OUI:A439B3*
 OUI:A439B6*
  ID_OUI_FROM_DATABASE=SHENZHEN PEIZHE MICROELECTRONICS CO .LTD
 
+OUI:A43A39*
+ ID_OUI_FROM_DATABASE=AURORA TECHNOLOGIES CO.,LTD.
+
 OUI:A43A69*
  ID_OUI_FROM_DATABASE=Vers Inc
 
@@ -116984,6 +118598,9 @@ OUI:A46706*
 OUI:A468BC*
  ID_OUI_FROM_DATABASE=Oakley Inc.
 
+OUI:A46B1F*
+ ID_OUI_FROM_DATABASE=eero inc.
+
 OUI:A46BB6*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -117065,6 +118682,9 @@ OUI:A47B1A*
 OUI:A47B2C*
  ID_OUI_FROM_DATABASE=Nokia
 
+OUI:A47B52*
+ ID_OUI_FROM_DATABASE=JoulWatt Technology Co., Ltd
+
 OUI:A47B85*
  ID_OUI_FROM_DATABASE=ULTIMEDIA Co Ltd,
 
@@ -117170,6 +118790,9 @@ OUI:A49426*
 OUI:A494DC*
  ID_OUI_FROM_DATABASE=Infinite Clouds
 
+OUI:A49700*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:A49733*
  ID_OUI_FROM_DATABASE=ASKEY COMPUTER CORP
 
@@ -117596,6 +119219,9 @@ OUI:A4DB4C*
 OUI:A4DCBE*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:A4DCD5*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:A4DD58*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -117794,6 +119420,9 @@ OUI:A4FCCE*
 OUI:A4FF95*
  ID_OUI_FROM_DATABASE=Nokia
 
+OUI:A4FF9F*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:A800E3*
  ID_OUI_FROM_DATABASE=Starkey Labs Inc.
 
@@ -117840,7 +119469,7 @@ OUI:A80C63*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
 OUI:A80CCA*
- ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies Company Limited
+ ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies company Limited
 
 OUI:A80DE1*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
@@ -117905,6 +119534,9 @@ OUI:A81D16*
 OUI:A81E84*
  ID_OUI_FROM_DATABASE=Quanta Computer Inc.
 
+OUI:A81F79*
+ ID_OUI_FROM_DATABASE=Yingling Innovations Pte. Ltd.
+
 OUI:A81FAF*
  ID_OUI_FROM_DATABASE=KRYPTON POLSKA
 
@@ -117917,6 +119549,9 @@ OUI:A82316*
 OUI:A823FE*
  ID_OUI_FROM_DATABASE=LG Electronics
 
+OUI:A82450*
+ ID_OUI_FROM_DATABASE=Beijing Huadianzhongxin Tech.Co.,Ltd
+
 OUI:A824B8*
  ID_OUI_FROM_DATABASE=Nokia
 
@@ -117956,9 +119591,15 @@ OUI:A82BD5*
 OUI:A82BD6*
  ID_OUI_FROM_DATABASE=Shina System Co., Ltd
 
+OUI:A82BDD*
+ ID_OUI_FROM_DATABASE=LCFC(Hefei) Electronics Technology co., ltd
+
 OUI:A82C3E*
  ID_OUI_FROM_DATABASE=Shenzhen Cultraview Digital Technology Co., Ltd
 
+OUI:A82C89*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:A8301C*
  ID_OUI_FROM_DATABASE=Qingdao Intelligent&Precise Electronics Co.,Ltd.
 
@@ -118340,6 +119981,9 @@ OUI:A86B7C*
 OUI:A86BAD*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
+OUI:A86D04*
+ ID_OUI_FROM_DATABASE=Siemens AG
+
 OUI:A86D5F*
  ID_OUI_FROM_DATABASE=Raisecom Technology CO., LTD
 
@@ -118550,6 +120194,9 @@ OUI:A899AD*
 OUI:A899DC*
  ID_OUI_FROM_DATABASE=i-TOP DESING TECHNOLOGY CO.,LTD
 
+OUI:A89A8C*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:A89A93*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
@@ -118718,6 +120365,9 @@ OUI:A8C252*
 OUI:A8C266*
  ID_OUI_FROM_DATABASE=HUMAX Co., Ltd.
 
+OUI:A8C407*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:A8C56F*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
@@ -118976,6 +120626,9 @@ OUI:AC00F9*
 OUI:AC0142*
  ID_OUI_FROM_DATABASE=Uriel Technologies SIA
 
+OUI:AC017A*
+ ID_OUI_FROM_DATABASE=Sichuan Tianyi Comheart Telecom Co.,LTD
+
 OUI:AC02CA*
  ID_OUI_FROM_DATABASE=HI Solutions, Inc.
 
@@ -119027,6 +120680,9 @@ OUI:AC0DFE*
 OUI:AC1007*
  ID_OUI_FROM_DATABASE=Arcadyan Corporation
 
+OUI:AC1065*
+ ID_OUI_FROM_DATABASE=KT Micro, Inc.
+
 OUI:AC11D3*
  ID_OUI_FROM_DATABASE=Suzhou HOTEK  Video Technology Co. Ltd
 
@@ -119294,6 +120950,9 @@ OUI:AC3D75*
 OUI:AC3D94*
  ID_OUI_FROM_DATABASE=Arista Networks
 
+OUI:AC3DCB*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:AC3EB1*
  ID_OUI_FROM_DATABASE=Google, Inc.
 
@@ -119678,6 +121337,9 @@ OUI:AC8226*
 OUI:AC8247*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:AC82F0*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:AC8317*
  ID_OUI_FROM_DATABASE=Shenzhen Furtunetel Communication Co., Ltd
 
@@ -119696,6 +121358,9 @@ OUI:AC84C6*
 OUI:AC84C9*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
+OUI:AC84FA*
+ ID_OUI_FROM_DATABASE=Zhejiang Weilai Jingling Artificial Intelligence Technology Co., Ltd.
+
 OUI:AC853D*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -119984,6 +121649,9 @@ OUI:ACBD0B*
 OUI:ACBD70*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:ACBDF7*
+ ID_OUI_FROM_DATABASE=Cisco Meraki
+
 OUI:ACBE75*
  ID_OUI_FROM_DATABASE=Ufine Technologies Co.,Ltd.
 
@@ -120044,6 +121712,9 @@ OUI:ACC906*
 OUI:ACC935*
  ID_OUI_FROM_DATABASE=Ness Corporation
 
+OUI:ACC9FF*
+ ID_OUI_FROM_DATABASE=Realme Chongqing Mobile Telecommunications Corp.,Ltd.
+
 OUI:ACCA0F*
  ID_OUI_FROM_DATABASE=INDISR COMMUNICATION SERVICES AND TECHNOLOGIES INDIA
 
@@ -120305,6 +121976,9 @@ OUI:ACF2C5*
 OUI:ACF42C*
  ID_OUI_FROM_DATABASE=Earda Technologies co Ltd
 
+OUI:ACF466*
+ ID_OUI_FROM_DATABASE=HP Inc.
+
 OUI:ACF473*
  ID_OUI_FROM_DATABASE=iRobot Corporation
 
@@ -120314,6 +121988,9 @@ OUI:ACF5E6*
 OUI:ACF6F7*
  ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
 
+OUI:ACF70D*
+ ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
+
 OUI:ACF7F3*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
@@ -120339,7 +122016,7 @@ OUI:ACFBC2*
  ID_OUI_FROM_DATABASE=Shenzhen Skyworth Digital  Technology  CO., Ltd
 
 OUI:ACFC82*
- ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies Company Limited
+ ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies company Limited
 
 OUI:ACFCE3*
  ID_OUI_FROM_DATABASE=EM Microelectronic
@@ -120389,6 +122066,9 @@ OUI:B009DA*
 OUI:B00AD5*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:B00B22*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:B00C9D*
  ID_OUI_FROM_DATABASE=Quectel Wireless Solutions Co.,Ltd.
 
@@ -120413,6 +122093,9 @@ OUI:B01266*
 OUI:B01408*
  ID_OUI_FROM_DATABASE=LIGHTSPEED INTERNATIONAL CO.
 
+OUI:B014DF*
+ ID_OUI_FROM_DATABASE=MitraStar Technology Corp.
+
 OUI:B01656*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -120519,7 +122202,7 @@ OUI:B024F3*
  ID_OUI_FROM_DATABASE=Progeny Systems
 
 OUI:B025AA*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=AIstone Global Limited
 
 OUI:B02628*
  ID_OUI_FROM_DATABASE=Broadcom Limited
@@ -120848,6 +122531,9 @@ OUI:B06971*
 OUI:B06A41*
  ID_OUI_FROM_DATABASE=Google, Inc.
 
+OUI:B06B11*
+ ID_OUI_FROM_DATABASE=Hui Zhou Gaoshengda Technology Co.,LTD
+
 OUI:B06BB3*
  ID_OUI_FROM_DATABASE=GRT
 
@@ -120923,6 +122609,9 @@ OUI:B07B25*
 OUI:B07C51*
  ID_OUI_FROM_DATABASE=Ruckus Wireless
 
+OUI:B07C8E*
+ ID_OUI_FROM_DATABASE=Brother Industries, LTD.
+
 OUI:B07D47*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -121250,6 +122939,9 @@ OUI:B0BBE5*
 OUI:B0BC7A*
  ID_OUI_FROM_DATABASE=Harman/Becker Automotive Systems GmbH
 
+OUI:B0BC8E*
+ ID_OUI_FROM_DATABASE=SkyMirr
+
 OUI:B0BD1B*
  ID_OUI_FROM_DATABASE=Dongguan Liesheng Electronic Co., Ltd.
 
@@ -121388,6 +123080,51 @@ OUI:B0CA68*
 OUI:B0CAE7*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:B0CCCE0*
+ ID_OUI_FROM_DATABASE=Steelco SpA
+
+OUI:B0CCCE1*
+ ID_OUI_FROM_DATABASE=Agrisys A/S
+
+OUI:B0CCCE2*
+ ID_OUI_FROM_DATABASE=4MOD Technology
+
+OUI:B0CCCE3*
+ ID_OUI_FROM_DATABASE=Gateview Technologies
+
+OUI:B0CCCE4*
+ ID_OUI_FROM_DATABASE=Shenzhen Xtooltech Intelligent Co.,Ltd.
+
+OUI:B0CCCE5*
+ ID_OUI_FROM_DATABASE=Beijing Viazijing Technology Co., Ltd.
+
+OUI:B0CCCE6*
+ ID_OUI_FROM_DATABASE=MULTI-FIELD LOW TEMPERATURE TECHNOLOGY(BEIJING) CO., LTD.
+
+OUI:B0CCCE7*
+ ID_OUI_FROM_DATABASE=EBI Patient Care, Inc.
+
+OUI:B0CCCE8*
+ ID_OUI_FROM_DATABASE=Shanghai CloudPrime.ai Technology Co, Ltd
+
+OUI:B0CCCE9*
+ ID_OUI_FROM_DATABASE=Taiv Inc
+
+OUI:B0CCCEA*
+ ID_OUI_FROM_DATABASE=Shenzhen Dangs Science and Technology CO.,Ltd.
+
+OUI:B0CCCEB*
+ ID_OUI_FROM_DATABASE=Watermark Systems (India) Private Limited
+
+OUI:B0CCCEC*
+ ID_OUI_FROM_DATABASE=Faaftech
+
+OUI:B0CCCED*
+ ID_OUI_FROM_DATABASE=Xiaomi EV Technology Co., Ltd.
+
+OUI:B0CCCEE*
+ ID_OUI_FROM_DATABASE=MICROTEST
+
 OUI:B0CCFE*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -121430,6 +123167,9 @@ OUI:B0D59D*
 OUI:B0D5CC*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:B0D5FB*
+ ID_OUI_FROM_DATABASE=Google, Inc.
+
 OUI:B0D77E*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -121550,6 +123290,9 @@ OUI:B0F00C*
 OUI:B0F1A3*
  ID_OUI_FROM_DATABASE=Fengfan (BeiJing) Technology Co., Ltd.
 
+OUI:B0F1AE*
+ ID_OUI_FROM_DATABASE=eero inc.
+
 OUI:B0F1BC*
  ID_OUI_FROM_DATABASE=Dhemax Ingenieros Ltda
 
@@ -121565,6 +123308,9 @@ OUI:B0F208*
 OUI:B0F2F6*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:B0F3E9*
+ ID_OUI_FROM_DATABASE=PATEO CONNECT (Xiamen) Co., Ltd.
+
 OUI:B0F530*
  ID_OUI_FROM_DATABASE=Hitron Technologies. Inc
 
@@ -121844,6 +123590,9 @@ OUI:B41DEF*
 OUI:B41E52*
  ID_OUI_FROM_DATABASE=Flock Safety
 
+OUI:B41F4D*
+ ID_OUI_FROM_DATABASE=Sony Interactive Entertainment Inc.
+
 OUI:B42046*
  ID_OUI_FROM_DATABASE=eero inc.
 
@@ -122015,6 +123764,9 @@ OUI:B43A31*
 OUI:B43A45*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
+OUI:B43A96*
+ ID_OUI_FROM_DATABASE=Arista Networks
+
 OUI:B43AE2*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -122210,6 +123962,9 @@ OUI:B45861*
 OUI:B45976*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:B45B86*
+ ID_OUI_FROM_DATABASE=Funshion Online Technologies Co.,Ltd
+
 OUI:B45BD1*
  ID_OUI_FROM_DATABASE=TP-Link Systems Inc.
 
@@ -122396,6 +124151,9 @@ OUI:B48901*
 OUI:B48910*
  ID_OUI_FROM_DATABASE=Coster T.E. S.P.A.
 
+OUI:B48931*
+ ID_OUI_FROM_DATABASE=Silicon Laboratories
+
 OUI:B48970*
  ID_OUI_FROM_DATABASE=IGEN Tech Co., Ltd.
 
@@ -122843,6 +124601,9 @@ OUI:B4E454*
 OUI:B4E46B*
  ID_OUI_FROM_DATABASE=China Mobile IOT Company Limited
 
+OUI:B4E53E*
+ ID_OUI_FROM_DATABASE=Ruckus Wireless
+
 OUI:B4E54C*
  ID_OUI_FROM_DATABASE=LLC Elektra
 
@@ -122981,6 +124742,9 @@ OUI:B4FF98*
 OUI:B80018*
  ID_OUI_FROM_DATABASE=Htel
 
+OUI:B8011F*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:B802A4*
  ID_OUI_FROM_DATABASE=Aeonsemi, Inc.
 
@@ -122990,6 +124754,9 @@ OUI:B80305*
 OUI:B80415*
  ID_OUI_FROM_DATABASE=Bayan Audio
 
+OUI:B80533*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:B805AB*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -123458,6 +125225,9 @@ OUI:B86CE0*
 OUI:B86CE8*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:B87029*
+ ID_OUI_FROM_DATABASE=Shenzhen Ruiyuanchuangxin Technology Co.,Ltd.
+
 OUI:B870F4*
  ID_OUI_FROM_DATABASE=COMPAL INFORMATION (KUNSHAN) CO., LTD.
 
@@ -123683,6 +125453,9 @@ OUI:B89BC9*
 OUI:B89BE4*
  ID_OUI_FROM_DATABASE=ABB Power Systems Power Generation
 
+OUI:B89C13*
+ ID_OUI_FROM_DATABASE=Alps Alpine
+
 OUI:B89EA6*
  ID_OUI_FROM_DATABASE=SPBEC-MINING CO.LTD
 
@@ -124010,6 +125783,9 @@ OUI:B8D812E*
 OUI:B8D812F*
  ID_OUI_FROM_DATABASE=Private
 
+OUI:B8D82D*
+ ID_OUI_FROM_DATABASE=Qingdao Intelligent&Precise Electronics Co.,Ltd.
+
 OUI:B8D94D*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
@@ -124037,6 +125813,9 @@ OUI:B8DC87*
 OUI:B8DD71*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:B8DDE8*
+ ID_OUI_FROM_DATABASE=Sichuan Tianyi Comheart Telecom Co.,LTD
+
 OUI:B8DE5E*
  ID_OUI_FROM_DATABASE=LONGCHEER TELECOMMUNICATION LIMITED
 
@@ -124331,6 +126110,9 @@ OUI:BC20A4*
 OUI:BC20BA*
  ID_OUI_FROM_DATABASE=Inspur (Shandong) Electronic Information Co., Ltd
 
+OUI:BC2106*
+ ID_OUI_FROM_DATABASE=Adtran Inc
+
 OUI:BC2228*
  ID_OUI_FROM_DATABASE=D-Link International
 
@@ -124376,6 +126158,9 @@ OUI:BC28D6*
 OUI:BC2978*
  ID_OUI_FROM_DATABASE=Prama Hikvision India Private Limited
 
+OUI:BC2A33*
+ ID_OUI_FROM_DATABASE=Quectel Wireless Solutions Co.,Ltd.
+
 OUI:BC2B02*
  ID_OUI_FROM_DATABASE=CHINA DRAGON TECHNOLOGY LIMITED
 
@@ -124400,6 +126185,9 @@ OUI:BC2DEF*
 OUI:BC2E48*
  ID_OUI_FROM_DATABASE=Commscope
 
+OUI:BC2EC3*
+ ID_OUI_FROM_DATABASE=Shenzhen Tianruixiang Communication Equipment Co.,Ltd
+
 OUI:BC2EF6*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -124532,6 +126320,12 @@ OUI:BC3400F*
 OUI:BC34CA*
  ID_OUI_FROM_DATABASE=INOVANCE
 
+OUI:BC34D6*
+ ID_OUI_FROM_DATABASE=Extreme Networks Headquarters
+
+OUI:BC351E*
+ ID_OUI_FROM_DATABASE=Tuya Smart Inc.
+
 OUI:BC35E5*
  ID_OUI_FROM_DATABASE=Hydro Systems Company
 
@@ -124604,6 +126398,9 @@ OUI:BC4486*
 OUI:BC44B0*
  ID_OUI_FROM_DATABASE=Elastifile
 
+OUI:BC4529*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:BC452E*
  ID_OUI_FROM_DATABASE=Knowledge Development for POF S.L.
 
@@ -124652,6 +126449,9 @@ OUI:BC4E3C*
 OUI:BC4E5D*
  ID_OUI_FROM_DATABASE=ZhongMiao Technology Co., Ltd.
 
+OUI:BC515F*
+ ID_OUI_FROM_DATABASE=Nokia Solutions and Networks India Private Limited
+
 OUI:BC51FE*
  ID_OUI_FROM_DATABASE=Swann communications Pty Ltd
 
@@ -124682,6 +126482,9 @@ OUI:BC54FC*
 OUI:BC5729*
  ID_OUI_FROM_DATABASE=Shenzhen KKM Co., Ltd
 
+OUI:BC5A34*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:BC5A56*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -124883,6 +126686,9 @@ OUI:BC7670*
 OUI:BC76C5*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:BC76F9*
+ ID_OUI_FROM_DATABASE=Ubiquoss Inc
+
 OUI:BC7737*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -124955,6 +126761,9 @@ OUI:BC8893*
 OUI:BC88C3*
  ID_OUI_FROM_DATABASE=Ningbo Dooya Mechanic & Electronic Technology Co., Ltd
 
+OUI:BC89A6*
+ ID_OUI_FROM_DATABASE=Nintendo Co.,Ltd
+
 OUI:BC89A7*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -125090,6 +126899,9 @@ OUI:BC9C31*
 OUI:BC9CC5*
  ID_OUI_FROM_DATABASE=Beijing Huafei Technology Co., Ltd.
 
+OUI:BC9D37*
+ ID_OUI_FROM_DATABASE=Telink Micro LLC
+
 OUI:BC9D42*
  ID_OUI_FROM_DATABASE=SHENZHEN RF-LINK TECHNOLOGY CO.,LTD.
 
@@ -125324,6 +127136,9 @@ OUI:BCD1D3*
 OUI:BCD206*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:BCD22C*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:BCD295*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -125576,6 +127391,9 @@ OUI:C006C3*
 OUI:C0074A*
  ID_OUI_FROM_DATABASE=Brita GmbH
 
+OUI:C00925*
+ ID_OUI_FROM_DATABASE=FN-LINK TECHNOLOGY Ltd.
+
 OUI:C00D7E*
  ID_OUI_FROM_DATABASE=Additech, Inc.
 
@@ -125603,6 +127421,9 @@ OUI:C014B8*
 OUI:C014FE*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:C0151B*
+ ID_OUI_FROM_DATABASE=Sony Interactive Entertainment Inc.
+
 OUI:C01692*
  ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
 
@@ -125858,6 +127679,9 @@ OUI:C03FDD*
 OUI:C04004*
  ID_OUI_FROM_DATABASE=Medicaroid Corporation
 
+OUI:C0408D*
+ ID_OUI_FROM_DATABASE=ALPSALPINE CO,.LTD
+
 OUI:C04121*
  ID_OUI_FROM_DATABASE=Nokia Solutions and Networks GmbH & Co. KG
 
@@ -125990,6 +127814,9 @@ OUI:C05234*
 OUI:C05336*
  ID_OUI_FROM_DATABASE=Beijing National Railway Research & Design Institute of Signal & Communication Group Co..Ltd.
 
+OUI:C0544D*
+ ID_OUI_FROM_DATABASE=Nokia Shanghai Bell Co., Ltd.
+
 OUI:C0555C*
  ID_OUI_FROM_DATABASE=Impulse Labs
 
@@ -126131,6 +127958,9 @@ OUI:C07009*
 OUI:C071AA*
  ID_OUI_FROM_DATABASE=ShenZhen OnMicro Electronics Co.,Ltd.
 
+OUI:C07415*
+ ID_OUI_FROM_DATABASE=IntelPro Inc.
+
 OUI:C0742B*
  ID_OUI_FROM_DATABASE=SHENZHEN XUNLONG SOFTWARE CO.,LIMITED
 
@@ -126245,6 +128075,9 @@ OUI:C08706*
 OUI:C087EB*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:C08840*
+ ID_OUI_FROM_DATABASE=GD Midea Air-Conditioning Equipment Co.,Ltd.
+
 OUI:C0885B*
  ID_OUI_FROM_DATABASE=SnD Tech Co., Ltd.
 
@@ -126344,6 +128177,9 @@ OUI:C09AD0*
 OUI:C09B63*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:C09B9E*
+ ID_OUI_FROM_DATABASE=Silicon Laboratories
+
 OUI:C09BF40*
  ID_OUI_FROM_DATABASE=Annapurna labs
 
@@ -126485,6 +128321,9 @@ OUI:C0AD97*
 OUI:C0AEFD*
  ID_OUI_FROM_DATABASE=Shenzhen HC-WLAN Technology Co.,Ltd
 
+OUI:C0AFF2*
+ ID_OUI_FROM_DATABASE=Dyson Limited
+
 OUI:C0B101*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -126611,6 +128450,9 @@ OUI:C0CC42*
 OUI:C0CCF8*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:C0CDD6*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:C0CECD*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -127190,6 +129032,9 @@ OUI:C432D1*
 OUI:C43306*
  ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
 
+OUI:C43396*
+ ID_OUI_FROM_DATABASE=Dongguan Hele Electronics Co., Ltd.
+
 OUI:C4345B*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -127712,6 +129557,9 @@ OUI:C484FC*
 OUI:C48508*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:C4864F*
+ ID_OUI_FROM_DATABASE=Beijing BitIntelligence Information Technology Co. Ltd.
+
 OUI:C486E9*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -127883,6 +129731,12 @@ OUI:C49894E*
 OUI:C49A02*
  ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
 
+OUI:C49A31*
+ ID_OUI_FROM_DATABASE=Zyxel Communications Corporation
+
+OUI:C49A89*
+ ID_OUI_FROM_DATABASE=Suzhou K-Hiragawa Electronic Technology Co.,Ltd
+
 OUI:C49D08*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -128093,6 +129947,9 @@ OUI:C4BA99*
 OUI:C4BAA3*
  ID_OUI_FROM_DATABASE=Beijing Winicssec Technologies Co., Ltd.
 
+OUI:C4BB03*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:C4BB4C*
  ID_OUI_FROM_DATABASE=Zebra Information Tech Co. Ltd
 
@@ -128294,6 +130151,9 @@ OUI:C4DA7D*
 OUI:C4DB04*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:C4DBAD*
+ ID_OUI_FROM_DATABASE=Ring LLC
+
 OUI:C4DD57*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
@@ -128597,6 +130457,9 @@ OUI:C80739*
 OUI:C80873*
  ID_OUI_FROM_DATABASE=Ruckus Wireless
 
+OUI:C8088B*
+ ID_OUI_FROM_DATABASE=Arista Networks
+
 OUI:C808E9*
  ID_OUI_FROM_DATABASE=LG Electronics
 
@@ -128669,6 +130532,9 @@ OUI:C816DA*
 OUI:C81739*
  ID_OUI_FROM_DATABASE=ITEL MOBILE LIMITED
 
+OUI:C817F5*
+ ID_OUI_FROM_DATABASE=Nanjing Qinheng Microelectronics Co., Ltd.
+
 OUI:C819F7*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -128714,12 +130580,18 @@ OUI:C82158*
 OUI:C821DA*
  ID_OUI_FROM_DATABASE=Shenzhen YOUHUA Technology Co., Ltd
 
+OUI:C82478*
+ ID_OUI_FROM_DATABASE=Edifier International
+
 OUI:C82496*
  ID_OUI_FROM_DATABASE=Jiangsu Yinhe  Electronics Co.,Ltd.
 
 OUI:C825E1*
  ID_OUI_FROM_DATABASE=Lemobile Information Technology (Beijing) Co., Ltd
 
+OUI:C826E2*
+ ID_OUI_FROM_DATABASE=CHINA DRAGON TECHNOLOGY LIMITED
+
 OUI:C82832*
  ID_OUI_FROM_DATABASE=Beijing Xiaomi Electronics Co., Ltd.
 
@@ -128949,7 +130821,7 @@ OUI:C85309*
  ID_OUI_FROM_DATABASE=LCFC(Hefei) Electronics Technology co., ltd
 
 OUI:C853E1*
- ID_OUI_FROM_DATABASE=Beijing Bytedance Network Technology Co., Ltd
+ ID_OUI_FROM_DATABASE=Douyin Vision Co., Ltd
 
 OUI:C8544B*
  ID_OUI_FROM_DATABASE=Zyxel Communications Corporation
@@ -129107,6 +130979,9 @@ OUI:C864C7*
 OUI:C8662C*
  ID_OUI_FROM_DATABASE=Beijing Haitai Fangyuan High Technology Co,.Ltd.
 
+OUI:C8664B*
+ ID_OUI_FROM_DATABASE=Aperion Technologies LLC
+
 OUI:C8665D*
  ID_OUI_FROM_DATABASE=Extreme Networks Headquarters
 
@@ -129251,6 +131126,9 @@ OUI:C87E75*
 OUI:C87EA1*
  ID_OUI_FROM_DATABASE=TCL MOKA International Limited
 
+OUI:C87F2B*
+ ID_OUI_FROM_DATABASE=INGRAM MICRO SERVICES
+
 OUI:C87F54*
  ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
 
@@ -129366,7 +131244,7 @@ OUI:C88F26*
  ID_OUI_FROM_DATABASE=Skyworth Digital Technology(Shenzhen) Co.,Ltd
 
 OUI:C89009*
- ID_OUI_FROM_DATABASE=Budderfly, LLC
+ ID_OUI_FROM_DATABASE=Budderfly Inc.
 
 OUI:C8903E*
  ID_OUI_FROM_DATABASE=Pakton Technologies
@@ -129513,7 +131391,7 @@ OUI:C8A1DC*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
 OUI:C8A23B*
- ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies Company Limited
+ ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies company Limited
 
 OUI:C8A2CE*
  ID_OUI_FROM_DATABASE=Oasis Media Systems LLC
@@ -129695,6 +131573,9 @@ OUI:C8C750*
 OUI:C8C791*
  ID_OUI_FROM_DATABASE=Zero1.tv GmbH
 
+OUI:C8C83F*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:C8C9A3*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
@@ -129833,6 +131714,9 @@ OUI:C8E265*
 OUI:C8E306*
  ID_OUI_FROM_DATABASE=eero inc.
 
+OUI:C8E31D*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:C8E42F*
  ID_OUI_FROM_DATABASE=Technical Research Design and Development
 
@@ -130289,6 +132173,9 @@ OUI:CC2293*
 OUI:CC22DF*
  ID_OUI_FROM_DATABASE=EM Microelectronic
 
+OUI:CC22FE*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:CC242E*
  ID_OUI_FROM_DATABASE=Shenzhen SuperElectron Technology Co.,Ltd.
 
@@ -130622,6 +132509,9 @@ OUI:CC5D57*
 OUI:CC5D78*
  ID_OUI_FROM_DATABASE=JTD Consulting
 
+OUI:CC5EA5*
+ ID_OUI_FROM_DATABASE=Palo Alto Networks
+
 OUI:CC5EF8*
  ID_OUI_FROM_DATABASE=CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
 
@@ -130640,6 +132530,9 @@ OUI:CC60C8*
 OUI:CC61E5*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
+OUI:CC6200*
+ ID_OUI_FROM_DATABASE=Honor Device Co., Ltd.
+
 OUI:CC62FE*
  ID_OUI_FROM_DATABASE=UNION MAN TECHNOLOGY CO.,LTD
 
@@ -130661,6 +132554,9 @@ OUI:CC6618*
 OUI:CC66B2*
  ID_OUI_FROM_DATABASE=Nokia
 
+OUI:CC67D8*
+ ID_OUI_FROM_DATABASE=Telin Semiconductor (Wuhan) Co.,Ltd
+
 OUI:CC68B6*
  ID_OUI_FROM_DATABASE=TP-Link Systems Inc
 
@@ -130689,7 +132585,7 @@ OUI:CC6BF1*
  ID_OUI_FROM_DATABASE=Sound Masking Inc.
 
 OUI:CC6C52*
- ID_OUI_FROM_DATABASE=DZS Inc.
+ ID_OUI_FROM_DATABASE=Zhone Technologies, Inc.
 
 OUI:CC6D55*
  ID_OUI_FROM_DATABASE=Sichuan Tianyi Comheart Telecom Co.,LTD
@@ -131033,6 +132929,9 @@ OUI:CCBA6F*
 OUI:CCBA97*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
+OUI:CCBABD*
+ ID_OUI_FROM_DATABASE=TP-Link Systems Inc.
+
 OUI:CCBBFE*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -131165,6 +133064,9 @@ OUI:CCCE40*
 OUI:CCCF83*
  ID_OUI_FROM_DATABASE=CIG SHANGHAI CO LTD
 
+OUI:CCCFFE*
+ ID_OUI_FROM_DATABASE=Henan Lingyunda Information Technology Co., Ltd
+
 OUI:CCD083*
  ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
 
@@ -131348,6 +133250,9 @@ OUI:CCE1D5*
 OUI:CCE236*
  ID_OUI_FROM_DATABASE=Hangzhou Yaguan Technology Co. LTD
 
+OUI:CCE4D1*
+ ID_OUI_FROM_DATABASE=Arista Networks
+
 OUI:CCE536*
  ID_OUI_FROM_DATABASE=ittim
 
@@ -131369,6 +133274,9 @@ OUI:CCE9FA*
 OUI:CCEA1C*
  ID_OUI_FROM_DATABASE=DCONWORKS  Co., Ltd
 
+OUI:CCEA27*
+ ID_OUI_FROM_DATABASE=GE Appliances
+
 OUI:CCEB18*
  ID_OUI_FROM_DATABASE=OOO TSS
 
@@ -131456,6 +133364,9 @@ OUI:CCFA00*
 OUI:CCFA66*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:CCFAF1*
+ ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
+
 OUI:CCFB65*
  ID_OUI_FROM_DATABASE=Nintendo Co., Ltd.
 
@@ -132155,6 +134066,9 @@ OUI:D06726*
 OUI:D067E5*
  ID_OUI_FROM_DATABASE=Dell Inc.
 
+OUI:D06827*
+ ID_OUI_FROM_DATABASE=eero inc.
+
 OUI:D0699E*
  ID_OUI_FROM_DATABASE=LUMINEX Lighting Control Equipment
 
@@ -132281,6 +134195,9 @@ OUI:D077CE*
 OUI:D07880*
  ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 
+OUI:D0789A*
+ ID_OUI_FROM_DATABASE=Vantiva - Connected Home
+
 OUI:D07AB5*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -132480,7 +134397,7 @@ OUI:D09686E*
  ID_OUI_FROM_DATABASE=withnetworks
 
 OUI:D096FB*
- ID_OUI_FROM_DATABASE=DZS Inc.
+ ID_OUI_FROM_DATABASE=Zhone Technologies, Inc.
 
 OUI:D097FE*
  ID_OUI_FROM_DATABASE=Realme Chongqing Mobile Telecommunications Corp.,Ltd.
@@ -132692,6 +134609,9 @@ OUI:D0B0CD*
 OUI:D0B128*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:D0B1CA*
+ ID_OUI_FROM_DATABASE=Shenzhen Skyworth Digital  Technology  CO., Ltd
+
 OUI:D0B214*
  ID_OUI_FROM_DATABASE=PoeWit Inc
 
@@ -132797,6 +134717,9 @@ OUI:D0C637*
 OUI:D0C65B*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:D0C67F*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:D0C730*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -133361,6 +135284,9 @@ OUI:D42751*
 OUI:D42787*
  ID_OUI_FROM_DATABASE=Shanghai High-Flying Electronics  Technology Co., Ltd
 
+OUI:D427FF*
+ ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
+
 OUI:D428B2*
  ID_OUI_FROM_DATABASE=ioBridge, Inc.
 
@@ -133391,6 +135317,9 @@ OUI:D42DC5*
 OUI:D42F23*
  ID_OUI_FROM_DATABASE=Akenori PTE Ltd
 
+OUI:D42F4B*
+ ID_OUI_FROM_DATABASE=Hon Hai Precision Industry Co.,LTD
+
 OUI:D42FCA*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -133568,6 +135497,9 @@ OUI:D452C7*
 OUI:D452EE*
  ID_OUI_FROM_DATABASE=SKY UK LIMITED
 
+OUI:D4532A*
+ ID_OUI_FROM_DATABASE=Beijing Xiaomi Mobile Software Co., Ltd
+
 OUI:D45347*
  ID_OUI_FROM_DATABASE=Merytronic 2012, S.L.
 
@@ -133688,6 +135620,9 @@ OUI:D46137D*
 OUI:D46137E*
  ID_OUI_FROM_DATABASE=UAB Brolis sensor technology
 
+OUI:D46195*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:D4619D*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -133743,7 +135678,7 @@ OUI:D468AA*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
 OUI:D468BA*
- ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies Company Limited
+ ID_OUI_FROM_DATABASE=Shenzhen Sundray Technologies company Limited
 
 OUI:D469A5*
  ID_OUI_FROM_DATABASE=Miura Systems Ltd.
@@ -133832,6 +135767,9 @@ OUI:D47954*
 OUI:D479C3*
  ID_OUI_FROM_DATABASE=Cameronet GmbH & Co. KG
 
+OUI:D47A97*
+ ID_OUI_FROM_DATABASE=Realme Chongqing Mobile Telecommunications Corp.,Ltd.
+
 OUI:D47AE2*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -133841,6 +135779,9 @@ OUI:D47AEC*
 OUI:D47B35*
  ID_OUI_FROM_DATABASE=NEO Monitors AS
 
+OUI:D47B6B*
+ ID_OUI_FROM_DATABASE=Shanghai Cygnus Semiconductor Co., Ltd.
+
 OUI:D47B75*
  ID_OUI_FROM_DATABASE=HARTING Electronics GmbH
 
@@ -134063,6 +136004,9 @@ OUI:D49B74*
 OUI:D49C28*
  ID_OUI_FROM_DATABASE=JayBird LLC
 
+OUI:D49C53*
+ ID_OUI_FROM_DATABASE=NETCRAZE LLC
+
 OUI:D49C8E*
  ID_OUI_FROM_DATABASE=University of FUKUI
 
@@ -134072,6 +136016,9 @@ OUI:D49CDD*
 OUI:D49CF4*
  ID_OUI_FROM_DATABASE=Palo Alto Networks
 
+OUI:D49D9D*
+ ID_OUI_FROM_DATABASE=Shenzhen Goodocom lnformation Technology Co.,Ltd.
+
 OUI:D49DC0*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -134090,6 +136037,51 @@ OUI:D49FDD*
 OUI:D4A02A*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:D4A0FB0*
+ ID_OUI_FROM_DATABASE=M2MD Technologies, Inc.
+
+OUI:D4A0FB1*
+ ID_OUI_FROM_DATABASE=Intersvyaz IT
+
+OUI:D4A0FB2*
+ ID_OUI_FROM_DATABASE=Beijing Lingji Innovations technology Co,LTD.
+
+OUI:D4A0FB3*
+ ID_OUI_FROM_DATABASE=NEXXUS NETWORKS INDIA PRIVATE LIMITED
+
+OUI:D4A0FB4*
+ ID_OUI_FROM_DATABASE=Shenzhen Dijiean Technology Co., Ltd
+
+OUI:D4A0FB5*
+ ID_OUI_FROM_DATABASE=Corelase Oy
+
+OUI:D4A0FB6*
+ ID_OUI_FROM_DATABASE=Huizhou Jiemeisi Technology Co.,Ltd.
+
+OUI:D4A0FB7*
+ ID_OUI_FROM_DATABASE=Skyfri Corp
+
+OUI:D4A0FB8*
+ ID_OUI_FROM_DATABASE=Parpro System Corporation
+
+OUI:D4A0FB9*
+ ID_OUI_FROM_DATABASE=Hangteng (HK) Technology Co., Limited
+
+OUI:D4A0FBA*
+ ID_OUI_FROM_DATABASE=IMPULSE CCTV NETWORKS INDIA PVT. LTD.
+
+OUI:D4A0FBB*
+ ID_OUI_FROM_DATABASE=Spatial Hover  Inc
+
+OUI:D4A0FBC*
+ ID_OUI_FROM_DATABASE=Snap-on Tools
+
+OUI:D4A0FBD*
+ ID_OUI_FROM_DATABASE=FASTWEL ELECTRONICS INDIA PRIVATE LIMITED
+
+OUI:D4A0FBE*
+ ID_OUI_FROM_DATABASE=GTEK GLOBAL CO.,LTD
+
 OUI:D4A148*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -134117,6 +136109,9 @@ OUI:D4A425*
 OUI:D4A499*
  ID_OUI_FROM_DATABASE=InView Technology Corporation
 
+OUI:D4A5B4*
+ ID_OUI_FROM_DATABASE=Hengji Jiaye (Hangzhou) Technology Co., Ltd
+
 OUI:D4A651*
  ID_OUI_FROM_DATABASE=Tuya Smart Inc.
 
@@ -134261,6 +136256,9 @@ OUI:D4BD1E*
 OUI:D4BD4F*
  ID_OUI_FROM_DATABASE=Ruckus Wireless
 
+OUI:D4BED7*
+ ID_OUI_FROM_DATABASE=Dell Inc.
+
 OUI:D4BED9*
  ID_OUI_FROM_DATABASE=Dell Inc.
 
@@ -134441,6 +136439,9 @@ OUI:D4E95E*
 OUI:D4E98A*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:D4E9F4*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:D4EA0E*
  ID_OUI_FROM_DATABASE=Avaya Inc
 
@@ -134546,6 +136547,9 @@ OUI:D4FC13*
 OUI:D4FE28*
  ID_OUI_FROM_DATABASE=Silicon Laboratories
 
+OUI:D4FF26*
+ ID_OUI_FROM_DATABASE=OHSUNG
+
 OUI:D8004D*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -134555,6 +136559,9 @@ OUI:D80093*
 OUI:D801D0*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:D801EB*
+ ID_OUI_FROM_DATABASE=Infinity Electronics Ltd
+
 OUI:D8028A*
  ID_OUI_FROM_DATABASE=Shenzhen YOUHUA Technology Co., Ltd
 
@@ -134690,6 +136697,9 @@ OUI:D81C14*
 OUI:D81C79*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:D81D13*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:D81D72*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -134702,6 +136712,9 @@ OUI:D81EDE*
 OUI:D81F12*
  ID_OUI_FROM_DATABASE=Tuya Smart Inc.
 
+OUI:D81F65*
+ ID_OUI_FROM_DATABASE=Private
+
 OUI:D81FCC*
  ID_OUI_FROM_DATABASE=Brocade Communications Systems LLC
 
@@ -134852,6 +136865,9 @@ OUI:D83D3F*
 OUI:D83DCC*
  ID_OUI_FROM_DATABASE=shenzhen UDD Technologies,co.,Ltd
 
+OUI:D83EEF*
+ ID_OUI_FROM_DATABASE=COOSEA GROUP (HK) COMPANY LIMITED
+
 OUI:D84008*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -134861,6 +136877,9 @@ OUI:D842AC*
 OUI:D842E2*
  ID_OUI_FROM_DATABASE=Canary Connect, Inc.
 
+OUI:D842F7*
+ ID_OUI_FROM_DATABASE=Tozed Kangwei Tech Co.,Ltd
+
 OUI:D843AE*
  ID_OUI_FROM_DATABASE=Micro-Star INTL CO., LTD.
 
@@ -134939,9 +136958,15 @@ OUI:D850A1*
 OUI:D850E6*
  ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
 
+OUI:D852FA*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:D8539A*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
+OUI:D853AD*
+ ID_OUI_FROM_DATABASE=Cisco Meraki
+
 OUI:D853BC*
  ID_OUI_FROM_DATABASE=Lenovo Information Products (Shenzhen)Co.,Ltd
 
@@ -134975,6 +137000,9 @@ OUI:D858D7*
 OUI:D85982*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:D85A49*
+ ID_OUI_FROM_DATABASE=INGCHIPS Technology Co., Ltd
+
 OUI:D85B22*
  ID_OUI_FROM_DATABASE=Shenzhen Hohunet Technology Co., Ltd
 
@@ -135053,6 +137081,9 @@ OUI:D868C3*
 OUI:D86960*
  ID_OUI_FROM_DATABASE=Steinsvik
 
+OUI:D86B83*
+ ID_OUI_FROM_DATABASE=Nintendo Co.,Ltd
+
 OUI:D86BF7*
  ID_OUI_FROM_DATABASE=Nintendo Co., Ltd.
 
@@ -135077,6 +137108,9 @@ OUI:D86D17*
 OUI:D8714D*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:D87154*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:D87157*
  ID_OUI_FROM_DATABASE=Lenovo Mobile Communication Technology Ltd.
 
@@ -135161,6 +137195,9 @@ OUI:D88332*
 OUI:D88466*
  ID_OUI_FROM_DATABASE=Extreme Networks Headquarters
 
+OUI:D885AC*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:D8860B0*
  ID_OUI_FROM_DATABASE=Inspur Group Co., Ltd.
 
@@ -135260,6 +137297,9 @@ OUI:D893D4*
 OUI:D89403*
  ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
 
+OUI:D89424*
+ ID_OUI_FROM_DATABASE=Mellanox Technologies, Inc.
+
 OUI:D8952F*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -135425,6 +137465,9 @@ OUI:D8B249*
 OUI:D8B293*
  ID_OUI_FROM_DATABASE=TOPSSD
 
+OUI:D8B2AA*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:D8B32F*
  ID_OUI_FROM_DATABASE=CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
 
@@ -135632,6 +137675,9 @@ OUI:D8DF7A*
 OUI:D8E004*
  ID_OUI_FROM_DATABASE=Vodia Networks Inc
 
+OUI:D8E016*
+ ID_OUI_FROM_DATABASE=Extreme Networks Headquarters
+
 OUI:D8E0B8*
  ID_OUI_FROM_DATABASE=BULAT LLC
 
@@ -135701,6 +137747,9 @@ OUI:D8EFCD*
 OUI:D8F0F2*
  ID_OUI_FROM_DATABASE=Zeebo Inc
 
+OUI:D8F12E*
+ ID_OUI_FROM_DATABASE=TP-Link Systems Inc.
+
 OUI:D8F15B*
  ID_OUI_FROM_DATABASE=Espressif Inc.
 
@@ -135842,6 +137891,9 @@ OUI:DC0EA1*
 OUI:DC1057*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:DC121D*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:DC152D*
  ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
 
@@ -136361,6 +138413,9 @@ OUI:DC6F08*
 OUI:DC7014*
  ID_OUI_FROM_DATABASE=Private
 
+OUI:DC7035*
+ ID_OUI_FROM_DATABASE=Shengzhen Gongjin Electronics
+
 OUI:DC7137*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -136535,6 +138590,9 @@ OUI:DC91BF*
 OUI:DC9272*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
+OUI:DC9396*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:DC9566*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -136610,6 +138668,9 @@ OUI:DCA120*
 OUI:DCA266*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
+OUI:DCA281*
+ ID_OUI_FROM_DATABASE=Honor Device Co., Ltd.
+
 OUI:DCA313*
  ID_OUI_FROM_DATABASE=Shenzhen Changjin Communication Technology Co.,Ltd
 
@@ -136703,6 +138764,9 @@ OUI:DCB4C4*
 OUI:DCB4CA*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
+OUI:DCB4D9*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:DCB54F*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -136718,6 +138782,9 @@ OUI:DCB7FC*
 OUI:DCB808*
  ID_OUI_FROM_DATABASE=Extreme Networks Headquarters
 
+OUI:DCBB3D*
+ ID_OUI_FROM_DATABASE=Extreme Networks Headquarters
+
 OUI:DCBB96*
  ID_OUI_FROM_DATABASE=Full Solution Telecom
 
@@ -136991,6 +139058,9 @@ OUI:DCEB94*
 OUI:DCEC06*
  ID_OUI_FROM_DATABASE=Heimi Network Technology Co., Ltd.
 
+OUI:DCEC4F*
+ ID_OUI_FROM_DATABASE=Guangzhou Shiyuan Electronic Technology Company Limited
+
 OUI:DCECE3*
  ID_OUI_FROM_DATABASE=HORYS TECHNOLOGIES LLC
 
@@ -137243,6 +139313,51 @@ OUI:E02202*
 OUI:E022A1*
  ID_OUI_FROM_DATABASE=AltoBeam Inc.
 
+OUI:E0233B0*
+ ID_OUI_FROM_DATABASE=Quality Pay Systems S.L.
+
+OUI:E0233B1*
+ ID_OUI_FROM_DATABASE=Elvys s.r.o
+
+OUI:E0233B2*
+ ID_OUI_FROM_DATABASE=PluralFusion INC
+
+OUI:E0233B3*
+ ID_OUI_FROM_DATABASE=356 Productions
+
+OUI:E0233B4*
+ ID_OUI_FROM_DATABASE=The KIE
+
+OUI:E0233B5*
+ ID_OUI_FROM_DATABASE=IOFAC
+
+OUI:E0233B6*
+ ID_OUI_FROM_DATABASE=Kiwimoore(Shanghai) Semiconductor Co.,Ltd
+
+OUI:E0233B7*
+ ID_OUI_FROM_DATABASE=Rehear Audiology Company LTD.
+
+OUI:E0233B8*
+ ID_OUI_FROM_DATABASE=Suzhou Visrgb Technology Co., Ltd
+
+OUI:E0233B9*
+ ID_OUI_FROM_DATABASE=HANET TECHNOLOGY
+
+OUI:E0233BA*
+ ID_OUI_FROM_DATABASE=ShenZhen Chainway Information Technology Co., Ltd.
+
+OUI:E0233BB*
+ ID_OUI_FROM_DATABASE=Shenzhen C & D Electronics Co., Ltd.
+
+OUI:E0233BC*
+ ID_OUI_FROM_DATABASE=Chengdu ChengFeng   Technology co,. Ltd.
+
+OUI:E0233BD*
+ ID_OUI_FROM_DATABASE=Magosys Systems LTD
+
+OUI:E0233BE*
+ ID_OUI_FROM_DATABASE=Ugreen Group Limited
+
 OUI:E023D7*
  ID_OUI_FROM_DATABASE=Sleep Number
 
@@ -137258,6 +139373,9 @@ OUI:E02481*
 OUI:E02538*
  ID_OUI_FROM_DATABASE=Titan Pet Products
 
+OUI:E02611*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:E02630*
  ID_OUI_FROM_DATABASE=Intrigue Technologies, Inc.
 
@@ -137405,6 +139523,9 @@ OUI:E0383F*
 OUI:E039D7*
  ID_OUI_FROM_DATABASE=Plexxi, Inc.
 
+OUI:E03AAA*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:E03C1C0*
  ID_OUI_FROM_DATABASE=Scangrip
 
@@ -137474,12 +139595,18 @@ OUI:E03F49*
 OUI:E04007*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:E04027*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:E04102*
  ID_OUI_FROM_DATABASE=zte corporation
 
 OUI:E04136*
  ID_OUI_FROM_DATABASE=MitraStar Technology Corp.
 
+OUI:E0426D*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
 OUI:E043DB*
  ID_OUI_FROM_DATABASE=Shenzhen ViewAt Technology Co.,Ltd.
 
@@ -137510,6 +139637,9 @@ OUI:E048D3*
 OUI:E048D8*
  ID_OUI_FROM_DATABASE=Guangzhi Wulian Technology(Guangzhou) Co., Ltd
 
+OUI:E04934*
+ ID_OUI_FROM_DATABASE=Calix Inc.
+
 OUI:E049ED*
  ID_OUI_FROM_DATABASE=Audeze LLC
 
@@ -137787,7 +139917,7 @@ OUI:E0859A*
  ID_OUI_FROM_DATABASE=SHENZHEN RF-LINK TECHNOLOGY CO.,LTD.
 
 OUI:E08614*
- ID_OUI_FROM_DATABASE=Novatel Wireless Solutions, Inc.
+ ID_OUI_FROM_DATABASE=Inseego Wireless, Inc
 
 OUI:E087B1*
  ID_OUI_FROM_DATABASE=Nata-Info Ltd.
@@ -137807,6 +139937,9 @@ OUI:E08A7E*
 OUI:E08C3C*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:E08CFE*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:E08E3C*
  ID_OUI_FROM_DATABASE=Aztech Electronics Pte Ltd
 
@@ -138200,9 +140333,15 @@ OUI:E0D462*
 OUI:E0D464*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:E0D491*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:E0D4E8*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:E0D55D*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:E0D55E*
  ID_OUI_FROM_DATABASE=GIGA-BYTE TECHNOLOGY CO.,LTD.
 
@@ -138254,6 +140393,9 @@ OUI:E0DCFF*
 OUI:E0DDC0*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
+OUI:E0DEF2*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:E0DF13*
  ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
 
@@ -138290,6 +140432,9 @@ OUI:E0E631*
 OUI:E0E656*
  ID_OUI_FROM_DATABASE=Nethesis  srl
 
+OUI:E0E6E3*
+ ID_OUI_FROM_DATABASE=TeamF1 Networks Pvt Limited
+
 OUI:E0E751*
  ID_OUI_FROM_DATABASE=Nintendo Co., Ltd.
 
@@ -138713,6 +140858,9 @@ OUI:E447B3*
 OUI:E448C7*
  ID_OUI_FROM_DATABASE=Cisco SPVTG
 
+OUI:E44AE0*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:E44C6C*
  ID_OUI_FROM_DATABASE=Shenzhen Guo Wei Electronic Co,. Ltd.
 
@@ -138806,6 +140954,12 @@ OUI:E455EA*
 OUI:E45614*
  ID_OUI_FROM_DATABASE=Suttle Apparatus
 
+OUI:E456AC*
+ ID_OUI_FROM_DATABASE=Silicon Laboratories
+
+OUI:E456CA*
+ ID_OUI_FROM_DATABASE=Fractal BMS
+
 OUI:E45740*
  ID_OUI_FROM_DATABASE=Commscope
 
@@ -138905,6 +141059,9 @@ OUI:E467A6*
 OUI:E467BA*
  ID_OUI_FROM_DATABASE=Danish Interpretation Systems A/S
 
+OUI:E467DD*
+ ID_OUI_FROM_DATABASE=ELA INNOVATION
+
 OUI:E468A3*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -138923,6 +141080,9 @@ OUI:E46CD1*
 OUI:E46D7F*
  ID_OUI_FROM_DATABASE=Ciena Corporation
 
+OUI:E46E8A*
+ ID_OUI_FROM_DATABASE=BYD Lithium Battery Co., Ltd.
+
 OUI:E46F13*
  ID_OUI_FROM_DATABASE=D-Link International
 
@@ -139031,6 +141191,9 @@ OUI:E484D3*
 OUI:E48501*
  ID_OUI_FROM_DATABASE=Geberit International AG
 
+OUI:E489CA*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:E48A93*
  ID_OUI_FROM_DATABASE=HISENSE VISUAL TECHNOLOGY CO.,LTD
 
@@ -139139,6 +141302,9 @@ OUI:E4956EE*
 OUI:E4956EF*
  ID_OUI_FROM_DATABASE=Private
 
+OUI:E49652*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
 OUI:E496AE*
  ID_OUI_FROM_DATABASE=ALTOGRAPHICS Inc.
 
@@ -139175,6 +141341,9 @@ OUI:E49E12*
 OUI:E49F1E*
  ID_OUI_FROM_DATABASE=Commscope
 
+OUI:E49F7D*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:E4A1E6*
  ID_OUI_FROM_DATABASE=Alcatel-Lucent Shanghai Bell Co., Ltd
 
@@ -139256,6 +141425,9 @@ OUI:E4B063*
 OUI:E4B107*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:E4B16C*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:E4B224*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -139277,6 +141449,9 @@ OUI:E4B555*
 OUI:E4B633*
  ID_OUI_FROM_DATABASE=Wuxi Stars Microsystem Technology Co., Ltd
 
+OUI:E4B731*
+ ID_OUI_FROM_DATABASE=Hangzhou Advance IOT Connectivity System Co., Ltd.
+
 OUI:E4B97A*
  ID_OUI_FROM_DATABASE=Dell Inc.
 
@@ -139874,6 +142049,9 @@ OUI:E83F67*
 OUI:E84040*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:E84074*
+ ID_OUI_FROM_DATABASE=Barrot Technology Co.,Ltd.
+
 OUI:E840F2*
  ID_OUI_FROM_DATABASE=PEGATRON CORPORATION
 
@@ -140222,6 +142400,12 @@ OUI:E879A3*
 OUI:E87AF3*
  ID_OUI_FROM_DATABASE=S5 Tech S.r.l.
 
+OUI:E87E1C*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
+OUI:E87EEF*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:E87F6B*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -140342,6 +142526,9 @@ OUI:E8986D*
 OUI:E898C2*
  ID_OUI_FROM_DATABASE=ZETLAB Company
 
+OUI:E898EE*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:E8995A*
  ID_OUI_FROM_DATABASE=PiiGAB, Processinformation i Goteborg AB
 
@@ -140366,6 +142553,9 @@ OUI:E89E0C*
 OUI:E89E13*
  ID_OUI_FROM_DATABASE=CRESYN
 
+OUI:E89E49*
+ ID_OUI_FROM_DATABASE=Mellanox Technologies, Inc.
+
 OUI:E89EB4*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
@@ -140402,6 +142592,9 @@ OUI:E8A364*
 OUI:E8A4C1*
  ID_OUI_FROM_DATABASE=Deep Sea Electronics Ltd
 
+OUI:E8A55A*
+ ID_OUI_FROM_DATABASE=Juniper Networks
+
 OUI:E8A660*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -140564,6 +142757,9 @@ OUI:E8BFB8*
 OUI:E8BFDB*
  ID_OUI_FROM_DATABASE=Inodesign Group
 
+OUI:E8BFE1*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:E8C1B8*
  ID_OUI_FROM_DATABASE=Nanjing Bangzhong Electronic Commerce Limited
 
@@ -140600,6 +142796,12 @@ OUI:E8C7CF*
 OUI:E8C829*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:E8C913*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
+OUI:E8CA50*
+ ID_OUI_FROM_DATABASE=Bouffalo Lab (Nanjing) Co., Ltd.
+
 OUI:E8CAC8*
  ID_OUI_FROM_DATABASE=Hui Zhou Gaoshengda Technology Co.,LTD
 
@@ -140621,6 +142823,9 @@ OUI:E8CC32*
 OUI:E8CC8C*
  ID_OUI_FROM_DATABASE=Chengdu Jiarui Hualian Communication Technology Co
 
+OUI:E8CD15*
+ ID_OUI_FROM_DATABASE=Vantiva USA LLC
+
 OUI:E8CD2D*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -141008,6 +143213,9 @@ OUI:EC0EC4*
 OUI:EC0ED6*
  ID_OUI_FROM_DATABASE=ITECH INSTRUMENTS SAS
 
+OUI:EC1055*
+ ID_OUI_FROM_DATABASE=Beijing Xiaomi Electronics Co.,Ltd
+
 OUI:EC107B*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -141161,6 +143369,9 @@ OUI:EC3091*
 OUI:EC30B3*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
+OUI:EC3111*
+ ID_OUI_FROM_DATABASE=Sichuan AI-Link Technology Co., Ltd.
+
 OUI:EC314A*
  ID_OUI_FROM_DATABASE=Chengdu Quanjing Intelligent Technology Co.,Ltd
 
@@ -141560,6 +143771,9 @@ OUI:EC7C74*
 OUI:EC7CB6*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:EC7CBA*
+ ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
+
 OUI:EC7D11*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
@@ -141773,6 +143987,9 @@ OUI:EC9C32*
 OUI:EC9ECD*
  ID_OUI_FROM_DATABASE=Artesyn Embedded Technologies
 
+OUI:EC9EEA*
+ ID_OUI_FROM_DATABASE=Xtra Technology LLC
+
 OUI:EC9F0D0*
  ID_OUI_FROM_DATABASE=Hesai Photonics Technology Co., Ltd
 
@@ -141971,6 +144188,9 @@ OUI:ECB970*
 OUI:ECBAFE*
  ID_OUI_FROM_DATABASE=GIROPTIC
 
+OUI:ECBB78*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:ECBBAE*
  ID_OUI_FROM_DATABASE=Digivoice Tecnologia em Eletronica Ltda
 
@@ -142160,6 +144380,9 @@ OUI:ECEA03*
 OUI:ECEBB8*
  ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
 
+OUI:ECED04*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:ECED73*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
@@ -142619,6 +144842,9 @@ OUI:F02B18*
 OUI:F02B7C*
  ID_OUI_FROM_DATABASE=Extreme Networks Headquarters
 
+OUI:F02C59*
+ ID_OUI_FROM_DATABASE=Chipsea Technologies (Shenzhen) Crop.
+
 OUI:F02E51*
  ID_OUI_FROM_DATABASE=Casa Systems
 
@@ -142802,6 +145028,9 @@ OUI:F05494*
 OUI:F05501*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:F0578D*
+ ID_OUI_FROM_DATABASE=JetHome LLC
+
 OUI:F057A6*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -142880,6 +145109,9 @@ OUI:F06853*
 OUI:F06865*
  ID_OUI_FROM_DATABASE=Taicang T&W Electronics
 
+OUI:F068E3*
+ ID_OUI_FROM_DATABASE=AzureWave Technology Inc.
+
 OUI:F06BCA*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -142901,6 +145133,9 @@ OUI:F06E32*
 OUI:F06F46*
  ID_OUI_FROM_DATABASE=Ubiik
 
+OUI:F06FCE*
+ ID_OUI_FROM_DATABASE=Ruckus Wireless
+
 OUI:F0704F*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -142955,6 +145190,9 @@ OUI:F07960*
 OUI:F079E8*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
+OUI:F07A55*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:F07B65*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
@@ -143666,6 +145904,9 @@ OUI:F40595*
 OUI:F40616*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:F4063C*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
 OUI:F40669*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -143765,6 +146006,9 @@ OUI:F412FA*
 OUI:F41399*
  ID_OUI_FROM_DATABASE=Aerospace new generation communications Co.,Ltd
 
+OUI:F414BF*
+ ID_OUI_FROM_DATABASE=LG Innotek
+
 OUI:F41532*
  ID_OUI_FROM_DATABASE=PETAiO (NanJing), Inc.
 
@@ -143772,7 +146016,7 @@ OUI:F41535*
  ID_OUI_FROM_DATABASE=SPON Communication Technology Co.,Ltd
 
 OUI:F41563*
- ID_OUI_FROM_DATABASE=F5 Networks, Inc.
+ ID_OUI_FROM_DATABASE=F5 Inc.
 
 OUI:F415FD*
  ID_OUI_FROM_DATABASE=Shanghai Pateo Electronic Equipment Manufacturing Co., Ltd.
@@ -143948,6 +146192,9 @@ OUI:F42853*
 OUI:F42896*
  ID_OUI_FROM_DATABASE=SPECTO PAINEIS ELETRONICOS LTDA
 
+OUI:F4289D*
+ ID_OUI_FROM_DATABASE=CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
+
 OUI:F42981*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
@@ -143999,6 +146246,9 @@ OUI:F43328*
 OUI:F43392*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:F433B7*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:F434F0*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -144164,6 +146414,9 @@ OUI:F44E05*
 OUI:F44E38*
  ID_OUI_FROM_DATABASE=Olibra LLC
 
+OUI:F44EB4*
+ ID_OUI_FROM_DATABASE=CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
+
 OUI:F44EE3*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
@@ -144602,6 +146855,51 @@ OUI:F49634*
 OUI:F49651*
  ID_OUI_FROM_DATABASE=NAKAYO Inc
 
+OUI:F4979D0*
+ ID_OUI_FROM_DATABASE=Tardis Technology
+
+OUI:F4979D1*
+ ID_OUI_FROM_DATABASE=Frame the space
+
+OUI:F4979D2*
+ ID_OUI_FROM_DATABASE=Infinite X Co., Ltd.
+
+OUI:F4979D3*
+ ID_OUI_FROM_DATABASE=Equinox Power
+
+OUI:F4979D4*
+ ID_OUI_FROM_DATABASE=MERRY ELECTRONICS CO., LTD.
+
+OUI:F4979D5*
+ ID_OUI_FROM_DATABASE=Warner Technology Corp
+
+OUI:F4979D6*
+ ID_OUI_FROM_DATABASE=camnex innovation pvt ltd
+
+OUI:F4979D7*
+ ID_OUI_FROM_DATABASE=LUXSHARE - ICT(NGHE AN) LIMITED
+
+OUI:F4979D8*
+ ID_OUI_FROM_DATABASE=Shanghai Kanghai Infomation System CO.,LTD
+
+OUI:F4979D9*
+ ID_OUI_FROM_DATABASE=Beijing Jiaxin Technology Co., Ltd
+
+OUI:F4979DA*
+ ID_OUI_FROM_DATABASE=MARKT Co., Ltd
+
+OUI:F4979DB*
+ ID_OUI_FROM_DATABASE=Kaiware (Shenzhen) Technologies Co.,Ltd
+
+OUI:F4979DC*
+ ID_OUI_FROM_DATABASE=Lab241 Co.,Ltd.
+
+OUI:F4979DD*
+ ID_OUI_FROM_DATABASE=Huitec printer solution co.,
+
+OUI:F4979DE*
+ ID_OUI_FROM_DATABASE=Teenage Engineering AB
+
 OUI:F497C2*
  ID_OUI_FROM_DATABASE=Nebulon Inc
 
@@ -144710,6 +147008,9 @@ OUI:F4A997*
 OUI:F4AAD0*
  ID_OUI_FROM_DATABASE=OHSUNG
 
+OUI:F4AB5C*
+ ID_OUI_FROM_DATABASE=Quectel Wireless Solutions Co.,Ltd.
+
 OUI:F4ACC1*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -144917,6 +147218,9 @@ OUI:F4D620*
 OUI:F4D7B2*
  ID_OUI_FROM_DATABASE=LGS Innovations, LLC
 
+OUI:F4D7E4*
+ ID_OUI_FROM_DATABASE=Realme Chongqing Mobile Telecommunications Corp.,Ltd.
+
 OUI:F4D9C6*
  ID_OUI_FROM_DATABASE=UNION MAN TECHNOLOGY CO.,LTD
 
@@ -145364,6 +147668,9 @@ OUI:F81F32*
 OUI:F82055*
  ID_OUI_FROM_DATABASE=Green Information System
 
+OUI:F82097*
+ ID_OUI_FROM_DATABASE=Aditya Infotech Ltd.
+
 OUI:F820A9*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -145458,7 +147765,7 @@ OUI:F82BE6B*
  ID_OUI_FROM_DATABASE=Shenzhen C & D Electronics Co., Ltd.
 
 OUI:F82BE6C*
- ID_OUI_FROM_DATABASE=Maia Tech, Inc
+ ID_OUI_FROM_DATABASE=MaiaEdge, Inc.
 
 OUI:F82BE6D*
  ID_OUI_FROM_DATABASE=ATHEER CONNECTIVITY
@@ -145589,6 +147896,9 @@ OUI:F84288*
 OUI:F842FB*
  ID_OUI_FROM_DATABASE=Yasuda Joho Co.,ltd.
 
+OUI:F843EF*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:F84477*
  ID_OUI_FROM_DATABASE=Silicon Laboratories
 
@@ -145610,6 +147920,9 @@ OUI:F8462D*
 OUI:F8472D*
  ID_OUI_FROM_DATABASE=X2gen Digital Corp. Ltd
 
+OUI:F847E3*
+ ID_OUI_FROM_DATABASE=Shenzhen Skyworth Digital  Technology  CO., Ltd
+
 OUI:F84897*
  ID_OUI_FROM_DATABASE=Hitachi, Ltd.
 
@@ -145685,6 +147998,9 @@ OUI:F854F6*
 OUI:F85548*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:F8554B*
+ ID_OUI_FROM_DATABASE=WirelessMobility Engineering Centre SDN. BHD
+
 OUI:F855CD*
  ID_OUI_FROM_DATABASE=Visteon Corporation
 
@@ -145715,6 +148031,9 @@ OUI:F85B9C*
 OUI:F85BC9*
  ID_OUI_FROM_DATABASE=M-Cube Spa
 
+OUI:F85C24*
+ ID_OUI_FROM_DATABASE=Sonos Inc.
+
 OUI:F85C45*
  ID_OUI_FROM_DATABASE=IC Nexus Co. Ltd.
 
@@ -145952,6 +148271,9 @@ OUI:F8811A*
 OUI:F88200*
  ID_OUI_FROM_DATABASE=CaptionCall
 
+OUI:F88306*
+ ID_OUI_FROM_DATABASE=Beijing Xiaomi Mobile Software Co., Ltd
+
 OUI:F88479*
  ID_OUI_FROM_DATABASE=Yaojin Technology(Shenzhen)Co.,Ltd
 
@@ -146411,6 +148733,9 @@ OUI:F8CE21*
 OUI:F8CE72*
  ID_OUI_FROM_DATABASE=Wistron Corporation
 
+OUI:F8CF52*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:F8CFC5*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
@@ -146435,12 +148760,18 @@ OUI:F8D2AC*
 OUI:F8D3A9*
  ID_OUI_FROM_DATABASE=AXAN Networks
 
+OUI:F8D3F0*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:F8D462*
  ID_OUI_FROM_DATABASE=Pumatronix Equipamentos Eletronicos Ltda.
 
 OUI:F8D478*
  ID_OUI_FROM_DATABASE=Flextronics Tech.(Ind) Pvt Ltd
 
+OUI:F8D554*
+ ID_OUI_FROM_DATABASE=GD Midea Air-Conditioning Equipment Co.,Ltd.
+
 OUI:F8D756*
  ID_OUI_FROM_DATABASE=Simm Tronic Limited
 
@@ -146492,6 +148823,9 @@ OUI:F8DFE1*
 OUI:F8E079*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
+OUI:F8E252*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:F8E35F*
  ID_OUI_FROM_DATABASE=Sichuan Tianyi Comheart Telecom Co.,LTD
 
@@ -146564,6 +148898,9 @@ OUI:F8EDFC*
 OUI:F8EF5D*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
+OUI:F8EFB1*
+ ID_OUI_FROM_DATABASE=Hangzhou Zhongxinhui lntelligent Technology Co.,Ltd.
+
 OUI:F8F005*
  ID_OUI_FROM_DATABASE=Newport Media Inc.
 
@@ -146591,6 +148928,9 @@ OUI:F8F21E*
 OUI:F8F25A*
  ID_OUI_FROM_DATABASE=G-Lab GmbH
 
+OUI:F8F295*
+ ID_OUI_FROM_DATABASE=Annapurna labs
+
 OUI:F8F3D3*
  ID_OUI_FROM_DATABASE=Shenzhen Gotron electronic CO.,LTD
 
@@ -146609,6 +148949,9 @@ OUI:F8F58C*
 OUI:F8F7B9*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:F8F7D2*
+ ID_OUI_FROM_DATABASE=Equal Optics, LLC
+
 OUI:F8F7D3*
  ID_OUI_FROM_DATABASE=International Communications Corporation
 
@@ -146909,9 +149252,15 @@ OUI:FC386A*
 OUI:FC3876*
  ID_OUI_FROM_DATABASE=Forum Communication Systems, Inc
 
+OUI:FC3882*
+ ID_OUI_FROM_DATABASE=Infinix mobility limited
+
 OUI:FC38C4*
  ID_OUI_FROM_DATABASE=China Grand Communications Co.,Ltd.
 
+OUI:FC395A*
+ ID_OUI_FROM_DATABASE=SonicWall
+
 OUI:FC3964*
  ID_OUI_FROM_DATABASE=ITEL MOBILE LIMITED
 
@@ -146921,6 +149270,9 @@ OUI:FC3CD7*
 OUI:FC3CE9*
  ID_OUI_FROM_DATABASE=Tsingtong Technologies Co, Ltd.
 
+OUI:FC3D73*
+ ID_OUI_FROM_DATABASE=eero inc.
+
 OUI:FC3D93*
  ID_OUI_FROM_DATABASE=LONGCHEER TELECOMMUNICATION LIMITED
 
@@ -147005,6 +149357,9 @@ OUI:FC4B57*
 OUI:FC4BBC*
  ID_OUI_FROM_DATABASE=Sunplus Technology Co., Ltd.
 
+OUI:FC4CEA*
+ ID_OUI_FROM_DATABASE=Dell Inc.
+
 OUI:FC4CEF*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -147032,6 +149387,9 @@ OUI:FC500C*
 OUI:FC5090*
  ID_OUI_FROM_DATABASE=SIMEX Sp. z o.o.
 
+OUI:FC50D6*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:FC51A4*
  ID_OUI_FROM_DATABASE=Commscope
 
@@ -147242,6 +149600,9 @@ OUI:FC777B*
 OUI:FC790B*
  ID_OUI_FROM_DATABASE=Hitachi High Technologies America, Inc.
 
+OUI:FC79DD*
+ ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
+
 OUI:FC7A58*
  ID_OUI_FROM_DATABASE=Shenzhen Skyworth Digital  Technology  CO., Ltd
 
@@ -147389,9 +149750,15 @@ OUI:FC9C98*
 OUI:FC9CA7*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:FC9D05*
+ ID_OUI_FROM_DATABASE=Micro-Star INTL CO., LTD.
+
 OUI:FC9DD8*
  ID_OUI_FROM_DATABASE=Beijing TongTongYiLian Science and Technology Ltd.
 
+OUI:FC9F2A*
+ ID_OUI_FROM_DATABASE=Zyxel Communications Corporation
+
 OUI:FC9FAE*
  ID_OUI_FROM_DATABASE=Fidus Systems Inc
 
@@ -147422,9 +149789,21 @@ OUI:FCA2DF0*
 OUI:FCA2DF1*
  ID_OUI_FROM_DATABASE=SpacemiT
 
+OUI:FCA2DF2*
+ ID_OUI_FROM_DATABASE=PDI COMMUNICATION SYSTEMS INC.
+
+OUI:FCA2DF3*
+ ID_OUI_FROM_DATABASE=PAVONE SISTEMI SRL
+
 OUI:FCA2DF4*
  ID_OUI_FROM_DATABASE=Hangzhou Laizhi Technology Co.,Ltd
 
+OUI:FCA2DF5*
+ ID_OUI_FROM_DATABASE=Annapurna labs
+
+OUI:FCA2DF6*
+ ID_OUI_FROM_DATABASE=shenzhen zovoton electronic co.,ltd
+
 OUI:FCA2DF7*
  ID_OUI_FROM_DATABASE=Flexmedia ind e com
 
@@ -147437,9 +149816,18 @@ OUI:FCA2DF9*
 OUI:FCA2DFA*
  ID_OUI_FROM_DATABASE=BPL MEDICAL TECHNOLOGIES PRIVATE LIMITED
 
+OUI:FCA2DFB*
+ ID_OUI_FROM_DATABASE=Lumentum
+
 OUI:FCA2DFC*
  ID_OUI_FROM_DATABASE=TiGHT AV
 
+OUI:FCA2DFD*
+ ID_OUI_FROM_DATABASE=MBio Diagnostics, Inc.
+
+OUI:FCA2DFE*
+ ID_OUI_FROM_DATABASE=Orion Power Systems, Inc.
+
 OUI:FCA386*
  ID_OUI_FROM_DATABASE=SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LTD
 
@@ -147542,6 +149930,9 @@ OUI:FCAAB6*
 OUI:FCAB90*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:FCABD0*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
 OUI:FCABF5*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -147572,6 +149963,9 @@ OUI:FCB0DE*
 OUI:FCB10D*
  ID_OUI_FROM_DATABASE=Shenzhen Tian Kun Technology Co.,LTD.
 
+OUI:FCB214*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:FCB2D6*
  ID_OUI_FROM_DATABASE=CIG SHANGHAI CO LTD
 
@@ -147857,6 +150251,51 @@ OUI:FCE26C*
 OUI:FCE33C*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:FCE4980*
+ ID_OUI_FROM_DATABASE=NTCSOFT
+
+OUI:FCE4981*
+ ID_OUI_FROM_DATABASE=QuEL, Inc.
+
+OUI:FCE4982*
+ ID_OUI_FROM_DATABASE=ART Finex Co.,Ltd.
+
+OUI:FCE4983*
+ ID_OUI_FROM_DATABASE=Shenzhen C & D Electronics Co., Ltd.
+
+OUI:FCE4984*
+ ID_OUI_FROM_DATABASE=TScale Electronics Mfg. (Kunshan) Co., Ltd
+
+OUI:FCE4985*
+ ID_OUI_FROM_DATABASE=SM Instruments
+
+OUI:FCE4986*
+ ID_OUI_FROM_DATABASE=Videonetics Technology Private Limited
+
+OUI:FCE4987*
+ ID_OUI_FROM_DATABASE=E Haute Intelligent Technology Co., Ltd
+
+OUI:FCE4988*
+ ID_OUI_FROM_DATABASE=Changzhou Leading Weighing Technology Co., Ltd
+
+OUI:FCE4989*
+ ID_OUI_FROM_DATABASE=AVCON Information Technology Co.,Ltd.
+
+OUI:FCE498A*
+ ID_OUI_FROM_DATABASE=SATEL Ltd
+
+OUI:FCE498B*
+ ID_OUI_FROM_DATABASE=GIGA Copper Networks GmbH
+
+OUI:FCE498C*
+ ID_OUI_FROM_DATABASE=Siretta Ltd
+
+OUI:FCE498D*
+ ID_OUI_FROM_DATABASE=Infinity Electronics Ltd
+
+OUI:FCE498E*
+ ID_OUI_FROM_DATABASE=TIH Microelectronics Technology Co. Ltd.
+
 OUI:FCE557*
  ID_OUI_FROM_DATABASE=Nokia Corporation
 
diff -pruN 257.7-1/hwdb.d/20-acpi-vendor.hwdb 257.9-0ubuntu2/hwdb.d/20-acpi-vendor.hwdb
--- 257.7-1/hwdb.d/20-acpi-vendor.hwdb	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/20-acpi-vendor.hwdb	2025-09-03 18:35:40.000000000 +0000
@@ -228,6 +228,9 @@ acpi:ISIC*:
 acpi:JMIC*:
  ID_VENDOR_FROM_DATABASE=Shenzhen Jaguar Microsystems Co.,Ltd.
 
+acpi:JPMC*:
+ ID_VENDOR_FROM_DATABASE=JP Morgan Chase N.A.
+
 acpi:JSYS*:
  ID_VENDOR_FROM_DATABASE=Juniper Systems, Inc.
 
@@ -327,6 +330,9 @@ acpi:RKCP*:
 acpi:ROKL*:
  ID_VENDOR_FROM_DATABASE=Rockwell Automation, Inc
 
+acpi:ROKU*:
+ ID_VENDOR_FROM_DATABASE=Roku, Inc.
+
 acpi:RPIL*:
  ID_VENDOR_FROM_DATABASE=Raspberry Pi
 
diff -pruN 257.7-1/hwdb.d/20-acpi-vendor.hwdb.patch 257.9-0ubuntu2/hwdb.d/20-acpi-vendor.hwdb.patch
--- 257.7-1/hwdb.d/20-acpi-vendor.hwdb.patch	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/20-acpi-vendor.hwdb.patch	2025-09-03 18:35:40.000000000 +0000
@@ -1,5 +1,5 @@
---- 20-acpi-vendor.hwdb.base	2025-05-15 10:42:40.716482750 +0200
-+++ 20-acpi-vendor.hwdb	2025-05-15 10:42:40.720482763 +0200
+--- 20-acpi-vendor.hwdb.base	2025-08-20 13:04:02.003302877 +0100
++++ 20-acpi-vendor.hwdb	2025-08-20 13:04:02.007302969 +0100
 @@ -3,6 +3,8 @@
  # Data imported from:
  #     https://uefi.org/uefi-pnp-export
@@ -19,7 +19,7 @@
  acpi:AMDI*:
   ID_VENDOR_FROM_DATABASE=AMD
  
-@@ -418,6 +417,9 @@
+@@ -424,6 +423,9 @@
  acpi:AAA*:
   ID_VENDOR_FROM_DATABASE=Avolites Ltd
  
@@ -29,7 +29,7 @@
  acpi:AAE*:
   ID_VENDOR_FROM_DATABASE=Anatek Electronics Inc.
  
-@@ -445,6 +447,9 @@
+@@ -451,6 +453,9 @@
  acpi:ABO*:
   ID_VENDOR_FROM_DATABASE=D-Link Systems Inc
  
@@ -39,7 +39,7 @@
  acpi:ABS*:
   ID_VENDOR_FROM_DATABASE=Abaco Systems, Inc.
  
-@@ -490,7 +495,7 @@
+@@ -496,7 +501,7 @@
  acpi:ACO*:
   ID_VENDOR_FROM_DATABASE=Allion Computer Inc.
  
@@ -48,7 +48,7 @@
   ID_VENDOR_FROM_DATABASE=Aspen Tech Inc
  
  acpi:ACR*:
-@@ -769,6 +774,9 @@
+@@ -775,6 +780,9 @@
  acpi:AMT*:
   ID_VENDOR_FROM_DATABASE=AMT International Industry
  
@@ -58,7 +58,7 @@
  acpi:AMX*:
   ID_VENDOR_FROM_DATABASE=AMX LLC
  
-@@ -817,6 +825,9 @@
+@@ -823,6 +831,9 @@
  acpi:AOA*:
   ID_VENDOR_FROM_DATABASE=AOpen Inc.
  
@@ -68,7 +68,7 @@
  acpi:AOE*:
   ID_VENDOR_FROM_DATABASE=Advanced Optics Electronics, Inc.
  
-@@ -826,6 +837,9 @@
+@@ -832,6 +843,9 @@
  acpi:AOT*:
   ID_VENDOR_FROM_DATABASE=Alcatel
  
@@ -78,7 +78,7 @@
  acpi:APC*:
   ID_VENDOR_FROM_DATABASE=American Power Conversion
  
-@@ -1007,7 +1021,7 @@
+@@ -1013,7 +1027,7 @@
   ID_VENDOR_FROM_DATABASE=ALPS ALPINE CO., LTD.
  
  acpi:AUO*:
@@ -87,7 +87,7 @@
  
  acpi:AUR*:
   ID_VENDOR_FROM_DATABASE=Aureal Semiconductor
-@@ -1087,6 +1101,9 @@
+@@ -1093,6 +1107,9 @@
  acpi:AXE*:
   ID_VENDOR_FROM_DATABASE=Axell Corporation
  
@@ -97,7 +97,7 @@
  acpi:AXI*:
   ID_VENDOR_FROM_DATABASE=American Magnetics
  
-@@ -1246,6 +1263,9 @@
+@@ -1252,6 +1269,9 @@
  acpi:BML*:
   ID_VENDOR_FROM_DATABASE=BIOMED Lab
  
@@ -107,7 +107,7 @@
  acpi:BMS*:
   ID_VENDOR_FROM_DATABASE=BIOMEDISYS
  
-@@ -1258,6 +1278,9 @@
+@@ -1264,6 +1284,9 @@
  acpi:BNO*:
   ID_VENDOR_FROM_DATABASE=Bang & Olufsen
  
@@ -117,7 +117,7 @@
  acpi:BNS*:
   ID_VENDOR_FROM_DATABASE=Boulder Nonlinear Systems
  
-@@ -1504,6 +1527,9 @@
+@@ -1510,6 +1533,9 @@
  acpi:CHA*:
   ID_VENDOR_FROM_DATABASE=Chase Research PLC
  
@@ -127,7 +127,7 @@
  acpi:CHD*:
   ID_VENDOR_FROM_DATABASE=ChangHong Electric Co.,Ltd
  
-@@ -1669,6 +1695,9 @@
+@@ -1675,6 +1701,9 @@
  acpi:COD*:
   ID_VENDOR_FROM_DATABASE=CODAN Pty. Ltd.
  
@@ -137,7 +137,7 @@
  acpi:COI*:
   ID_VENDOR_FROM_DATABASE=Codec Inc.
  
-@@ -2087,7 +2116,7 @@
+@@ -2093,7 +2122,7 @@
   ID_VENDOR_FROM_DATABASE=Dragon Information Technology
  
  acpi:DJE*:
@@ -146,7 +146,7 @@
  
  acpi:DJP*:
   ID_VENDOR_FROM_DATABASE=Maygay Machines, Ltd
-@@ -2440,6 +2469,9 @@
+@@ -2446,6 +2475,9 @@
  acpi:EIN*:
   ID_VENDOR_FROM_DATABASE=Elegant Invention
  
@@ -156,7 +156,7 @@
  acpi:EKA*:
   ID_VENDOR_FROM_DATABASE=MagTek Inc.
  
-@@ -2710,6 +2742,9 @@
+@@ -2716,6 +2748,9 @@
  acpi:FCG*:
   ID_VENDOR_FROM_DATABASE=First International Computer Ltd
  
@@ -166,7 +166,7 @@
  acpi:FCS*:
   ID_VENDOR_FROM_DATABASE=Focus Enhancements, Inc.
  
-@@ -3086,7 +3121,7 @@
+@@ -3092,7 +3127,7 @@
   ID_VENDOR_FROM_DATABASE=General Standards Corporation
  
  acpi:GSM*:
@@ -175,7 +175,7 @@
  
  acpi:GSN*:
   ID_VENDOR_FROM_DATABASE=Grandstream Networks, Inc.
-@@ -3196,6 +3231,9 @@
+@@ -3202,6 +3237,9 @@
  acpi:HEC*:
   ID_VENDOR_FROM_DATABASE=Hisense Electric Co., Ltd.
  
@@ -185,7 +185,7 @@
  acpi:HEL*:
   ID_VENDOR_FROM_DATABASE=Hitachi Micro Systems Europe Ltd
  
-@@ -3331,6 +3369,9 @@
+@@ -3337,6 +3375,9 @@
  acpi:HSD*:
   ID_VENDOR_FROM_DATABASE=HannStar Display Corp
  
@@ -195,7 +195,7 @@
  acpi:HSM*:
   ID_VENDOR_FROM_DATABASE=AT&T Microelectronics
  
-@@ -3457,6 +3498,9 @@
+@@ -3463,6 +3504,9 @@
  acpi:ICI*:
   ID_VENDOR_FROM_DATABASE=Infotek Communication Inc
  
@@ -205,7 +205,7 @@
  acpi:ICM*:
   ID_VENDOR_FROM_DATABASE=Intracom SA
  
-@@ -3553,6 +3597,9 @@
+@@ -3559,6 +3603,9 @@
  acpi:IKE*:
   ID_VENDOR_FROM_DATABASE=Ikegami Tsushinki Co. Ltd.
  
@@ -215,7 +215,7 @@
  acpi:IKS*:
   ID_VENDOR_FROM_DATABASE=Ikos Systems Inc
  
-@@ -3601,6 +3648,9 @@
+@@ -3607,6 +3654,9 @@
  acpi:IMX*:
   ID_VENDOR_FROM_DATABASE=arpara Technology Co., Ltd.
  
@@ -225,7 +225,7 @@
  acpi:INA*:
   ID_VENDOR_FROM_DATABASE=Inventec Corporation
  
-@@ -4129,6 +4179,9 @@
+@@ -4135,6 +4185,9 @@
  acpi:LAN*:
   ID_VENDOR_FROM_DATABASE=Sodeman Lancom Inc
  
@@ -235,7 +235,7 @@
  acpi:LAS*:
   ID_VENDOR_FROM_DATABASE=LASAT Comm. A/S
  
-@@ -4180,6 +4233,9 @@
+@@ -4186,6 +4239,9 @@
  acpi:LED*:
   ID_VENDOR_FROM_DATABASE=Long Engineering Design Inc
  
@@ -245,7 +245,7 @@
  acpi:LEG*:
   ID_VENDOR_FROM_DATABASE=Legerity, Inc
  
-@@ -4198,6 +4254,9 @@
+@@ -4204,6 +4260,9 @@
  acpi:LGD*:
   ID_VENDOR_FROM_DATABASE=LG Display
  
@@ -255,7 +255,7 @@
  acpi:LGI*:
   ID_VENDOR_FROM_DATABASE=Logitech Inc
  
-@@ -4264,6 +4323,9 @@
+@@ -4270,6 +4329,9 @@
  acpi:LND*:
   ID_VENDOR_FROM_DATABASE=Land Computer Company Ltd
  
@@ -265,7 +265,7 @@
  acpi:LNK*:
   ID_VENDOR_FROM_DATABASE=Link Tech Inc
  
-@@ -4298,7 +4360,7 @@
+@@ -4304,7 +4366,7 @@
   ID_VENDOR_FROM_DATABASE=Design Technology
  
  acpi:LPL*:
@@ -274,7 +274,7 @@
  
  acpi:LSC*:
   ID_VENDOR_FROM_DATABASE=LifeSize Communications
-@@ -4474,6 +4536,9 @@
+@@ -4480,6 +4542,9 @@
  acpi:MCX*:
   ID_VENDOR_FROM_DATABASE=Millson Custom Solutions Inc.
  
@@ -284,7 +284,7 @@
  acpi:MDA*:
   ID_VENDOR_FROM_DATABASE=Media4 Inc
  
-@@ -4720,6 +4785,9 @@
+@@ -4726,6 +4791,9 @@
  acpi:MOM*:
   ID_VENDOR_FROM_DATABASE=Momentum Data Systems
  
@@ -294,7 +294,7 @@
  acpi:MOS*:
   ID_VENDOR_FROM_DATABASE=Moses Corporation
  
-@@ -4960,6 +5028,9 @@
+@@ -4966,6 +5034,9 @@
  acpi:NAL*:
   ID_VENDOR_FROM_DATABASE=Network Alchemy
  
@@ -304,7 +304,7 @@
  acpi:NAT*:
   ID_VENDOR_FROM_DATABASE=NaturalPoint Inc.
  
-@@ -5500,6 +5571,9 @@
+@@ -5506,6 +5577,9 @@
  acpi:PCX*:
   ID_VENDOR_FROM_DATABASE=PC Xperten
  
@@ -314,7 +314,7 @@
  acpi:PDM*:
   ID_VENDOR_FROM_DATABASE=Psion Dacom Plc.
  
-@@ -5563,9 +5637,6 @@
+@@ -5569,9 +5643,6 @@
  acpi:PHE*:
   ID_VENDOR_FROM_DATABASE=Philips Medical Systems Boeblingen GmbH
  
@@ -324,7 +324,7 @@
  acpi:PHL*:
   ID_VENDOR_FROM_DATABASE=Philips Consumer Electronics Company
  
-@@ -5656,9 +5727,6 @@
+@@ -5662,9 +5733,6 @@
  acpi:PNL*:
   ID_VENDOR_FROM_DATABASE=Panelview, Inc.
  
@@ -334,7 +334,7 @@
  acpi:PNR*:
   ID_VENDOR_FROM_DATABASE=Planar Systems, Inc.
  
-@@ -6136,9 +6204,6 @@
+@@ -6142,9 +6210,6 @@
  acpi:RTI*:
   ID_VENDOR_FROM_DATABASE=Rancho Tech Inc
  
@@ -344,7 +344,7 @@
  acpi:RTL*:
   ID_VENDOR_FROM_DATABASE=Realtek Semiconductor Company Ltd
  
-@@ -6313,9 +6378,6 @@
+@@ -6319,9 +6384,6 @@
  acpi:SEE*:
   ID_VENDOR_FROM_DATABASE=SeeColor Corporation
  
@@ -354,7 +354,7 @@
  acpi:SEI*:
   ID_VENDOR_FROM_DATABASE=Seitz & Associates Inc
  
-@@ -6799,6 +6861,9 @@
+@@ -6805,6 +6867,9 @@
  acpi:SVD*:
   ID_VENDOR_FROM_DATABASE=SVD Computer
  
@@ -364,7 +364,7 @@
  acpi:SVI*:
   ID_VENDOR_FROM_DATABASE=Sun Microsystems
  
-@@ -6883,6 +6948,9 @@
+@@ -6889,6 +6954,9 @@
  acpi:SZM*:
   ID_VENDOR_FROM_DATABASE=Shenzhen MTC Co., Ltd
  
@@ -374,7 +374,7 @@
  acpi:TAA*:
   ID_VENDOR_FROM_DATABASE=Tandberg
  
-@@ -6973,6 +7041,9 @@
+@@ -6979,6 +7047,9 @@
  acpi:TDG*:
   ID_VENDOR_FROM_DATABASE=Six15 Technologies
  
@@ -384,7 +384,7 @@
  acpi:TDM*:
   ID_VENDOR_FROM_DATABASE=Tandem Computer Europe Inc
  
-@@ -7015,6 +7086,9 @@
+@@ -7021,6 +7092,9 @@
  acpi:TEV*:
   ID_VENDOR_FROM_DATABASE=Televés, S.A.
  
@@ -394,7 +394,7 @@
  acpi:TEZ*:
   ID_VENDOR_FROM_DATABASE=Tech Source Inc.
  
-@@ -7144,9 +7218,6 @@
+@@ -7150,9 +7224,6 @@
  acpi:TNC*:
   ID_VENDOR_FROM_DATABASE=TNC Industrial Company Ltd
  
@@ -404,7 +404,7 @@
  acpi:TNM*:
   ID_VENDOR_FROM_DATABASE=TECNIMAGEN SA
  
-@@ -7459,14 +7530,14 @@
+@@ -7465,14 +7536,14 @@
  acpi:UNC*:
   ID_VENDOR_FROM_DATABASE=Unisys Corporation
  
@@ -425,7 +425,7 @@
  
  acpi:UNI*:
   ID_VENDOR_FROM_DATABASE=Uniform Industry Corp.
-@@ -7501,6 +7572,9 @@
+@@ -7507,6 +7578,9 @@
  acpi:USA*:
   ID_VENDOR_FROM_DATABASE=Utimaco Safeware AG
  
@@ -435,7 +435,7 @@
  acpi:USD*:
   ID_VENDOR_FROM_DATABASE=U.S. Digital Corporation
  
-@@ -7762,9 +7836,6 @@
+@@ -7768,9 +7842,6 @@
  acpi:WAL*:
   ID_VENDOR_FROM_DATABASE=Wave Access
  
@@ -445,7 +445,7 @@
  acpi:WAV*:
   ID_VENDOR_FROM_DATABASE=Wavephore
  
-@@ -7892,7 +7963,7 @@
+@@ -7898,7 +7969,7 @@
   ID_VENDOR_FROM_DATABASE=WyreStorm Technologies LLC
  
  acpi:WYS*:
@@ -454,7 +454,7 @@
  
  acpi:WYT*:
   ID_VENDOR_FROM_DATABASE=Wooyoung Image & Information Co.,Ltd.
-@@ -7906,9 +7977,6 @@
+@@ -7912,9 +7983,6 @@
  acpi:XDM*:
   ID_VENDOR_FROM_DATABASE=XDM Ltd.
  
@@ -464,7 +464,7 @@
  acpi:XES*:
   ID_VENDOR_FROM_DATABASE=Extreme Engineering Solutions, Inc.
  
-@@ -7942,9 +8010,6 @@
+@@ -7948,9 +8016,6 @@
  acpi:XNT*:
   ID_VENDOR_FROM_DATABASE=XN Technologies, Inc.
  
@@ -474,7 +474,7 @@
  acpi:XQU*:
   ID_VENDOR_FROM_DATABASE=SHANGHAI SVA-DAV ELECTRONICS CO., LTD
  
-@@ -8011,6 +8076,9 @@
+@@ -8017,6 +8082,9 @@
  acpi:ZBX*:
   ID_VENDOR_FROM_DATABASE=Zebax Technologies
  
diff -pruN 257.7-1/hwdb.d/20-pci-classes.hwdb 257.9-0ubuntu2/hwdb.d/20-pci-classes.hwdb
--- 257.7-1/hwdb.d/20-pci-classes.hwdb	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/20-pci-classes.hwdb	2025-09-03 18:35:40.000000000 +0000
@@ -395,6 +395,9 @@ pci:v*d*sv*sd*bc08sc05*
 pci:v*d*sv*sd*bc08sc06*
  ID_PCI_SUBCLASS_FROM_DATABASE=IOMMU
 
+pci:v*d*sv*sd*bc08sc07*
+ ID_PCI_SUBCLASS_FROM_DATABASE=Root Complex Event Collector
+
 pci:v*d*sv*sd*bc08sc80*
  ID_PCI_SUBCLASS_FROM_DATABASE=System peripheral
 
diff -pruN 257.7-1/hwdb.d/20-pci-vendor-model.hwdb 257.9-0ubuntu2/hwdb.d/20-pci-vendor-model.hwdb
--- 257.7-1/hwdb.d/20-pci-vendor-model.hwdb	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/20-pci-vendor-model.hwdb	2025-09-03 18:35:40.000000000 +0000
@@ -242,6 +242,12 @@ pci:v0000025Ed00002B59*
 pci:v0000025Ed00002B59sv0000025Esd00000008*
  ID_MODEL_FROM_DATABASE=NVMe DC SSD [Atomos Prime] (NVMe DC SSD U.2-SFF 15mm [D7-PS1010])
 
+pci:v0000025Ed00002B59sv0000025Esd0000000C*
+ ID_MODEL_FROM_DATABASE=NVMe DC SSD [Atomos Prime] (NVMe DC SSD E1.S 9.5mm [D7-PS1010])
+
+pci:v0000025Ed00002B59sv0000025Esd0000000D*
+ ID_MODEL_FROM_DATABASE=NVMe DC SSD [Atomos Prime] (NVMe DC SSD E1.S 15mm [D7-PS1010])
+
 pci:v0000025Ed00002B59sv0000025Esd00000019*
  ID_MODEL_FROM_DATABASE=NVMe DC SSD [Atomos Prime] (NVMe DC SSD E3.S-1T 7.5mm [D7-PS1010])
 
@@ -359,6 +365,30 @@ pci:v00000721*
 pci:v00000731*
  ID_VENDOR_FROM_DATABASE=Jingjia Microelectronics Co Ltd
 
+pci:v00000731d00001100*
+ ID_MODEL_FROM_DATABASE=JM1100
+
+pci:v00000731d00001100sv00000731sd00001101*
+ ID_MODEL_FROM_DATABASE=JM1100 (-C)
+
+pci:v00000731d00001100sv00000731sd00001102*
+ ID_MODEL_FROM_DATABASE=JM1100 (-II)
+
+pci:v00000731d00001100sv00000731sd00001103*
+ ID_MODEL_FROM_DATABASE=JM1100 (-I)
+
+pci:v00000731d00001100sv00000731sd00001104*
+ ID_MODEL_FROM_DATABASE=JM1100 (-M)
+
+pci:v00000731d00001100sv00000731sd00001105*
+ ID_MODEL_FROM_DATABASE=JM1100 (-Y)
+
+pci:v00000731d00001100sv00000731sd00001106*
+ ID_MODEL_FROM_DATABASE=JM1100 (-EI)
+
+pci:v00000731d00001100sv00000731sd00001107*
+ ID_MODEL_FROM_DATABASE=JM1100 (-EM)
+
 pci:v00000731d00007200*
  ID_MODEL_FROM_DATABASE=JM7200 Series GPU
 
@@ -470,6 +500,15 @@ pci:v00000731d0000930Asv00000731sd000093
 pci:v00000731d0000930B*
  ID_MODEL_FROM_DATABASE=JH930-M
 
+pci:v00000731d0000F011*
+ ID_MODEL_FROM_DATABASE=JM1100-IV
+
+pci:v00000731d0000F111*
+ ID_MODEL_FROM_DATABASE=JM1100-MV
+
+pci:v00000731d0000FF11*
+ ID_MODEL_FROM_DATABASE=JM1100-YV
+
 pci:v00000777*
  ID_VENDOR_FROM_DATABASE=Ubiquiti Networks, Inc.
 
@@ -1821,7 +1860,7 @@ pci:v00001000d00000072sv00001BD4sd000000
  ID_MODEL_FROM_DATABASE=SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon] (6G SAS2008IR SA5248)
 
 pci:v00001000d00000072sv00004C52sd000096C8*
- ID_MODEL_FROM_DATABASE=SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon] (LRSA96C8 8-Port SATA3(6Gb/s)Exchange Adapter (with Raid))
+ ID_MODEL_FROM_DATABASE=SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon] (LRSA96C8 8-Port SATA3 (6Gb/s) Exchange Adapter (with RAID))
 
 pci:v00001000d00000072sv00008086sd0000350F*
  ID_MODEL_FROM_DATABASE=SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon] (RMS2LL040 RAID Controller)
@@ -2219,6 +2258,12 @@ pci:v00001000d00000097sv00001000sd000030
 pci:v00001000d00000097sv00001000sd00003130*
  ID_MODEL_FROM_DATABASE=SAS3008 PCI-Express Fusion-MPT SAS-3 (SAS 9300-16i)
 
+pci:v00001000d00000097sv00001000sd00003170*
+ ID_MODEL_FROM_DATABASE=SAS3008 PCI-Express Fusion-MPT SAS-3 (SAS9302-16e)
+
+pci:v00001000d00000097sv00001014sd00000457*
+ ID_MODEL_FROM_DATABASE=SAS3008 PCI-Express Fusion-MPT SAS-3 (9302-8i [N2215])
+
 pci:v00001000d00000097sv00001028sd00001F45*
  ID_MODEL_FROM_DATABASE=SAS3008 PCI-Express Fusion-MPT SAS-3 (HBA330 Adapter)
 
@@ -2462,6 +2507,15 @@ pci:v00001000d000000B3sv00001028sd000022
 pci:v00001000d000000B3sv00001028sd000022D3*
  ID_MODEL_FROM_DATABASE=Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx (PERC H975i Adapter)
 
+pci:v00001000d000000B3sv00001028sd000023CB*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx (PERC H975i Front)
+
+pci:v00001000d000000B3sv00001028sd000023CD*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx (PERC H975i Adapter)
+
+pci:v00001000d000000B3sv00001028sd00002446*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx (PERC H976i Front)
+
 pci:v00001000d000000B3sv00001D49sd0000020B*
  ID_MODEL_FROM_DATABASE=Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx (ThinkSystem 460-16e SAS/SATA PCIe Gen5 24Gb HBA)
 
@@ -2486,6 +2540,21 @@ pci:v00001000d000000B5sv00001000sd000050
 pci:v00001000d000000B5sv00001000sd00005030*
  ID_MODEL_FROM_DATABASE=Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx (eHBA 9700-16e 24G SAS/PCIe Storage Adapter)
 
+pci:v00001000d000000B5sv00001028sd000022D2*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx (PERC H975i Front - Virtual)
+
+pci:v00001000d000000B5sv00001028sd000022D3*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx (PERC H975i Adapter - Virtual)
+
+pci:v00001000d000000B5sv00001028sd000023CB*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx (PERC H975i Front - Virtual)
+
+pci:v00001000d000000B5sv00001028sd000023CD*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx (PERC H975i Adapter - Virtual)
+
+pci:v00001000d000000B5sv00001028sd00002446*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx (PERC H976i Front - Virtual)
+
 pci:v00001000d000000B8*
  ID_MODEL_FROM_DATABASE=Fusion-MPT Switch SAS50xx/SAS51xx
 
@@ -3579,7 +3648,7 @@ pci:v00001002d00001636*
  ID_MODEL_FROM_DATABASE=Renoir [Radeon Vega Series / Radeon Vega Mobile Series]
 
 pci:v00001002d00001637*
- ID_MODEL_FROM_DATABASE=Renoir Radeon High Definition Audio Controller
+ ID_MODEL_FROM_DATABASE=Renoir/Cezanne HDMI/DP Audio Controller
 
 pci:v00001002d00001638*
  ID_MODEL_FROM_DATABASE=Cezanne [Radeon Vega Series / Radeon Vega Mobile Series]
@@ -3591,7 +3660,7 @@ pci:v00001002d0000163F*
  ID_MODEL_FROM_DATABASE=VanGogh [AMD Custom GPU 0405]
 
 pci:v00001002d00001640*
- ID_MODEL_FROM_DATABASE=Rembrandt Radeon High Definition Audio Controller
+ ID_MODEL_FROM_DATABASE=Radeon High Definition Audio Controller [Rembrandt/Strix]
 
 pci:v00001002d0000164C*
  ID_MODEL_FROM_DATABASE=Lucienne
@@ -3615,10 +3684,13 @@ pci:v00001002d00001714sv0000103Csd000016
  ID_MODEL_FROM_DATABASE=BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series] (ProBook 4535s)
 
 pci:v00001002d00001900*
- ID_MODEL_FROM_DATABASE=Phoenix3
+ ID_MODEL_FROM_DATABASE=HawkPoint1
 
 pci:v00001002d00001901*
- ID_MODEL_FROM_DATABASE=Phoenix4
+ ID_MODEL_FROM_DATABASE=HawkPoint2
+
+pci:v00001002d00001902*
+ ID_MODEL_FROM_DATABASE=Krackan2
 
 pci:v00001002d00003150*
  ID_MODEL_FROM_DATABASE=RV380/M24 [Mobility Radeon X600]
@@ -8819,6 +8891,9 @@ pci:v00001002d000067FFsv0000148Csd000023
 pci:v00001002d000067FFsv00001682sd00009560*
  ID_MODEL_FROM_DATABASE=Baffin [Radeon RX 550 640SP / RX 560/560X] (Radeon RX 560)
 
+pci:v00001002d000067FFsv00001849sd00005037*
+ ID_MODEL_FROM_DATABASE=Baffin [Radeon RX 550 640SP / RX 560/560X] (PHANTOM G R RX550 2G/M/ASRK)
+
 pci:v00001002d000067FFsv00001DA2sd0000E348*
  ID_MODEL_FROM_DATABASE=Baffin [Radeon RX 550 640SP / RX 560/560X] (Radeon RX 560)
 
@@ -9506,6 +9581,9 @@ pci:v00001002d0000687Fsv00001002sd00006B
 pci:v00001002d0000687Fsv00001043sd000004C4*
  ID_MODEL_FROM_DATABASE=Vega 10 XL/XT [Radeon RX Vega 56/64] (Radeon RX Vega 64)
 
+pci:v00001002d0000687Fsv00001043sd00000555*
+ ID_MODEL_FROM_DATABASE=Vega 10 XL/XT [Radeon RX Vega 56/64] (ROG STRIX RX Vega 56 8GB)
+
 pci:v00001002d0000687Fsv00001458sd0000230C*
  ID_MODEL_FROM_DATABASE=Vega 10 XL/XT [Radeon RX Vega 56/64] (Radeon RX VEGA 56 GAMING OC 8G)
 
@@ -11624,6 +11702,9 @@ pci:v00001002d0000731Fsv00001DA2sd0000E4
 pci:v00001002d00007340*
  ID_MODEL_FROM_DATABASE=Navi 14 [Radeon RX 5500/5500M / Pro 5500M]
 
+pci:v00001002d00007340sv0000106Bsd00000210*
+ ID_MODEL_FROM_DATABASE=Navi 14 [Radeon RX 5500/5500M / Pro 5500M] (Radeon Pro 5300M)
+
 pci:v00001002d00007341*
  ID_MODEL_FROM_DATABASE=Navi 14 [Radeon Pro W5500]
 
@@ -11888,6 +11969,9 @@ pci:v00001002d00007470*
 pci:v00001002d0000747E*
  ID_MODEL_FROM_DATABASE=Navi 32 [Radeon RX 7700 XT / 7800 XT]
 
+pci:v00001002d0000747Esv0000148Csd00002427*
+ ID_MODEL_FROM_DATABASE=Navi 32 [Radeon RX 7700 XT / 7800 XT] (RX 7800 XT [Hellhound / Red Devil])
+
 pci:v00001002d00007480*
  ID_MODEL_FROM_DATABASE=Navi 33 [Radeon RX 7600/7600 XT/7600M XT/7600S/7700S / PRO W7600]
 
@@ -11912,6 +11996,9 @@ pci:v00001002d0000748B*
 pci:v00001002d00007499*
  ID_MODEL_FROM_DATABASE=Navi 33 [Radeon RX 7400/7300/Pro W7400]
 
+pci:v00001002d0000749F*
+ ID_MODEL_FROM_DATABASE=Navi 33 [Radeon RX 7500]
+
 pci:v00001002d000074A0*
  ID_MODEL_FROM_DATABASE=Aqua Vanjaram [Instinct MI300A]
 
@@ -11930,11 +12017,26 @@ pci:v00001002d000074A9*
 pci:v00001002d000074B5*
  ID_MODEL_FROM_DATABASE=Aqua Vanjaram [Instinct MI300X VF]
 
+pci:v00001002d000074B9*
+ ID_MODEL_FROM_DATABASE=Aqua Vanjaram [Instinct MI325X VF]
+
 pci:v00001002d000074BD*
  ID_MODEL_FROM_DATABASE=Aqua Vanjaram [Instinct MI300X HF]
 
 pci:v00001002d00007550*
- ID_MODEL_FROM_DATABASE=Navi 48 [RX 9070/9070 XT]
+ ID_MODEL_FROM_DATABASE=Navi 48 [Radeon RX 9070/9070 XT/9070 GRE]
+
+pci:v00001002d00007550sv0000148Csd00002435*
+ ID_MODEL_FROM_DATABASE=Navi 48 [Radeon RX 9070/9070 XT/9070 GRE] (Reaper Radeon RX 9070 XT 16GB GDDR6 (RX9070XT 16G-A))
+
+pci:v00001002d00007550sv00001DA2sd0000E490*
+ ID_MODEL_FROM_DATABASE=Navi 48 [Radeon RX 9070/9070 XT/9070 GRE] (Navi 48 XTX [Sapphire Pulse Radeon RX 9070 XT])
+
+pci:v00001002d00007551*
+ ID_MODEL_FROM_DATABASE=Navi 48 [Radeon AI PRO R9700]
+
+pci:v00001002d00007590*
+ ID_MODEL_FROM_DATABASE=Navi 44 [Radeon RX 9060 XT]
 
 pci:v00001002d00007833*
  ID_MODEL_FROM_DATABASE=RS350 Host Bridge
@@ -13121,6 +13223,9 @@ pci:v00001002d0000AB30*
 pci:v00001002d0000AB38*
  ID_MODEL_FROM_DATABASE=Navi 10 HDMI Audio
 
+pci:v00001002d0000AB40*
+ ID_MODEL_FROM_DATABASE=Navi 48 HDMI/DP Audio Controller
+
 pci:v00001002d0000AC00*
  ID_MODEL_FROM_DATABASE=Theater 506 World-Wide Analog Decoder
 
@@ -14444,6 +14549,9 @@ pci:v00001014d000004ED*
 pci:v00001014d00000611*
  ID_MODEL_FROM_DATABASE=4769 Cryptographic Adapter
 
+pci:v00001014d000006A2*
+ ID_MODEL_FROM_DATABASE=4770 Cryptographic Adapter
+
 pci:v00001014d000006A7*
  ID_MODEL_FROM_DATABASE=Spyre Accelerator
 
@@ -15476,6 +15584,12 @@ pci:v00001022d00001515*
 pci:v00001022d00001516*
  ID_MODEL_FROM_DATABASE=Family 14h Processor Root Port
 
+pci:v00001022d0000151C*
+ ID_MODEL_FROM_DATABASE=USB4 Router 0
+
+pci:v00001022d0000151D*
+ ID_MODEL_FROM_DATABASE=USB4 Router 1
+
 pci:v00001022d00001530*
  ID_MODEL_FROM_DATABASE=Family 16h Processor Function 0
 
@@ -15683,6 +15797,24 @@ pci:v00001022d00001584*
 pci:v00001022d00001585*
  ID_MODEL_FROM_DATABASE=Family 16h (Models 30h-3fh) Processor Function 5
 
+pci:v00001022d00001587*
+ ID_MODEL_FROM_DATABASE=Strix Halo USB 3.1 xHCI
+
+pci:v00001022d00001588*
+ ID_MODEL_FROM_DATABASE=Strix Halo USB 3.1 xHCI
+
+pci:v00001022d00001589*
+ ID_MODEL_FROM_DATABASE=Strix Halo USB 3.1 xHCI
+
+pci:v00001022d0000158B*
+ ID_MODEL_FROM_DATABASE=Strix Halo USB 3.1 xHCI
+
+pci:v00001022d0000158D*
+ ID_MODEL_FROM_DATABASE=Strix Halo USB4 Host Router
+
+pci:v00001022d0000158E*
+ ID_MODEL_FROM_DATABASE=Strix Halo USB4 Host Router
+
 pci:v00001022d00001590*
  ID_MODEL_FROM_DATABASE=Amur/Nolan HT Configuration
 
@@ -15822,16 +15954,16 @@ pci:v00001022d000015DE*
  ID_MODEL_FROM_DATABASE=Raven/Raven2/FireFlight HD Audio Controller
 
 pci:v00001022d000015DF*
- ID_MODEL_FROM_DATABASE=Family 17h (Models 10h-1fh) Platform Security Processor
+ ID_MODEL_FROM_DATABASE=Raven/Raven2/FireFlight/Renoir/Cezanne Platform Security Processor
 
 pci:v00001022d000015DFsv00001043sd0000876B*
- ID_MODEL_FROM_DATABASE=Family 17h (Models 10h-1fh) Platform Security Processor (PRIME Motherboard)
+ ID_MODEL_FROM_DATABASE=Raven/Raven2/FireFlight/Renoir/Cezanne Platform Security Processor (PRIME Motherboard)
 
 pci:v00001022d000015DFsv000017AAsd00005124*
- ID_MODEL_FROM_DATABASE=Family 17h (Models 10h-1fh) Platform Security Processor (ThinkPad E595)
+ ID_MODEL_FROM_DATABASE=Raven/Raven2/FireFlight/Renoir/Cezanne Platform Security Processor (ThinkPad E595)
 
 pci:v00001022d000015DFsv0000EA50sd0000CE19*
- ID_MODEL_FROM_DATABASE=Family 17h (Models 10h-1fh) Platform Security Processor (mCOM10-L1900)
+ ID_MODEL_FROM_DATABASE=Raven/Raven2/FireFlight/Renoir/Cezanne Platform Security Processor (mCOM10-L1900)
 
 pci:v00001022d000015E0*
  ID_MODEL_FROM_DATABASE=Raven USB 3.1
@@ -15864,13 +15996,13 @@ pci:v00001022d000015E1sv0000EA50sd0000CE
  ID_MODEL_FROM_DATABASE=Raven USB 3.1 (mCOM10-L1900)
 
 pci:v00001022d000015E2*
- ID_MODEL_FROM_DATABASE=ACP/ACP3X/ACP6x Audio Coprocessor
+ ID_MODEL_FROM_DATABASE=Audio Coprocessor
 
 pci:v00001022d000015E2sv000017AAsd00005124*
- ID_MODEL_FROM_DATABASE=ACP/ACP3X/ACP6x Audio Coprocessor (ThinkPad E595)
+ ID_MODEL_FROM_DATABASE=Audio Coprocessor (ThinkPad E595)
 
 pci:v00001022d000015E2sv0000EA50sd0000CE19*
- ID_MODEL_FROM_DATABASE=ACP/ACP3X/ACP6x Audio Coprocessor (mCOM10-L1900)
+ ID_MODEL_FROM_DATABASE=Audio Coprocessor (mCOM10-L1900)
 
 pci:v00001022d000015E3*
  ID_MODEL_FROM_DATABASE=Family 17h/19h/1ah HD Audio Controller
@@ -16547,12 +16679,18 @@ pci:v00001022d000043D5*
 pci:v00001022d000043E9*
  ID_MODEL_FROM_DATABASE=500 Series Chipset Switch Upstream Port
 
+pci:v00001022d000043EA*
+ ID_MODEL_FROM_DATABASE=500 Series Chipset Switch Downstream Port
+
 pci:v00001022d000043EB*
  ID_MODEL_FROM_DATABASE=500 Series Chipset SATA Controller
 
 pci:v00001022d000043EBsv00001B21sd00001062*
  ID_MODEL_FROM_DATABASE=500 Series Chipset SATA Controller (ASM1062 Serial ATA Controller)
 
+pci:v00001022d000043EC*
+ ID_MODEL_FROM_DATABASE=A520 Series Chipset USB 3.1 XHCI Controller
+
 pci:v00001022d000043EE*
  ID_MODEL_FROM_DATABASE=500 Series Chipset USB 3.1 XHCI Controller
 
@@ -16571,6 +16709,9 @@ pci:v00001022d000043F6*
 pci:v00001022d000043F7*
  ID_MODEL_FROM_DATABASE=600 Series Chipset USB 3.2 Controller
 
+pci:v00001022d000043FC*
+ ID_MODEL_FROM_DATABASE=800 Series Chipset USB 3.x XHCI Controller
+
 pci:v00001022d000043FD*
  ID_MODEL_FROM_DATABASE=800 Series Chipset USB 3.x XHCI Controller
 
@@ -17564,6 +17705,9 @@ pci:v00001028d00000016sv00001028sd00001F
 pci:v00001028d00000073*
  ID_MODEL_FROM_DATABASE=NV-RAM Adapter
 
+pci:v00001028d00000C46*
+ ID_MODEL_FROM_DATABASE=PERC S160 RAID controller
+
 pci:v00001028d00001028*
  ID_MODEL_FROM_DATABASE=PCIe Bridge riser
 
@@ -21224,6 +21368,9 @@ pci:v0000104Dd00008009*
 pci:v0000104Dd0000800C*
  ID_MODEL_FROM_DATABASE=DTL-H800 [PS1 sound development board]
 
+pci:v0000104Dd0000800D*
+ ID_MODEL_FROM_DATABASE=DVBK-2000(E) DV Still Image Capture Board
+
 pci:v0000104Dd00008039*
  ID_MODEL_FROM_DATABASE=CXD3222 i.LINK Controller
 
@@ -22922,6 +23069,9 @@ pci:v00001077d00002031sv0000103Csd000080
 pci:v00001077d00002031sv00001077sd00000241*
  ID_MODEL_FROM_DATABASE=ISP8324-based 16Gb Fibre Channel to PCI Express Adapter (QLE2670 16Gb Single Port Fibre Channel Adapter)
 
+pci:v00001077d00002031sv00001077sd00000249*
+ ID_MODEL_FROM_DATABASE=ISP8324-based 16Gb Fibre Channel to PCI Express Adapter (QLE2672 16Gb Dual Port Fibre Channel Adapter)
+
 pci:v00001077d00002071*
  ID_MODEL_FROM_DATABASE=ISP2714-based 16/32Gb Fibre Channel to PCIe Adapter
 
@@ -23126,6 +23276,12 @@ pci:v00001077d00002532sv00001590sd000000
 pci:v00001077d00002971*
  ID_MODEL_FROM_DATABASE=ISP2684
 
+pci:v00001077d00002981*
+ ID_MODEL_FROM_DATABASE=32G SFP28 EP2744 Apatter
+
+pci:v00001077d00002981sv00001BD4sd000000B0*
+ ID_MODEL_FROM_DATABASE=32G SFP28 EP2744 Apatter
+
 pci:v00001077d00003022*
  ID_MODEL_FROM_DATABASE=ISP4022-based Ethernet NIC
 
@@ -27686,12 +27842,18 @@ pci:v000010B5d00008680*
 pci:v000010B5d00008696*
  ID_MODEL_FROM_DATABASE=PEX 8696 96-lane, 24-Port PCI Express Gen 2 (5.0 GT/s) Multi-Root Switch
 
+pci:v000010B5d00008714*
+ ID_MODEL_FROM_DATABASE=PEX 8714 12-Lane, 5-Port PCI Express Gen 3 (8 GT/s) Switch
+
 pci:v000010B5d00008717*
  ID_MODEL_FROM_DATABASE=PEX 8717 16-lane, 8-Port PCI Express Gen 3 (8.0 GT/s) Switch with DMA
 
 pci:v000010B5d00008718*
  ID_MODEL_FROM_DATABASE=PEX 8718 16-Lane, 5-Port PCI Express Gen 3 (8.0 GT/s) Switch
 
+pci:v000010B5d00008723*
+ ID_MODEL_FROM_DATABASE=PEX 8723 24-Lane, 6-Port PCI Express Gen 3 (8 GT/s) Switch
+
 pci:v000010B5d00008724*
  ID_MODEL_FROM_DATABASE=PEX 8724 24-Lane, 6-Port PCI Express Gen 3 (8 GT/s) Switch, 19 x 19mm FCBGA
 
@@ -27707,6 +27869,9 @@ pci:v000010B5d00008725*
 pci:v000010B5d00008732*
  ID_MODEL_FROM_DATABASE=PEX 8732 32-lane, 8-Port PCI Express Gen 3 (8.0 GT/s) Switch
 
+pci:v000010B5d00008733*
+ ID_MODEL_FROM_DATABASE=PEX 8733 32-Lane, 19-Port PCI Express Gen 3 (8 GT/s) Switch
+
 pci:v000010B5d00008734*
  ID_MODEL_FROM_DATABASE=PEX 8734 32-lane, 8-Port PCI Express Gen 3 (8.0GT/s) Switch
 
@@ -27728,6 +27893,15 @@ pci:v000010B5d00008749*
 pci:v000010B5d00008749sv00004C52sd00009349*
  ID_MODEL_FROM_DATABASE=PEX 8749 48-Lane, 18-Port PCI Express Gen 3 (8.0 GT/s) Multi-Root Switch with DMA (LRNV9349 8-port SFF-8643 NVMe SSD Exchange Adapter)
 
+pci:v000010B5d00008764*
+ ID_MODEL_FROM_DATABASE=PEX 8764 64-Lane, 16-Port PCI Express Gen 3 (8 GT/s) Switch
+
+pci:v000010B5d00008780*
+ ID_MODEL_FROM_DATABASE=PEX 8780 80-Lane, 20-Port PCI Express Gen 3 (8 GT/s) Switch
+
+pci:v000010B5d00008796*
+ ID_MODEL_FROM_DATABASE=PEX8796 96-Lane, 24-Port PCIe Gen 3 (8.0 GT/s) Switch
+
 pci:v000010B5d000087A0*
  ID_MODEL_FROM_DATABASE=PEX PCI Express Switch NT0 Port Link Interface
 
@@ -28199,6 +28373,9 @@ pci:v000010B5d00009656sv00001885sd000007
 pci:v000010B5d00009656sv00001885sd00000701*
  ID_MODEL_FROM_DATABASE=PCI9656 PCI <-> IOBus Bridge (Tsunami FPGA PMC with Altera Stratix S30)
 
+pci:v000010B5d00009712*
+ ID_MODEL_FROM_DATABASE=PEX9712 12-Lane, 5-Port PCIe Gen 3 (8.0 GT/s) ExpressFabric Switch
+
 pci:v000010B5d00009733*
  ID_MODEL_FROM_DATABASE=PEX 9733 33-lane, 9-port PCI Express Gen 3 (8.0 GT/s) Switch
 
@@ -28214,6 +28391,15 @@ pci:v000010B5d00009749*
 pci:v000010B5d00009749sv00001D49sd00000004*
  ID_MODEL_FROM_DATABASE=PEX 9749 49-lane, 13-port PCI Express Gen 3 (8.0 GT/s) Switch (ThinkSystem 1610-8P NVMe Switch Adapter)
 
+pci:v000010B5d00009765*
+ ID_MODEL_FROM_DATABASE=PEX9765 65-Lane, 17-Port PCIe Gen 3 (8.0 GT/s) ExpressFabric Switch
+
+pci:v000010B5d00009781*
+ ID_MODEL_FROM_DATABASE=PEX9781 81-Lane, 21-Port PCIe Gen 3 (8.0 GT/s) ExpressFabric Switch
+
+pci:v000010B5d00009797*
+ ID_MODEL_FROM_DATABASE=PEX9781 97-Lane, 25-Port PCIe Gen 3 (8.0 GT/s) ExpressFabric Switch
+
 pci:v000010B5d0000A100*
  ID_MODEL_FROM_DATABASE=Blackmagic Design DeckLink
 
@@ -35381,6 +35567,12 @@ pci:v000010DEd00000FA5*
 pci:v000010DEd00000FA7*
  ID_MODEL_FROM_DATABASE=GK11x [Tegra on x86 (PEATRANS)]
 
+pci:v000010DEd00000FAE*
+ ID_MODEL_FROM_DATABASE=Tegra X1 PCIe x4 Root Complex
+
+pci:v000010DEd00000FAF*
+ ID_MODEL_FROM_DATABASE=Tegra X1 PCIe x1 Root Complex
+
 pci:v000010DEd00000FB0*
  ID_MODEL_FROM_DATABASE=GM200 High Definition Audio
 
@@ -35942,6 +36134,12 @@ pci:v000010DEd000010C5*
 pci:v000010DEd000010D8*
  ID_MODEL_FROM_DATABASE=GT218 [NVS 300]
 
+pci:v000010DEd000010E5*
+ ID_MODEL_FROM_DATABASE=Parker PCIe x4 Root Complex
+
+pci:v000010DEd000010E6*
+ ID_MODEL_FROM_DATABASE=Parker PCIe x1 Root Complex
+
 pci:v000010DEd000010EF*
  ID_MODEL_FROM_DATABASE=GP102 HDMI Audio Controller
 
@@ -37986,7 +38184,7 @@ pci:v000010DEd00001AF1*
  ID_MODEL_FROM_DATABASE=GA100 [A100 NVSwitch]
 
 pci:v000010DEd00001B00*
- ID_MODEL_FROM_DATABASE=GP102 [TITAN X]
+ ID_MODEL_FROM_DATABASE=GP102 [TITAN X Pascal]
 
 pci:v000010DEd00001B01*
  ID_MODEL_FROM_DATABASE=GP102 [GeForce GTX 1080 Ti 10GB]
@@ -38954,6 +39152,15 @@ pci:v000010DEd00002291*
 pci:v000010DEd00002296*
  ID_MODEL_FROM_DATABASE=Tegra PCIe Endpoint Virtual Network
 
+pci:v000010DEd0000229A*
+ ID_MODEL_FROM_DATABASE=Orin PCIe x8 Root Complex
+
+pci:v000010DEd0000229C*
+ ID_MODEL_FROM_DATABASE=Orin PCIe x4/x8 Endpoint/Root Complex
+
+pci:v000010DEd0000229E*
+ ID_MODEL_FROM_DATABASE=Orin PCIe x1 Root Complex
+
 pci:v000010DEd000022A3*
  ID_MODEL_FROM_DATABASE=GH100 [H100 NVSwitch]
 
@@ -38969,6 +39176,12 @@ pci:v000010DEd000022BD*
 pci:v000010DEd000022BE*
  ID_MODEL_FROM_DATABASE=AD107 High Definition Audio Controller
 
+pci:v000010DEd000022D8*
+ ID_MODEL_FROM_DATABASE=THOR Processor PCI Express Root Port
+
+pci:v000010DEd000022E6*
+ ID_MODEL_FROM_DATABASE=THOR Processor PCI Express x16 Controller
+
 pci:v000010DEd00002302*
  ID_MODEL_FROM_DATABASE=GH100
 
@@ -39528,7 +39741,16 @@ pci:v000010DEd00002901*
  ID_MODEL_FROM_DATABASE=GB100 [B200]
 
 pci:v000010DEd00002920*
- ID_MODEL_FROM_DATABASE=GB100 [TS4]
+ ID_MODEL_FROM_DATABASE=GB100 [TS4 / B100]
+
+pci:v000010DEd00002924*
+ ID_MODEL_FROM_DATABASE=GB100
+
+pci:v000010DEd00002925*
+ ID_MODEL_FROM_DATABASE=GB100
+
+pci:v000010DEd0000293D*
+ ID_MODEL_FROM_DATABASE=GB100
 
 pci:v000010DEd00002940*
  ID_MODEL_FROM_DATABASE=GB100 [Reserved Dev ID B]
@@ -39536,6 +39758,9 @@ pci:v000010DEd00002940*
 pci:v000010DEd00002941*
  ID_MODEL_FROM_DATABASE=GB100 [HGX GB200]
 
+pci:v000010DEd0000297E*
+ ID_MODEL_FROM_DATABASE=GB100
+
 pci:v000010DEd00002980*
  ID_MODEL_FROM_DATABASE=GB102 [Reserved Dev ID A]
 
@@ -39545,12 +39770,30 @@ pci:v000010DEd000029BC*
 pci:v000010DEd000029C0*
  ID_MODEL_FROM_DATABASE=GB102 [Reserved Dev ID B]
 
+pci:v000010DEd000029F1*
+ ID_MODEL_FROM_DATABASE=GB102
+
+pci:v000010DEd00002B00*
+ ID_MODEL_FROM_DATABASE=TA1090SA [THOR]
+
 pci:v000010DEd00002B85*
  ID_MODEL_FROM_DATABASE=GB202 [GeForce RTX 5090]
 
 pci:v000010DEd00002B87*
  ID_MODEL_FROM_DATABASE=GB202 [GeForce RTX 5090 D]
 
+pci:v000010DEd00002BB1*
+ ID_MODEL_FROM_DATABASE=GB202GL [RTX PRO 6000 Blackwell Workstation Edition]
+
+pci:v000010DEd00002BB3*
+ ID_MODEL_FROM_DATABASE=GB202GL [RTX PRO 5000 Blackwell]
+
+pci:v000010DEd00002BB4*
+ ID_MODEL_FROM_DATABASE=GB202GL [RTX PRO 6000 Blackwell Max-Q Workstation Edition]
+
+pci:v000010DEd00002BB5*
+ ID_MODEL_FROM_DATABASE=GB202GL [RTX PRO 6000 Blackwell Server Edition]
+
 pci:v000010DEd00002C02*
  ID_MODEL_FROM_DATABASE=GB203 [GeForce RTX 5080]
 
@@ -39566,41 +39809,77 @@ pci:v000010DEd00002C19*
 pci:v000010DEd00002C2C*
  ID_MODEL_FROM_DATABASE=GB6-256(N22W-ES-A1)
 
+pci:v000010DEd00002C31*
+ ID_MODEL_FROM_DATABASE=GB203GL [RTX PRO 4500 Blackwell]
+
+pci:v000010DEd00002C34*
+ ID_MODEL_FROM_DATABASE=GB203GL [RTX PRO 4000 Blackwell]
+
+pci:v000010DEd00002C38*
+ ID_MODEL_FROM_DATABASE=GB203GLM [RTX PRO 5000 Blackwell Generation Laptop GPU]
+
+pci:v000010DEd00002C39*
+ ID_MODEL_FROM_DATABASE=GB203GLM [RTX PRO 4000 Blackwell Generation Laptop GPU]
+
 pci:v000010DEd00002C58*
  ID_MODEL_FROM_DATABASE=GB203M / GN22-X11 [GeForce RTX 5090 Max-Q / Mobile]
 
 pci:v000010DEd00002C59*
  ID_MODEL_FROM_DATABASE=GB203M / GN22-X9 [GeForce RTX 5080 Max-Q / Mobile]
 
+pci:v000010DEd00002D04*
+ ID_MODEL_FROM_DATABASE=GB206 [GeForce RTX 5060 Ti]
+
+pci:v000010DEd00002D05*
+ ID_MODEL_FROM_DATABASE=GB206 [GeForce RTX 5060]
+
 pci:v000010DEd00002D18*
- ID_MODEL_FROM_DATABASE=AD108M [GeForce RTX 5070 Max-Q / Mobile]
+ ID_MODEL_FROM_DATABASE=GB206M [GeForce RTX 5070 Max-Q / Mobile]
 
 pci:v000010DEd00002D19*
- ID_MODEL_FROM_DATABASE=AD108M [GeForce RTX 5060 Max-Q / Mobile]
+ ID_MODEL_FROM_DATABASE=GB206M [GeForce RTX 5060 Max-Q / Mobile]
 
 pci:v000010DEd00002D2C*
  ID_MODEL_FROM_DATABASE=GB6-128 (N22Y-ES-A1)
 
+pci:v000010DEd00002D39*
+ ID_MODEL_FROM_DATABASE=GB206GLM [RTX PRO 2000 Blackwell Generation Laptop GPU]
+
 pci:v000010DEd00002D58*
- ID_MODEL_FROM_DATABASE=AD108M [GeForce RTX 5070 Max-Q / Mobile]
+ ID_MODEL_FROM_DATABASE=GB206M [GeForce RTX 5070 Max-Q / Mobile]
 
 pci:v000010DEd00002D59*
- ID_MODEL_FROM_DATABASE=AD108M [GeForce RTX 5060 Max-Q / Mobile]
+ ID_MODEL_FROM_DATABASE=GB206M [GeForce RTX 5060 Max-Q / Mobile]
+
+pci:v000010DEd00002D83*
+ ID_MODEL_FROM_DATABASE=GB207 [GeForce RTX 5050]
 
 pci:v000010DEd00002D98*
- ID_MODEL_FROM_DATABASE=AD108M [GeForce RTX 5050 Max-Q / Mobile]
+ ID_MODEL_FROM_DATABASE=GB207M [GeForce RTX 5050 Max-Q / Mobile]
+
+pci:v000010DEd00002DB8*
+ ID_MODEL_FROM_DATABASE=GB207GLM [RTX PRO 1000 Blackwell Generation Laptop GPU]
+
+pci:v000010DEd00002DB9*
+ ID_MODEL_FROM_DATABASE=GB207GLM [RTX PRO 500 Blackwell Generation Laptop GPU]
 
 pci:v000010DEd00002DD8*
- ID_MODEL_FROM_DATABASE=AD108M [GeForce RTX 5050 Max-Q / Mobile]
+ ID_MODEL_FROM_DATABASE=GB207M [GeForce RTX 5050 Max-Q / Mobile]
+
+pci:v000010DEd00002E2A*
+ ID_MODEL_FROM_DATABASE=GB20B
 
 pci:v000010DEd00002F04*
- ID_MODEL_FROM_DATABASE=GN22 [GeForce RTX 5070]
+ ID_MODEL_FROM_DATABASE=GB205 [GeForce RTX 5070]
 
 pci:v000010DEd00002F18*
- ID_MODEL_FROM_DATABASE=AD108M [GeForce RTX 5070 Ti Max-Q / Mobile]
+ ID_MODEL_FROM_DATABASE=GB205M [GeForce RTX 5070 Ti Mobile]
+
+pci:v000010DEd00002F38*
+ ID_MODEL_FROM_DATABASE=GB205GLM [RTX PRO 3000 Blackwell Generation Laptop GPU]
 
 pci:v000010DEd00002F58*
- ID_MODEL_FROM_DATABASE=AD108M [GeForce RTX 5070 Ti Max-Q / Mobile]
+ ID_MODEL_FROM_DATABASE=GB205M [GeForce RTX 5070 Ti Mobile]
 
 pci:v000010DEd000031C0*
  ID_MODEL_FROM_DATABASE=GB110
@@ -40058,6 +40337,9 @@ pci:v000010E3d00000862*
 pci:v000010E3d00008111*
  ID_MODEL_FROM_DATABASE=Tsi381 PCIe to PCI Bridge
 
+pci:v000010E3d00008113*
+ ID_MODEL_FROM_DATABASE=89HPEB383 PCIe-to-PCI Bridge
+
 pci:v000010E3d00008260*
  ID_MODEL_FROM_DATABASE=CA91L8200B [Dual PCI PowerSpan II]
 
@@ -40262,6 +40544,9 @@ pci:v000010ECd00005227sv000017AAsd000022
 pci:v000010ECd00005227sv000017AAsd00002214*
  ID_MODEL_FROM_DATABASE=RTS5227 PCI Express Card Reader (ThinkPad X240)
 
+pci:v000010ECd00005228*
+ ID_MODEL_FROM_DATABASE=RTS5288 PCIe SD UHS-I Card Reader controller
+
 pci:v000010ECd00005229*
  ID_MODEL_FROM_DATABASE=RTS5229 PCI Express Card Reader
 
@@ -40332,7 +40617,10 @@ pci:v000010ECd00005260*
  ID_MODEL_FROM_DATABASE=RTS5260 PCI Express Card Reader
 
 pci:v000010ECd00005261*
- ID_MODEL_FROM_DATABASE=RTS5261 PCI Express Card Reader
+ ID_MODEL_FROM_DATABASE=RTS5261 PCIe SD Express Card Reader controller
+
+pci:v000010ECd00005264*
+ ID_MODEL_FROM_DATABASE=RTS5264 PCIe SD UHS-II & SD Express Card Reader controller
 
 pci:v000010ECd00005286*
  ID_MODEL_FROM_DATABASE=RTS5286 PCI Express Card Reader
@@ -40367,6 +40655,9 @@ pci:v000010ECd00005765*
 pci:v000010ECd00005770*
  ID_MODEL_FROM_DATABASE=RTS5770DL NVMe SSD Controller (DRAM-less)
 
+pci:v000010ECd00005771*
+ ID_MODEL_FROM_DATABASE=RTS5771 NVMe SSD Controller (DRAM-less)
+
 pci:v000010ECd00005772*
  ID_MODEL_FROM_DATABASE=RTS5772DL NVMe SSD Controller (DRAM-less)
 
@@ -40958,6 +41249,9 @@ pci:v000010ECd0000B822sv000017AAsd000051
 pci:v000010ECd0000B822sv000017AAsd0000B023*
  ID_MODEL_FROM_DATABASE=RTL8822BE 802.11a/b/g/n/ac WiFi adapter (ThinkPad E595)
 
+pci:v000010ECd0000B851*
+ ID_MODEL_FROM_DATABASE=RTL8851BE PCIe 802.11ax Wireless Network Controller
+
 pci:v000010ECd0000B852*
  ID_MODEL_FROM_DATABASE=RTL8852BE PCIe 802.11ax Wireless Network Controller
 
@@ -41609,6 +41903,12 @@ pci:v00001102d0000000Bsv00001102sd000000
 pci:v00001102d0000000Bsv00001102sd00000062*
  ID_MODEL_FROM_DATABASE=EMU20k2 [Sound Blaster X-Fi Titanium Series] (SB1270 [SoundBlaster X-Fi Titanium HD])
 
+pci:v00001102d00000010*
+ ID_MODEL_FROM_DATABASE=CA0132 Sound Core3D [Sound Blaster AE-7]
+
+pci:v00001102d00000010sv00001102sd00000081*
+ ID_MODEL_FROM_DATABASE=CA0132 Sound Core3D [Sound Blaster AE-7] (Sound Blaster AE-7)
+
 pci:v00001102d00000012*
  ID_MODEL_FROM_DATABASE=CA0132 Sound Core3D [Sound Blaster Recon3D / Z-Series / Sound BlasterX AE-5 Plus]
 
@@ -42108,7 +42408,7 @@ pci:v00001106d00000586sv00001106sd000000
  ID_MODEL_FROM_DATABASE=VT82C586/A/B PCI-to-ISA [Apollo VP] (MVP3 ISA Bridge)
 
 pci:v00001106d00000591*
- ID_MODEL_FROM_DATABASE=VT8237A SATA 2-Port Controller
+ ID_MODEL_FROM_DATABASE=VT8237A Integrated SATA RAID Controller
 
 pci:v00001106d00000595*
  ID_MODEL_FROM_DATABASE=VT82C595 [Apollo VP2]
@@ -43160,6 +43460,9 @@ pci:v00001106d0000337A*
 pci:v00001106d0000337B*
  ID_MODEL_FROM_DATABASE=VT8237A Host Bridge
 
+pci:v00001106d00003401*
+ ID_MODEL_FROM_DATABASE=VT6325 Firewire Controller
+
 pci:v00001106d00003402*
  ID_MODEL_FROM_DATABASE=VT8261 PCI to ISA Bridge
 
@@ -43196,9 +43499,21 @@ pci:v00001106d0000345B*
 pci:v00001106d00003483*
  ID_MODEL_FROM_DATABASE=VL805/806 xHCI USB 3.0 Controller
 
+pci:v00001106d0000365A*
+ ID_MODEL_FROM_DATABASE=VT3365 Card Reader Host Controller
+
+pci:v00001106d0000365B*
+ ID_MODEL_FROM_DATABASE=VT3365 SDIO Host Controller
+
 pci:v00001106d00003A01*
  ID_MODEL_FROM_DATABASE=VX11 Graphics [Chrome 645/640]
 
+pci:v00001106d0000401A*
+ ID_MODEL_FROM_DATABASE=VT6325 Card Reader Host Controller
+
+pci:v00001106d0000401B*
+ ID_MODEL_FROM_DATABASE=VT6325 SDIO PCI-E Host Controller
+
 pci:v00001106d00004149*
  ID_MODEL_FROM_DATABASE=VIA VT6420 (ATA133) Controller
 
@@ -43301,6 +43616,9 @@ pci:v00001106d00005327*
 pci:v00001106d00005336*
  ID_MODEL_FROM_DATABASE=K8M890CE I/O APIC Interrupt Controller
 
+pci:v00001106d00005337*
+ ID_MODEL_FROM_DATABASE=VT8237A Integrated SATA Controller
+
 pci:v00001106d00005340*
  ID_MODEL_FROM_DATABASE=PT900 I/O APIC Interrupt Controller
 
@@ -43314,7 +43632,7 @@ pci:v00001106d00005364*
  ID_MODEL_FROM_DATABASE=CN896/VN896/P4M900 I/O APIC Interrupt Controller
 
 pci:v00001106d00005372*
- ID_MODEL_FROM_DATABASE=VT8237/8251 Serial ATA Controller
+ ID_MODEL_FROM_DATABASE=VT8237S SATA Controller
 
 pci:v00001106d00005409*
  ID_MODEL_FROM_DATABASE=VX855/VX875 APIC and Central Traffic Control
@@ -43332,7 +43650,7 @@ pci:v00001106d00006122*
  ID_MODEL_FROM_DATABASE=VN1000 Graphics [Chrome 520 IGP]
 
 pci:v00001106d00006287*
- ID_MODEL_FROM_DATABASE=SATA RAID Controller
+ ID_MODEL_FROM_DATABASE=VT8251 AHCI SATA Controller
 
 pci:v00001106d00006290*
  ID_MODEL_FROM_DATABASE=K8M890CE Host Bridge
@@ -43427,6 +43745,9 @@ pci:v00001106d00007353*
 pci:v00001106d00007364*
  ID_MODEL_FROM_DATABASE=CN896/VN896/P4M900 Host Bridge
 
+pci:v00001106d00007372*
+ ID_MODEL_FROM_DATABASE=VT8237S SATA RAID Controller
+
 pci:v00001106d00007409*
  ID_MODEL_FROM_DATABASE=VX855/VX875 North-South Module Interface Control
 
@@ -43520,11 +43841,17 @@ pci:v00001106d00009001*
 pci:v00001106d00009040*
  ID_MODEL_FROM_DATABASE=VT8261 SATA Controller [StorX RAID Controller - 9040]
 
+pci:v00001106d00009041*
+ ID_MODEL_FROM_DATABASE=VX900/VX11 SATA Controller [StorX RAID Controller - 9041]
+
 pci:v00001106d00009082*
  ID_MODEL_FROM_DATABASE=Standard AHCI 1.0 SATA Controller
 
 pci:v00001106d00009140*
- ID_MODEL_FROM_DATABASE=HDMI Audio Device
+ ID_MODEL_FROM_DATABASE=VX11 Graphics [Chrome 645/640] HDMI Audio Device
+
+pci:v00001106d00009170*
+ ID_MODEL_FROM_DATABASE=VX900 Graphics [Chrome9 HD] HDMI Audio Device
 
 pci:v00001106d00009201*
  ID_MODEL_FROM_DATABASE=USB3.0 Controller
@@ -47120,6 +47447,9 @@ pci:v00001179d00000116*
 pci:v00001179d00000116sv00001179sd00000001*
  ID_MODEL_FROM_DATABASE=XG5 NVMe SSD Controller
 
+pci:v00001179d00000119*
+ ID_MODEL_FROM_DATABASE=XD5 NVMe SSD Controller
+
 pci:v00001179d0000011A*
  ID_MODEL_FROM_DATABASE=XG6 NVMe SSD Controller
 
@@ -47724,7 +48054,7 @@ pci:v00001180d00000832sv000017AAsd000020
  ID_MODEL_FROM_DATABASE=R5C832 IEEE 1394 Controller (ThinkPad R61)
 
 pci:v00001180d00000832sv000017AAsd000020C7*
- ID_MODEL_FROM_DATABASE=R5C832 IEEE 1394 Controller (ThinkPad R61)
+ ID_MODEL_FROM_DATABASE=R5C832 IEEE 1394 Controller (ThinkPad R61/T400)
 
 pci:v00001180d00000841*
  ID_MODEL_FROM_DATABASE=R5C841 CardBus/SD/SDIO/MMC/MS/MSPro/xD/IEEE1394
@@ -49046,6 +49376,12 @@ pci:v000011BCd00000001*
 pci:v000011BD*
  ID_VENDOR_FROM_DATABASE=Pinnacle Systems Inc.
 
+pci:v000011BDd00000015*
+ ID_MODEL_FROM_DATABASE=FireWire Controller
+
+pci:v000011BDd00000023*
+ ID_MODEL_FROM_DATABASE=Studio 700
+
 pci:v000011BDd0000002E*
  ID_MODEL_FROM_DATABASE=PCTV 40i
 
@@ -49937,6 +50273,18 @@ pci:v000011F7*
 pci:v000011F8*
  ID_VENDOR_FROM_DATABASE=Microchip Technology
 
+pci:v000011F8d00004036*
+ ID_MODEL_FROM_DATABASE=PM40036 Switchtec PFX 36xG4 Fanout PCIe Switch
+
+pci:v000011F8d00004052*
+ ID_MODEL_FROM_DATABASE=PM40052 Switchtec PFX 52xG4 Fanout PCIe Switch
+
+pci:v000011F8d00004084*
+ ID_MODEL_FROM_DATABASE=PM40084 Switchtec PFX 84xG4 Fanout PCIe Switch
+
+pci:v000011F8d00004128*
+ ID_MODEL_FROM_DATABASE=PM41028 Switchtec PSX 28xG4 Programmable PCIe Switch
+
 pci:v000011F8d00005000*
  ID_MODEL_FROM_DATABASE=PM50100 Switchtec PFX 100xG5 Fanout PCIe Switch
 
@@ -50909,6 +51257,12 @@ pci:v00001233*
 pci:v00001235*
  ID_VENDOR_FROM_DATABASE=SMART Modular Technologies
 
+pci:v00001235d0000C241*
+ ID_MODEL_FROM_DATABASE=CXA-4F1W
+
+pci:v00001235d0000C241sv00001028sd00002382*
+ ID_MODEL_FROM_DATABASE=CXA-4F1W (4-DIMM Add In Card)
+
 pci:v00001236*
  ID_VENDOR_FROM_DATABASE=Sigma Designs Corporation
 
@@ -51647,6 +52001,9 @@ pci:v0000126Fd00002262*
 pci:v0000126Fd00002263*
  ID_MODEL_FROM_DATABASE=SM2263EN/SM2263XT (DRAM-less) NVMe SSD Controllers
 
+pci:v0000126Fd00002268*
+ ID_MODEL_FROM_DATABASE=SM2268XT (DRAM-less) NVMe SSD Controller
+
 pci:v0000126Fd00002269*
  ID_MODEL_FROM_DATABASE=SM2269XT (DRAM-less) NVMe SSD Controller
 
@@ -54548,6 +54905,9 @@ pci:v00001344d00005425*
 pci:v00001344d00005427*
  ID_MODEL_FROM_DATABASE=2650 NVMe SSD (DRAM-less)
 
+pci:v00001344d00005428*
+ ID_MODEL_FROM_DATABASE=4600 NVMe SSD
+
 pci:v00001344d00005429*
  ID_MODEL_FROM_DATABASE=2600 NVMe SSD (DRAM-less)
 
@@ -54767,6 +55127,12 @@ pci:v0000135Ad00000B23*
 pci:v0000135Ad00000BA1*
  ID_MODEL_FROM_DATABASE=UC-101 1 + 1 port RS-232 card
 
+pci:v0000135Ad00000BA2*
+ ID_MODEL_FROM_DATABASE=UC-101 1 + 1 port RS-232 card
+
+pci:v0000135Ad00000BA3*
+ ID_MODEL_FROM_DATABASE=UC-101 1 + 1 port RS-232 card
+
 pci:v0000135Ad00000BC1*
  ID_MODEL_FROM_DATABASE=UC-203 1 + 1 port RS-232 + LPT card
 
@@ -54800,6 +55166,12 @@ pci:v0000135Ad00000C23*
 pci:v0000135Ad00000C41*
  ID_MODEL_FROM_DATABASE=UC-368 4 port RS-422/485 Opto Isolated card
 
+pci:v0000135Ad00000C42*
+ ID_MODEL_FROM_DATABASE=UC-368 4 port RS-422/485 Opto Isolated card
+
+pci:v0000135Ad00000C43*
+ ID_MODEL_FROM_DATABASE=UC-368 4 port RS-422/485 Opto Isolated card
+
 pci:v0000135Ad00000CA1*
  ID_MODEL_FROM_DATABASE=UC-253 2 port RS-232 card
 
@@ -54917,6 +55289,18 @@ pci:v0000135Ad0000401E*
 pci:v0000135Ad0000401F*
  ID_MODEL_FROM_DATABASE=PX-475 1 port RS-232 + LPT card (LPT port)
 
+pci:v0000135Ad00004020*
+ ID_MODEL_FROM_DATABASE=XC-157 LPT ExpressCard
+
+pci:v0000135Ad00004021*
+ ID_MODEL_FROM_DATABASE=XC-475 1 port RS-232 + LPT ExpressCard (Serial port)
+
+pci:v0000135Ad00004022*
+ ID_MODEL_FROM_DATABASE=XC-475 1 port RS-232 + LPT ExpressCard (LPT port)
+
+pci:v0000135Ad00004026*
+ ID_MODEL_FROM_DATABASE=XC-235 1 port RS-232 ExpressCard
+
 pci:v0000135Ad00004027*
  ID_MODEL_FROM_DATABASE=IX-100 1 port RS-232 card
 
@@ -60005,6 +60389,12 @@ pci:v0000144Dd0000A80E*
 pci:v0000144Dd0000A80F*
  ID_MODEL_FROM_DATABASE=BM9C1 QLC NVME SSD (DRAM-less)
 
+pci:v0000144Dd0000A810*
+ ID_MODEL_FROM_DATABASE=NVMe SSD 9100 PRO [PM9E1]
+
+pci:v0000144Dd0000A811*
+ ID_MODEL_FROM_DATABASE=BM9H1 NVME SSD (DRAM-less)
+
 pci:v0000144Dd0000A820*
  ID_MODEL_FROM_DATABASE=NVMe SSD Controller 171X
 
@@ -60530,6 +60920,9 @@ pci:v00001458d00001002*
 pci:v00001458d000022E8*
  ID_MODEL_FROM_DATABASE=Ellesmere [Radeon RX 480]
 
+pci:v00001458d00002425*
+ ID_MODEL_FROM_DATABASE=Radeon RX 9070 GAMING OC 16G
+
 pci:v00001458d00003483*
  ID_MODEL_FROM_DATABASE=USB 3.0 Controller (VIA VL80x-based xHCI Controller)
 
@@ -61073,6 +61466,9 @@ pci:v000014C3d00000608*
 pci:v000014C3d00000616*
  ID_MODEL_FROM_DATABASE=MT7922 802.11ax PCI Express Wireless Network Adapter
 
+pci:v000014C3d00000717*
+ ID_MODEL_FROM_DATABASE=MT7925 (RZ717) Wi-Fi 7 160MHz
+
 pci:v000014C3d00004D75*
  ID_MODEL_FROM_DATABASE=T700 5G Modem [5G Solution 5000]
 
@@ -65477,6 +65873,9 @@ pci:v00001542d00009310*
 pci:v00001542d00009320*
  ID_MODEL_FROM_DATABASE=Arria 10 FPGA Card
 
+pci:v00001542d00009330*
+ ID_MODEL_FROM_DATABASE=Cyclone V FPGA Card
+
 pci:v00001542d00009350*
  ID_MODEL_FROM_DATABASE=Analog Input Card
 
@@ -66254,6 +66653,21 @@ pci:v000015B3d00000292*
 pci:v000015B3d00000293*
  ID_MODEL_FROM_DATABASE=Arcus3 RMA
 
+pci:v000015B3d00000294*
+ ID_MODEL_FROM_DATABASE=Ophy 2.1 (SagittaZ)
+
+pci:v000015B3d00000296*
+ ID_MODEL_FROM_DATABASE=OPHY2.6
+
+pci:v000015B3d00000298*
+ ID_MODEL_FROM_DATABASE=OPHY3.0
+
+pci:v000015B3d0000029A*
+ ID_MODEL_FROM_DATABASE=OPHY3.1
+
+pci:v000015B3d0000029C*
+ ID_MODEL_FROM_DATABASE=OPHY3.5
+
 pci:v000015B3d000002A0*
  ID_MODEL_FROM_DATABASE=Quantum-6 in Flash Recovery Mode
 
@@ -66503,6 +66917,9 @@ pci:v000015B3d00001015sv0000193Dsd000010
 pci:v000015B3d00001015sv00001E81sd00000C10*
  ID_MODEL_FROM_DATABASE=MT27710 Family [ConnectX-4 Lx] (25GbE dual-port SFP28, PCIe3.0 x8 [3SC10])
 
+pci:v000015B3d00001015sv00001F3Fsd00000C10*
+ ID_MODEL_FROM_DATABASE=MT27710 Family [ConnectX-4 Lx] (25GbE dual-port SFP28, PCIe3.0 x8, 3SC10)
+
 pci:v000015B3d00001016*
  ID_MODEL_FROM_DATABASE=MT27710 Family [ConnectX-4 Lx Virtual Function]
 
@@ -66581,6 +66998,9 @@ pci:v000015B3d0000101Fsv00001BD4sd000000
 pci:v000015B3d0000101Fsv00001BD4sd000000AE*
  ID_MODEL_FROM_DATABASE=MT2894 Family [ConnectX-6 Lx] (S252MCX6Lx)
 
+pci:v000015B3d0000101Fsv00001F3Fsd00000C11*
+ ID_MODEL_FROM_DATABASE=MT2894 Family [ConnectX-6 Lx] (25GbE dual-port SFP28, PCIe4.0 x8, 3SC1125GbE dual-port SFP28, PCIe4.0 x8, 3SC11)
+
 pci:v000015B3d0000101Fsv00001FF9sd000000AD*
  ID_MODEL_FROM_DATABASE=MT2894 Family [ConnectX-6 Lx] (ENFM6251-SP2)
 
@@ -67050,7 +67470,7 @@ pci:v000015B7d00005016*
  ID_MODEL_FROM_DATABASE=WD PC SN740 NVMe SSD 512GB (DRAM-less)
 
 pci:v000015B7d00005017*
- ID_MODEL_FROM_DATABASE=WD Black SN770 / PC SN740 256GB / PC SN560 (DRAM-less) NVMe SSD
+ ID_MODEL_FROM_DATABASE=WD SN560/SN740/SN770/SN5000 NVMe SSD
 
 pci:v000015B7d00005019*
  ID_MODEL_FROM_DATABASE=WD Green SN350 240GB (DRAM-less) / SN560E NVMe SSD
@@ -67082,6 +67502,9 @@ pci:v000015B7d00005030*
 pci:v000015B7d00005034*
  ID_MODEL_FROM_DATABASE=WD PC SN5000S M.2 2230 NVMe SSD (DRAM-less)
 
+pci:v000015B7d00005035*
+ ID_MODEL_FROM_DATABASE=WD PC SN5000S M.2 2242 NVMe SSD (DRAM-less)
+
 pci:v000015B7d00005036*
  ID_MODEL_FROM_DATABASE=WD PC SN5000S M.2 2280 NVMe SSD (DRAM-less)
 
@@ -67091,6 +67514,9 @@ pci:v000015B7d00005041*
 pci:v000015B7d00005042*
  ID_MODEL_FROM_DATABASE=WD Black SN770M NVMe SSD (DRAM-less)
 
+pci:v000015B7d00005044*
+ ID_MODEL_FROM_DATABASE=WD PC SN7100S NVMe SSD (DRAM-less)
+
 pci:v000015B7d00005045*
  ID_MODEL_FROM_DATABASE=WD_BLACK SN7100 NVMe SSD (DRAM-less)
 
@@ -67100,6 +67526,12 @@ pci:v000015B7d00005046*
 pci:v000015B7d00005049*
  ID_MODEL_FROM_DATABASE=SN8000S NVMe SSD
 
+pci:v000015B7d0000504A*
+ ID_MODEL_FROM_DATABASE=WD Blue SN5000 NVMe SSD (DRAM-less)
+
+pci:v000015B7d00005050*
+ ID_MODEL_FROM_DATABASE=WD PC SN8050S / WD_BLACK SN8100 NVMe SSD
+
 pci:v000015B8*
  ID_VENDOR_FROM_DATABASE=ADDI-DATA GmbH
 
@@ -70388,6 +70820,12 @@ pci:v000017CBd0000010E*
 pci:v000017CBd00000110*
  ID_MODEL_FROM_DATABASE=SM8475 PCIe Root Complex [Snapdragon 8+ Gen 1]
 
+pci:v000017CBd00000111*
+ ID_MODEL_FROM_DATABASE=SC8380XP PCIe Root Complex [Snapdragon X / X Plus / X Elite]
+
+pci:v000017CBd00000113*
+ ID_MODEL_FROM_DATABASE=SM8550/SM8650 PCIe Root Complex [Snapdragon 8 Gen 2/Gen 3]
+
 pci:v000017CBd00000300*
  ID_MODEL_FROM_DATABASE=MDM9x35 LTE Modem [Snapdragon X7]
 
@@ -70412,6 +70850,9 @@ pci:v000017CBd00000401*
 pci:v000017CBd00001000*
  ID_MODEL_FROM_DATABASE=QCS405 PCIe Root Complex
 
+pci:v000017CBd00001003*
+ ID_MODEL_FROM_DATABASE=IPQ6018 PCIe Root Complex
+
 pci:v000017CBd00001101*
  ID_MODEL_FROM_DATABASE=QCA6390 Wireless Network Adapter
 
@@ -72887,6 +73328,30 @@ pci:v00001957d00000446*
 pci:v00001957d00000447*
  ID_MODEL_FROM_DATABASE=T4160 without security
 
+pci:v00001957d00000820*
+ ID_MODEL_FROM_DATABASE=T1040 with security
+
+pci:v00001957d00000821*
+ ID_MODEL_FROM_DATABASE=T1040 without security
+
+pci:v00001957d00000824*
+ ID_MODEL_FROM_DATABASE=T1042 with security
+
+pci:v00001957d00000825*
+ ID_MODEL_FROM_DATABASE=T1042 without security
+
+pci:v00001957d00000828*
+ ID_MODEL_FROM_DATABASE=T1020 with security
+
+pci:v00001957d00000829*
+ ID_MODEL_FROM_DATABASE=T1020 without security
+
+pci:v00001957d0000082C*
+ ID_MODEL_FROM_DATABASE=T1022 with security
+
+pci:v00001957d0000082D*
+ ID_MODEL_FROM_DATABASE=T1022 without security
+
 pci:v00001957d00000830*
  ID_MODEL_FROM_DATABASE=T2080 with security
 
@@ -73307,6 +73772,9 @@ pci:v0000198A*
 pci:v00001993*
  ID_VENDOR_FROM_DATABASE=Innominate Security Technologies AG
 
+pci:v00001998*
+ ID_VENDOR_FROM_DATABASE=Toyou Feiji Electronics Co., Ltd.
+
 pci:v00001999*
  ID_VENDOR_FROM_DATABASE=A-Logics
 
@@ -73760,6 +74228,12 @@ pci:v000019E5d0000A127*
 pci:v000019E5d0000A12A*
  ID_MODEL_FROM_DATABASE=HiSilicon Add-on PCI-PCI Bridge
 
+pci:v000019E5d0000A12D*
+ ID_MODEL_FROM_DATABASE=HiSilicon Embedded PMU
+
+pci:v000019E5d0000A12E*
+ ID_MODEL_FROM_DATABASE=HiSilicon Embedded PCIe PTT
+
 pci:v000019E5d0000A220*
  ID_MODEL_FROM_DATABASE=HNS GE Network Controller
 
@@ -74018,6 +74492,24 @@ pci:v00001A3Bd00001112*
 pci:v00001A3E*
  ID_VENDOR_FROM_DATABASE=Micro-Research Finland Oy
 
+pci:v00001A3Ed0000132C*
+ ID_MODEL_FROM_DATABASE=MTCA Event Receiver 300
+
+pci:v00001A3Ed0000152C*
+ ID_MODEL_FROM_DATABASE=CompactPCI Event Receiver 300
+
+pci:v00001A3Ed0000172C*
+ ID_MODEL_FROM_DATABASE=PCI Express Event Receiver 300
+
+pci:v00001A3Ed0000192C*
+ ID_MODEL_FROM_DATABASE=CompactPCI Event Receiver TG 300
+
+pci:v00001A3Ed0000232C*
+ ID_MODEL_FROM_DATABASE=MTCA Event Master 300
+
+pci:v00001A3Ed0000252C*
+ ID_MODEL_FROM_DATABASE=CompactPCI Event Generator 300
+
 pci:v00001A41*
  ID_VENDOR_FROM_DATABASE=Tilera Corp.
 
@@ -74570,44 +75062,236 @@ pci:v00001AF4d00001009*
 pci:v00001AF4d00001041*
  ID_MODEL_FROM_DATABASE=Virtio 1.0 network device
 
+pci:v00001AF4d00001041sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 network device (QEMU)
+
 pci:v00001AF4d00001042*
  ID_MODEL_FROM_DATABASE=Virtio 1.0 block device
 
+pci:v00001AF4d00001042sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 block device (QEMU)
+
 pci:v00001AF4d00001043*
  ID_MODEL_FROM_DATABASE=Virtio 1.0 console
 
+pci:v00001AF4d00001043sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 console (QEMU)
+
 pci:v00001AF4d00001044*
  ID_MODEL_FROM_DATABASE=Virtio 1.0 RNG
 
+pci:v00001AF4d00001044sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 RNG (QEMU)
+
 pci:v00001AF4d00001045*
- ID_MODEL_FROM_DATABASE=Virtio 1.0 memory balloon
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 balloon
+
+pci:v00001AF4d00001045sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 balloon (QEMU)
+
+pci:v00001AF4d00001046*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 ioMemory
+
+pci:v00001AF4d00001046sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 ioMemory (QEMU)
+
+pci:v00001AF4d00001047*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 remote processor messaging
+
+pci:v00001AF4d00001047sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 remote processor messaging (QEMU)
 
 pci:v00001AF4d00001048*
  ID_MODEL_FROM_DATABASE=Virtio 1.0 SCSI
 
+pci:v00001AF4d00001048sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 SCSI (QEMU)
+
 pci:v00001AF4d00001049*
- ID_MODEL_FROM_DATABASE=Virtio 1.0 filesystem
+ ID_MODEL_FROM_DATABASE=Virtio 9P transport
+
+pci:v00001AF4d00001049sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 9P transport (QEMU)
+
+pci:v00001AF4d0000104A*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 WLAN MAC
+
+pci:v00001AF4d0000104Asv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 WLAN MAC (QEMU)
+
+pci:v00001AF4d0000104B*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 remoteproc serial link
+
+pci:v00001AF4d0000104Bsv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 remoteproc serial link (QEMU)
+
+pci:v00001AF4d0000104D*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 memory balloon
+
+pci:v00001AF4d0000104Dsv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 memory balloon (QEMU)
 
 pci:v00001AF4d00001050*
  ID_MODEL_FROM_DATABASE=Virtio 1.0 GPU
 
+pci:v00001AF4d00001050sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 GPU (QEMU)
+
+pci:v00001AF4d00001051*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 clock/timer
+
+pci:v00001AF4d00001051sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 clock/timer (QEMU)
+
 pci:v00001AF4d00001052*
  ID_MODEL_FROM_DATABASE=Virtio 1.0 input
 
+pci:v00001AF4d00001052sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 input (QEMU)
+
 pci:v00001AF4d00001053*
  ID_MODEL_FROM_DATABASE=Virtio 1.0 socket
 
+pci:v00001AF4d00001053sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 socket (QEMU)
+
+pci:v00001AF4d00001054*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 crypto
+
+pci:v00001AF4d00001054sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 crypto (QEMU)
+
+pci:v00001AF4d00001055*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 signal distribution device
+
+pci:v00001AF4d00001055sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 signal distribution device (QEMU)
+
+pci:v00001AF4d00001056*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 pstore device
+
+pci:v00001AF4d00001056sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 pstore device (QEMU)
+
+pci:v00001AF4d00001057*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 IOMMU
+
+pci:v00001AF4d00001057sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 IOMMU (QEMU)
+
 pci:v00001AF4d00001058*
- ID_MODEL_FROM_DATABASE=virtio-mem
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 mem
+
+pci:v00001AF4d00001058sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 mem (QEMU)
+
+pci:v00001AF4d00001059*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 sound
+
+pci:v00001AF4d00001059sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 sound (QEMU)
 
 pci:v00001AF4d0000105A*
- ID_MODEL_FROM_DATABASE=Virtio file system
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 file system
+
+pci:v00001AF4d0000105Asv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 file system (QEMU)
+
+pci:v00001AF4d0000105B*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 pmem
+
+pci:v00001AF4d0000105Bsv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 pmem (QEMU)
+
+pci:v00001AF4d0000105C*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 rpmb
+
+pci:v00001AF4d0000105Csv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 rpmb (QEMU)
+
+pci:v00001AF4d0000105D*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 mac80211-hwsim
+
+pci:v00001AF4d0000105Dsv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 mac80211-hwsim (QEMU)
+
+pci:v00001AF4d0000105E*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 video encoder
+
+pci:v00001AF4d0000105Esv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 video encoder (QEMU)
+
+pci:v00001AF4d0000105F*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 video decoder
+
+pci:v00001AF4d0000105Fsv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 video decoder (QEMU)
+
+pci:v00001AF4d00001060*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 SCMI
+
+pci:v00001AF4d00001060sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 SCMI (QEMU)
+
+pci:v00001AF4d00001061*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 nitro secure module
+
+pci:v00001AF4d00001061sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 nitro secure module (QEMU)
+
+pci:v00001AF4d00001062*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 I2C adapter
+
+pci:v00001AF4d00001062sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 I2C adapter (QEMU)
+
+pci:v00001AF4d00001063*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 watchdog
+
+pci:v00001AF4d00001063sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 watchdog (QEMU)
+
+pci:v00001AF4d00001064*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 can
+
+pci:v00001AF4d00001064sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 can (QEMU)
+
+pci:v00001AF4d00001065*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 dmabuf
+
+pci:v00001AF4d00001065sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 dmabuf (QEMU)
+
+pci:v00001AF4d00001066*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 parameter server
+
+pci:v00001AF4d00001066sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 parameter server (QEMU)
+
+pci:v00001AF4d00001067*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 audio policy
+
+pci:v00001AF4d00001067sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 audio policy (QEMU)
+
+pci:v00001AF4d00001068*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 Bluetooth
+
+pci:v00001AF4d00001068sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 Bluetooth (QEMU)
+
+pci:v00001AF4d00001069*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 GPIO
+
+pci:v00001AF4d00001069sv00001AF4sd00001100*
+ ID_MODEL_FROM_DATABASE=Virtio 1.0 GPIO (QEMU)
 
 pci:v00001AF4d00001110*
- ID_MODEL_FROM_DATABASE=Inter-VM shared memory
+ ID_MODEL_FROM_DATABASE=QEMU Inter-VM shared memory device
 
 pci:v00001AF4d00001110sv00001AF4sd00001100*
- ID_MODEL_FROM_DATABASE=Inter-VM shared memory (QEMU Virtual Machine)
+ ID_MODEL_FROM_DATABASE=QEMU Inter-VM shared memory device (QEMU)
 
 pci:v00001AF5*
  ID_VENDOR_FROM_DATABASE=Netezza Corp.
@@ -74882,6 +75566,9 @@ pci:v00001B36d0000000C*
 pci:v00001B36d0000000D*
  ID_MODEL_FROM_DATABASE=QEMU XHCI Host Controller
 
+pci:v00001B36d0000000E*
+ ID_MODEL_FROM_DATABASE=QEMU PCIe-to-PCI bridge
+
 pci:v00001B36d00000010*
  ID_MODEL_FROM_DATABASE=QEMU NVM Express Controller
 
@@ -75017,6 +75704,9 @@ pci:v00001B4Bd00002241sv00001028sd000022
 pci:v00001B4Bd00002241sv00001028sd00002287*
  ID_MODEL_FROM_DATABASE=88NR2241 Non-Volatile memory controller (BOSS-N1 Modular DC-MHS)
 
+pci:v00001B4Bd00002241sv00001028sd000023B0*
+ ID_MODEL_FROM_DATABASE=88NR2241 Non-Volatile memory controller (eBOSS-N1 DC-MHS)
+
 pci:v00001B4Bd00002241sv00001B4Bsd00002241*
  ID_MODEL_FROM_DATABASE=88NR2241 Non-Volatile memory controller (Santa Cruz NVMe Host Adapter)
 
@@ -75029,6 +75719,12 @@ pci:v00001B4Bd00002241sv00001D49sd000003
 pci:v00001B4Bd00002241sv00001D49sd00000307*
  ID_MODEL_FROM_DATABASE=88NR2241 Non-Volatile memory controller (ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit)
 
+pci:v00001B4Bd00002241sv0000207Dsd00000800*
+ ID_MODEL_FROM_DATABASE=88NR2241 Non-Volatile memory controller (TrustRAID B310n)
+
+pci:v00001B4Bd00002241sv0000207Dsd00000801*
+ ID_MODEL_FROM_DATABASE=88NR2241 Non-Volatile memory controller (TrustRAID B260s)
+
 pci:v00001B4Bd00002241sv00004C52sd00009541*
  ID_MODEL_FROM_DATABASE=88NR2241 Non-Volatile memory controller (LRNV9541 2-port M.2 NVMe Raid Adapter)
 
@@ -75047,6 +75743,9 @@ pci:v00001B4Bd00002B45*
 pci:v00001B4Bd00009120*
  ID_MODEL_FROM_DATABASE=88SE9120 SATA 6Gb/s Controller
 
+pci:v00001B4Bd00009122*
+ ID_MODEL_FROM_DATABASE=88SE912x SATA 6Gb/s Controller [AHCI mode]
+
 pci:v00001B4Bd00009123*
  ID_MODEL_FROM_DATABASE=88SE9123 PCIe SATA 6.0 Gb/s controller
 
@@ -75071,6 +75770,9 @@ pci:v00001B4Bd00009130sv00001043sd000084
 pci:v00001B4Bd00009170*
  ID_MODEL_FROM_DATABASE=88SE9170 PCIe 2.0 x1 2-port SATA 6 Gb/s Controller
 
+pci:v00001B4Bd00009171*
+ ID_MODEL_FROM_DATABASE=88SE9171 PCIe 2.0 x1 1-port SATA 6 Gb/s Controller
+
 pci:v00001B4Bd00009172*
  ID_MODEL_FROM_DATABASE=88SE9172 SATA 6Gb/s Controller
 
@@ -75078,7 +75780,7 @@ pci:v00001B4Bd00009178*
  ID_MODEL_FROM_DATABASE=88SE9170 PCIe SATA 6Gb/s Controller
 
 pci:v00001B4Bd0000917A*
- ID_MODEL_FROM_DATABASE=88SE9172 SATA III 6Gb/s RAID Controller
+ ID_MODEL_FROM_DATABASE=88SE9172 SATA III 6Gb/s Controller [IDE mode]
 
 pci:v00001B4Bd00009182*
  ID_MODEL_FROM_DATABASE=88SE9182 PCIe 2.0 x2 2-port SATA 6 Gb/s Controller
@@ -75086,15 +75788,27 @@ pci:v00001B4Bd00009182*
 pci:v00001B4Bd00009183*
  ID_MODEL_FROM_DATABASE=88SS9183 PCIe SSD Controller
 
+pci:v00001B4Bd00009186*
+ ID_MODEL_FROM_DATABASE=88SE9186 6Gb/s SATA 6Gb/s Controller [AHCI mode]
+
+pci:v00001B4Bd0000918A*
+ ID_MODEL_FROM_DATABASE=88SE9182 PCIe SATA 6 Gb/s controller [IDE mode]
+
 pci:v00001B4Bd00009192*
  ID_MODEL_FROM_DATABASE=88SE9172 SATA III 6Gb/s RAID Controller
 
 pci:v00001B4Bd000091A0*
  ID_MODEL_FROM_DATABASE=88SE912x SATA 6Gb/s Controller [IDE mode]
 
+pci:v00001B4Bd000091A3*
+ ID_MODEL_FROM_DATABASE=88SE9128 PCIe SATA 6 Gb/s controller [IDE mode]
+
 pci:v00001B4Bd000091A4*
  ID_MODEL_FROM_DATABASE=88SE912x IDE Controller
 
+pci:v00001B4Bd000091B0*
+ ID_MODEL_FROM_DATABASE=88SE9172 SATA 6 Gb/s controller [IDE mode]
+
 pci:v00001B4Bd00009215*
  ID_MODEL_FROM_DATABASE=88SE9215 PCIe 2.0 x1 4-port SATA 6 Gb/s Controller
 
@@ -75269,6 +75983,9 @@ pci:v00001B73d00001100*
 pci:v00001B73d00001100sv000016B8sd00006E31*
  ID_MODEL_FROM_DATABASE=FL1100 USB 3.0 Host Controller (Allegro Pro USB 3.0 PCIe)
 
+pci:v00001B73d00001400*
+ ID_MODEL_FROM_DATABASE=USB 3.0 Host Controller
+
 pci:v00001B74*
  ID_VENDOR_FROM_DATABASE=OpenVox Communication Co. Ltd.
 
@@ -75602,6 +76319,15 @@ pci:v00001BB1d00005021*
 pci:v00001BB1d00005026*
  ID_MODEL_FROM_DATABASE=FireCuda 540 SSD
 
+pci:v00001BB1d00005027*
+ ID_MODEL_FROM_DATABASE=LaCie Rugged SSD Pro5
+
+pci:v00001BB1d00005100*
+ ID_MODEL_FROM_DATABASE=PCIe Gen3 SSD
+
+pci:v00001BB1d00005101*
+ ID_MODEL_FROM_DATABASE=PCIe Gen5 SSD
+
 pci:v00001BB3*
  ID_VENDOR_FROM_DATABASE=Bluecherry
 
@@ -75785,6 +76511,12 @@ pci:v00001BD4d0000100E*
 pci:v00001BD4d0000100F*
  ID_MODEL_FROM_DATABASE=NS6500G2UXXXX,NS6600G2UXXXX NVME SSD
 
+pci:v00001BD4d00002981*
+ ID_MODEL_FROM_DATABASE=32G SFP28 EP2744 Apatter
+
+pci:v00001BD4d00002981sv00001BD4sd000000B0*
+ ID_MODEL_FROM_DATABASE=32G SFP28 EP2744 Apatter
+
 pci:v00001BEE*
  ID_VENDOR_FROM_DATABASE=IXXAT Automation GmbH
 
@@ -75974,6 +76706,12 @@ pci:v00001C1Fd00000024*
 pci:v00001C1Fd00000025*
  ID_MODEL_FROM_DATABASE=FD922
 
+pci:v00001C1Fd00000026*
+ ID_MODEL_FROM_DATABASE=FD788
+
+pci:v00001C1Fd00000027*
+ ID_MODEL_FROM_DATABASE=FD940
+
 pci:v00001C28*
  ID_VENDOR_FROM_DATABASE=Lite-On IT Corp. / Plextor
 
@@ -76754,6 +77492,9 @@ pci:v00001C5Fd0000003Fsv00001EA0sd000022
 pci:v00001C5Fd0000003Fsv00001EA0sd00002201*
  ID_MODEL_FROM_DATABASE=PBlaze7 7940/7946 NVMe SSD (TP2511 Series U.2 NVMe Datacenter SSD(7.68TB))
 
+pci:v00001C5Fd0000003Fsv00001EA0sd00002202*
+ ID_MODEL_FROM_DATABASE=PBlaze7 7940/7946 NVMe SSD (TP2310 Series U.2 NVMe Datacenter SSD(7.68TB))
+
 pci:v00001C5Fd0000003Fsv00001EA0sd00002210*
  ID_MODEL_FROM_DATABASE=PBlaze7 7940/7946 NVMe SSD (TP2510 Series E3.S NVMe Datacenter SSD(7.68TB))
 
@@ -76943,6 +77684,9 @@ pci:v00001CC1d0000621A*
 pci:v00001CC1d0000622A*
  ID_MODEL_FROM_DATABASE=LEGEND 960 NVMe SSD
 
+pci:v00001CC1d0000623A*
+ ID_MODEL_FROM_DATABASE=LEGEND 710 NVMe SSD (DRAM-less)
+
 pci:v00001CC1d0000624A*
  ID_MODEL_FROM_DATABASE=LEGEND 700, XPG GAMMIX S20 NVMe SSD (DRAM-less)
 
@@ -76955,9 +77699,18 @@ pci:v00001CC1d0000627A*
 pci:v00001CC1d0000628A*
  ID_MODEL_FROM_DATABASE=LEGEND 800 NVMe SSD (DRAM-less)
 
+pci:v00001CC1d0000631A*
+ ID_MODEL_FROM_DATABASE=LEGEND 970 NVMe SSD
+
 pci:v00001CC1d0000633A*
  ID_MODEL_FROM_DATABASE=LEGEND 900 NVMe SSD (DRAM-less)
 
+pci:v00001CC1d0000634C*
+ ID_MODEL_FROM_DATABASE=LEGEND 820 NVMe SSD (DRAM-less)
+
+pci:v00001CC1d0000635A*
+ ID_MODEL_FROM_DATABASE=XPG GAMMIX S60 NVMe SSD (DRAM-less)
+
 pci:v00001CC1d0000642A*
  ID_MODEL_FROM_DATABASE=XPG GAMMIX S50 CORE NVMe SSD (DRAM-less)
 
@@ -77048,8 +77801,14 @@ pci:v00001CC4d00006303*
 pci:v00001CC4d00006304*
  ID_MODEL_FROM_DATABASE=AM630 PCIe 4.0 NVMe SSD 1024GB
 
+pci:v00001CC4d0000634C*
+ ID_MODEL_FROM_DATABASE=LEGEND 820 NVMe SSD (DRAM-less)
+
+pci:v00001CC4d0000635A*
+ ID_MODEL_FROM_DATABASE=GAMMIX S60 NVMe SSD (DRAM-less)
+
 pci:v00001CC4d0000660C*
- ID_MODEL_FROM_DATABASE=RPETJ1T24MHP2QDQ PCIe 4.0 NVMe SSD 1024GB
+ ID_MODEL_FROM_DATABASE=AH660 PCIe 4.0 NVMe SSD
 
 pci:v00001CC4d00006A01*
  ID_MODEL_FROM_DATABASE=AM620 PCIe 3.0 NVMe SSD 128GB
@@ -77061,19 +77820,19 @@ pci:v00001CC4d00006A03*
  ID_MODEL_FROM_DATABASE=RPETJ512MKP1QDQ PCIe 4.0 NVMe SSD 512GB (DRAM-less)
 
 pci:v00001CC4d00006A04*
- ID_MODEL_FROM_DATABASE=RPETJ1T24MKP2QDQ PCIe 4.0 NVMe SSD 1024GB (DRAM-less)
+ ID_MODEL_FROM_DATABASE=AM6A0 PCIe 4.0 NVMe SSD 1024GB (DRAM-less)
 
 pci:v00001CC4d00006A13*
  ID_MODEL_FROM_DATABASE=RPJYJ512MKN1QWQ PCIe 4.0 NVMe SSD 512GB (DRAM-less)
 
 pci:v00001CC4d00006A14*
- ID_MODEL_FROM_DATABASE=RPEYJ1T24MKN2QWY PCIe 4.0 NVMe SSD 1024GB (DRAM-less)
+ ID_MODEL_FROM_DATABASE=AM6A1 PCIe 4.0 NVMe SSD 1024GB (DRAM-less)
 
 pci:v00001CC4d00006B04*
  ID_MODEL_FROM_DATABASE=AM6B0 PCIe 4.0 NVMe SSD
 
 pci:v00001CC4d00006B13*
- ID_MODEL_FROM_DATABASE=RPJYJ512MLR1QWY PCIe 4.0 NVMe SSD 512GB (DRAM-less)
+ ID_MODEL_FROM_DATABASE=AM6B1 PCIe 4.0 NVMe SSD 512GB (DRAM-less)
 
 pci:v00001CC4d00006B14*
  ID_MODEL_FROM_DATABASE=RPJYJ1T24MLR1HWY PCIe 4.0 NVMe SSD 1024GB (DRAM-less)
@@ -77219,6 +77978,9 @@ pci:v00001CD7d00000010*
 pci:v00001CD7d00000014*
  ID_MODEL_FROM_DATABASE=PRO CAPTURE AIO 4K PLUS
 
+pci:v00001CD7d00000015*
+ ID_MODEL_FROM_DATABASE=Pro Capture HDMI 4K +
+
 pci:v00001CD7d00000017*
  ID_MODEL_FROM_DATABASE=PRO CAPTURE AIO 4K
 
@@ -77282,6 +78044,156 @@ pci:v00001CE4d00000100*
 pci:v00001CF0*
  ID_VENDOR_FROM_DATABASE=Akitio
 
+pci:v00001CF2*
+ ID_VENDOR_FROM_DATABASE=ZTE Corp.
+
+pci:v00001CF2d00008036*
+ ID_MODEL_FROM_DATABASE=DH Switch
+
+pci:v00001CF2d00008040*
+ ID_MODEL_FROM_DATABASE=NEO X510 SRIOV PF Ethernet Controller
+
+pci:v00001CF2d00008041*
+ ID_MODEL_FROM_DATABASE=NEO X510 SRIOV VF Ethernet Controller Virtual Function
+
+pci:v00001CF2d00008042*
+ ID_MODEL_FROM_DATABASE=NX I512 VDPA VF Ethernet Controller Virtual Function
+
+pci:v00001CF2d00008044*
+ ID_MODEL_FROM_DATABASE=NEO X510 MPF Ethernet Controller
+
+pci:v00001CF2d00008045*
+ ID_MODEL_FROM_DATABASE=NX I512 BOND PF Ethernet Controller
+
+pci:v00001CF2d00008046*
+ ID_MODEL_FROM_DATABASE=NX I512 OVS PF Ethernet Controller
+
+pci:v00001CF2d00008047*
+ ID_MODEL_FROM_DATABASE=NEO X510 BOND PF Ethernet Controller
+
+pci:v00001CF2d00008048*
+ ID_MODEL_FROM_DATABASE=NEO X510 OVS PF Ethernet Controller
+
+pci:v00001CF2d00008049*
+ ID_MODEL_FROM_DATABASE=NX E312 SRIOV RDMA PF Ethernet Controller
+
+pci:v00001CF2d0000804A*
+ ID_MODEL_FROM_DATABASE=NEO X512 NOF PF Ethernet Controller
+
+pci:v00001CF2d0000804B*
+ ID_MODEL_FROM_DATABASE=NEO X512 SRIOV PF Ethernet Controller
+
+pci:v00001CF2d0000804C*
+ ID_MODEL_FROM_DATABASE=NEO X512 INITIATOR1 PF Ethernet Controller
+
+pci:v00001CF2d0000804D*
+ ID_MODEL_FROM_DATABASE=NEO X512 INITIATOR2 PF Ethernet Controller
+
+pci:v00001CF2d0000804E*
+ ID_MODEL_FROM_DATABASE=NX I512 UPF PF Ethernet Controller
+
+pci:v00001CF2d0000804F*
+ ID_MODEL_FROM_DATABASE=NX I512 UPF VF Ethernet Controller Virtual Function
+
+pci:v00001CF2d00008060*
+ ID_MODEL_FROM_DATABASE=NX E312 SRIOV RDMA VF Ethernet Controller Virtual Function
+
+pci:v00001CF2d00008061*
+ ID_MODEL_FROM_DATABASE=NX E310 SRIOV PF Ethernet Controller
+
+pci:v00001CF2d00008062*
+ ID_MODEL_FROM_DATABASE=NX E310 SRIOV VF Ethernet Controller Virtual Function
+
+pci:v00001CF2d00008063*
+ ID_MODEL_FROM_DATABASE=NX I510 BOND PF Ethernet Controller
+
+pci:v00001CF2d00008064*
+ ID_MODEL_FROM_DATABASE=NX I510 OVS PF Ethernet Controller
+
+pci:v00001CF2d00008065*
+ ID_MODEL_FROM_DATABASE=NX I510 VDPA VF Ethernet Controller Virtual Function
+
+pci:v00001CF2d00008066*
+ ID_MODEL_FROM_DATABASE=NX I511 SRIOV PF Ethernet Controller
+
+pci:v00001CF2d00008067*
+ ID_MODEL_FROM_DATABASE=NX I511 OVS PF Ethernet Controller
+
+pci:v00001CF2d00008068*
+ ID_MODEL_FROM_DATABASE=NX I511 VDPA VF Ethernet Controller Virtual Function
+
+pci:v00001CF2d0000806B*
+ ID_MODEL_FROM_DATABASE=NEO X512 RDMA PF Ethernet Controller
+
+pci:v00001CF2d0000806C*
+ ID_MODEL_FROM_DATABASE=NEO X512 RDMA VF Ethernet Controller Virtual Function
+
+pci:v00001CF2d0000806D*
+ ID_MODEL_FROM_DATABASE=NX I512 RDMA PF Ethernet Controller
+
+pci:v00001CF2d0000806E*
+ ID_MODEL_FROM_DATABASE=NX I512 RDMA VF Ethernet Controller Virtual Function
+
+pci:v00001CF2d0000806F*
+ ID_MODEL_FROM_DATABASE=NX I512 UPF BOND PF Ethernet Controller
+
+pci:v00001CF2d0000807D*
+ ID_MODEL_FROM_DATABASE=NX E312S SRIOV PF Ethernet Controller
+
+pci:v00001CF2d0000807E*
+ ID_MODEL_FROM_DATABASE=NX E316 SRIOV PF Ethernet Controller
+
+pci:v00001CF2d0000807F*
+ ID_MODEL_FROM_DATABASE=NX E316 SRIOV VF Ethernet Controller Virtual Function
+
+pci:v00001CF2d00008080*
+ ID_MODEL_FROM_DATABASE=NX E311 SRIOV PF Ethernet Controller
+
+pci:v00001CF2d00008081*
+ ID_MODEL_FROM_DATABASE=NX E311 SRIOV VF Ethernet Controller Virtual Function
+
+pci:v00001CF2d00008082*
+ ID_MODEL_FROM_DATABASE=NX I511 SRIOV PF Ethernet Controller
+
+pci:v00001CF2d00008083*
+ ID_MODEL_FROM_DATABASE=NX I511 SRIOV VF Ethernet Controller Virtual Function
+
+pci:v00001CF2d00008084*
+ ID_MODEL_FROM_DATABASE=NX E310 RDMA PF Ethernet Controller
+
+pci:v00001CF2d00008085*
+ ID_MODEL_FROM_DATABASE=NX E310 RDMA VF Ethernet Controller Virtual Function
+
+pci:v00001CF2d00008086*
+ ID_MODEL_FROM_DATABASE=NX I510 SRIOV SEC PF Ethernet Controller
+
+pci:v00001CF2d00008087*
+ ID_MODEL_FROM_DATABASE=NX I510 SRIOV SEC VF Ethernet Controller Virtual Function
+
+pci:v00001CF2d00008088*
+ ID_MODEL_FROM_DATABASE=NX E312S SRIOV VF Ethernet Controller Virtual Function
+
+pci:v00001CF2d00008089*
+ ID_MODEL_FROM_DATABASE=NEO X512 SRIOV PF Ethernet Controller
+
+pci:v00001CF2d0000808A*
+ ID_MODEL_FROM_DATABASE=NEO X512 SRIOV PF Ethernet Controller
+
+pci:v00001CF2d000080A0*
+ ID_MODEL_FROM_DATABASE=NX E312 PF Ethernet Controller
+
+pci:v00001CF2d000080A1*
+ ID_MODEL_FROM_DATABASE=NX E312 VF Ethernet Controller Virtual Function
+
+pci:v00001CF2d000080A2*
+ ID_MODEL_FROM_DATABASE=NX E312S_D SRIOV PF Ethernet Controller
+
+pci:v00001CF2d000080A3*
+ ID_MODEL_FROM_DATABASE=NX E312S_D SRIOV VF Ethernet Controller Virtual Function
+
+pci:v00001CF2d000080A4*
+ ID_MODEL_FROM_DATABASE=NX I512 OFFLOAD PF Ethernet Controller
+
 pci:v00001CF7*
  ID_VENDOR_FROM_DATABASE=Subspace Dynamics
 
@@ -78200,6 +79112,9 @@ pci:v00001D78d00001515sv00001D78sd000072
 pci:v00001D78d00001515sv00001D78sd00007208*
  ID_MODEL_FROM_DATABASE=DERA EMEI NVMe Controller (Aliflash V2 U.2 15mm 7.68TB NVMe SSD)
 
+pci:v00001D78d00001516*
+ ID_MODEL_FROM_DATABASE=DERA D8436/D8456 NVMe SSD
+
 pci:v00001D79*
  ID_VENDOR_FROM_DATABASE=Transcend Information, Inc.
 
@@ -78215,6 +79130,9 @@ pci:v00001D79d00002264*
 pci:v00001D79d00002267*
  ID_MODEL_FROM_DATABASE=NVMe PCIe SSD 220S/240S/MTE710T
 
+pci:v00001D79d00002269*
+ ID_MODEL_FROM_DATABASE=NVMe PCIe SSD 410S (DRAM-less)
+
 pci:v00001D79d00005766*
  ID_MODEL_FROM_DATABASE=NVMe PCIe SSD 110Q (DRAM-less)
 
@@ -78413,6 +79331,9 @@ pci:v00001D97d00005220*
 pci:v00001D97d00005236*
  ID_MODEL_FROM_DATABASE=Lexar NM800 PRO NVME SSD
 
+pci:v00001D97d00005772*
+ ID_MODEL_FROM_DATABASE=Lexar NQ700 NVME SSD (DRAM-less)
+
 pci:v00001D9B*
  ID_VENDOR_FROM_DATABASE=Meta Platforms, Inc.
 
@@ -78698,7 +79619,7 @@ pci:v00001DBEd00005668sv00001DBEsd000050
 pci:v00001DBEd00005668sv00001DBEsd00005009*
  ID_MODEL_FROM_DATABASE=NVMe PCIe 5.0 DC SSD (Dongting-N3 DC SSD U.2 25600GB)
 
-pci:v00001DBEd00005668sv00001DBEsd00005010*
+pci:v00001DBEd00005668sv00001DBEsd00005080*
  ID_MODEL_FROM_DATABASE=NVMe PCIe 5.0 DC SSD (Dongting-N3 DC SSD U.2 30720GB)
 
 pci:v00001DBEd00005668sv00001DBEsd00005118*
@@ -78707,6 +79628,33 @@ pci:v00001DBEd00005668sv00001DBEsd000051
 pci:v00001DBEd00005668sv00001DBEsd00005190*
  ID_MODEL_FROM_DATABASE=NVMe PCIe 5.0 DC SSD (Dongting-N3Q DC QLC SSD U.2 30720GB)
 
+pci:v00001DBEd00005668sv00001DBEsd00005192*
+ ID_MODEL_FROM_DATABASE=NVMe PCIe 5.0 DC SSD (Dongting-N3Q DC QLC SSD U.2 61440GB)
+
+pci:v00001DBEd00005668sv00001DBEsd00005803*
+ ID_MODEL_FROM_DATABASE=NVMe PCIe 5.0 DC SSD (Dongting-N3 DC SSD E3.S 3200GB)
+
+pci:v00001DBEd00005668sv00001DBEsd00005804*
+ ID_MODEL_FROM_DATABASE=NVMe PCIe 5.0 DC SSD (Dongting-N3 DC SSD E3.S 3840GB)
+
+pci:v00001DBEd00005668sv00001DBEsd00005805*
+ ID_MODEL_FROM_DATABASE=NVMe PCIe 5.0 DC SSD (Dongting-N3 DC SSD E3.S 6400GB)
+
+pci:v00001DBEd00005668sv00001DBEsd00005806*
+ ID_MODEL_FROM_DATABASE=NVMe PCIe 5.0 DC SSD (Dongting-N3 DC SSD E3.S 7680GB)
+
+pci:v00001DBEd00005668sv00001DBEsd00005807*
+ ID_MODEL_FROM_DATABASE=NVMe PCIe 5.0 DC SSD (Dongting-N3 DC SSD E3.S 12800GB)
+
+pci:v00001DBEd00005668sv00001DBEsd00005808*
+ ID_MODEL_FROM_DATABASE=NVMe PCIe 5.0 DC SSD (Dongting-N3 DC SSD E3.S 15360GB)
+
+pci:v00001DBEd00005668sv00001DBEsd00005809*
+ ID_MODEL_FROM_DATABASE=NVMe PCIe 5.0 DC SSD (Dongting-N3 DC SSD E3.S 25600GB)
+
+pci:v00001DBEd00005668sv00001DBEsd00005880*
+ ID_MODEL_FROM_DATABASE=NVMe PCIe 5.0 DC SSD (Dongting-N3 DC SSD E3.S 30720GB)
+
 pci:v00001DBEd00005668sv00001DBEsd00006116*
  ID_MODEL_FROM_DATABASE=NVMe PCIe 5.0 DC SSD (Dongting-Z3Q DC ZNS SSD U.2 7680GB)
 
@@ -78779,6 +79727,9 @@ pci:v00001DD4d00004432*
 pci:v00001DD4d00005200*
  ID_MODEL_FROM_DATABASE=N5200 NVMe SSD
 
+pci:v00001DD5*
+ ID_VENDOR_FROM_DATABASE=Manli Technology Group Limited
+
 pci:v00001DD8*
  ID_VENDOR_FROM_DATABASE=AMD Pensando Systems
 
@@ -79484,6 +80435,18 @@ pci:v00001DD8d0000100Dsv00001DD8sd000050
 pci:v00001DD8d0000100Dsv00001DD8sd00005200*
  ID_MODEL_FROM_DATABASE=DSC Virtio Network Device VF (DSC3-2Q400 100/200/400G 2-port DDR5 128G eMMC G3 Services Card)
 
+pci:v00001DD8d0000100F*
+ ID_MODEL_FROM_DATABASE=Register/Memory Resource Device
+
+pci:v00001DD8d0000100Fsv00001DD8sd00005201*
+ ID_MODEL_FROM_DATABASE=Register/Memory Resource Device (POLLARA-1Q400 100/200/400G 1-port Card)
+
+pci:v00001DD8d00001012*
+ ID_MODEL_FROM_DATABASE=TAWK IPC Device
+
+pci:v00001DD8d00001012sv00001DD8sd00005201*
+ ID_MODEL_FROM_DATABASE=TAWK IPC Device (POLLARA-1Q400 100/200/400G 1-port Card)
+
 pci:v00001DDD*
  ID_VENDOR_FROM_DATABASE=Thorlabs
 
@@ -79565,12 +80528,21 @@ pci:v00001DEDd00008004*
 pci:v00001DEE*
  ID_VENDOR_FROM_DATABASE=Biwin Storage Technology Co., Ltd.
 
+pci:v00001DEEd00001202*
+ ID_MODEL_FROM_DATABASE=HP EX900 Plus NVMe SSD (DRAM-less)
+
+pci:v00001DEEd00001602*
+ ID_MODEL_FROM_DATABASE=HP FX700 NVMe SSD (DRAM-less)
+
 pci:v00001DEEd00002262*
  ID_MODEL_FROM_DATABASE=HP EX950 NVMe SSD
 
 pci:v00001DEEd00002263*
  ID_MODEL_FROM_DATABASE=HP EX900 NVMe SSD (DRAM-less)
 
+pci:v00001DEEd00002500*
+ ID_MODEL_FROM_DATABASE=XCG 2500 Enterprise Gen 4 SSD
+
 pci:v00001DEEd00004121*
  ID_MODEL_FROM_DATABASE=PCIe 4.0 SP406/416 NVMe SSD
 
@@ -79601,6 +80573,30 @@ pci:v00001DEEd00004121sv00001DEEsd000000
 pci:v00001DEEd00005161*
  ID_MODEL_FROM_DATABASE=BIWIN NVMe SSD SP506/SP516
 
+pci:v00001DEEd00005161sv00001DEEsd00000001*
+ ID_MODEL_FROM_DATABASE=BIWIN NVMe SSD SP506/SP516 (NVMe SSD SP516 1.6T 2.5" U.2)
+
+pci:v00001DEEd00005161sv00001DEEsd00000002*
+ ID_MODEL_FROM_DATABASE=BIWIN NVMe SSD SP506/SP516 (NVMe SSD SP516 3.2T 2.5" U.2)
+
+pci:v00001DEEd00005161sv00001DEEsd00000003*
+ ID_MODEL_FROM_DATABASE=BIWIN NVMe SSD SP506/SP516 (NVMe SSD SP516 6.4T 2.5" U.2)
+
+pci:v00001DEEd00005161sv00001DEEsd00000004*
+ ID_MODEL_FROM_DATABASE=BIWIN NVMe SSD SP506/SP516 (NVMe SSD SP516 12.8T 2.5" U.2)
+
+pci:v00001DEEd00005161sv00001DEEsd00000011*
+ ID_MODEL_FROM_DATABASE=BIWIN NVMe SSD SP506/SP516 (NVMe SSD SP506 1.92T 2.5" U.2)
+
+pci:v00001DEEd00005161sv00001DEEsd00000012*
+ ID_MODEL_FROM_DATABASE=BIWIN NVMe SSD SP506/SP516 (NVMe SSD SP506 3.84T 2.5" U.2)
+
+pci:v00001DEEd00005161sv00001DEEsd00000013*
+ ID_MODEL_FROM_DATABASE=BIWIN NVMe SSD SP506/SP516 (NVMe SSD SP506 7.68T 2.5" U.2)
+
+pci:v00001DEEd00005161sv00001DEEsd00000014*
+ ID_MODEL_FROM_DATABASE=BIWIN NVMe SSD SP506/SP516 (NVMe SSD SP506 15.36T 2.5" U.2)
+
 pci:v00001DEEd00005216*
  ID_MODEL_FROM_DATABASE=KingSpec NX series NVMe SSD (DRAM-less)
 
@@ -79967,6 +80963,66 @@ pci:v00001E0Fd00000011sv00001028sd000021
 pci:v00001E0Fd00000011sv00001028sd00002195*
  ID_MODEL_FROM_DATABASE=NVMe SSD Controller CD7 (NVMe CD7 E3.S 7.68TB)
 
+pci:v00001E0Fd00000013*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7
+
+pci:v00001E0Fd00000013sv00001028sd0000222D*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 FIPS U.2 RI 30.72TB)
+
+pci:v00001E0Fd00000013sv00001028sd0000222E*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 FIPS U.2 RI 15.36TB)
+
+pci:v00001E0Fd00000013sv00001028sd0000222F*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 FIPS U.2 RI 7.68TB)
+
+pci:v00001E0Fd00000013sv00001028sd00002230*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 FIPS U.2 RI 3.84TB)
+
+pci:v00001E0Fd00000013sv00001028sd00002231*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 FIPS U.2 RI 1.92TB)
+
+pci:v00001E0Fd00000013sv00001028sd00002232*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 U.2 RI 30.72TB)
+
+pci:v00001E0Fd00000013sv00001028sd00002233*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 U.2 RI 15.36TB)
+
+pci:v00001E0Fd00000013sv00001028sd00002234*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 U.2 RI 7.68TB)
+
+pci:v00001E0Fd00000013sv00001028sd00002235*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 U.2 RI 3.84TB)
+
+pci:v00001E0Fd00000013sv00001028sd00002236*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 U.2 RI 1.92TB)
+
+pci:v00001E0Fd00000013sv00001028sd00002237*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 FIPS U.2 MU 12.8TB)
+
+pci:v00001E0Fd00000013sv00001028sd00002238*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 FIPS U.2 MU 6.4TB)
+
+pci:v00001E0Fd00000013sv00001028sd00002239*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 FIPS U.2 MU 3.2TB)
+
+pci:v00001E0Fd00000013sv00001028sd0000223A*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 FIPS U.2 MU 1.6TB)
+
+pci:v00001E0Fd00000013sv00001028sd0000223B*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 U.2 MU 12.8TB)
+
+pci:v00001E0Fd00000013sv00001028sd0000223C*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 U.2 MU 6.4TB)
+
+pci:v00001E0Fd00000013sv00001028sd0000223D*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 U.2 MU 3.2TB)
+
+pci:v00001E0Fd00000013sv00001028sd0000223E*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 U.2 MU 1.6TB)
+
+pci:v00001E0Fd00000013sv00001028sd0000228C*
+ ID_MODEL_FROM_DATABASE=VMe SSD Controller CM7 (Ent NVMe CM7 U.2 MU 6.4TB)
+
 pci:v00001E0Fd00000014*
  ID_MODEL_FROM_DATABASE=NVMe SSD Controller CM7 EDSFF
 
@@ -80021,6 +81077,9 @@ pci:v00001E0Fd00000018*
 pci:v00001E0Fd0000001A*
  ID_MODEL_FROM_DATABASE=NVMe SSD Controller BG6 (DRAM-less)
 
+pci:v00001E0Fd0000001B*
+ ID_MODEL_FROM_DATABASE=NVMe SSD Controller EG6 (DRAM-less)
+
 pci:v00001E0Fd0000001F*
  ID_MODEL_FROM_DATABASE=NVMe SSD Controller CD8
 
@@ -80144,6 +81203,24 @@ pci:v00001E0Fd0000002Csv00001028sd000022
 pci:v00001E0Fd0000002Csv00001028sd000022CA*
  ID_MODEL_FROM_DATABASE=NVMe SSD Controller CD8P EDSFF (DC NVMe CD8P E3.S MU 1.6TB)
 
+pci:v00001E0Fd0000002E*
+ ID_MODEL_FROM_DATABASE=NVMe SSD Controller XD8
+
+pci:v00001E0Fd0000002F*
+ ID_MODEL_FROM_DATABASE=NVMe SSD Controller BG7 (DRAM-less)
+
+pci:v00001E0Fd00000030*
+ ID_MODEL_FROM_DATABASE=NVMe SSD Controller EG7
+
+pci:v00001E0Fd00000031*
+ ID_MODEL_FROM_DATABASE=PCIe 5.0 NVMe SSD Controller XG10
+
+pci:v00001E0Fd00000032*
+ ID_MODEL_FROM_DATABASE=PCIe 4.0 NVMe SSD Controller XG10d
+
+pci:v00001E0Fd00000033*
+ ID_MODEL_FROM_DATABASE=Exceria Plus G4 NVMe SSD (DRAM-less)
+
 pci:v00001E17*
  ID_VENDOR_FROM_DATABASE=Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
 
@@ -80237,6 +81314,12 @@ pci:v00001E36d0000C033*
 pci:v00001E36d0000C035*
  ID_MODEL_FROM_DATABASE=S60 [Enflame]
 
+pci:v00001E36d0000C041*
+ ID_MODEL_FROM_DATABASE=L300 [Enflame]
+
+pci:v00001E36d0000C042*
+ ID_MODEL_FROM_DATABASE=L600 [Enflame]
+
 pci:v00001E38*
  ID_VENDOR_FROM_DATABASE=Blaize, Inc
 
@@ -80606,6 +81689,27 @@ pci:v00001E3Bd00001098sv00001E3Bsd000000
 pci:v00001E3Bd00001098sv00001E3Bsd00000091*
  ID_MODEL_FROM_DATABASE=Haishen3 NVMe SSD (Enterprise NVMe SSD HHHL 0.75TB (H3900))
 
+pci:v00001E3Bd00001321*
+ ID_MODEL_FROM_DATABASE=AdgeStor NVMe SSD
+
+pci:v00001E3Bd00001321sv00001E3Bsd00004000*
+ ID_MODEL_FROM_DATABASE=AdgeStor NVMe SSD (M.2 0.48TB)
+
+pci:v00001E3Bd00001321sv00001E3Bsd00004001*
+ ID_MODEL_FROM_DATABASE=AdgeStor NVMe SSD (M.2 0.96TB)
+
+pci:v00001E3Bd00001321sv00001E3Bsd00004002*
+ ID_MODEL_FROM_DATABASE=AdgeStor NVMe SSD (M.2 1.92TB)
+
+pci:v00001E3Bd00001321sv00001E3Bsd00004100*
+ ID_MODEL_FROM_DATABASE=AdgeStor NVMe SSD (M.2 0.48TB)
+
+pci:v00001E3Bd00001321sv00001E3Bsd00004101*
+ ID_MODEL_FROM_DATABASE=AdgeStor NVMe SSD (M.2 0.96TB)
+
+pci:v00001E3Bd00001321sv00001E3Bsd00004102*
+ ID_MODEL_FROM_DATABASE=AdgeStor NVMe SSD (M.2 1.92TB)
+
 pci:v00001E3Bd00001333*
  ID_MODEL_FROM_DATABASE=Haishen5 NVMe SSD
 
@@ -80789,6 +81893,9 @@ pci:v00001E49d00000041*
 pci:v00001E49d00000071*
  ID_MODEL_FROM_DATABASE=ZHITAI TiPlus7100
 
+pci:v00001E49d00000081*
+ ID_MODEL_FROM_DATABASE=ZHITAI Ti600 NVMe SSD
+
 pci:v00001E49d00001001*
  ID_MODEL_FROM_DATABASE=PC005 NVMe SSD
 
@@ -80810,6 +81917,9 @@ pci:v00001E49d00001071*
 pci:v00001E49d00001073*
  ID_MODEL_FROM_DATABASE=PC411 M.2 2242 NVMe SSD (DRAM-less)
 
+pci:v00001E49d00001081*
+ ID_MODEL_FROM_DATABASE=PC41Q M.2 2280 NVMe SSD (DRAM-less)
+
 pci:v00001E4B*
  ID_VENDOR_FROM_DATABASE=MAXIO Technology (Hangzhou) Ltd.
 
@@ -80909,6 +82019,9 @@ pci:v00001E60*
 pci:v00001E60d00002864*
  ID_MODEL_FROM_DATABASE=Hailo-8 AI Processor
 
+pci:v00001E60d000045C4*
+ ID_MODEL_FROM_DATABASE=Hailo-10H AI Processor
+
 pci:v00001E67*
  ID_VENDOR_FROM_DATABASE=Untether AI
 
@@ -80948,8 +82061,11 @@ pci:v00001E7Cd0000BCA1*
 pci:v00001E7E*
  ID_VENDOR_FROM_DATABASE=Pliops
 
+pci:v00001E7Ed00000200*
+ ID_MODEL_FROM_DATABASE=XDP [Extreme Data Processor PRO 1.0]
+
 pci:v00001E7Ed00009034*
- ID_MODEL_FROM_DATABASE=Pliops Extreme Data Processor [XDP1.0]
+ ID_MODEL_FROM_DATABASE=XDP [Extreme Data Processor FLEX 1.0]
 
 pci:v00001E7F*
  ID_VENDOR_FROM_DATABASE=Jiangsu Huacun Elec. Tech. Co., Ltd.
@@ -81050,6 +82166,24 @@ pci:v00001E95d00001007*
 pci:v00001E95d00001008*
  ID_MODEL_FROM_DATABASE=CL5-8D512 NVMe SSD M.2 (DRAM-less)
 
+pci:v00001E95d0000100C*
+ ID_MODEL_FROM_DATABASE=CL6 Series NVMe SSD M.2 (DRAM-less)
+
+pci:v00001E95d00001010*
+ ID_MODEL_FROM_DATABASE=CX3 Series NVMe SSD
+
+pci:v00001E95d00001010sv00001E95sd00000000*
+ ID_MODEL_FROM_DATABASE=CX3 Series NVMe SSD (M.2 2280 480 GB)
+
+pci:v00001E95d00001010sv00001E95sd00000001*
+ ID_MODEL_FROM_DATABASE=CX3 Series NVMe SSD (M.2 2280 960 GB)
+
+pci:v00001E95d00001010sv00001E95sd00000002*
+ ID_MODEL_FROM_DATABASE=CX3 Series NVMe SSD (M.2 2280 1,920 GB)
+
+pci:v00001E95d00001010sv00001E95sd00000003*
+ ID_MODEL_FROM_DATABASE=CX3 Series NVMe SSD (M.2 2280 3,840 GB)
+
 pci:v00001E95d00003500*
  ID_MODEL_FROM_DATABASE=CA5-8D256 NVMe SSD M.2
 
@@ -81080,6 +82214,12 @@ pci:v00001EA0d00002A20*
 pci:v00001EA0d00002A22*
  ID_MODEL_FROM_DATABASE=Cloud Intelligent Inference Controller
 
+pci:v00001EA0d00002A24*
+ ID_MODEL_FROM_DATABASE=Cloud Intelligent Inference Controller
+
+pci:v00001EA0d00002A26*
+ ID_MODEL_FROM_DATABASE=Cloud Intelligent Inference Controller
+
 pci:v00001EA0d00002A30*
  ID_MODEL_FROM_DATABASE=Cloud Video Transcode Controller
 
@@ -81162,19 +82302,37 @@ pci:v00001EC6d00000100sv00001EC6sd000000
  ID_MODEL_FROM_DATABASE=SV100 (VA1A)
 
 pci:v00001EC6d00000100sv00001EC6sd00000012*
- ID_MODEL_FROM_DATABASE=SV100 (VA1)
+ ID_MODEL_FROM_DATABASE=SV100 (VA1-16G)
 
 pci:v00001EC6d00000100sv00001EC6sd00000013*
  ID_MODEL_FROM_DATABASE=SV100 (VA1E)
 
+pci:v00001EC6d00000100sv00001EC6sd00000014*
+ ID_MODEL_FROM_DATABASE=SV100 (VA1L)
+
+pci:v00001EC6d00000100sv00001EC6sd00000015*
+ ID_MODEL_FROM_DATABASE=SV100 (VA1-32G)
+
 pci:v00001EC6d00000100sv00001EC6sd00000020*
- ID_MODEL_FROM_DATABASE=SV100 (VA10V)
+ ID_MODEL_FROM_DATABASE=SV100 (VA10-32G)
 
 pci:v00001EC6d00000100sv00001EC6sd00000021*
- ID_MODEL_FROM_DATABASE=SV100 (VA10A)
+ ID_MODEL_FROM_DATABASE=SV100 (VA12-32G)
 
 pci:v00001EC6d00000100sv00001EC6sd00000022*
- ID_MODEL_FROM_DATABASE=SV100 (VA10)
+ ID_MODEL_FROM_DATABASE=SV100 (VA16)
+
+pci:v00001EC6d00000100sv00001EC6sd00000023*
+ ID_MODEL_FROM_DATABASE=SV100 (VA10-64G)
+
+pci:v00001EC6d00000100sv00001EC6sd00000024*
+ ID_MODEL_FROM_DATABASE=SV100 (VA10L)
+
+pci:v00001EC6d00000100sv00001EC6sd00000025*
+ ID_MODEL_FROM_DATABASE=SV100 (VA12-64G)
+
+pci:v00001EC6d00000100sv00001EC6sd00000026*
+ ID_MODEL_FROM_DATABASE=SV100 (VA12-128G)
 
 pci:v00001EC6d00000100sv00001EC6sd00000030*
  ID_MODEL_FROM_DATABASE=SV100 (VE1P)
@@ -81191,12 +82349,39 @@ pci:v00001EC6d00000100sv00001EC6sd000000
 pci:v00001EC6d00000100sv00001EC6sd00000034*
  ID_MODEL_FROM_DATABASE=SV100 (VE1E)
 
+pci:v00001EC6d00000100sv00001EC6sd00000035*
+ ID_MODEL_FROM_DATABASE=SV100 (VE1C)
+
+pci:v00001EC6d00000100sv00001EC6sd00000036*
+ ID_MODEL_FROM_DATABASE=SV100 (VE1MT)
+
+pci:v00001EC6d00000100sv00001EC6sd0000003A*
+ ID_MODEL_FROM_DATABASE=SV100 (VR1S-8G)
+
+pci:v00001EC6d00000100sv00001EC6sd0000003B*
+ ID_MODEL_FROM_DATABASE=SV100 (VR1S-16G)
+
+pci:v00001EC6d00000100sv00001EC6sd0000003C*
+ ID_MODEL_FROM_DATABASE=SV100 (VR1M-8G)
+
+pci:v00001EC6d00000100sv00001EC6sd0000003D*
+ ID_MODEL_FROM_DATABASE=SV100 (VR1M-16G)
+
+pci:v00001EC6d00000100sv00001EC6sd0000003E*
+ ID_MODEL_FROM_DATABASE=SV100 (VR1MT-8G)
+
+pci:v00001EC6d00000100sv00001EC6sd0000003F*
+ ID_MODEL_FROM_DATABASE=SV100 (VR1MT-16G)
+
 pci:v00001EC6d00000100sv00001EC6sd00000040*
- ID_MODEL_FROM_DATABASE=SV100 (VV1U)
+ ID_MODEL_FROM_DATABASE=SV100 (VA1M)
 
 pci:v00001EC6d00000100sv00001EC6sd00000041*
  ID_MODEL_FROM_DATABASE=SV100 (VA1U)
 
+pci:v00001EC6d00000100sv00001EC6sd00000050*
+ ID_MODEL_FROM_DATABASE=SV100 (VAM)
+
 pci:v00001EC6d00000200*
  ID_MODEL_FROM_DATABASE=SG100
 
@@ -81210,11 +82395,47 @@ pci:v00001EC6d00000200sv00001EC6sd000000
  ID_MODEL_FROM_DATABASE=SG100 (VG1800)
 
 pci:v00001EC6d00000200sv00001EC6sd00000063*
- ID_MODEL_FROM_DATABASE=SG100 (VG1000)
+ ID_MODEL_FROM_DATABASE=SG100 (VG1000-32G)
+
+pci:v00001EC6d00000200sv00001EC6sd00000064*
+ ID_MODEL_FROM_DATABASE=SG100 (VG600)
+
+pci:v00001EC6d00000200sv00001EC6sd00000065*
+ ID_MODEL_FROM_DATABASE=SG100 (VG800)
+
+pci:v00001EC6d00000200sv00001EC6sd00000066*
+ ID_MODEL_FROM_DATABASE=SG100 (VG1000-64G)
+
+pci:v00001EC6d00000200sv00001EC6sd00000067*
+ ID_MODEL_FROM_DATABASE=SG100 (VG1000-24G)
+
+pci:v00001EC6d00000200sv00001EC6sd00000068*
+ ID_MODEL_FROM_DATABASE=SG100 (VG1000c-24G)
+
+pci:v00001EC6d00000200sv00001EC6sd00000069*
+ ID_MODEL_FROM_DATABASE=SG100 (VG1000c-32G)
+
+pci:v00001EC6d00000200sv00001EC6sd0000006A*
+ ID_MODEL_FROM_DATABASE=SG100 (VG1000c-64G)
+
+pci:v00001EC6d00000200sv00001EC6sd0000006B*
+ ID_MODEL_FROM_DATABASE=SG100 (VG1000c-16G)
+
+pci:v00001EC6d00000200sv00001EC6sd0000006C*
+ ID_MODEL_FROM_DATABASE=SG100 (VG1000c-48G)
+
+pci:v00001EC6d00000200sv00001EC6sd0000006D*
+ ID_MODEL_FROM_DATABASE=SG100 (VG600c)
+
+pci:v00001EC6d00000200sv00001EC6sd0000006E*
+ ID_MODEL_FROM_DATABASE=SG100 (VG800c)
 
 pci:v00001EC6d0000020F*
  ID_MODEL_FROM_DATABASE=SG100 vGPU
 
+pci:v00001EC6d00000300*
+ ID_MODEL_FROM_DATABASE=SR100
+
 pci:v00001EC8*
  ID_VENDOR_FROM_DATABASE=Beijing Fantasy Technology Co., Ltd.
 
@@ -81230,6 +82451,12 @@ pci:v00001EC8d00008810*
 pci:v00001EC8d00008810sv00001EC8sd000012A2*
  ID_MODEL_FROM_DATABASE=Fantasy I (Device)
 
+pci:v00001EC8d00008900*
+ ID_MODEL_FROM_DATABASE=GR308
+
+pci:v00001EC8d00008902*
+ ID_MODEL_FROM_DATABASE=GR3 Audio
+
 pci:v00001EC8d00009800*
  ID_MODEL_FROM_DATABASE=Fantasy II
 
@@ -81254,6 +82481,9 @@ pci:v00001EC8d00009810*
 pci:v00001EC8d00009810sv00001EC8sd000012A2*
  ID_MODEL_FROM_DATABASE=Fantasy II-M (Fantasy II Device)
 
+pci:v00001EC8d00009A00*
+ ID_MODEL_FROM_DATABASE=GR316
+
 pci:v00001EC9*
  ID_VENDOR_FROM_DATABASE=Wingtech Group(HongKong)Limited
 
@@ -81503,6 +82733,42 @@ pci:v00001EE4d00001180sv00001EE4sd000004
 pci:v00001EE4d00001180sv00001EE4sd00000427*
  ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD U.2 6.4TB (P8118Z3))
 
+pci:v00001EE4d00001180sv00001EE4sd00000515*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD U.2 1.92TB (P8118Z4))
+
+pci:v00001EE4d00001180sv00001EE4sd00000516*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD U.2 3.84TB (P8118Z4))
+
+pci:v00001EE4d00001180sv00001EE4sd00000517*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD U.2 7.68TB (P8118Z4))
+
+pci:v00001EE4d00001180sv00001EE4sd00000525*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD U.2 1.6TB (P8118Z4))
+
+pci:v00001EE4d00001180sv00001EE4sd00000526*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD U.2 3.2TB (P8118Z4))
+
+pci:v00001EE4d00001180sv00001EE4sd00000527*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD U.2 6.4TB (P8118Z4))
+
+pci:v00001EE4d00001180sv00001EE4sd00000615*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD U.2 1.92TB (P8128Z3))
+
+pci:v00001EE4d00001180sv00001EE4sd00000616*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD U.2 3.84TB (P8128Z3))
+
+pci:v00001EE4d00001180sv00001EE4sd00000617*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD U.2 7.68TB (P8128Z3))
+
+pci:v00001EE4d00001180sv00001EE4sd00000625*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD U.2 1.6TB (P8128Z3))
+
+pci:v00001EE4d00001180sv00001EE4sd00000626*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD U.2 3.2TB (P8128Z3))
+
+pci:v00001EE4d00001180sv00001EE4sd00000627*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD U.2 6.4TB (P8128Z3))
+
 pci:v00001EE4d00001180sv00001EE4sd00003013*
  ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 480GB (P8118E))
 
@@ -81575,6 +82841,78 @@ pci:v00001EE4d00001180sv00001EE4sd000032
 pci:v00001EE4d00001180sv00001EE4sd00003227*
  ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 6.4TB (P8118X))
 
+pci:v00001EE4d00001180sv00001EE4sd00003315*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 1.92TB (P8118E4))
+
+pci:v00001EE4d00001180sv00001EE4sd00003316*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 3.84TB (P8118E4))
+
+pci:v00001EE4d00001180sv00001EE4sd00003317*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 7.68TB (P8118E4))
+
+pci:v00001EE4d00001180sv00001EE4sd00003325*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 1.6TB (P8118E4))
+
+pci:v00001EE4d00001180sv00001EE4sd00003326*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 3.2TB (P8118E4))
+
+pci:v00001EE4d00001180sv00001EE4sd00003327*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 6.4TB (P8118E4))
+
+pci:v00001EE4d00001180sv00001EE4sd00003415*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 1.92TB (P8118Z3))
+
+pci:v00001EE4d00001180sv00001EE4sd00003416*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 3.84TB (P8118Z3))
+
+pci:v00001EE4d00001180sv00001EE4sd00003417*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 7.68TB (P8118Z3))
+
+pci:v00001EE4d00001180sv00001EE4sd00003425*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 1.6TB (P8118Z3))
+
+pci:v00001EE4d00001180sv00001EE4sd00003426*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 3.2TB (P8118Z3))
+
+pci:v00001EE4d00001180sv00001EE4sd00003427*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 6.4TB (P8118Z3))
+
+pci:v00001EE4d00001180sv00001EE4sd00003515*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 1.92TB (P8118Z4))
+
+pci:v00001EE4d00001180sv00001EE4sd00003516*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 3.84TB (P8118Z4))
+
+pci:v00001EE4d00001180sv00001EE4sd00003517*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 7.68TB (P8118Z4))
+
+pci:v00001EE4d00001180sv00001EE4sd00003525*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 1.6TB (P8118Z4))
+
+pci:v00001EE4d00001180sv00001EE4sd00003526*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 3.2TB (P8118Z4))
+
+pci:v00001EE4d00001180sv00001EE4sd00003527*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 6.4TB (P8118Z4))
+
+pci:v00001EE4d00001180sv00001EE4sd00003615*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 1.92TB (P8128Z3))
+
+pci:v00001EE4d00001180sv00001EE4sd00003616*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 3.84TB (P8128Z3))
+
+pci:v00001EE4d00001180sv00001EE4sd00003617*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 7.68TB (P8128Z3))
+
+pci:v00001EE4d00001180sv00001EE4sd00003625*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 1.6TB (P8128Z3))
+
+pci:v00001EE4d00001180sv00001EE4sd00003626*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 3.2TB (P8128Z3))
+
+pci:v00001EE4d00001180sv00001EE4sd00003627*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD AIC 6.4TB (P8128Z3))
+
 pci:v00001EE4d00001180sv00001EE4sd0000ABCD*
  ID_MODEL_FROM_DATABASE=PETA8118 NVMe SSD Series (NVMe SSD U.2)
 
@@ -81635,6 +82973,78 @@ pci:v00001EE4d00001181sv00001EE4sd000022
 pci:v00001EE4d00001181sv00001EE4sd00002227*
  ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 6.4TB (P8118X))
 
+pci:v00001EE4d00001181sv00001EE4sd00002315*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 1.92TB (P8118E4))
+
+pci:v00001EE4d00001181sv00001EE4sd00002316*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 3.84TB (P8118E4))
+
+pci:v00001EE4d00001181sv00001EE4sd00002317*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 7.68TB (P8118E4))
+
+pci:v00001EE4d00001181sv00001EE4sd00002325*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 1.6TB (P8118E4))
+
+pci:v00001EE4d00001181sv00001EE4sd00002326*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 3.2TB (P8118E4))
+
+pci:v00001EE4d00001181sv00001EE4sd00002327*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 6.4TB (P8118E4))
+
+pci:v00001EE4d00001181sv00001EE4sd00002415*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 1.92TB (P8118Z3))
+
+pci:v00001EE4d00001181sv00001EE4sd00002416*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 3.84TB (P8118Z3))
+
+pci:v00001EE4d00001181sv00001EE4sd00002417*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 7.68TB (P8118Z3))
+
+pci:v00001EE4d00001181sv00001EE4sd00002425*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 1.6TB (P8118Z3))
+
+pci:v00001EE4d00001181sv00001EE4sd00002426*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 3.2TB (P8118Z3))
+
+pci:v00001EE4d00001181sv00001EE4sd00002427*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 6.4TB (P8118Z3))
+
+pci:v00001EE4d00001181sv00001EE4sd00002515*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 1.92TB (P8118Z4))
+
+pci:v00001EE4d00001181sv00001EE4sd00002516*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 3.84TB (P8118Z4))
+
+pci:v00001EE4d00001181sv00001EE4sd00002517*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 7.68TB (P8118Z4))
+
+pci:v00001EE4d00001181sv00001EE4sd00002525*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 1.6TB (P8118Z4))
+
+pci:v00001EE4d00001181sv00001EE4sd00002526*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 3.2TB (P8118Z4))
+
+pci:v00001EE4d00001181sv00001EE4sd00002527*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 6.4TB (P8118Z4))
+
+pci:v00001EE4d00001181sv00001EE4sd00002615*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 1.92TB (P8128Z3))
+
+pci:v00001EE4d00001181sv00001EE4sd00002616*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 3.84TB (P8128Z3))
+
+pci:v00001EE4d00001181sv00001EE4sd00002617*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 7.68TB (P8128Z3))
+
+pci:v00001EE4d00001181sv00001EE4sd00002625*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 1.6TB (P8128Z3))
+
+pci:v00001EE4d00001181sv00001EE4sd00002626*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 3.2TB (P8128Z3))
+
+pci:v00001EE4d00001181sv00001EE4sd00002627*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe E1S Series (NVMe SSD E1.S 6.4TB (P8128Z3))
+
 pci:v00001EE4d00001182*
  ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series
 
@@ -81710,6 +83120,126 @@ pci:v00001EE4d00001182sv00001EE4sd000012
 pci:v00001EE4d00001182sv00001EE4sd00001226*
  ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 3.2TB (P8118X))
 
+pci:v00001EE4d00001182sv00001EE4sd00001313*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 480GB (P8118E4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001314*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 960GB (P8118E4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001315*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 1.92TB (P8118E4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001316*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 3.84TB (P8118E4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001317*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 7.68TB (P8118E4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001323*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 400GB (P8118E4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001324*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 800GB (P8118E4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001325*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 1.6TB (P8118E4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001326*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 3.2TB (P8118E4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001327*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 6.4TB (P8118E4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001413*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 480GB (P8118Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001414*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 960GB (P8118Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001415*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 1.92TB (P8118Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001416*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 3.84TB (P8118Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001417*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 7.68TB (P8118Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001423*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 400GB(P8118Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001424*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 800GB (P8118Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001425*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 1.6TB (P8118Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001426*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 3.2TB (P8118Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001427*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 6.4TB (P8118Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001513*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 480GB (P8118Z4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001514*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 960GB (P8118Z4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001515*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 1.92TB (P8118Z4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001516*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 3.84TB (P8118Z4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001517*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 7.68TB (P8118Z4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001523*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 400GB (P8118Z4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001524*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 800GB (P8118Z4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001525*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 1.6TB (P8118Z4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001526*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 3.2TB (P8118Z4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001527*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 6.4TB (P8118Z4))
+
+pci:v00001EE4d00001182sv00001EE4sd00001613*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 480GB (P8128Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001614*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 960GB (P8128Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001615*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 1.92TB (P8128Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001616*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 3.84TB (P8128Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001617*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 7.68TB (P8128Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001623*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 400GB (P8128Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001624*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 800GB (P8128Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001625*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 1.6TB (P8128Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001626*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 3.2TB (P8128Z3))
+
+pci:v00001EE4d00001182sv00001EE4sd00001627*
+ ID_MODEL_FROM_DATABASE=PETA8118 NVMe M2 Series (NVMe SSD M.2 6.4TB (P8128Z3))
+
 pci:v00001EE9*
  ID_VENDOR_FROM_DATABASE=SUSE LLC
 
@@ -81860,6 +83390,12 @@ pci:v00001EFFd00001120*
 pci:v00001EFFd00001121*
  ID_MODEL_FROM_DATABASE=RBLN-CA12 (VF)
 
+pci:v00001EFFd00001210*
+ ID_MODEL_FROM_DATABASE=RBLN-CA21 (PF)
+
+pci:v00001EFFd00001211*
+ ID_MODEL_FROM_DATABASE=RBLN-CA21 (VF)
+
 pci:v00001EFFd00001220*
  ID_MODEL_FROM_DATABASE=RBLN-CA22 (PF)
 
@@ -81990,31 +83526,31 @@ pci:v00001F0Fd0000340A*
  ID_MODEL_FROM_DATABASE=M18110 Lx Family BASE-T OCP
 
 pci:v00001F0Fd0000340B*
- ID_MODEL_FROM_DATABASE=M18120 Family
+ ID_MODEL_FROM_DATABASE=M18000 Family
 
 pci:v00001F0Fd0000340C*
- ID_MODEL_FROM_DATABASE=M18120 Lx Family
+ ID_MODEL_FROM_DATABASE=M18000 Lx Family
 
 pci:v00001F0Fd0000340D*
- ID_MODEL_FROM_DATABASE=M18120 Family BASE-T
+ ID_MODEL_FROM_DATABASE=M18000 Family BASE-T
 
 pci:v00001F0Fd0000340E*
- ID_MODEL_FROM_DATABASE=M18120 Lx Family BASE-T
+ ID_MODEL_FROM_DATABASE=M18000 Lx Family BASE-T
 
 pci:v00001F0Fd0000340F*
- ID_MODEL_FROM_DATABASE=M18120 Family OCP
+ ID_MODEL_FROM_DATABASE=M18000 Family OCP
 
 pci:v00001F0Fd00003410*
- ID_MODEL_FROM_DATABASE=M18120 Lx Family OCP
+ ID_MODEL_FROM_DATABASE=M18000 Lx Family OCP
 
 pci:v00001F0Fd00003411*
- ID_MODEL_FROM_DATABASE=M18120 Family BASE-T OCP
+ ID_MODEL_FROM_DATABASE=M18000 Family BASE-T OCP
 
 pci:v00001F0Fd00003412*
- ID_MODEL_FROM_DATABASE=M18120 Lx Family BASE-T OCP
+ ID_MODEL_FROM_DATABASE=M18000 Lx Family BASE-T OCP
 
 pci:v00001F0Fd00003413*
- ID_MODEL_FROM_DATABASE=M18100 Family Virtual Function
+ ID_MODEL_FROM_DATABASE=M18000 Family Virtual Function
 
 pci:v00001F0Fd00009088*
  ID_MODEL_FROM_DATABASE=D1055AS PCI Express Switch Downstream Port
@@ -82251,37 +83787,82 @@ pci:v00001F47d00001001*
  ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller
 
 pci:v00001F47d00001001sv00001F47sd00000001*
- ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (FLEXFLOW-2200T Ethernet 10G 2P)
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 10G 2P FLEXFLOW-2200T)
 
 pci:v00001F47d00001001sv00001F47sd00000002*
- ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (FLEXFLOW-2200T Ethernet 25G 2P)
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 25G 2P FLEXFLOW-2200T)
 
 pci:v00001F47d00001001sv00001F47sd00000003*
- ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (FLEXFLOW-2200T Ethernet 40G 2P)
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 40G 2P FLEXFLOW-2200T)
 
 pci:v00001F47d00001001sv00001F47sd00000004*
- ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (FLEXFLOW-2200T Ethernet 100G 1P)
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 100G 1P FLEXFLOW-2200T)
 
 pci:v00001F47d00001001sv00001F47sd00000005*
- ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (FLEXFLOW-2200T Ethernet 100G 2P)
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 100G 2P FLEXFLOW-2200T)
 
 pci:v00001F47d00001001sv00001F47sd00000006*
- ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (FLEXFLOW-2200T Ethernet 10G 2P)
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 10G 2P FLEXFLOW-2200T)
 
 pci:v00001F47d00001001sv00001F47sd00000007*
- ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (FLEXFLOW-2200T Ethernet 25G 2P)
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 25G 2P FLEXFLOW-2200T)
 
 pci:v00001F47d00001001sv00001F47sd00000008*
- ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (FLEXFLOW-2200T Ethernet 40G 2P)
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 40G 2P FLEXFLOW-2200T)
 
 pci:v00001F47d00001001sv00001F47sd00000009*
- ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (FLEXFLOW-2200T Ethernet 100G 1P)
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 100G 1P FLEXFLOW-2200T)
 
 pci:v00001F47d00001001sv00001F47sd0000000A*
- ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (FLEXFLOW-2200T Ethernet 100G 2P)
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 100G 2P FLEXFLOW-2200T)
+
+pci:v00001F47d00001002*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller [Virtual Function]
 
 pci:v00001F47d00001003*
- ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller MGMT Function
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller [MGMT Function]
+
+pci:v00001F47d00001004*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T DATA Offload Engine
+
+pci:v00001F47d00001005*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P NVMe Controller
+
+pci:v00001F47d00001011*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller
+
+pci:v00001F47d00001011sv00001F47sd00000001*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 10G 2P FLEXFLOW-2200T)
+
+pci:v00001F47d00001011sv00001F47sd00000002*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 25G 2P FLEXFLOW-2200T)
+
+pci:v00001F47d00001011sv00001F47sd00000003*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 40G 2P FLEXFLOW-2200T)
+
+pci:v00001F47d00001011sv00001F47sd00000004*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 100G 1P FLEXFLOW-2200T)
+
+pci:v00001F47d00001011sv00001F47sd00000005*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 100G 2P FLEXFLOW-2200T)
+
+pci:v00001F47d00001011sv00001F47sd00000006*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 10G 2P FLEXFLOW-2200T)
+
+pci:v00001F47d00001011sv00001F47sd00000007*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 25G 2P FLEXFLOW-2200T)
+
+pci:v00001F47d00001011sv00001F47sd00000008*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 40G 2P FLEXFLOW-2200T)
+
+pci:v00001F47d00001011sv00001F47sd00000009*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 100G 1P FLEXFLOW-2200T)
+
+pci:v00001F47d00001011sv00001F47sd0000000A*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T Ethernet Controller (Ethernet 100G 2P FLEXFLOW-2200T)
+
+pci:v00001F47d00001203*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200T RoCEv2 Network Controller
 
 pci:v00001F47d00002018*
  ID_MODEL_FROM_DATABASE=DPU Card
@@ -82289,6 +83870,240 @@ pci:v00001F47d00002018*
 pci:v00001F47d00002020*
  ID_MODEL_FROM_DATABASE=DPU
 
+pci:v00001F47d00003101*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2100R Ethernet Controller
+
+pci:v00001F47d00003101sv00001F47sd00000001*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2100R Ethernet Controller (Ethernet 10G 2P FLEXFLOW-2100R)
+
+pci:v00001F47d00003101sv00001F47sd00000002*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2100R Ethernet Controller (Ethernet 25G 2P FLEXFLOW-2100R)
+
+pci:v00001F47d00003101sv00001F47sd00000003*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2100R Ethernet Controller (Ethernet 50G 2P FLEXFLOW-2100R)
+
+pci:v00001F47d00003101sv00001F47sd00000004*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2100R Ethernet Controller (Ethernet 100G 2P FLEXFLOW-2100R)
+
+pci:v00001F47d00003101sv00001F47sd00000005*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2100R Ethernet Controller (Ethernet 10G 2P FLEXFLOW-2100R)
+
+pci:v00001F47d00003101sv00001F47sd00000006*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2100R Ethernet Controller (Ethernet 25G 2P FLEXFLOW-2100R)
+
+pci:v00001F47d00003101sv00001F47sd00000007*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2100R Ethernet Controller (Ethernet 50G 2P FLEXFLOW-2100R)
+
+pci:v00001F47d00003101sv00001F47sd00000008*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2100R Ethernet Controller (Ethernet 100G 2P FLEXFLOW-2100R)
+
+pci:v00001F47d00003201*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200R Ethernet Controller
+
+pci:v00001F47d00003201sv00001F47sd00000001*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200R Ethernet Controller (Ethernet 10G 2P FLEXFLOW-2200R)
+
+pci:v00001F47d00003201sv00001F47sd00000002*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200R Ethernet Controller (Ethernet 25G 2P FLEXFLOW-2200R)
+
+pci:v00001F47d00003201sv00001F47sd00000003*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200R Ethernet Controller (Ethernet 50G 2P FLEXFLOW-2200R)
+
+pci:v00001F47d00003201sv00001F47sd00000004*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200R Ethernet Controller (Ethernet 100G 2P FLEXFLOW-2200R)
+
+pci:v00001F47d00003201sv00001F47sd00000005*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200R Ethernet Controller (Ethernet 10G 2P FLEXFLOW-2200R)
+
+pci:v00001F47d00003201sv00001F47sd00000006*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200R Ethernet Controller (Ethernet 25G 2P FLEXFLOW-2200R)
+
+pci:v00001F47d00003201sv00001F47sd00000007*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200R Ethernet Controller (Ethernet 50G 2P FLEXFLOW-2200R)
+
+pci:v00001F47d00003201sv00001F47sd00000008*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200R Ethernet Controller (Ethernet 100G 2P FLEXFLOW-2200R)
+
+pci:v00001F47d00003211*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200R Ethernet Controller
+
+pci:v00001F47d00003211sv00001F47sd00000001*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200R Ethernet Controller (Ethernet 10G 2P FLEXFLOW-2200R)
+
+pci:v00001F47d00003211sv00001F47sd00000002*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200R Ethernet Controller (Ethernet 25G 2P FLEXFLOW-2200R)
+
+pci:v00001F47d00003211sv00001F47sd00000003*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200R Ethernet Controller (Ethernet 50G 2P FLEXFLOW-2200R)
+
+pci:v00001F47d00003211sv00001F47sd00000004*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200R Ethernet Controller (Ethernet 100G 2P FLEXFLOW-2200R)
+
+pci:v00001F47d00003211sv00001F47sd00000005*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200R Ethernet Controller (Ethernet 10G 2P FLEXFLOW-2200R)
+
+pci:v00001F47d00003211sv00001F47sd00000006*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200R Ethernet Controller (Ethernet 25G 2P FLEXFLOW-2200R)
+
+pci:v00001F47d00003211sv00001F47sd00000007*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200R Ethernet Controller (Ethernet 50G 2P FLEXFLOW-2200R)
+
+pci:v00001F47d00003211sv00001F47sd00000008*
+ ID_MODEL_FROM_DATABASE=FLEXFLOW-2200R Ethernet Controller (Ethernet 100G 2P FLEXFLOW-2200R)
+
+pci:v00001F47d00004001*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200E Ethernet Controller
+
+pci:v00001F47d00004001sv00001F47sd00000001*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200E Ethernet Controller (Ethernet 25G 2P CONFLUX-2200E)
+
+pci:v00001F47d00004001sv00001F47sd00000002*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200E Ethernet Controller (Ethernet 40G 2P CONFLUX-2200E)
+
+pci:v00001F47d00004001sv00001F47sd00000003*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200E Ethernet Controller (Ethernet 100G 1P CONFLUX-2200E)
+
+pci:v00001F47d00004001sv00001F47sd00000004*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200E Ethernet Controller (Ethernet 100G 2P CONFLUX-2200E)
+
+pci:v00001F47d00004001sv00001F47sd00000005*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200E Ethernet Controller (Ethernet 25G 2P CONFLUX-2200E)
+
+pci:v00001F47d00004001sv00001F47sd00000006*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200E Ethernet Controller (Ethernet 40G 2P CONFLUX-2200E)
+
+pci:v00001F47d00004001sv00001F47sd00000007*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200E Ethernet Controller (Ethernet 100G 1P CONFLUX-2200E)
+
+pci:v00001F47d00004001sv00001F47sd00000008*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200E Ethernet Controller (Ethernet 100G 2P CONFLUX-2200E)
+
+pci:v00001F47d00004002*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200E Ethernet Controller [Virtual Function]
+
+pci:v00001F47d00004003*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200E Ethernet Controller [MGMT Function]
+
+pci:v00001F47d00004004*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200E DATA Offload Engine
+
+pci:v00001F47d00004203*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200E RoCEv2 Network Controller
+
+pci:v00001F47d00005001*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller
+
+pci:v00001F47d00005001sv00001F47sd00000001*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller (Ethernet 25G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005001sv00001F47sd00000003*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller (Ethernet 100G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005001sv00001F47sd00000004*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller (Ethernet 25G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005001sv00001F47sd00000006*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller (Ethernet 100G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005001sv00001F47sd00000007*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller (Ethernet 25G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005001sv00001F47sd00000009*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller (Ethernet 100G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005001sv00001F47sd0000000A*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller (Ethernet 25G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005001sv00001F47sd0000000C*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller (Ethernet 100G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005002*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller [Virtual Function]
+
+pci:v00001F47d00005003*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P NVMe Controller
+
+pci:v00001F47d00005003sv00001F47sd00000001*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P NVMe Controller (Ethernet 25G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005003sv00001F47sd00000003*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P NVMe Controller (Ethernet 100G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005003sv00001F47sd00000004*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P NVMe Controller (Ethernet 25G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005003sv00001F47sd00000006*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P NVMe Controller (Ethernet 100G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005003sv00001F47sd00000007*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P NVMe Controller (Ethernet 25G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005003sv00001F47sd00000009*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P NVMe Controller (Ethernet 100G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005003sv00001F47sd0000000A*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P NVMe Controller (Ethernet 25G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005003sv00001F47sd0000000C*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P NVMe Controller (Ethernet 100G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005004*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P NVMe Controller [Virtual Function]
+
+pci:v00001F47d00005005*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller [MGMT Function]
+
+pci:v00001F47d00005005sv00001F47sd00000001*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller [MGMT Function]
+
+pci:v00001F47d00005005sv00001F47sd00000002*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller [MGMT Function] (DPU)
+
+pci:v00001F47d00005006*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller [YDMI Function]
+
+pci:v00001F47d00005006sv00001F47sd00000001*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller [YDMI Function]
+
+pci:v00001F47d00005006sv00001F47sd00000002*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller [YDMI Function] (DPU)
+
+pci:v00001F47d00005007*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P DATA OFFLOAD ENGINE
+
+pci:v00001F47d00005011*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller
+
+pci:v00001F47d00005011sv00001F47sd00000004*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller (Ethernet 25G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005011sv00001F47sd00000006*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller (Ethernet 100G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005011sv00001F47sd0000000A*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller (Ethernet 25G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005011sv00001F47sd0000000C*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller (Ethernet 100G 2P CONFLUX-2200P)
+
+pci:v00001F47d00005015*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller [MGMT Function]
+
+pci:v00001F47d00005015sv00001F47sd00000001*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller [MGMT Function]
+
+pci:v00001F47d00005015sv00001F47sd00000002*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller [MGMT Function] (DPU)
+
+pci:v00001F47d00005016*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller [YDMI Function]
+
+pci:v00001F47d00005016sv00001F47sd00000001*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller [YDMI Function]
+
+pci:v00001F47d00005016sv00001F47sd00000002*
+ ID_MODEL_FROM_DATABASE=CONFLUX-2200P Ethernet Controller [YDMI Function] (DPU)
+
 pci:v00001F4B*
  ID_VENDOR_FROM_DATABASE=Axera Semiconductor Co., Ltd
 
@@ -82343,9 +84158,21 @@ pci:v00001F67d00001111*
 pci:v00001F67d00001111sv00001BD4sd000000B2*
  ID_MODEL_FROM_DATABASE=YSA-100 RDMA Ethernet Network Controller (O1E2YYSA100)
 
+pci:v00001F67d00001111sv00001BD4sd000000B9*
+ ID_MODEL_FROM_DATABASE=YSA-100 RDMA Ethernet Network Controller (O2E1YYSA100)
+
 pci:v00001F67d00001111sv00001FF9sd000000B1*
  ID_MODEL_FROM_DATABASE=YSA-100 RDMA Ethernet Network Controller (ENFY1102-QP2)
 
+pci:v00001F67d00001111sv00001FF9sd000000B8*
+ ID_MODEL_FROM_DATABASE=YSA-100 RDMA Ethernet Network Controller (ENFY1202-QP1)
+
+pci:v00001F67d00001111sv00001FF9sd000000BA*
+ ID_MODEL_FROM_DATABASE=YSA-100 RDMA Ethernet Network Controller (ENFY1251-SP4)
+
+pci:v00001F67d00001111sv00001FF9sd000000BB*
+ ID_MODEL_FROM_DATABASE=YSA-100 RDMA Ethernet Network Controller (ENFY1251-SP4 (Roce))
+
 pci:v00001F67d00001112*
  ID_MODEL_FROM_DATABASE=metaScale SmartNIC Virtual Function
 
@@ -82376,9 +84203,33 @@ pci:v00001F82*
 pci:v00001F82d00000011*
  ID_MODEL_FROM_DATABASE=Corsair [DMX 1000 Series]
 
+pci:v00001F82d000000F1*
+ ID_MODEL_FROM_DATABASE=Jetstream [DMX F1 Transparent NIC]
+
+pci:v00001F90*
+ ID_VENDOR_FROM_DATABASE=Quside Technologies
+
+pci:v00001F90d00007024*
+ ID_MODEL_FROM_DATABASE=QRNG PCIe Device
+
+pci:v00001F90d00007025*
+ ID_MODEL_FROM_DATABASE=QRNG PCIe Device
+
 pci:v00001F99*
  ID_VENDOR_FROM_DATABASE=Shenzhen Techwinsemi Technology Co., Ltd.
 
+pci:v00001F99d00001202*
+ ID_MODEL_FROM_DATABASE=TWSC TE3420 series
+
+pci:v00001F99d00001608*
+ ID_MODEL_FROM_DATABASE=PCIe Gen4 x4 M.2 2280
+
+pci:v00001F99d00001F88*
+ ID_MODEL_FROM_DATABASE=TE3420 PCIe Gen3 x4 M.2 2280
+
+pci:v00001F99d00003420*
+ ID_MODEL_FROM_DATABASE=PCIe Gen3 x4 M.2 2280
+
 pci:v00001F9D*
  ID_VENDOR_FROM_DATABASE=Axelera AI
 
@@ -82727,18 +84578,30 @@ pci:v00001FE4*
 pci:v00001FE4d00001600*
  ID_MODEL_FROM_DATABASE=HP600 Series NVMe SSD
 
+pci:v00001FE4d00001600sv00001FE4sd00000001*
+ ID_MODEL_FROM_DATABASE=HP600 Series NVMe SSD (Enterprise NVMe SSD U.2 15.36TB (HP600))
+
+pci:v00001FE4d00001600sv00001FE4sd00000003*
+ ID_MODEL_FROM_DATABASE=HP600 Series NVMe SSD (Enterprise NVMe SSD U.2 12.80TB (HP630))
+
+pci:v00001FE4d00001600sv00001FE4sd00000011*
+ ID_MODEL_FROM_DATABASE=HP600 Series NVMe SSD (Enterprise NVMe SSD U.2 30.72TB (HP620))
+
+pci:v00001FE4d00001600sv00001FE4sd00000013*
+ ID_MODEL_FROM_DATABASE=HP600 Series NVMe SSD (Enterprise NVMe SSD U.2 61.44TB (HP620))
+
 pci:v00001FE4d00001600sv00001FE4sd00000075*
  ID_MODEL_FROM_DATABASE=HP600 Series NVMe SSD (Enterprise NVMe SSD U.2 3.84TB(HP610))
 
 pci:v00001FE4d00001600sv00001FE4sd00000076*
  ID_MODEL_FROM_DATABASE=HP600 Series NVMe SSD (Enterprise NVMe SSD U.2 7.68TB(HP610))
 
-pci:v00001FE4d00001600sv00001FE4sd00000077*
- ID_MODEL_FROM_DATABASE=HP600 Series NVMe SSD (Enterprise NVMe SSD U.2 6.40TB(HP630))
-
 pci:v00001FE4d00001600sv00001FE4sd00000078*
  ID_MODEL_FROM_DATABASE=HP600 Series NVMe SSD (Enterprise NVMe SSD U.2 3.20TB(HP630))
 
+pci:v00001FE4d00001600sv00001FE4sd00000079*
+ ID_MODEL_FROM_DATABASE=HP600 Series NVMe SSD (Enterprise NVMe SSD U.2 6.40TB (HP630))
+
 pci:v00001FE9*
  ID_VENDOR_FROM_DATABASE=MemryX
 
@@ -82871,20 +84734,35 @@ pci:v00002036d00001618sv00002036sd000008
 pci:v00002036d00001619*
  ID_MODEL_FROM_DATABASE=NF1618 Family Virtual Function
 
+pci:v0000203B*
+ ID_VENDOR_FROM_DATABASE=XTX Markets Technologies Ltd.
+
 pci:v00002046*
  ID_VENDOR_FROM_DATABASE=GXMICRO Technology (Shanghai) Co., Ltd.
 
 pci:v00002048*
  ID_VENDOR_FROM_DATABASE=Beijing SpaceControl Technology Co.Ltd
 
+pci:v00002058*
+ ID_VENDOR_FROM_DATABASE=Lime Microsystems Ltd.
+
 pci:v0000205C*
  ID_VENDOR_FROM_DATABASE=Zhejiang VMing Semiconductor Co., Ltd.
 
+pci:v0000205Cd00001514*
+ ID_MODEL_FROM_DATABASE=EP9410 U.2 1.92TB NVME SSD
+
 pci:v0000205Cd00001515*
  ID_MODEL_FROM_DATABASE=EP9410 U.2 3.84TB NVME SSD
 
-pci:v0000205Cd00001516*
- ID_MODEL_FROM_DATABASE=EP9410 U.2 7.68TB NVME SSD
+pci:v0000205Cd00001534*
+ ID_MODEL_FROM_DATABASE=EP9430 U.2 1.6TB NVME SSD
+
+pci:v0000205Cd00001535*
+ ID_MODEL_FROM_DATABASE=EP9430 U.2 3.2TB NVME SSD
+
+pci:v0000205Cd00001536*
+ ID_MODEL_FROM_DATABASE=EP9430 U.2 6.4TB NVME SSD
 
 pci:v00002061*
  ID_VENDOR_FROM_DATABASE=Unis Flash Memory
@@ -83042,18 +84920,27 @@ pci:v00002096d00005403*
 pci:v00002096d00005404*
  ID_MODEL_FROM_DATABASE=KCP54(04) 2280 PCIe G4 x4 TLC
 
+pci:v00002099*
+ ID_VENDOR_FROM_DATABASE=Rolling Wireless S.a.r.l.
+
 pci:v0000209B*
  ID_VENDOR_FROM_DATABASE=BitIntelligence Technology
 
 pci:v0000209Bd00001000*
  ID_MODEL_FROM_DATABASE=TCU Family - TCU-1
 
+pci:v0000209Bd00001001*
+ ID_MODEL_FROM_DATABASE=TCU Family - TCU-1 Virtual Function
+
 pci:v0000209F*
  ID_VENDOR_FROM_DATABASE=Mobilint, Inc.
 
 pci:v000020A7*
  ID_VENDOR_FROM_DATABASE=EEVengers Inc.
 
+pci:v000020A8*
+ ID_VENDOR_FROM_DATABASE=Rayson HI-TECH(SZ) Co., Ltd.
+
 pci:v000020A9*
  ID_VENDOR_FROM_DATABASE=LDA Technologies Ltd.
 
@@ -83063,6 +84950,54 @@ pci:v000020A9d00001008*
 pci:v000020A9d00001104*
  ID_MODEL_FROM_DATABASE=NEOTAPX FPGA Timing Synchronization Card
 
+pci:v000020BA*
+ ID_VENDOR_FROM_DATABASE=Hangzhou Hikstorage Technology Co., Ltd.
+
+pci:v000020BAd00001202*
+ ID_MODEL_FROM_DATABASE=NAND memory controller
+
+pci:v000020BAd00001202sv000020BAsd00001202*
+ ID_MODEL_FROM_DATABASE=NAND memory controller (NVMe SSD V2000 (DRAM-less))
+
+pci:v000020BB*
+ ID_VENDOR_FROM_DATABASE=Quantum Machines
+
+pci:v000020BBd00000111*
+ ID_MODEL_FROM_DATABASE=OPNIC
+
+pci:v000020BC*
+ ID_VENDOR_FROM_DATABASE=Xinsheng Technology Co., Ltd.
+
+pci:v000020BCd00001001*
+ ID_MODEL_FROM_DATABASE=Smart Network Adapter
+
+pci:v000020BCd00001001sv000020BCsd00001082*
+ ID_MODEL_FROM_DATABASE=Smart Network Adapter (Ethernet Network Adapter XS-N1082-2X for 10GbE SFP+ Dual-port)
+
+pci:v000020BCd00001001sv000020BCsd00002083*
+ ID_MODEL_FROM_DATABASE=Smart Network Adapter (Ethernet Network Adapter XS-N2083-2X for 25GbE SFP28 SFP+ Dual-port ROCEv2)
+
+pci:v000020BCd00001001sv000020BCsd00002084*
+ ID_MODEL_FROM_DATABASE=Smart Network Adapter (Ethernet Network Adapter XS-N2084-2X for 25GbE SFP28 SFP+ Dual-port ROCEv2)
+
+pci:v000020BCd00001001sv000020BCsd00004084*
+ ID_MODEL_FROM_DATABASE=Smart Network Adapter (Ethernet Network Adapter XS-N4084-2X for 100GbE QSFP28/56 Dual-port)
+
+pci:v000020BCd00002001*
+ ID_MODEL_FROM_DATABASE=Solid State Storage
+
+pci:v000020D0*
+ ID_VENDOR_FROM_DATABASE=Telin Semiconductor (Wuhan) Co., Ltd.
+
+pci:v000020D0d00002001*
+ ID_MODEL_FROM_DATABASE=PACIFIC-S1 NVMe SSD
+
+pci:v000020D2*
+ ID_VENDOR_FROM_DATABASE=Awide Labs LTD.
+
+pci:v000020D2d00000200*
+ ID_MODEL_FROM_DATABASE=XRaid [Extreme Performance Compression RAID Accelerator]
+
 pci:v000020F4*
  ID_VENDOR_FROM_DATABASE=TRENDnet
 
@@ -83181,7 +85116,7 @@ pci:v00002646d0000501E*
  ID_MODEL_FROM_DATABASE=OM3PGP4 NVMe SSD (DRAM-less)
 
 pci:v00002646d0000501F*
- ID_MODEL_FROM_DATABASE=FURY Renegade NVMe SSD + Heatsink [E18]
+ ID_MODEL_FROM_DATABASE=FURY Renegade NVMe SSD [E18] (Heatsink)
 
 pci:v00002646d00005021*
  ID_MODEL_FROM_DATABASE=OM8SEP4 Design-In PCIe 4 NVMe SSD (QLC) (DRAM-less)
@@ -83210,9 +85145,18 @@ pci:v00002646d00005028*
 pci:v00002646d0000502A*
  ID_MODEL_FROM_DATABASE=FURY Renegade G5 NVMe SSD [SM2508]
 
+pci:v00002646d0000502B*
+ ID_MODEL_FROM_DATABASE=NV3 NVMe SSD [E29T] (DRAM-less)
+
 pci:v00002646d0000502C*
  ID_MODEL_FROM_DATABASE=DC3000ME NVMe SSD [SC5]
 
+pci:v00002646d0000502D*
+ ID_MODEL_FROM_DATABASE=OM8TAP4 PCIe 4 NVMe SSD (QLC) (DRAM-less)
+
+pci:v00002646d00005030*
+ ID_MODEL_FROM_DATABASE=NV3 2230 NVMe SSD [SM2268XT2] (DRAM-less)
+
 pci:v0000270B*
  ID_VENDOR_FROM_DATABASE=Xantel Corporation
 
@@ -83381,6 +85325,30 @@ pci:v000034BA*
 pci:v00003513*
  ID_VENDOR_FROM_DATABASE=ARCOM Control Systems Ltd
 
+pci:v00003633*
+ ID_VENDOR_FROM_DATABASE=DeepCool
+
+pci:v00003633d00000001*
+ ID_MODEL_FROM_DATABASE=AK400 DIGITAL CPU Air Cooler
+
+pci:v00003633d00000002*
+ ID_MODEL_FROM_DATABASE=AK620 DIGITAL CPU Air Cooler
+
+pci:v00003633d00000003*
+ ID_MODEL_FROM_DATABASE=AK500 DIGITAL CPU Air Cooler
+
+pci:v00003633d00000004*
+ ID_MODEL_FROM_DATABASE=AK500S DIGITAL CPU Air Cooler
+
+pci:v00003633d00000005*
+ ID_MODEL_FROM_DATABASE=CH560 DIGITAL PC Case
+
+pci:v00003633d00000006*
+ ID_MODEL_FROM_DATABASE=LS Series (LS520 / LS720 SE DIGITAL) CPU Liquid Cooler
+
+pci:v00003633d00000007*
+ ID_MODEL_FROM_DATABASE=MORPHEUS PC Case
+
 pci:v0000369A*
  ID_VENDOR_FROM_DATABASE=HighSecLabs, Ltd.
 
@@ -83555,6 +85523,9 @@ pci:v00003D3Dd00003D04*
 pci:v00003D3Dd0000FFFF*
  ID_MODEL_FROM_DATABASE=Glint VGA
 
+pci:v00003E08*
+ ID_VENDOR_FROM_DATABASE=Sinead Tech Co., Ltd
+
 pci:v00004005*
  ID_VENDOR_FROM_DATABASE=Avance Logic Inc.
 
@@ -83678,6 +85649,12 @@ pci:v00004144*
 pci:v00004144d00000044*
  ID_MODEL_FROM_DATABASE=ADM-XRCIIPro
 
+pci:v00004149*
+ ID_VENDOR_FROM_DATABASE=AIMOTIVE Kft.
+
+pci:v00004149d0000D011*
+ ID_MODEL_FROM_DATABASE=HIL camera injector board
+
 pci:v00004150*
  ID_VENDOR_FROM_DATABASE=ONA Electroerosion
 
@@ -85334,6 +87311,9 @@ pci:v00006766d00003D07*
 pci:v00006766d00003D08*
  ID_MODEL_FROM_DATABASE=Arise2020
 
+pci:v00006766d00003D0E*
+ ID_MODEL_FROM_DATABASE=Arise10D0
+
 pci:v00006766d00003D40*
  ID_MODEL_FROM_DATABASE=GLF HDMI/DP Audio
 
@@ -87854,6 +89834,9 @@ pci:v00008086d00000D00*
 pci:v00008086d00000D01*
  ID_MODEL_FROM_DATABASE=Crystal Well PCI Express x16 Controller
 
+pci:v00008086d00000D03*
+ ID_MODEL_FROM_DATABASE=Crystal Well Dynamic Platform and Thermal Framework Processor Participant
+
 pci:v00008086d00000D04*
  ID_MODEL_FROM_DATABASE=Crystal Well DRAM Controller
 
@@ -87866,9 +89849,15 @@ pci:v00008086d00000D09*
 pci:v00008086d00000D0C*
  ID_MODEL_FROM_DATABASE=Crystal Well HD Audio Controller
 
+pci:v00008086d00000D12*
+ ID_MODEL_FROM_DATABASE=Crystal Well Integrated Graphics Controller
+
 pci:v00008086d00000D16*
  ID_MODEL_FROM_DATABASE=Crystal Well Integrated Graphics Controller
 
+pci:v00008086d00000D22*
+ ID_MODEL_FROM_DATABASE=Crystal Well Integrated Iris Pro Graphics 5200
+
 pci:v00008086d00000D26*
  ID_MODEL_FROM_DATABASE=Crystal Well Integrated Graphics Controller
 
@@ -90143,6 +92132,15 @@ pci:v00008086d00001132sv00008086sd000045
 pci:v00008086d00001132sv00008086sd00004557*
  ID_MODEL_FROM_DATABASE=82815 Chipset Graphics Controller (CGC) (D815EGEW Mainboard)
 
+pci:v00008086d00001133*
+ ID_MODEL_FROM_DATABASE=Thunderbolt 4 Bridge [Maple Ridge 2C 2020]
+
+pci:v00008086d00001134*
+ ID_MODEL_FROM_DATABASE=Thunderbolt 4 NHI [Maple Ridge 2C 2020]
+
+pci:v00008086d00001135*
+ ID_MODEL_FROM_DATABASE=Thunderbolt 4 USB Controller [Maple Ridge 2C 2020]
+
 pci:v00008086d00001136*
  ID_MODEL_FROM_DATABASE=Thunderbolt 4 Bridge [Maple Ridge 4C 2020]
 
@@ -90842,6 +92840,15 @@ pci:v00008086d000012D3sv00008086sd000000
 pci:v00008086d000012D3sv00008086sd00000004*
  ID_MODEL_FROM_DATABASE=Ethernet Controller E830-CC for SFP (Ethernet Network Adapter E830-XXV-4 for OCP 3.0)
 
+pci:v00008086d000012D3sv00008086sd00000005*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller E830-CC for SFP (Ethernet Network Adapter E830-XXV-8F for OCP 3.0)
+
+pci:v00008086d000012D3sv00008086sd00000006*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller E830-CC for SFP (Ethernet Network Adapter E830-XXV-8F)
+
+pci:v00008086d000012D3sv00008086sd00000007*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller E830-CC for SFP (Ethernet Network Adapter E830-XXV-4F)
+
 pci:v00008086d000012D4*
  ID_MODEL_FROM_DATABASE=Ethernet Controller E830-CC for SFP-DD
 
@@ -91556,6 +93563,9 @@ pci:v00008086d00001539*
 pci:v00008086d0000153A*
  ID_MODEL_FROM_DATABASE=Ethernet Connection I217-LM
 
+pci:v00008086d0000153Asv00001028sd00000617*
+ ID_MODEL_FROM_DATABASE=Ethernet Connection I217-LM (Precision T5810)
+
 pci:v00008086d0000153Asv0000103Csd00001909*
  ID_MODEL_FROM_DATABASE=Ethernet Connection I217-LM (ZBook 15)
 
@@ -95624,6 +97634,9 @@ pci:v00008086d00002448sv000017AAsd000020
 pci:v00008086d00002448sv000017AAsd000020AE*
  ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (ThinkPad T61/R61)
 
+pci:v00008086d00002448sv000017AAsd000020F4*
+ ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (ThinkPad T400)
+
 pci:v00008086d00002448sv000017C0sd000010D2*
  ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (Medion Akoya E7214 Notebook PC [MD98410])
 
@@ -100943,9 +102956,15 @@ pci:v00008086d00002850sv000017C0sd000040
 pci:v00008086d00002850sv0000E4BFsd0000CC47*
  ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) IDE Controller (CCG-RUMBA)
 
+pci:v00008086d00002880*
+ ID_MODEL_FROM_DATABASE=Ice Lake DDRIO Registers
+
 pci:v00008086d000028C0*
  ID_MODEL_FROM_DATABASE=Volume Management Device NVMe RAID Controller
 
+pci:v00008086d000028C0sv00001D49sd0000011A*
+ ID_MODEL_FROM_DATABASE=Volume Management Device NVMe RAID Controller (Intel VROC (VMD NVMe RAID) for ThinkSystem V4 PL)
+
 pci:v00008086d00002912*
  ID_MODEL_FROM_DATABASE=82801IH (ICH9DH) LPC Interface Controller
 
@@ -101630,6 +103649,9 @@ pci:v00008086d00002940sv00001043sd000082
 pci:v00008086d00002940sv00001462sd00007345*
  ID_MODEL_FROM_DATABASE=82801I (ICH9 Family) PCI Express Port 1 (MS-7345 Motherboard: Intel 82801I/IR [ICH9/ICH9R])
 
+pci:v00008086d00002940sv000017AAsd000020F3*
+ ID_MODEL_FROM_DATABASE=82801I (ICH9 Family) PCI Express Port 1 (ThinkPad T400)
+
 pci:v00008086d00002940sv00008086sd00002940*
  ID_MODEL_FROM_DATABASE=82801I (ICH9 Family) PCI Express Port 1 (Optiplex 755)
 
@@ -101639,6 +103661,9 @@ pci:v00008086d00002942*
 pci:v00008086d00002942sv00001028sd0000020D*
  ID_MODEL_FROM_DATABASE=82801I (ICH9 Family) PCI Express Port 2 (Inspiron 530)
 
+pci:v00008086d00002942sv000017AAsd000020F3*
+ ID_MODEL_FROM_DATABASE=82801I (ICH9 Family) PCI Express Port 2 (ThinkPad T400)
+
 pci:v00008086d00002944*
  ID_MODEL_FROM_DATABASE=82801I (ICH9 Family) PCI Express Port 3
 
@@ -101654,6 +103679,9 @@ pci:v00008086d00002946*
 pci:v00008086d00002946sv00001028sd0000020D*
  ID_MODEL_FROM_DATABASE=82801I (ICH9 Family) PCI Express Port 4 (Inspiron 530)
 
+pci:v00008086d00002946sv000017AAsd000020F3*
+ ID_MODEL_FROM_DATABASE=82801I (ICH9 Family) PCI Express Port 4 (ThinkPad T400)
+
 pci:v00008086d00002948*
  ID_MODEL_FROM_DATABASE=82801I (ICH9 Family) PCI Express Port 5
 
@@ -101666,6 +103694,9 @@ pci:v00008086d00002948sv00001043sd000082
 pci:v00008086d00002948sv00001462sd00007345*
  ID_MODEL_FROM_DATABASE=82801I (ICH9 Family) PCI Express Port 5 (MS-7345 Motherboard: Intel 82801I/IR [ICH9/ICH9R])
 
+pci:v00008086d00002948sv000017AAsd000020F3*
+ ID_MODEL_FROM_DATABASE=82801I (ICH9 Family) PCI Express Port 5 (ThinkPad T400)
+
 pci:v00008086d0000294A*
  ID_MODEL_FROM_DATABASE=82801I (ICH9 Family) PCI Express Port 6
 
@@ -102161,6 +104192,9 @@ pci:v00008086d00002A42*
 pci:v00008086d00002A42sv00001028sd000002AA*
  ID_MODEL_FROM_DATABASE=Mobile 4 Series Chipset Integrated Graphics Controller (Dell Inspiron 1545)
 
+pci:v00008086d00002A42sv000017AAsd000020E4*
+ ID_MODEL_FROM_DATABASE=Mobile 4 Series Chipset Integrated Graphics Controller (ThinkPad T400)
+
 pci:v00008086d00002A42sv000017AAsd00002112*
  ID_MODEL_FROM_DATABASE=Mobile 4 Series Chipset Integrated Graphics Controller (ThinkPad T400)
 
@@ -102170,6 +104204,9 @@ pci:v00008086d00002A42sv0000E4BFsd0000CC
 pci:v00008086d00002A43*
  ID_MODEL_FROM_DATABASE=Mobile 4 Series Chipset Integrated Graphics Controller
 
+pci:v00008086d00002A43sv000017AAsd000020E4*
+ ID_MODEL_FROM_DATABASE=Mobile 4 Series Chipset Integrated Graphics Controller (ThinkPad T400)
+
 pci:v00008086d00002A43sv000017AAsd00002112*
  ID_MODEL_FROM_DATABASE=Mobile 4 Series Chipset Integrated Graphics Controller (ThinkPad T400)
 
@@ -102191,6 +104228,9 @@ pci:v00008086d00002A46*
 pci:v00008086d00002A47*
  ID_MODEL_FROM_DATABASE=Mobile 4 Series Chipset AMT SOL Redirection
 
+pci:v00008086d00002A47sv000017AAsd000020EC*
+ ID_MODEL_FROM_DATABASE=Mobile 4 Series Chipset AMT SOL Redirection (ThinkPad T400)
+
 pci:v00008086d00002A50*
  ID_MODEL_FROM_DATABASE=Cantiga MEI Controller
 
@@ -103907,9 +105947,87 @@ pci:v00008086d00003440*
 pci:v00008086d00003441*
  ID_MODEL_FROM_DATABASE=Ice Lake UPI Link/Phy0
 
+pci:v00008086d00003442*
+ ID_MODEL_FROM_DATABASE=Ice Lake UPI Phy0 Registers
+
+pci:v00008086d00003445*
+ ID_MODEL_FROM_DATABASE=Ice Lake UPI Mesh Stop Registers
+
+pci:v00008086d00003446*
+ ID_MODEL_FROM_DATABASE=Ice Lake UPI PMON0 Registers
+
+pci:v00008086d00003447*
+ ID_MODEL_FROM_DATABASE=Ice Lake UPI PMON1 Registers
+
+pci:v00008086d00003448*
+ ID_MODEL_FROM_DATABASE=Ice Lake PCU Registers
+
+pci:v00008086d0000344A*
+ ID_MODEL_FROM_DATABASE=Ice Lake Integrated Memory Controller
+
+pci:v00008086d0000344B*
+ ID_MODEL_FROM_DATABASE=Ice Lake PCU Registers
+
+pci:v00008086d0000344C*
+ ID_MODEL_FROM_DATABASE=Ice Lake CHA Registers
+
+pci:v00008086d0000344D*
+ ID_MODEL_FROM_DATABASE=Ice Lake CHA Registers
+
+pci:v00008086d0000344F*
+ ID_MODEL_FROM_DATABASE=Ice Lake CHA Registers
+
+pci:v00008086d00003450*
+ ID_MODEL_FROM_DATABASE=Ice Lake Ubox Registers
+
+pci:v00008086d00003451*
+ ID_MODEL_FROM_DATABASE=Ice Lake Ubox Registers
+
+pci:v00008086d00003452*
+ ID_MODEL_FROM_DATABASE=Ice Lake Ubox Registers
+
+pci:v00008086d00003455*
+ ID_MODEL_FROM_DATABASE=Ice Lake Ubox Registers
+
 pci:v00008086d00003456*
  ID_MODEL_FROM_DATABASE=Ice Lake NorthPeak
 
+pci:v00008086d00003457*
+ ID_MODEL_FROM_DATABASE=Ice Lake CHA Registers
+
+pci:v00008086d00003458*
+ ID_MODEL_FROM_DATABASE=Ice Lake PCU Registers
+
+pci:v00008086d00003459*
+ ID_MODEL_FROM_DATABASE=Ice Lake PCU Registers
+
+pci:v00008086d0000345A*
+ ID_MODEL_FROM_DATABASE=Ice Lake PCU Registers
+
+pci:v00008086d0000345B*
+ ID_MODEL_FROM_DATABASE=Ice Lake PCU Registers
+
+pci:v00008086d0000345C*
+ ID_MODEL_FROM_DATABASE=Ice Lake PCU Registers
+
+pci:v00008086d0000345D*
+ ID_MODEL_FROM_DATABASE=Ice Lake PCU Registers
+
+pci:v00008086d0000345E*
+ ID_MODEL_FROM_DATABASE=Ice Lake PCU Registers
+
+pci:v00008086d0000347A*
+ ID_MODEL_FROM_DATABASE=Ice Lake PCI Express Root Port A
+
+pci:v00008086d0000347B*
+ ID_MODEL_FROM_DATABASE=Ice Lake PCI Express Root Port B
+
+pci:v00008086d0000347C*
+ ID_MODEL_FROM_DATABASE=Ice Lake PCI Express Root Port C
+
+pci:v00008086d0000347D*
+ ID_MODEL_FROM_DATABASE=Ice Lake PCI Express Root Port D
+
 pci:v00008086d0000347E*
  ID_MODEL_FROM_DATABASE=Ice Lake Xeon Non-Transparent Bridge
 
@@ -104600,14 +106718,29 @@ pci:v00008086d0000372C*
 pci:v00008086d0000373F*
  ID_MODEL_FROM_DATABASE=Xeon C5500/C3500 IOxAPIC
 
+pci:v00008086d000037C0*
+ ID_MODEL_FROM_DATABASE=C62x chipset series PCIe x16/x8 Upstream Port
+
+pci:v00008086d000037C2*
+ ID_MODEL_FROM_DATABASE=C62x chipset series PCIe Virtual Switch Port 0
+
+pci:v00008086d000037C3*
+ ID_MODEL_FROM_DATABASE=C62x chipset series PCIe Virtual Switch Port 1
+
+pci:v00008086d000037C4*
+ ID_MODEL_FROM_DATABASE=C62x chipset series PCIe Virtual Switch Port 2
+
+pci:v00008086d000037C5*
+ ID_MODEL_FROM_DATABASE=C62x chipset series PCIe Virtual Switch Port 3
+
 pci:v00008086d000037C8*
- ID_MODEL_FROM_DATABASE=C62x Chipset QuickAssist Technology
+ ID_MODEL_FROM_DATABASE=C62x Chipset series QuickAssist Technology Physical Function 0~2
 
 pci:v00008086d000037C8sv00008086sd00000001*
- ID_MODEL_FROM_DATABASE=C62x Chipset QuickAssist Technology (QuickAssist Adapter 8960)
+ ID_MODEL_FROM_DATABASE=C62x Chipset series QuickAssist Technology Physical Function 0~2 (QuickAssist Adapter 8960)
 
 pci:v00008086d000037C8sv00008086sd00000002*
- ID_MODEL_FROM_DATABASE=C62x Chipset QuickAssist Technology (QuickAssist Adapter 8970)
+ ID_MODEL_FROM_DATABASE=C62x Chipset series QuickAssist Technology Physical Function 0~2 (QuickAssist Adapter 8970)
 
 pci:v00008086d000037C9*
  ID_MODEL_FROM_DATABASE=C62x Chipset QuickAssist Technology Virtual Function
@@ -105707,6 +107840,12 @@ pci:v00008086d00003C2F*
 pci:v00008086d00003C40*
  ID_MODEL_FROM_DATABASE=Xeon E5/Core i7 IIO Switch and IRP Performance Monitor
 
+pci:v00008086d00003C41*
+ ID_MODEL_FROM_DATABASE=Sandy Bridge QPI Port 0 Performance Monitor
+
+pci:v00008086d00003C42*
+ ID_MODEL_FROM_DATABASE=Sandy Bridge QPI Port 1 Performance Monitor
+
 pci:v00008086d00003C43*
  ID_MODEL_FROM_DATABASE=Xeon E5/Core i7 Ring to PCI Express Performance Monitor
 
@@ -105731,6 +107870,9 @@ pci:v00008086d00003C83*
 pci:v00008086d00003C84*
  ID_MODEL_FROM_DATABASE=Xeon E5/Core i7 QPI Link Reut 0
 
+pci:v00008086d00003C86*
+ ID_MODEL_FROM_DATABASE=Sandy Bridge QPI Port 0 DFX Link
+
 pci:v00008086d00003C90*
  ID_MODEL_FROM_DATABASE=Xeon E5/Core i7 QPI Link 1
 
@@ -105740,6 +107882,9 @@ pci:v00008086d00003C93*
 pci:v00008086d00003C94*
  ID_MODEL_FROM_DATABASE=Xeon E5/Core i7 QPI Link Reut 1
 
+pci:v00008086d00003C96*
+ ID_MODEL_FROM_DATABASE=Sandy Bridge QPI Port 1 DFX Link
+
 pci:v00008086d00003CA0*
  ID_MODEL_FROM_DATABASE=Xeon E5/Core i7 Processor Home Agent
 
@@ -105857,6 +108002,9 @@ pci:v00008086d00003E1F*
 pci:v00008086d00003E1Fsv00001458sd00005000*
  ID_MODEL_FROM_DATABASE=8th Gen Core 4-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S] (Z370 AORUS Gaming K3-CF)
 
+pci:v00008086d00003E20*
+ ID_MODEL_FROM_DATABASE=i9 Core / Xeon E 2200M Coffee Lake Host Bridge / DRAM Registers
+
 pci:v00008086d00003E30*
  ID_MODEL_FROM_DATABASE=8th/9th Gen Core 8-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S]
 
@@ -105942,7 +108090,7 @@ pci:v00008086d00003EC2sv00001043sd000086
  ID_MODEL_FROM_DATABASE=8th Gen Core Processor Host Bridge/DRAM Registers (PRIME H310M-D)
 
 pci:v00008086d00003EC4*
- ID_MODEL_FROM_DATABASE=8th Gen Core Processor Host Bridge/DRAM Registers
+ ID_MODEL_FROM_DATABASE=8th/9th Gen Core Processor Host Bridge / DRAM Registers
 
 pci:v00008086d00003EC6*
  ID_MODEL_FROM_DATABASE=8th Gen Core Processor Host Bridge/DRAM Registers
@@ -107294,15 +109442,33 @@ pci:v00008086d0000530D*
 pci:v00008086d00005481*
  ID_MODEL_FROM_DATABASE=Alder Lake-N PCH eSPI Controller
 
+pci:v00008086d000054A0*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N P2SB Bridge
+
+pci:v00008086d000054A1*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N Power Management Controller (PMC)
+
 pci:v00008086d000054A3*
  ID_MODEL_FROM_DATABASE=Alder Lake-N SMBus
 
 pci:v00008086d000054A4*
  ID_MODEL_FROM_DATABASE=Alder Lake-N SPI (flash) Controller
 
+pci:v00008086d000054A6*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N Intel Trace Hub
+
 pci:v00008086d000054A8*
  ID_MODEL_FROM_DATABASE=Alder Lake-N Serial IO UART Host Controller
 
+pci:v00008086d000054A9*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N UART Controller
+
+pci:v00008086d000054AA*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N Generic SPI (GSPI) Controller #0
+
+pci:v00008086d000054AB*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N Generic SPI (GSPI) Controller #1
+
 pci:v00008086d000054B0*
  ID_MODEL_FROM_DATABASE=Alder Lake-N PCI Express Root Port #9
 
@@ -107330,26 +109496,89 @@ pci:v00008086d000054BB*
 pci:v00008086d000054BE*
  ID_MODEL_FROM_DATABASE=Alder Lake-N PCI Express Root Port #7
 
+pci:v00008086d000054C4*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N eMMC Controller
+
+pci:v00008086d000054C5*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N I2C Controller #4
+
+pci:v00008086d000054C6*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N I2C Controller #5
+
+pci:v00008086d000054C7*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N UART Controller #2
+
 pci:v00008086d000054C8*
  ID_MODEL_FROM_DATABASE=Alder Lake-N PCH High Definition Audio Controller
 
+pci:v00008086d000054D0*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N Touch Host Controller #0 (THC #0)
+
+pci:v00008086d000054D1*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N Touch Host Controller #1 (THC #1)
+
 pci:v00008086d000054D3*
  ID_MODEL_FROM_DATABASE=Alder Lake-N SATA AHCI Controller
 
+pci:v00008086d000054DA*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N UART Controller #3
+
 pci:v00008086d000054E0*
  ID_MODEL_FROM_DATABASE=Alder Lake-N PCH HECI Controller
 
+pci:v00008086d000054E1*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N PCH HECI Controller
+
+pci:v00008086d000054E4*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N PCH HECI Controller
+
+pci:v00008086d000054E5*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N PCH HECI Controller
+
+pci:v00008086d000054E8*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N PCH I2C Controller
+
+pci:v00008086d000054E9*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N PCH I2C Controller
+
+pci:v00008086d000054EA*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N PCH I2C Controller
+
+pci:v00008086d000054EB*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N PCH I2C Controller
+
 pci:v00008086d000054ED*
- ID_MODEL_FROM_DATABASE=Alder Lake-N PCH USB 3.2 xHCI Host Controller
+ ID_MODEL_FROM_DATABASE=Alder Lake-N PCH USB 3.2 Gen 2x1 (10 Gb/s) xHCI Host Controller
+
+pci:v00008086d000054EE*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N USB 3.2 Gen 1x1 (5 Gb/s) Device Controller (xDCI)
 
 pci:v00008086d000054EF*
  ID_MODEL_FROM_DATABASE=Alder Lake-N PCH Shared SRAM
 
 pci:v00008086d000054F0*
- ID_MODEL_FROM_DATABASE=CNVi: Wi-Fi
+ ID_MODEL_FROM_DATABASE=Alder Lake-N PCH CNVi WiFi
 
 pci:v00008086d000054F0sv00008086sd00000244*
- ID_MODEL_FROM_DATABASE=CNVi: Wi-Fi (Wi-Fi 6 AX101NGW)
+ ID_MODEL_FROM_DATABASE=Alder Lake-N PCH CNVi WiFi (Wi-Fi 6 AX101NGW)
+
+pci:v00008086d000054F1*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N PCH CNVi WiFi
+
+pci:v00008086d000054F2*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N PCH CNVi WiFi
+
+pci:v00008086d000054F3*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N PCH CNVi WiFi
+
+pci:v00008086d000054FB*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N Generic SPI (GSPI) Controller #2
+
+pci:v00008086d000054FC*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N Integrated Sensor Hub
+
+pci:v00008086d000054FF*
+ ID_MODEL_FROM_DATABASE=Alder Lake-N UFS Controller
 
 pci:v00008086d00005502*
  ID_MODEL_FROM_DATABASE=Ethernet Controller (2) I225-LMvP
@@ -107460,28 +109689,28 @@ pci:v00008086d000056C2*
  ID_MODEL_FROM_DATABASE=ATS-M [Data Center GPU Flex 170V]
 
 pci:v00008086d00005780*
- ID_MODEL_FROM_DATABASE=Thunderbolt 80/120G Bridge [Barlow Ridge Host 80G 2023]
+ ID_MODEL_FROM_DATABASE=JHL9580 Thunderbolt 5 80/120G Bridge [Barlow Ridge Host 80G 2023]
 
 pci:v00008086d00005781*
- ID_MODEL_FROM_DATABASE=Thunderbolt 80/120G NHI [Barlow Ridge Host 80G 2023]
+ ID_MODEL_FROM_DATABASE=JHL9580 Thunderbolt 5 80/120G NHI [Barlow Ridge Host 80G 2023]
 
 pci:v00008086d00005782*
- ID_MODEL_FROM_DATABASE=Thunderbolt 80/120G USB Controller [Barlow Ridge Host 80G 2023]
+ ID_MODEL_FROM_DATABASE=JHL9580 Thunderbolt 5 80/120G USB Controller [Barlow Ridge Host 80G 2023]
 
 pci:v00008086d00005783*
- ID_MODEL_FROM_DATABASE=Thunderbolt Bridge [Barlow Ridge Host 40G 2023]
+ ID_MODEL_FROM_DATABASE=JHL9540 Thunderbolt 4 Bridge [Barlow Ridge Host 40G 2023]
 
 pci:v00008086d00005784*
- ID_MODEL_FROM_DATABASE=Thunderbolt NHI [Barlow Ridge Host 40G 2023]
+ ID_MODEL_FROM_DATABASE=JHL9540 Thunderbolt 4 NHI [Barlow Ridge Host 40G 2023]
 
 pci:v00008086d00005785*
- ID_MODEL_FROM_DATABASE=Thunderbolt USB Controller [Barlow Ridge Host 40G 2023]
+ ID_MODEL_FROM_DATABASE=JHL9540 Thunderbolt 4 USB Controller [Barlow Ridge Host 40G 2023]
 
 pci:v00008086d00005786*
- ID_MODEL_FROM_DATABASE=Thunderbolt 80/120G Bridge [Barlow Ridge Hub 80G 2023]
+ ID_MODEL_FROM_DATABASE=JHL9480 Thunderbolt 5 80/120G Bridge [Barlow Ridge Hub 80G 2023]
 
 pci:v00008086d00005787*
- ID_MODEL_FROM_DATABASE=Thunderbolt 80/120G USB Controller [Barlow Ridge Hub 80G 2023]
+ ID_MODEL_FROM_DATABASE=JHL9480 Thunderbolt 5 80/120G USB Controller [Barlow Ridge Hub 80G 2023]
 
 pci:v00008086d00005795*
  ID_MODEL_FROM_DATABASE=Granite Rapids Chipset LPC Controller
@@ -107499,10 +109728,10 @@ pci:v00008086d0000579F*
  ID_MODEL_FROM_DATABASE=Ethernet Connection E825-C 10GbE
 
 pci:v00008086d000057A4*
- ID_MODEL_FROM_DATABASE=Thunderbolt Bridge [Barlow Ridge Hub 40G 2023]
+ ID_MODEL_FROM_DATABASE=JHL9440 Thunderbolt 4 Bridge [Barlow Ridge Hub 40G 2023]
 
 pci:v00008086d000057A5*
- ID_MODEL_FROM_DATABASE=Thunderbolt USB Controller [Barlow Ridge Hub 40G 2023]
+ ID_MODEL_FROM_DATABASE=JHL9440 Thunderbolt 4 USB Controller [Barlow Ridge Hub 40G 2023]
 
 pci:v00008086d000057AD*
  ID_MODEL_FROM_DATABASE=E610 Virtual Function
@@ -107783,12 +110012,21 @@ pci:v00008086d00005AEE*
 pci:v00008086d00005AF0*
  ID_MODEL_FROM_DATABASE=Celeron N3350/Pentium N4200/Atom E3900 Series Host Bridge
 
+pci:v00008086d0000641D*
+ ID_MODEL_FROM_DATABASE=Lunar Lake-M Dynamic Tuning Technology
+
 pci:v00008086d00006420*
  ID_MODEL_FROM_DATABASE=Lunar Lake [Intel Graphics]
 
 pci:v00008086d0000643E*
  ID_MODEL_FROM_DATABASE=Lunar Lake NPU
 
+pci:v00008086d0000645D*
+ ID_MODEL_FROM_DATABASE=Lunar Lake IPU
+
+pci:v00008086d0000647D*
+ ID_MODEL_FROM_DATABASE=Lunar Lake-M Crashlog and Telemetry
+
 pci:v00008086d000064A0*
  ID_MODEL_FROM_DATABASE=Lunar Lake [Intel Arc Graphics 130V / 140V]
 
@@ -108863,6 +111101,9 @@ pci:v00008086d00007AFC*
 pci:v00008086d00007AFD*
  ID_MODEL_FROM_DATABASE=Alder Lake-S PCH Serial IO I2C Controller #5
 
+pci:v00008086d00007D01*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-H 6p+8e cores Host Bridge/DRAM Controller
+
 pci:v00008086d00007D03*
  ID_MODEL_FROM_DATABASE=Meteor Lake-P Dynamic Tuning Technology
 
@@ -108908,6 +111149,9 @@ pci:v00008086d00007DD5*
 pci:v00008086d00007E01*
  ID_MODEL_FROM_DATABASE=Meteor Lake-P LPC/eSPI Controller
 
+pci:v00008086d00007E02*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-H eSPI Controller
+
 pci:v00008086d00007E22*
  ID_MODEL_FROM_DATABASE=Meteor Lake-P SMBus Controller
 
@@ -108932,6 +111176,9 @@ pci:v00008086d00007E28*
 pci:v00008086d00007E30*
  ID_MODEL_FROM_DATABASE=Meteor Lake-P Serial IO SPI Controller #1
 
+pci:v00008086d00007E3F*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-H/U PCIe Root Port #8
+
 pci:v00008086d00007E40*
  ID_MODEL_FROM_DATABASE=Meteor Lake PCH CNVi WiFi
 
@@ -108947,6 +111194,9 @@ pci:v00008086d00007E46*
 pci:v00008086d00007E4C*
  ID_MODEL_FROM_DATABASE=Meteor Lake-P Gaussian & Neural-Network Accelerator
 
+pci:v00008086d00007E4D*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-H/U PCIe Root Port #9
+
 pci:v00008086d00007E50*
  ID_MODEL_FROM_DATABASE=Meteor Lake-P Serial IO I2C Controller #4
 
@@ -108980,6 +111230,9 @@ pci:v00008086d00007E7D*
 pci:v00008086d00007E7E*
  ID_MODEL_FROM_DATABASE=Meteor Lake-P USB Device Controller
 
+pci:v00008086d00007E7F*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-H/U Shared SRAM
+
 pci:v00008086d00007EC0*
  ID_MODEL_FROM_DATABASE=Meteor Lake-P Thunderbolt 4 USB Controller
 
@@ -109001,6 +111254,12 @@ pci:v00008086d00007EC6*
 pci:v00008086d00007EC7*
  ID_MODEL_FROM_DATABASE=Meteor Lake-P Thunderbolt 4 PCI Express Root Port #3
 
+pci:v00008086d00007ECA*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-H/U PCIe Root Port #10
+
+pci:v00008086d00007ECC*
+ ID_MODEL_FROM_DATABASE=Meteor Lake-H PCIe Root Port #12
+
 pci:v00008086d00007F70*
  ID_MODEL_FROM_DATABASE=Arrow Lake-S PCH CNVi WiFi
 
@@ -109805,12 +112064,18 @@ pci:v00008086d00008D0E*
 pci:v00008086d00008D10*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset PCI Express Root Port #1
 
+pci:v00008086d00008D10sv00001028sd00000617*
+ ID_MODEL_FROM_DATABASE=C610/X99 series chipset PCI Express Root Port #1 (Precision T5810)
+
 pci:v00008086d00008D11*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset PCI Express Root Port #1
 
 pci:v00008086d00008D12*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset PCI Express Root Port #2
 
+pci:v00008086d00008D12sv00001028sd00000617*
+ ID_MODEL_FROM_DATABASE=C610/X99 series chipset PCI Express Root Port #2 (Precision T5810)
+
 pci:v00008086d00008D13*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset PCI Express Root Port #2
 
@@ -109853,12 +112118,18 @@ pci:v00008086d00008D1F*
 pci:v00008086d00008D20*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset HD Audio Controller
 
+pci:v00008086d00008D20sv00001028sd00000617*
+ ID_MODEL_FROM_DATABASE=C610/X99 series chipset HD Audio Controller (Precision T5810)
+
 pci:v00008086d00008D21*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset HD Audio Controller
 
 pci:v00008086d00008D22*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset SMBus Controller
 
+pci:v00008086d00008D22sv00001028sd00000617*
+ ID_MODEL_FROM_DATABASE=C610/X99 series chipset SMBus Controller (Precision T5810)
+
 pci:v00008086d00008D22sv000015D9sd00000821*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset SMBus Controller (X10DRW-i)
 
@@ -109874,6 +112145,9 @@ pci:v00008086d00008D24sv000015D9sd000008
 pci:v00008086d00008D26*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset USB Enhanced Host Controller #1
 
+pci:v00008086d00008D26sv00001028sd00000617*
+ ID_MODEL_FROM_DATABASE=C610/X99 series chipset USB Enhanced Host Controller #1 (Precision T5810)
+
 pci:v00008086d00008D26sv000015D9sd00000821*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset USB Enhanced Host Controller #1 (X10DRW-i)
 
@@ -109883,6 +112157,9 @@ pci:v00008086d00008D26sv000015D9sd000008
 pci:v00008086d00008D2D*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset USB Enhanced Host Controller #2
 
+pci:v00008086d00008D2Dsv00001028sd00000617*
+ ID_MODEL_FROM_DATABASE=C610/X99 series chipset USB Enhanced Host Controller #2 (Precision T5810)
+
 pci:v00008086d00008D2Dsv000015D9sd00000821*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset USB Enhanced Host Controller #2 (X10DRW-i)
 
@@ -109892,6 +112169,9 @@ pci:v00008086d00008D2Dsv000015D9sd000008
 pci:v00008086d00008D31*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset USB xHCI Host Controller
 
+pci:v00008086d00008D31sv00001028sd00000617*
+ ID_MODEL_FROM_DATABASE=C610/X99 series chipset USB xHCI Host Controller (Precision T5810)
+
 pci:v00008086d00008D31sv000015D9sd00000821*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset USB xHCI Host Controller (X10DRW-i)
 
@@ -109907,6 +112187,9 @@ pci:v00008086d00008D34*
 pci:v00008086d00008D3A*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset MEI Controller #1
 
+pci:v00008086d00008D3Asv00001028sd00000617*
+ ID_MODEL_FROM_DATABASE=C610/X99 series chipset MEI Controller #1 (Precision T5810)
+
 pci:v00008086d00008D3Asv000015D9sd00000821*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset MEI Controller #1 (X10DRW-i)
 
@@ -109943,6 +112226,9 @@ pci:v00008086d00008D43*
 pci:v00008086d00008D44*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset LPC Controller
 
+pci:v00008086d00008D44sv00001028sd00000617*
+ ID_MODEL_FROM_DATABASE=C610/X99 series chipset LPC Controller (Precision T5810)
+
 pci:v00008086d00008D44sv000015D9sd00000821*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset LPC Controller (X10DRW-i)
 
@@ -109988,6 +112274,9 @@ pci:v00008086d00008D60*
 pci:v00008086d00008D62*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset sSATA Controller [AHCI mode]
 
+pci:v00008086d00008D62sv00001028sd00000617*
+ ID_MODEL_FROM_DATABASE=C610/X99 series chipset sSATA Controller [AHCI mode] (Precision T5810)
+
 pci:v00008086d00008D62sv000015D9sd00000821*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset sSATA Controller [AHCI mode] (X10DRW-i)
 
@@ -110006,6 +112295,9 @@ pci:v00008086d00008D6E*
 pci:v00008086d00008D7C*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset SPSR
 
+pci:v00008086d00008D7Csv00001028sd00000617*
+ ID_MODEL_FROM_DATABASE=C610/X99 series chipset SPSR (Precision T5810)
+
 pci:v00008086d00008D7Csv000015D9sd00000821*
  ID_MODEL_FROM_DATABASE=C610/X99 series chipset SPSR (X10DRW-i)
 
@@ -111764,6 +114056,9 @@ pci:v00008086d0000A1EC*
 pci:v00008086d0000A1ED*
  ID_MODEL_FROM_DATABASE=C620 Series Chipset Family MROM 1
 
+pci:v00008086d0000A1F0*
+ ID_MODEL_FROM_DATABASE=C62x HD Audio Controller
+
 pci:v00008086d0000A1F8*
  ID_MODEL_FROM_DATABASE=Lewisburg IE: HECI #1
 
@@ -111785,6 +114080,57 @@ pci:v00008086d0000A202*
 pci:v00008086d0000A206*
  ID_MODEL_FROM_DATABASE=Lewisburg SATA Controller [RAID mode]
 
+pci:v00008086d0000A210*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A211*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A212*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A213*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A214*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A215*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A216*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A217*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A218*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A219*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A21A*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A21B*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A21C*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A21D*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A21E*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A21F*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A221*
+ ID_MODEL_FROM_DATABASE=Lewisburg Power Management Controller
+
 pci:v00008086d0000A223*
  ID_MODEL_FROM_DATABASE=Lewisburg SMBus
 
@@ -111803,6 +114149,18 @@ pci:v00008086d0000A252*
 pci:v00008086d0000A256*
  ID_MODEL_FROM_DATABASE=Lewisburg SSATA Controller [RAID mode]
 
+pci:v00008086d0000A267*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A268*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A269*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
+pci:v00008086d0000A26A*
+ ID_MODEL_FROM_DATABASE=Lewisburg PCI Express Root Port
+
 pci:v00008086d0000A282*
  ID_MODEL_FROM_DATABASE=200 Series PCH SATA controller [AHCI mode]
 
@@ -112019,20 +114377,29 @@ pci:v00008086d0000A305*
 pci:v00008086d0000A306*
  ID_MODEL_FROM_DATABASE=Q370 Chipset LPC/eSPI Controller
 
+pci:v00008086d0000A307*
+ ID_MODEL_FROM_DATABASE=Q360 Chipset LPC/eSPI Controller
+
 pci:v00008086d0000A308*
- ID_MODEL_FROM_DATABASE=300 Series Chipset Family LPC Controller
+ ID_MODEL_FROM_DATABASE=B360 Chipset LPC/eSPI Controller
 
 pci:v00008086d0000A309*
- ID_MODEL_FROM_DATABASE=Cannon Point-LP LPC Controller
+ ID_MODEL_FROM_DATABASE=C246 Chipset LPC/eSPI Controller
+
+pci:v00008086d0000A30A*
+ ID_MODEL_FROM_DATABASE=C242 Chipset LPC/eSPI Controller
 
 pci:v00008086d0000A30C*
  ID_MODEL_FROM_DATABASE=QM370 Chipset LPC/eSPI Controller
 
 pci:v00008086d0000A30D*
- ID_MODEL_FROM_DATABASE=HM470 Chipset LPC/eSPI Controller
+ ID_MODEL_FROM_DATABASE=HM370 Chipset LPC/eSPI Controller
 
 pci:v00008086d0000A30E*
- ID_MODEL_FROM_DATABASE=Cannon Lake LPC Controller
+ ID_MODEL_FROM_DATABASE=CM246 Chipset LPC/eSPI Controller
+
+pci:v00008086d0000A313*
+ ID_MODEL_FROM_DATABASE=Cannon Lake LPC/eSPI Controller
 
 pci:v00008086d0000A323*
  ID_MODEL_FROM_DATABASE=Cannon Lake PCH SMBus Controller
@@ -112424,6 +114791,18 @@ pci:v00008086d0000A845*
 pci:v00008086d0000A847*
  ID_MODEL_FROM_DATABASE=Lunar Lake-M UFS Controller
 
+pci:v00008086d0000A848*
+ ID_MODEL_FROM_DATABASE=Lunar Lake-M Touch Host Controller #0 ID1
+
+pci:v00008086d0000A849*
+ ID_MODEL_FROM_DATABASE=Lunar Lake-M Touch Host Controller #0 ID2
+
+pci:v00008086d0000A84A*
+ ID_MODEL_FROM_DATABASE=Lunar Lake-M Touch Host Controller #1 ID1
+
+pci:v00008086d0000A84B*
+ ID_MODEL_FROM_DATABASE=Lunar Lake-M Touch Host Controller #1 ID2
+
 pci:v00008086d0000A84E*
  ID_MODEL_FROM_DATABASE=Lunar Lake-M Thunderbolt 4 PCI Express Root Port #0
 
@@ -112433,6 +114812,12 @@ pci:v00008086d0000A84F*
 pci:v00008086d0000A860*
  ID_MODEL_FROM_DATABASE=Lunar Lake-M Thunderbolt 4 PCI Express Root Port #2
 
+pci:v00008086d0000A870*
+ ID_MODEL_FROM_DATABASE=Lunar Lake-M CSME HECI #1
+
+pci:v00008086d0000A873*
+ ID_MODEL_FROM_DATABASE=Lunar Lake-M Keyboard and Text (KT) Redirection
+
 pci:v00008086d0000A878*
  ID_MODEL_FROM_DATABASE=Lunar Lake-M Serial IO I2C Controller #0
 
@@ -112448,6 +114833,9 @@ pci:v00008086d0000A87B*
 pci:v00008086d0000A87D*
  ID_MODEL_FROM_DATABASE=Lunar Lake-M USB 3.2 Gen 2x1 xHCI Host Controller
 
+pci:v00008086d0000A87F*
+ ID_MODEL_FROM_DATABASE=Lunar Lake-M Shared SRAM
+
 pci:v00008086d0000ABC0*
  ID_MODEL_FROM_DATABASE=Omni-Path Fabric Switch Silicon 100 Series
 
@@ -112472,6 +114860,18 @@ pci:v00008086d0000B082*
 pci:v00008086d0000B083*
  ID_MODEL_FROM_DATABASE=Panther Lake [Intel Graphics]
 
+pci:v00008086d0000B084*
+ ID_MODEL_FROM_DATABASE=Panther Lake [Intel Graphics]
+
+pci:v00008086d0000B085*
+ ID_MODEL_FROM_DATABASE=Panther Lake [Intel Graphics]
+
+pci:v00008086d0000B086*
+ ID_MODEL_FROM_DATABASE=Panther Lake [Intel Graphics]
+
+pci:v00008086d0000B087*
+ ID_MODEL_FROM_DATABASE=Panther Lake [Intel Graphics]
+
 pci:v00008086d0000B08F*
  ID_MODEL_FROM_DATABASE=Panther Lake [Intel Graphics]
 
@@ -112607,6 +115007,9 @@ pci:v00008086d0000E20D*
 pci:v00008086d0000E210*
  ID_MODEL_FROM_DATABASE=Battlemage G21 [Intel Graphics]
 
+pci:v00008086d0000E211*
+ ID_MODEL_FROM_DATABASE=Battlemage G21 [Intel Graphics]
+
 pci:v00008086d0000E212*
  ID_MODEL_FROM_DATABASE=Battlemage G21 [Intel Graphics]
 
@@ -112616,6 +115019,18 @@ pci:v00008086d0000E215*
 pci:v00008086d0000E216*
  ID_MODEL_FROM_DATABASE=Battlemage G21 [Intel Graphics]
 
+pci:v00008086d0000E220*
+ ID_MODEL_FROM_DATABASE=Battlemage G31 [Intel Graphics]
+
+pci:v00008086d0000E221*
+ ID_MODEL_FROM_DATABASE=Battlemage G31 [Intel Graphics]
+
+pci:v00008086d0000E222*
+ ID_MODEL_FROM_DATABASE=Battlemage G31 [Intel Graphics]
+
+pci:v00008086d0000E223*
+ ID_MODEL_FROM_DATABASE=Battlemage G31 [Intel Graphics]
+
 pci:v00008086d0000F1A5*
  ID_MODEL_FROM_DATABASE=SSD 600P Series
 
@@ -112640,6 +115055,12 @@ pci:v00008086d0000F1AA*
 pci:v00008086d0000FAF0*
  ID_MODEL_FROM_DATABASE=SSD 665p Series [Neptune Harbor Refresh]
 
+pci:v00008086d0000FD80*
+ ID_MODEL_FROM_DATABASE=Wildcat Lake [Intel Graphics]
+
+pci:v00008086d0000FD81*
+ ID_MODEL_FROM_DATABASE=Wildcat Lake [Intel Graphics]
+
 pci:v00008088*
  ID_VENDOR_FROM_DATABASE=Beijing Wangxun Technology Co., Ltd.
 
@@ -113052,7 +115473,10 @@ pci:v00008888*
  ID_VENDOR_FROM_DATABASE=Silicon Magic
 
 pci:v00008888d00008504*
- ID_MODEL_FROM_DATABASE=AVMatrix VC42
+ ID_MODEL_FROM_DATABASE=AVMatrix VC42 4-port HDMI Capture
+
+pci:v00008888d00008581*
+ ID_MODEL_FROM_DATABASE=AVMatrix VC12 4K HDMI Capture
 
 pci:v00008912*
  ID_VENDOR_FROM_DATABASE=TRX
@@ -114722,6 +117146,9 @@ pci:v00009902d00000002*
 pci:v00009902d00000003*
  ID_MODEL_FROM_DATABASE=SG1010 Starfabric Switch and PCI Bridge
 
+pci:v00009999*
+ ID_VENDOR_FROM_DATABASE=MetaX Integrated Circuits (Shanghai) Co., Ltd.
+
 pci:v00009A11*
  ID_VENDOR_FROM_DATABASE=Tiger Lake-H Gaussian & Neural Accelerator
 
@@ -114761,6 +117188,9 @@ pci:v00009D32d00001502*
 pci:v00009D32d00001504*
  ID_MODEL_FROM_DATABASE=STAR1500L NVMe SSD
 
+pci:v00009D32d00001505*
+ ID_MODEL_FROM_DATABASE=STAR1500K NVMe SSD
+
 pci:v00009D32d00001516*
  ID_MODEL_FROM_DATABASE=STAR1516 PCIe NVMe SSD Controller
 
@@ -115085,6 +117515,9 @@ pci:v0000C0A9d00005426*
 pci:v0000C0A9d0000542B*
  ID_MODEL_FROM_DATABASE=T705 NVMe PCIe SSD
 
+pci:v0000C0A9d0000560B*
+ ID_MODEL_FROM_DATABASE=E100 NVMe PCIe SSD (DRAM-less)
+
 pci:v0000C0DE*
  ID_VENDOR_FROM_DATABASE=Motorola
 
@@ -115346,6 +117779,12 @@ pci:v0000D20Cd00006011sv0000D20Csd0000EA
 pci:v0000D405*
  ID_VENDOR_FROM_DATABASE=LeapIO
 
+pci:v0000D405d00008200*
+ ID_MODEL_FROM_DATABASE=LeapHBA
+
+pci:v0000D405d00008201*
+ ID_MODEL_FROM_DATABASE=LeapRAID
+
 pci:v0000D4D4*
  ID_VENDOR_FROM_DATABASE=Dy4 Systems Inc
 
@@ -115835,6 +118274,9 @@ pci:v0000EDD8d0000A0A1*
 pci:v0000EDD8d0000A0A9*
  ID_MODEL_FROM_DATABASE=2000MI
 
+pci:v0000EFAB*
+ ID_VENDOR_FROM_DATABASE=Enfabrica
+
 pci:v0000F043*
  ID_VENDOR_FROM_DATABASE=ASUSTeK Computer Inc. (Wrong ID)
 
@@ -115847,6 +118289,9 @@ pci:v0000F111*
 pci:v0000F117*
  ID_VENDOR_FROM_DATABASE=Cerio
 
+pci:v0000F117d000000FF*
+ ID_MODEL_FROM_DATABASE=Test Device
+
 pci:v0000F117d00001000*
  ID_MODEL_FROM_DATABASE=Emulated PCIe Switch
 
diff -pruN 257.7-1/hwdb.d/20-usb-vendor-model.hwdb 257.9-0ubuntu2/hwdb.d/20-usb-vendor-model.hwdb
--- 257.7-1/hwdb.d/20-usb-vendor-model.hwdb	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/20-usb-vendor-model.hwdb	2025-09-03 18:35:40.000000000 +0000
@@ -119,6 +119,12 @@ usb:v017C*
 usb:v017Cp145F*
  ID_MODEL_FROM_DATABASE=Trust Deskset
 
+usb:v019C*
+ ID_VENDOR_FROM_DATABASE=mek
+
+usb:v019Cp0042*
+ ID_MODEL_FROM_DATABASE=mek_42
+
 usb:v0200*
  ID_VENDOR_FROM_DATABASE=TP-Link
 
@@ -149,6 +155,15 @@ usb:v02AD*
 usb:v02ADp138C*
  ID_MODEL_FROM_DATABASE=PVR Mass Storage
 
+usb:v0300*
+ ID_VENDOR_FROM_DATABASE=Ajazz
+
+usb:v0300p1010*
+ ID_MODEL_FROM_DATABASE=Akp153E Desktop Controller
+
+usb:v0300p1020*
+ ID_MODEL_FROM_DATABASE=AKP153R Desktop Controller
+
 usb:v0303*
  ID_VENDOR_FROM_DATABASE=Mini Automation Controller
 
@@ -228,7 +243,7 @@ usb:v03E8p8004*
  ID_MODEL_FROM_DATABASE=Aox 99001
 
 usb:v03E9*
- ID_VENDOR_FROM_DATABASE=Thesys Microelectronics
+ ID_VENDOR_FROM_DATABASE=Melexis (formerly Thesys Microelectronics)
 
 usb:v03EA*
  ID_VENDOR_FROM_DATABASE=Data Broadcasting Corp.
@@ -713,6 +728,12 @@ usb:v03F0p042A*
 usb:v03F0p0441*
  ID_MODEL_FROM_DATABASE=Prime [NW280AA, G8X92AA]
 
+usb:v03F0p046B*
+ ID_MODEL_FROM_DATABASE=Dock G5
+
+usb:v03F0p0483*
+ ID_MODEL_FROM_DATABASE=Engage Go 10 Tablet
+
 usb:v03F0p0504*
  ID_MODEL_FROM_DATABASE=DeskJet 885c
 
@@ -740,6 +761,9 @@ usb:v03F0p051D*
 usb:v03F0p052A*
  ID_MODEL_FROM_DATABASE=LaserJet M1212nf MFP
 
+usb:v03F0p0583*
+ ID_MODEL_FROM_DATABASE=Engage Go 10 Tablet
+
 usb:v03F0p0601*
  ID_MODEL_FROM_DATABASE=ScanJet 6300c
 
@@ -767,6 +791,9 @@ usb:v03F0p0641*
 usb:v03F0p0653*
  ID_MODEL_FROM_DATABASE=DeskJet 3700 series
 
+usb:v03F0p0683*
+ ID_MODEL_FROM_DATABASE=Engage Go 10 Tablet
+
 usb:v03F0p0701*
  ID_MODEL_FROM_DATABASE=ScanJet 5300c/5370c
 
@@ -917,6 +944,9 @@ usb:v03F0p1104*
 usb:v03F0p1105*
  ID_MODEL_FROM_DATABASE=ScanJet 5470c/5490c
 
+usb:v03F0p110C*
+ ID_MODEL_FROM_DATABASE=Pocket Media Drive
+
 usb:v03F0p1111*
  ID_MODEL_FROM_DATABASE=OfficeJet v60
 
@@ -2981,6 +3011,9 @@ usb:v0408p3001*
 usb:v0408p3008*
  ID_MODEL_FROM_DATABASE=Optical Touch Screen
 
+usb:v0408p4033*
+ ID_MODEL_FROM_DATABASE=HD Webcam
+
 usb:v0408pA060*
  ID_MODEL_FROM_DATABASE=HD Webcam
 
@@ -3029,6 +3062,9 @@ usb:v0409p004F*
 usb:v0409p0050*
  ID_MODEL_FROM_DATABASE=7-port hub
 
+usb:v0409p0056*
+ ID_MODEL_FROM_DATABASE=uPD720133 IDE bridge
+
 usb:v0409p0058*
  ID_MODEL_FROM_DATABASE=HighSpeed Hub
 
@@ -4400,6 +4436,9 @@ usb:v041Ep4097*
 usb:v041Ep4099*
  ID_MODEL_FROM_DATABASE=Creative VF0800 [RealSense Camera SR300]
 
+usb:v041Ep40A3*
+ ID_MODEL_FROM_DATABASE=Live! Cam V3 2K [VF-0900]
+
 usb:v041Ep4100*
  ID_MODEL_FROM_DATABASE=Nomad Jukebox 2
 
@@ -5819,6 +5858,9 @@ usb:v043Dp010F*
 usb:v043Dp0142*
  ID_MODEL_FROM_DATABASE=X3650 (Printer, Scanner, Copier)
 
+usb:v043Dp01BD*
+ ID_MODEL_FROM_DATABASE=S800 Series Scanner
+
 usb:v043Dp01FA*
  ID_MODEL_FROM_DATABASE=S310 series
 
@@ -5888,6 +5930,9 @@ usb:v043Ep9A11*
 usb:v043Ep9A39*
  ID_MODEL_FROM_DATABASE=27UP850 - WK.AEUDCSN - External Monitor 4K
 
+usb:v043Ep9A57*
+ ID_MODEL_FROM_DATABASE=UltraGear Monitor
+
 usb:v043Ep9C01*
  ID_MODEL_FROM_DATABASE=LGE Sync
 
@@ -5963,6 +6008,9 @@ usb:v044E*
 usb:v044Ep1104*
  ID_MODEL_FROM_DATABASE=Japanese Keyboard
 
+usb:v044Ep1218*
+ ID_MODEL_FROM_DATABASE=Electric Touchpad
+
 usb:v044Ep2002*
  ID_MODEL_FROM_DATABASE=MD-5500 Printer
 
@@ -8153,6 +8201,12 @@ usb:v046Ap01A4*
 usb:v046Ap01A6*
  ID_MODEL_FROM_DATABASE=MX BOARD 2.0S FL RGB DE Keyboard
 
+usb:v046Ap0201*
+ ID_MODEL_FROM_DATABASE=Smart Board 1150
+
+usb:v046Ap0202*
+ ID_MODEL_FROM_DATABASE=Smart Terminal 1150
+
 usb:v046ApB090*
  ID_MODEL_FROM_DATABASE=Keyboard
 
@@ -8495,6 +8549,9 @@ usb:v046Dp08E0*
 usb:v046Dp08E1*
  ID_MODEL_FROM_DATABASE=Labtec Webcam
 
+usb:v046Dp08E4*
+ ID_MODEL_FROM_DATABASE=C505e HD Webcam
+
 usb:v046Dp08E5*
  ID_MODEL_FROM_DATABASE=C920 PRO HD Webcam
 
@@ -8948,6 +9005,9 @@ usb:v046DpC092*
 usb:v046DpC093*
  ID_MODEL_FROM_DATABASE=M500s Optical Mouse
 
+usb:v046DpC09D*
+ ID_MODEL_FROM_DATABASE=G102 LIGHTSYNC Gaming Mouse
+
 usb:v046DpC101*
  ID_MODEL_FROM_DATABASE=UltraX Media Remote
 
@@ -9122,6 +9182,9 @@ usb:v046DpC24E*
 usb:v046DpC24F*
  ID_MODEL_FROM_DATABASE=G29 Driving Force Racing Wheel [PS3]
 
+usb:v046DpC251*
+ ID_MODEL_FROM_DATABASE=GamePanel for Dell XPS M1730
+
 usb:v046DpC260*
  ID_MODEL_FROM_DATABASE=G29 Driving Force Racing Wheel [PS4]
 
@@ -9161,6 +9224,9 @@ usb:v046DpC298*
 usb:v046DpC299*
  ID_MODEL_FROM_DATABASE=G25 Racing Wheel
 
+usb:v046DpC29A*
+ ID_MODEL_FROM_DATABASE=Driving Force GT
+
 usb:v046DpC29B*
  ID_MODEL_FROM_DATABASE=G27 Racing Wheel
 
@@ -9272,6 +9338,9 @@ usb:v046DpC336*
 usb:v046DpC33A*
  ID_MODEL_FROM_DATABASE=G413 Gaming Keyboard
 
+usb:v046DpC33E*
+ ID_MODEL_FROM_DATABASE=G915 Mechanical Keyboard
+
 usb:v046DpC33F*
  ID_MODEL_FROM_DATABASE=G815 Mechanical Keyboard
 
@@ -10019,6 +10088,9 @@ usb:v047CpFFFF*
 usb:v047D*
  ID_VENDOR_FROM_DATABASE=Kensington
 
+usb:v047Dp00F2*
+ ID_MODEL_FROM_DATABASE=VeriMark Desktop
+
 usb:v047Dp1001*
  ID_MODEL_FROM_DATABASE=Mouse*in*a*Box
 
@@ -10616,6 +10688,9 @@ usb:v0486*
 usb:v0486p0185*
  ID_MODEL_FROM_DATABASE=EeePC T91MT HID Touch Panel
 
+usb:v0486p573C*
+ ID_MODEL_FROM_DATABASE=Xreal Light Microcontroller
+
 usb:v0487*
  ID_VENDOR_FROM_DATABASE=Stewart Connector
 
@@ -10931,6 +11006,9 @@ usb:v0499p1037*
 usb:v0499p103C*
  ID_MODEL_FROM_DATABASE=MOTIF-RACK ES
 
+usb:v0499p1045*
+ ID_MODEL_FROM_DATABASE=MM6
+
 usb:v0499p1054*
  ID_MODEL_FROM_DATABASE=S90XS Keyboard/Music Synthesizer
 
@@ -11618,6 +11696,9 @@ usb:v04A9p106E*
 usb:v04A9p1070*
  ID_MODEL_FROM_DATABASE=S530D
 
+usb:v04A9p1071*
+ ID_MODEL_FROM_DATABASE=Sony MPR-501
+
 usb:v04A9p1072*
  ID_MODEL_FROM_DATABASE=I850 Printer
 
@@ -11627,6 +11708,9 @@ usb:v04A9p1073*
 usb:v04A9p1074*
  ID_MODEL_FROM_DATABASE=S330 Printer
 
+usb:v04A9p1075*
+ ID_MODEL_FROM_DATABASE=Sony MPR-505
+
 usb:v04A9p1076*
  ID_MODEL_FROM_DATABASE=i70
 
@@ -12101,6 +12185,9 @@ usb:v04A9p178D*
 usb:v04A9p180B*
  ID_MODEL_FROM_DATABASE=PIXMA MG3000 series
 
+usb:v04A9p183B*
+ ID_MODEL_FROM_DATABASE=PIXMA MG3110 Series
+
 usb:v04A9p1856*
  ID_MODEL_FROM_DATABASE=PIXMA TS6250
 
@@ -12122,6 +12209,9 @@ usb:v04A9p1906*
 usb:v04A9p1907*
  ID_MODEL_FROM_DATABASE=CanoScan LiDE 700F
 
+usb:v04A9p1908*
+ ID_MODEL_FROM_DATABASE=CanoScan 9000F
+
 usb:v04A9p1909*
  ID_MODEL_FROM_DATABASE=CanoScan LiDE 110
 
@@ -13805,6 +13895,9 @@ usb:v04B0p0436*
 usb:v04B0p043F*
  ID_MODEL_FROM_DATABASE=D5600
 
+usb:v04B0p0455*
+ ID_MODEL_FROM_DATABASE=Z50II
+
 usb:v04B0p0F03*
  ID_MODEL_FROM_DATABASE=PD-10 Wireless Printer Adapter
 
@@ -14663,9 +14756,15 @@ usb:v04B8p0892*
 usb:v04B8p0893*
  ID_MODEL_FROM_DATABASE=EP-774A
 
+usb:v04B8p08D1*
+ ID_MODEL_FROM_DATABASE=L220/L360 Series
+
 usb:v04B8p0E03*
  ID_MODEL_FROM_DATABASE=Thermal Receipt Printer [TM-T20]
 
+usb:v04B8p0E31*
+ ID_MODEL_FROM_DATABASE=Thermal Receipt Printer [TM-L100]
+
 usb:v04B8p1114*
  ID_MODEL_FROM_DATABASE=XP-440 [Expression Home Small-in-One Printer]
 
@@ -14678,6 +14777,24 @@ usb:v04B8p1129*
 usb:v04B8p1168*
  ID_MODEL_FROM_DATABASE=Workforce WF-7820/7840 Series
 
+usb:v04B8p1186*
+ ID_MODEL_FROM_DATABASE=ET-2820 Series [ET-2820 EcoTank All-in-One]
+
+usb:v04B8p118A*
+ ID_MODEL_FROM_DATABASE=ET-2810/L3250 Series [EcoTank ET-2810/L3250]
+
+usb:v04B8p118B*
+ ID_MODEL_FROM_DATABASE=ET-2850/L4260 Series [EcoTank ET-2850/L4260]
+
+usb:v04B8p11B0*
+ ID_MODEL_FROM_DATABASE=XP-4200 Series [Expression Home XP-4200]
+
+usb:v04B8p11B9*
+ ID_MODEL_FROM_DATABASE=ET-2830/L3550 Series [EcoTank ET-2830/L3550]
+
+usb:v04B8p11C8*
+ ID_MODEL_FROM_DATABASE=ET-2860/L3270 Series [EcoTank ET-2860/L3270]
+
 usb:v04B9*
  ID_VENDOR_FROM_DATABASE=Rainbow Technologies, Inc.
 
@@ -14930,6 +15047,15 @@ usb:v04BFp1304*
 usb:v04BFp1305*
  ID_MODEL_FROM_DATABASE=i3 Multi Sensing Module
 
+usb:v04BFp1400*
+ ID_MODEL_FROM_DATABASE=Javelin Module Recovery
+
+usb:v04BFp1401*
+ ID_MODEL_FROM_DATABASE=Javelin Module
+
+usb:v04BFp1500*
+ ID_MODEL_FROM_DATABASE=Gas sensor demo board
+
 usb:v04C1*
  ID_VENDOR_FROM_DATABASE=U.S. Robotics (3Com)
 
@@ -15044,9 +15170,15 @@ usb:v04C5p125A*
 usb:v04C5p132E*
  ID_MODEL_FROM_DATABASE=fi-7160
 
+usb:v04C5p1526*
+ ID_MODEL_FROM_DATABASE=PalmSecure-F Pro
+
 usb:v04C5p159F*
  ID_MODEL_FROM_DATABASE=ScanSnap iX1500
 
+usb:v04C5p15FF*
+ ID_MODEL_FROM_DATABASE=Fi-8170 Document Scanner [Ricoh fi-8170: High Performance Desktop Scanner - PFU]
+
 usb:v04C5p200F*
  ID_MODEL_FROM_DATABASE=Sigma DP2 (Mass Storage)
 
@@ -15143,6 +15275,9 @@ usb:v04CAp3014*
 usb:v04CAp3015*
  ID_MODEL_FROM_DATABASE=Qualcomm Atheros QCA9377 Bluetooth
 
+usb:v04CAp3802*
+ ID_MODEL_FROM_DATABASE=MediaTek Bluetooth MT7921
+
 usb:v04CAp7022*
  ID_MODEL_FROM_DATABASE=HP HD Webcam
 
@@ -45938,6 +46073,24 @@ usb:v0E25*
 usb:v0E26*
  ID_VENDOR_FROM_DATABASE=J-Phone East Co., Ltd
 
+usb:v0E2C*
+ ID_VENDOR_FROM_DATABASE=Materialise Motion NV
+
+usb:v0E2Cp0012*
+ ID_MODEL_FROM_DATABASE=footscan pressure plate (0.5m)
+
+usb:v0E2Cp0013*
+ ID_MODEL_FROM_DATABASE=footscan pressure plate (1.0m)
+
+usb:v0E2Cp0018*
+ ID_MODEL_FROM_DATABASE=footscan 2D interface box
+
+usb:v0E2Cp0020*
+ ID_MODEL_FROM_DATABASE=footscan pressure plate (1.5m)
+
+usb:v0E2Cp002D*
+ ID_MODEL_FROM_DATABASE=footscan heavy duty pressure plate (1.0m)
+
 usb:v0E2E*
  ID_VENDOR_FROM_DATABASE=Brady Worldwide, Inc.
 
diff -pruN 257.7-1/hwdb.d/60-autosuspend-fingerprint-reader.hwdb 257.9-0ubuntu2/hwdb.d/60-autosuspend-fingerprint-reader.hwdb
--- 257.7-1/hwdb.d/60-autosuspend-fingerprint-reader.hwdb	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/60-autosuspend-fingerprint-reader.hwdb	2025-09-03 18:35:40.000000000 +0000
@@ -188,6 +188,7 @@ usb:v2808pA78A*
 # Supported by libfprint driver fpcmoc
 usb:v10A5pFFE0*
 usb:v10A5pA305*
+usb:v10A5pA306*
 usb:v10A5pDA04*
 usb:v10A5pD805*
 usb:v10A5pD205*
@@ -259,6 +260,8 @@ usb:v06CBp0104*
 usb:v06CBp0106*
 usb:v06CBp0107*
 usb:v06CBp0108*
+usb:v06CBp0109*
+usb:v06CBp010A*
 usb:v06CBp0123*
 usb:v06CBp0124*
 usb:v06CBp0126*
@@ -269,6 +272,7 @@ usb:v06CBp016C*
 usb:v06CBp0173*
 usb:v06CBp0174*
 usb:v06CBp019D*
+usb:v06CBp019F*
  ID_AUTOSUSPEND=1
  ID_PERSIST=0
 
diff -pruN 257.7-1/hwdb.d/60-autosuspend.hwdb 257.9-0ubuntu2/hwdb.d/60-autosuspend.hwdb
--- 257.7-1/hwdb.d/60-autosuspend.hwdb	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/60-autosuspend.hwdb	2025-09-03 18:35:40.000000000 +0000
@@ -96,6 +96,10 @@ usb:v2CB7p0007*
  ID_AUTOSUSPEND=1
  ID_AUTOSUSPEND_DELAY_MS=7000
 
+# Dell Computer Corp. DW5826e Qualcomm Snapdragon X12 Global LTE-A
+usb:v413Cp8217*
+ ID_AUTOSUSPEND=1
+
 #########################################
 # Wacom
 #########################################
diff -pruN 257.7-1/hwdb.d/60-evdev.hwdb 257.9-0ubuntu2/hwdb.d/60-evdev.hwdb
--- 257.7-1/hwdb.d/60-evdev.hwdb	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/60-evdev.hwdb	2025-09-03 18:35:40.000000000 +0000
@@ -749,6 +749,7 @@ evdev:name:AlpsPS/2 ALPS GlidePoint:dmi:
 # Lenovo Thinkpad T490 and T14/P14s Gen1/2
 evdev:name:SynPS/2 Synaptics TouchPad:dmi:*:svnLENOVO:*pvrThinkPadT490:*
 evdev:name:SynPS/2 Synaptics TouchPad:dmi:*:svnLENOVO:*pvrThinkPadT14Gen1:*
+evdev:name:SynPS/2 Synaptics TouchPad:dmi:*:svnLENOVO:*pvrThinkPadT14Gen2a:*
 evdev:name:SynPS/2 Synaptics TouchPad:dmi:*:svnLENOVO:*pvrThinkPadP14sGen1:*
 evdev:name:SynPS/2 Synaptics TouchPad:dmi:*:svnLENOVO:*pvrThinkPadP14sGen2a:*
  EVDEV_ABS_00=::44
diff -pruN 257.7-1/hwdb.d/60-keyboard.hwdb 257.9-0ubuntu2/hwdb.d/60-keyboard.hwdb
--- 257.7-1/hwdb.d/60-keyboard.hwdb	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/60-keyboard.hwdb	2025-09-03 18:35:40.000000000 +0000
@@ -155,8 +155,8 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:p
 # Acer Aspire One AO532h
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnAO532h:*
  KEYBOARD_KEY_84=bluetooth
- KEYBOARD_KEY_ce=unknown  # Brightness Up, also emitted by acpi-video, ignore
- KEYBOARD_KEY_ef=unknown  # Brightness Down, also emitted by acpi-video, ignore
+ KEYBOARD_KEY_ce=unknown                                # Brightness Up, also emitted by acpi-video, ignore
+ KEYBOARD_KEY_ef=unknown                                # Brightness Down, also emitted by acpi-video, ignore
 
 # Acer Aspire One AOD270 (Atom N2600) and its Packard Bell Dot SC rebrand
 evdev:name:Acer WMI hotkeys:dmi:bvn*:bvr*:bd*:svnAcer*:pnAOD270*:*
@@ -165,8 +165,8 @@ evdev:name:Acer WMI hotkeys:dmi:*:svnPac
 
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnAOD270*:*
 evdev:atkbd:dmi:*:svnPackardBell:pndots:*:rvnPackardBell:rnSJE01_CT:*
- KEYBOARD_KEY_ce=unknown  # Brightness Up, also emitted by acpi-video, ignore
- KEYBOARD_KEY_ef=unknown  # Brightness Down, also emitted by acpi-video, ignore
+ KEYBOARD_KEY_ce=unknown                                # Brightness Up, also emitted by acpi-video, ignore
+ KEYBOARD_KEY_ef=unknown                                # Brightness Down, also emitted by acpi-video, ignore
 
 # Predator PT314-52s
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnPredator*PT314-52s:pvr*
@@ -243,6 +243,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:p
 # Nitro ANV15-51
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnNitro*ANV*15-51:pvr*
  KEYBOARD_KEY_66=micmute                                # Microphone mute button
+ KEYBOARD_KEY_f5=prog1                                  # NitroSense button
 
 ###########################################################
 # Alienware
@@ -250,7 +251,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:p
 
 # Alienware/Dell reserves these keys; safe to apply on all their devices
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAlienware*:pn*:*
- KEYBOARD_KEY_68=!prog3                                 # Fn+f1 Performance mode toggle
+ KEYBOARD_KEY_68=!performance                           # Fn+f1 Performance mode toggle
  KEYBOARD_KEY_81=touchpad_toggle                        # Touchpad toggle
  KEYBOARD_KEY_8a=ejectcd
  KEYBOARD_KEY_92=macro1                                 # Fn+f2
@@ -284,6 +285,9 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnASUS:pn
  KEYBOARD_KEY_ee=volumedown
  KEYBOARD_KEY_ef=mute
 
+evdev:name:Asus WMI hotkeys:dmi:bvn*:bvr*:bd*:svnASUS*:pn*M1607KA*:*
+ KEYBOARD_KEY_7e=prog2                                  # Fn+F8, launch emoji keyboard
+
 # Asus TF103C misses the home button in its PNP0C40 GPIO resources
 # causing the volume-button mappings to be off by one, correct this
 evdev:name:gpio-keys:phys:gpio-keys/input0:ev:3:dmi:*:svnASUSTeKCOMPUTERINC.:pnTF103C*:*
@@ -303,10 +307,10 @@ evdev:name:gpio-keys:phys:gpio-keys/inpu
 # All four of these buttons generate a multi-scancode sequence
 # consisting of Left_Meta, Right_Ctrl and another scancode.
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAYANEO:pnKUN:pvr*
- KEYBOARD_KEY_18=f15                              # LC (next to the left shoulder button)
- KEYBOARD_KEY_20=f16                              # RC (next to the right shoulder button)
- KEYBOARD_KEY_28=f17                              # Ayaneo (lower-right corner of screen)
- KEYBOARD_KEY_30=f18                              # Touchpad Mode (top-right corner of screen)
+ KEYBOARD_KEY_18=f15                                    # LC (next to the left shoulder button)
+ KEYBOARD_KEY_20=f16                                    # RC (next to the right shoulder button)
+ KEYBOARD_KEY_28=f17                                    # Ayaneo (lower-right corner of screen)
+ KEYBOARD_KEY_30=f18                                    # Touchpad Mode (top-right corner of screen)
 
 # Most AYANEO devices expose an AT Translated Set 2 Keyboard
 # for either three or four additional buttons not available
@@ -315,10 +319,10 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAYANEO:
 # depend on the model, but the final scancode is always the
 # same.
 evdev:name:AT Translated Set 2 keyboard:dmi:*:svnAYANEO:*
- KEYBOARD_KEY_66=f15                            # LC (All models)
- KEYBOARD_KEY_67=f16                            # RC (All models)
- KEYBOARD_KEY_68=f17                            # Ayaneo (All models)
- KEYBOARD_KEY_69=f18                            # Touchpad Mode (Kun only)
+ KEYBOARD_KEY_66=f15                                    # LC (All models)
+ KEYBOARD_KEY_67=f16                                    # RC (All models)
+ KEYBOARD_KEY_68=f17                                    # Ayaneo (All models)
+ KEYBOARD_KEY_69=f18                                    # Touchpad Mode (Kun only)
 
 ###########################################################
 # BenQ
@@ -392,7 +396,7 @@ evdev:name:gpio-keys:phys:gpio-keys/inpu
 ###########################################################
 
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnDell*:pn*:*
- KEYBOARD_KEY_68=!prog2                                 # G-Mode (Dell-specific)
+ KEYBOARD_KEY_68=!performance                           # G-Mode (Dell-specific)
  KEYBOARD_KEY_81=playpause                              # Play/Pause
  KEYBOARD_KEY_82=stopcd                                 # Stop
  KEYBOARD_KEY_83=previoussong                           # Previous song
@@ -432,10 +436,10 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnDell*:p
 
 # Dell Inspiron 11 3168
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnDell*:pnInspiron11-3168:pvr*
- KEYBOARD_KEY_c7=!home                                 # Fn-LeftArrow
- KEYBOARD_KEY_cf=!end                                  # Fn-RightArrow
- KEYBOARD_KEY_c9=!pageup                               # Fn-UpArrow
- KEYBOARD_KEY_d1=!pagedown                             # Fn-DownArrow
+ KEYBOARD_KEY_c7=!home                                  # Fn-LeftArrow
+ KEYBOARD_KEY_cf=!end                                   # Fn-RightArrow
+ KEYBOARD_KEY_c9=!pageup                                # Fn-UpArrow
+ KEYBOARD_KEY_d1=!pagedown                              # Fn-DownArrow
 
 # Dell Inspiron 1520 and Latitude 2110
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnDell*:pnInspiron*1520:*
@@ -504,7 +508,7 @@ evdev:name:Dell Privacy Driver:dmi:bvn*:
 
 # Dell Professional Sound Bar AE515
 evdev:input:b0003v413CpA506*
- KEYBOARD_KEY_b002f=micmute                            # Mic mute toggle
+ KEYBOARD_KEY_b002f=micmute                             # Mic mute toggle
 
 ###########################################################
 # Everex
@@ -703,10 +707,10 @@ evdev:name:Intel HID events:dmi:bvn*:bvr
 
 # HP Elite x2 1013 G3
 evdev:atkbd:dmi:bvn*:bvr*:svnHP*:pnHPElitex21013G3:*
- KEYBOARD_KEY_f8=unknown                               # rfkill is also reported by HP Wireless hotkeys
+ KEYBOARD_KEY_f8=unknown                                # rfkill is also reported by HP Wireless hotkeys
  KEYBOARD_KEY_64=calendar
- KEYBOARD_KEY_81=micmute                               # Microphone mute button
- KEYBOARD_KEY_ee=switchvideomode                       # Switch display outputs
+ KEYBOARD_KEY_81=micmute                                # Microphone mute button
+ KEYBOARD_KEY_ee=switchvideomode                        # Switch display outputs
  KEYBOARD_KEY_92=brightnessdown
  KEYBOARD_KEY_97=brightnessup
 
@@ -741,14 +745,14 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett
 evdev:atkbd:dmi:bvncoreboot:bvr*:bd*:svnHewlett-Packard*:pn*EliteBook2170p:*
 evdev:atkbd:dmi:bvncoreboot:bvr*:bd*:svnHP*:pn*EliteBook2170p:*
  KEYBOARD_KEY_66=backspace
- KEYBOARD_KEY_be=battery		# Fn+F2
- KEYBOARD_KEY_d7=switchvideomode	# Fn+F4
- KEYBOARD_KEY_a3=mute			# Fn+F5
- KEYBOARD_KEY_a1=volumedown		# Fn+F6
- KEYBOARD_KEY_a2=volumeup		# Fn+F7
- KEYBOARD_KEY_a4=brightnessdown		# Fn+F9
- KEYBOARD_KEY_c3=brightnessup		# Fn+F10
- KEYBOARD_KEY_e3=wlan			# Fn+F12
+ KEYBOARD_KEY_be=battery                                # Fn+F2
+ KEYBOARD_KEY_d7=switchvideomode                        # Fn+F4
+ KEYBOARD_KEY_a3=mute                                   # Fn+F5
+ KEYBOARD_KEY_a1=volumedown                             # Fn+F6
+ KEYBOARD_KEY_a2=volumeup                               # Fn+F7
+ KEYBOARD_KEY_a4=brightnessdown                         # Fn+F9
+ KEYBOARD_KEY_c3=brightnessup                           # Fn+F10
+ KEYBOARD_KEY_e3=wlan                                   # Fn+F12
 
 # Elitebook 2760p
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*2760p*:*
@@ -1126,8 +1130,8 @@ evdev:atkbd:dmi:bvn*:bvr*:svnLENOVO:pn21
  KEYBOARD_KEY_b0=!volumeup
 
 evdev:atkbd:dmi:*:svnLENOVO:*:pvrLenovoYoga300-11IBR:*
- KEYBOARD_KEY_62=unknown  # Touchpad on, also emitted by "Ideapad extra buttons", ignore
- KEYBOARD_KEY_63=unknown  # Touchpad off, also emitted by "Ideapad extra buttons", ignore
+ KEYBOARD_KEY_62=unknown                                # Touchpad on, also emitted by "Ideapad extra buttons", ignore
+ KEYBOARD_KEY_63=unknown                                # Touchpad off, also emitted by "Ideapad extra buttons", ignore
 
 # Lenovo Y50-70
 evdev:atkbd:dmi:bvn*:bvr*:svnLENOVO*:pn*20378*:pvr*
@@ -1273,10 +1277,10 @@ evdev:input:b0003v046Dp0056*
 evdev:input:b0003v046Dp0057*
  KEYBOARD_KEY_c1041=battery                             # Battery icon (Fn + F1)
 
-#KEYBOARD_KEY_c101d=scrolldown   # Button below scrollwheel (see note above)
-#KEYBOARD_KEY_c101e=scrollup     # Button above scrollwheel (see note above)
-#KEYBOARD_KEY_c1022=scrollleft   # Left click on scroll-wheel (see note above)
-#KEYBOARD_KEY_c1024=scrollright  # Right click on scroll-wheel (see note above)
+#KEYBOARD_KEY_c101d=scrolldown                          # Button below scrollwheel (see note above)
+#KEYBOARD_KEY_c101e=scrollup                            # Button above scrollwheel (see note above)
+#KEYBOARD_KEY_c1022=scrollleft                          # Left click on scroll-wheel (see note above)
+#KEYBOARD_KEY_c1024=scrollright                         # Right click on scroll-wheel (see note above)
 
 # MX3200 keyboard (27 MHz, modelnumber Y-RAV80)
 evdev:input:b0003v046Dp005C*
@@ -1801,7 +1805,7 @@ evdev:input:b0003v258Ap001E*
 ###########################################################
 
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svn*:pn*:pvr*:rvnQuanta:rn30B7:rvr65.2B:*
- KEYBOARD_KEY_88=media                                  # "quick play
+ KEYBOARD_KEY_88=media                                  # quick play
 
 ###########################################################
 # Redmi
@@ -1841,17 +1845,17 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svn[sS][aA
 
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*356V[45]*:pvr*
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*355V[45]*:pvr*
- KEYBOARD_KEY_ce=!prog1                  # Fn+F1  launch control setting
- KEYBOARD_KEY_89=!brightnessdown         # Fn+F2  brightness down
- KEYBOARD_KEY_88=!brightnessup           # Fn+F3  brightness up
- KEYBOARD_KEY_82=!switchvideomode        # Fn+F4  display toggle
- KEYBOARD_KEY_f7=!touchpad_on            # Fn+F5  touchpad on
- KEYBOARD_KEY_f9=!touchpad_off           # Fn+F5  touchpad off
- KEYBOARD_KEY_a0=!mute                   # Fn+F6  mute
- KEYBOARD_KEY_ae=!volumedown             # Fn+F7  volume down
- KEYBOARD_KEY_b0=!volumeup               # Fn+F8  volume up
- KEYBOARD_KEY_b3=!prog2                  # Fn+F11 toggle fan/cool mode
- KEYBOARD_KEY_d5=!wlan                   # Fn+F12 toggle wifi
+ KEYBOARD_KEY_ce=!prog1                                 # Fn+F1  launch control setting
+ KEYBOARD_KEY_89=!brightnessdown                        # Fn+F2  brightness down
+ KEYBOARD_KEY_88=!brightnessup                          # Fn+F3  brightness up
+ KEYBOARD_KEY_82=!switchvideomode                       # Fn+F4  display toggle
+ KEYBOARD_KEY_f7=!touchpad_on                           # Fn+F5  touchpad on
+ KEYBOARD_KEY_f9=!touchpad_off                          # Fn+F5  touchpad off
+ KEYBOARD_KEY_a0=!mute                                  # Fn+F6  mute
+ KEYBOARD_KEY_ae=!volumedown                            # Fn+F7  volume down
+ KEYBOARD_KEY_b0=!volumeup                              # Fn+F8  volume up
+ KEYBOARD_KEY_b3=!prog2                                 # Fn+F11 toggle fan/cool mode
+ KEYBOARD_KEY_d5=!wlan                                  # Fn+F12 toggle wifi
 
 # Series 5
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*530U*:*
@@ -2012,6 +2016,13 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnT-bao:p
  KEYBOARD_KEY_76=touchpad_toggle                        # Touchpad toggle
 
 ###########################################################
+# TongFang
+###########################################################
+# TongFang GX4 (X4SP4NAL)
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAiStone:pnX4SP4NAL:*
+ KEYBOARD_KEY_f8=fn
+
+###########################################################
 # Toshiba
 ###########################################################
 
@@ -2287,6 +2298,11 @@ evdev:name:SIPODEV USB Composite Device:
  KEYBOARD_KEY_7006d=prog3                               # Programmable button
  KEYBOARD_KEY_7006e=prog4                               # Programmable button
 
+# Positivo (K116J)
+evdev:name:AT Translated Set 2 keyboard:dmi:bvn*:svnPositivo*:pn*:pvr*:rvnPositivo*:rnK116J*
+ KEYBOARD_KEY_69=www
+ KEYBOARD_KEY_6e=search
+
 ###########################################################
 # Multilaser
 ###########################################################
@@ -2326,7 +2342,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnDIXONSP
 # The layout must be an xkb compatible layout (defined with XKB_FIXED_LAYOUT),
 # with an accompanying variant (defined with XKB_FIXED_VARIANT) if necessary.
 
-# Yubico Yubico Yubikey II"
+# Yubico Yubico Yubikey II
 evdev:input:b0003v1050p0010*
 # Yubico Yubikey NEO OTP+CCID
 evdev:input:b0003v1050p0111*
diff -pruN 257.7-1/hwdb.d/60-sensor.hwdb 257.9-0ubuntu2/hwdb.d/60-sensor.hwdb
--- 257.7-1/hwdb.d/60-sensor.hwdb	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/60-sensor.hwdb	2025-09-03 18:35:40.000000000 +0000
@@ -157,7 +157,7 @@ sensor:modalias:acpi:INVN6500*:dmi:*svnA
 
 # Asus Transformer Mini T103HAF
 sensor:modalias:platform:HID-SENSOR-200073*:dmi:*svn*ASUSTeK*:pnT103HAF:*
- ACCEL_MOUNT_MATRIX=0, -1, 0; 1, 0, 0; 0, 0, -1 
+ ACCEL_MOUNT_MATRIX=0, -1, 0; 1, 0, 0; 0, 0, -1
 
 sensor:modalias:acpi:INVN6500*:dmi:*svnASUSTeK*:*pnTP201SA:*
 sensor:modalias:acpi:INVN6500*:dmi:*svnASUSTeK*:pn*E205SA:*
@@ -524,7 +524,7 @@ sensor:modalias:acpi:KIOX000A*:dmi:*:svn
 # Exo
 #########################################
 
-# EXO Wings 2in1 w1125 
+# EXO Wings 2in1 w1125
 sensor:modalias:acpi:SMO8500*:dmi:*:svnEXO*:pnWings:*
  ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, 1, 0; 0, 0, 1
 
@@ -654,7 +654,7 @@ sensor:modalias:acpi:SMO8840*:dmi:*:svnH
 sensor:modalias:acpi:KIOX000A*:dmi:bvnAmericanMegatrendsInc.:*:svnTobefilledbyO.E.M.:pnTW891:pvrTobefilledbyO.E.M.:rvnTobefilledbyO.E.M.:rnTW891:rvr1.0:cvnToBeFilledByO.E.M.:ct3:cvrToBeFilledByO.E.M.:*
  ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
 
-# I.T.Works TW701 7" windows tablet, same hw as Trekstor ST70416-6
+# I.T.Works TW701 7 inch windows tablet, same hw as Trekstor ST70416-6
 sensor:modalias:acpi:BMA250*:dmi:*:bvritWORKS.G.WI71C.JGBMRB*:*:svnInsyde:pni71c:*
  ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
 
@@ -662,6 +662,10 @@ sensor:modalias:acpi:BMA250*:dmi:*:bvrit
 # Irbis
 #########################################
 
+#TW43
+sensor:modalias:acpi:BMA250E*:dmi:*:svnIRBIS:pnTW43:*
+ ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, -1
+
 #TW90
 sensor:modalias:acpi:BOSC0200*:dmi:*:svnIRBIS:pnTW90:*
  ACCEL_MOUNT_MATRIX=0, 1, 0; -1, 0, 0; 0, 0, 1
@@ -867,6 +871,14 @@ sensor:modalias:acpi:KIOX000A*:dmi:*:rvn
  ACCEL_LOCATION=display
 
 #########################################
+# Microtech
+#########################################
+
+# Microtech e-tab Pro
+sensor:modalias:acpi:KIOX000A*:dmi:*:svnMicrotech:pne-tabPro:*
+ ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, 1, 0; 0, 0, 1
+
+#########################################
 # MPMAN
 #########################################
 
@@ -900,7 +912,7 @@ sensor:modalias:acpi:KIOX010A*:dmi:*:svn
 # Nuvision (TMax)
 #########################################
 
-# Nuvision/TMAX 8" Windows signature edition. TM800W560L
+# Nuvision/TMAX 8 inch Windows signature edition. TM800W560L
 sensor:modalias:acpi:KIOX000A*:dmi:*:svnTMAX:pnTM800W560L:*
  ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
 
diff -pruN 257.7-1/hwdb.d/70-maker-tools.hwdb 257.9-0ubuntu2/hwdb.d/70-maker-tools.hwdb
--- 257.7-1/hwdb.d/70-maker-tools.hwdb	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/70-maker-tools.hwdb	2025-09-03 18:35:40.000000000 +0000
@@ -68,5 +68,5 @@ usb:v2B71p000E*
 # PowerSpec Ultra 3DPrinter
 usb:v0315p0001*
 usb:v2B71p00F6*
-usb:v2B71p00FF
+usb:v2B71p00FF*
  ID_MAKER_TOOL=1
diff -pruN 257.7-1/hwdb.d/70-mouse.hwdb 257.9-0ubuntu2/hwdb.d/70-mouse.hwdb
--- 257.7-1/hwdb.d/70-mouse.hwdb	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/70-mouse.hwdb	2025-09-03 18:35:40.000000000 +0000
@@ -192,6 +192,14 @@ mouse:bluetooth:v05acp030d:name:*:*
  MOUSE_DPI=1300@1000
 
 ##########################################
+# Asus
+##########################################
+
+# Asus Cerberus
+mouse:usb:v04d9pa0d6:name:E-Signal/A-One USB Gaming Mouse:*
+ MOUSE_DPI=800@500 *1350@500 1600@500 2650@500
+
+##########################################
 # Cherry
 ##########################################
 
@@ -388,6 +396,10 @@ mouse:usb:v17efp6045:name:Lenovo USB Las
 mouse:usb:v17efp6044:name:ThinkPad USB Laser Mouse:*
  MOUSE_DPI=1200@125
 
+# Lenovo Essential USB Mouse (SM-8823)
+mouse:usb:v17efp608d:name:PixArt Lenovo USB Optical Mouse:*
+ MOUSE_DPI=1600@125
+
 ##########################################
 # Logitech
 ##########################################
@@ -675,6 +687,10 @@ mouse:usb:v046dpc517:name:Logitech USB R
 mouse:usb:v046dpc046:name:Logitech USB Optical Mouse:*
  MOUSE_DPI=1000@125
 
+# Logitech RX1500
+mouse:usb:v046dpc061:name:Logitech USB Laser Mouse:*
+ MOUSE_DPI=1000@125
+
 # Logitech M100 Optical Mouse
 mouse:usb:v046dpc05a:name:Logitech USB Optical Mouse:*
  MOUSE_DPI=1000@125
@@ -833,6 +849,14 @@ mouse:usb:v1532p0042:name:Razer Razer Ab
 mouse:usb:v1532p0029:name:Razer Razer DeathAdder:*
  MOUSE_DPI=3500@1000
 
+# Razer Cobra RZ04-03750300-R3U1
+mouse:usb:v1532p00a3:name:Razer Razer Cobra:*
+ MOUSE_DPI=400@1000 800@1000 *1600@1000 3200@1000 6400@1000
+
+# Razer Basilisk V3
+mouse:usb:v1532p0099:name:Razer Razer Basilisk V3:*
+ MOUSE_DPI=400@125 800@125 1600@125 3200@125 6400@125 400@500 800@500 1600@500 3200@500 6400@500 400@1000 800@1000 *1600@1000 3200@1000 6400@1000
+
 ##########################################
 # Roccat
 ##########################################
diff -pruN 257.7-1/hwdb.d/70-software-radio.hwdb 257.9-0ubuntu2/hwdb.d/70-software-radio.hwdb
--- 257.7-1/hwdb.d/70-software-radio.hwdb	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/70-software-radio.hwdb	2025-09-03 18:35:40.000000000 +0000
@@ -22,21 +22,6 @@
 #   ID_SOFTWARE_RADIO=0|1
 
 ##########################################
-# Nuand
-##########################################
-# bladeRF 1.x
-usb:v2CF0p5246*
- ID_SOFTWARE_RADIO=1
-
-# bladeRF 1.x (legacy)
-usb:v1D50p6066*
- ID_SOFTWARE_RADIO=1
-
-# bladeRF 2.0 micro
-usb:v2CF0p5250*
- ID_SOFTWARE_RADIO=1
-
-##########################################
 # Analog Devices
 ##########################################
 # ADI pluto SDR
@@ -68,6 +53,21 @@ usb:v3923p7814*
  ID_SOFTWARE_RADIO=1
 
 ##########################################
+# Nuand
+##########################################
+# bladeRF 1.x
+usb:v2CF0p5246*
+ ID_SOFTWARE_RADIO=1
+
+# bladeRF 1.x (legacy)
+usb:v1D50p6066*
+ ID_SOFTWARE_RADIO=1
+
+# bladeRF 2.0 micro
+usb:v2CF0p5250*
+ ID_SOFTWARE_RADIO=1
+
+##########################################
 # RTL-SDR
 ##########################################
 # original RTL2832U vid/pid (hama nano, for example)
diff -pruN 257.7-1/hwdb.d/acpi_id_registry.csv 257.9-0ubuntu2/hwdb.d/acpi_id_registry.csv
--- 257.7-1/hwdb.d/acpi_id_registry.csv	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/acpi_id_registry.csv	2025-09-03 18:35:40.000000000 +0000
@@ -135,4 +135,6 @@ IDEMIA,IDEM,06/26/2018
 "Areus GmbH",AREU,04/07/2025
 "Rockwell Automation, Inc",ROKL,04/18/2025
 "JUMPtec GmbH",JUMP,04/22/2025
-"Fsas Technologies Inc.",FSAS,04/30/2025
\ No newline at end of file
+"Fsas Technologies Inc.",FSAS,04/30/2025
+"JP Morgan Chase N.A.",JPMC,05/30/2025
+"Roku, Inc.",ROKU,07/15/2025
\ No newline at end of file
diff -pruN 257.7-1/hwdb.d/ma-large.txt 257.9-0ubuntu2/hwdb.d/ma-large.txt
--- 257.7-1/hwdb.d/ma-large.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/ma-large.txt	2025-09-03 18:35:40.000000000 +0000
@@ -245,12 +245,6 @@ E4F27C     (base 16)		Juniper Networks
 				Sunnyvale  CA  94089
 				US
 
-DC-7C-F7   (hex)		China Mobile Group Device Co.,Ltd.
-DC7CF7     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 90-6C-4B   (hex)		Advance Security Electronics
 906C4B     (base 16)		Advance Security Electronics
 				8228 NW South River Dr
@@ -941,12 +935,6 @@ B0D888     (base 16)		Panasonic Automoti
 				Matsumoto City  Nagano  399-8730
 				JP
 
-28-EC-22   (hex)		eero inc.
-28EC22     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 40-D4-F6   (hex)		Honor Device Co., Ltd.
 40D4F6     (base 16)		Honor Device Co., Ltd.
 				Suite 3401, Unit A, Building 6, Shum Yip Sky Park, No. 8089, Hongli West Road, Xiangmihu Street, Futian District 
@@ -1553,12 +1541,6 @@ E8EBDD     (base 16)		Guangzhou Qingying
 				Hangzhou  Zhejiang  310052
 				CN
 
-00-50-CA   (hex)		DZS Inc.
-0050CA     (base 16)		DZS Inc.
-				680 CENTRAL AVENUE - STE. #301
-				DOVER  NH  03820
-				US
-
 74-EE-8D   (hex)		Apollo Intelligent Connectivity (Beijing) Technology Co., Ltd.
 74EE8D     (base 16)		Apollo Intelligent Connectivity (Beijing) Technology Co., Ltd.
 				Baidu Technology Park Building No.2 No.10 Xibeiwang East Road Haidian District
@@ -2441,12 +2423,6 @@ C4A052     (base 16)		Motorola Mobility
 				Hsinchu City  Hsinchu  30071
 				TW
 
-78-76-89   (hex)		eero inc.
-787689     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 80-76-C2   (hex)		GD Midea Air-Conditioning Equipment Co.,Ltd.
 8076C2     (base 16)		GD Midea Air-Conditioning Equipment Co.,Ltd.
 				Midea Global Innovation Center,Beijiao Town,Shunde
@@ -3683,12 +3659,6 @@ C09F51     (base 16)		SERNET (SUZHOU) TE
 				Qingdao  Shangdong  266510
 				CN
 
-84-70-D7   (hex)		eero inc.
-8470D7     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 58-1D-D8   (hex)		Sagemcom Broadband SAS
 581DD8     (base 16)		Sagemcom Broadband SAS
 				250, route de l'Empereur
@@ -3773,12 +3743,6 @@ E8D87E     (base 16)		Amazon Technologie
 				Kanata  Ontario  K2K 2E6
 				CA
 
-9C-57-BC   (hex)		eero inc.
-9C57BC     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 00-15-A6   (hex)		Digital Electronics Products Ltd.
 0015A6     (base 16)		Digital Electronics Products Ltd.
 				Room 301, 3 rd Floor, Tsun Yip Centre
@@ -4103,12 +4067,6 @@ C0C170     (base 16)		Shenzhen SuperElec
 				Piscataway  NJ  08554
 				US
 
-E8-EB-D3   (hex)		Mellanox Technologies, Inc.
-E8EBD3     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 E8-81-AB   (hex)		Beijing Sankuai Online Technology Co.,Ltd
 E881AB     (base 16)		Beijing Sankuai Online Technology Co.,Ltd
 				BC Building, China Electronic Science Taiji Information Technology Industry Base, Yard 7, Rongda Road, Chaoyang District
@@ -4151,12 +4109,6 @@ B0A4F0     (base 16)		HUAWEI TECHNOLOGIE
 				Rueil Malmaison Cedex  hauts de seine  92848
 				FR
 
-7C-6A-60   (hex)		China Mobile Group Device Co.,Ltd.
-7C6A60     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 B4-69-5F   (hex)		TCT mobile ltd
 B4695F     (base 16)		TCT mobile ltd
 				No.86 hechang 7th road, zhongkai, Hi-Tech District
@@ -4211,12 +4163,6 @@ A8537D     (base 16)		Mist Systems, Inc.
 				Cupertino  CA  95014
 				US
 
-30-34-22   (hex)		eero inc.
-303422     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 E4-DA-DF   (hex)		Taicang T&W Electronics
 E4DADF     (base 16)		Taicang T&W Electronics
 				89# Jiang Nan RD
@@ -4823,12 +4769,6 @@ A4EF15     (base 16)		AltoBeam (China) I
 				Kanata  Ontario  K2K 2E6
 				CA
 
-A8-61-DF   (hex)		China Mobile Group Device Co.,Ltd.
-A861DF     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 30-5A-99   (hex)		Sichuan Tianyi Comheart Telecom Co.,LTD
 305A99     (base 16)		Sichuan Tianyi Comheart Telecom Co.,LTD
 				No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County
@@ -5183,12 +5123,6 @@ D48A3B     (base 16)		HUNAN FN-LINK TECH
 				Oxford  ---  OX4 4GA
 				GB
 
-08-9B-F1   (hex)		eero inc.
-089BF1     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 78-44-4A   (hex)		Shenzhen Aiwinn information Technology Co., Ltd.
 78444A     (base 16)		Shenzhen Aiwinn information Technology Co., Ltd.
 				Room 1001, 10th floor, Building G3, TCL International E city, Shuguang community, Xili street, Nanshan district,
@@ -5291,12 +5225,6 @@ D03F27     (base 16)		Wyze Labs Inc
 				Kirkland  WA  98033
 				US
 
-50-29-7B   (hex)		China Mobile Group Device Co.,Ltd.
-50297B     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 30-03-C8   (hex)		CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
 3003C8     (base 16)		CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
 				B22 Building,NO.51 Tongle Road, Shajing Town, Jiangnan District, Nanning, Guangxi Province, China
@@ -6911,12 +6839,6 @@ E8D2FF     (base 16)		Sagemcom Broadband
 				Irvine  CA  92618
 				US
 
-D0-12-CB   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-D012CB     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 78-CF-2F   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
 78CF2F     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
@@ -7535,12 +7457,6 @@ B436D1     (base 16)		Renesas Electronic
 				Hangzhou  Zhejiang  310052
 				CN
 
-94-FF-61   (hex)		China Mobile Group Device Co.,Ltd.
-94FF61     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 DC-77-4C   (hex)		Cisco Systems, Inc
 DC774C     (base 16)		Cisco Systems, Inc
 				80 West Tasman Drive
@@ -7565,24 +7481,6 @@ A085FC     (base 16)		Microsoft Corporat
 				REDMOND  WA  98052
 				US
 
-14-A9-D0   (hex)		F5 Networks, Inc.
-14A9D0     (base 16)		F5 Networks, Inc.
-				801 5th Avenue
-				Seattle  WA  98104
-				US
-
-00-0A-49   (hex)		F5 Networks, Inc.
-000A49     (base 16)		F5 Networks, Inc.
-				401 Elliott Ave. W.
-				Seattle  WA  98119
-				US
-
-00-94-A1   (hex)		F5 Networks, Inc.
-0094A1     (base 16)		F5 Networks, Inc.
-				401 Elliott Ave. W.
-				Seattle  WA  98119
-				US
-
 80-F1-F1   (hex)		Tech4home, Lda
 80F1F1     (base 16)		Tech4home, Lda
 				Rua de Fundoes N151
@@ -8885,12 +8783,6 @@ F05CD5     (base 16)		Apple, Inc.
 				Tokyo    104-0061
 				JP
 
-6C-AE-F6   (hex)		eero inc.
-6CAEF6     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 C0-14-B8   (hex)		Nokia
 C014B8     (base 16)		Nokia
 				600 March Road
@@ -9059,12 +8951,6 @@ F86FDE     (base 16)		Shenzhen Goodix Te
 				Hsinchu    308
 				TW
 
-04-3F-72   (hex)		Mellanox Technologies, Inc.
-043F72     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 1C-4D-66   (hex)		Amazon Technologies Inc.
 1C4D66     (base 16)		Amazon Technologies Inc.
 				P.O Box 8102
@@ -9803,12 +9689,6 @@ E0EB62     (base 16)		Shanghai Hulu Devi
 				Guangzhou  Guangdong  511455
 				CN
 
-1C-41-76   (hex)		China Mobile Group Device Co.,Ltd.
-1C4176     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 48-21-6C   (hex)		China Mobile IOT Company Limited
 48216C     (base 16)		China Mobile IOT Company Limited
 				Building D3,No.8 Yangliu North Road,Yubei District 
@@ -10367,12 +10247,6 @@ B808CF     (base 16)		Intel Corporate
 				San Jose  CA  94568
 				US
 
-60-5F-8D   (hex)		eero inc.
-605F8D     (base 16)		eero inc.
-				500 Howard Street, Suite 900
-				SAN FRANCISCO  CA  94105
-				US
-
 C4-B3-6A   (hex)		Cisco Systems, Inc
 C4B36A     (base 16)		Cisco Systems, Inc
 				80 West Tasman Drive
@@ -10559,12 +10433,6 @@ B0518E     (base 16)		Holl technology CO
 				Reno  NV  89507
 				US
 
-98-9B-CB   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-989BCB     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 AC-F6-F7   (hex)		LG Electronics (Mobile Communications)
 ACF6F7     (base 16)		LG Electronics (Mobile Communications)
 				60-39, Gasan-dong, Geumcheon-gu
@@ -10904,12 +10772,6 @@ B4ED19     (base 16)		Pie Digital, Inc.
 				Kakuda  Miyagi-Pref  981-1595
 				JP
 
-AC-5A-EE   (hex)		China Mobile Group Device Co.,Ltd.
-AC5AEE     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 F0-51-EA   (hex)		Fitbit, Inc.
 F051EA     (base 16)		Fitbit, Inc.
 				199 Fremont Street, 14th Fl
@@ -12344,24 +12206,12 @@ B0EB57     (base 16)		HUAWEI TECHNOLOGIE
 				Dongguan    523808
 				CN
 
-18-69-DA   (hex)		China Mobile Group Device Co.,Ltd.
-1869DA     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 FC-A6-CD   (hex)		Fiberhome Telecommunication Technologies Co.,LTD
 FCA6CD     (base 16)		Fiberhome Telecommunication Technologies Co.,LTD
 				No.5 DongXin Road
 				Wuhan  Hubei  430074
 				CN
 
-44-C8-74   (hex)		China Mobile Group Device Co.,Ltd.
-44C874     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 74-C1-4F   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
 74C14F     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
@@ -12764,12 +12614,6 @@ F099B6     (base 16)		Apple, Inc.
 				Haidian District  Beijing  100085
 				CN
 
-C4-33-06   (hex)		China Mobile Group Device Co.,Ltd.
-C43306     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 98-45-62   (hex)		Shanghai Baud Data Communication Co.,Ltd.
 984562     (base 16)		Shanghai Baud Data Communication Co.,Ltd.
 				NO.123 JULI RD
@@ -16211,12 +16055,6 @@ B0F893     (base 16)		Shanghai MXCHIP In
 				Seoul    153777
 				KR
 
-00-02-C9   (hex)		Mellanox Technologies, Inc.
-0002C9     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 7C-A9-7D   (hex)		Objenious
 7CA97D     (base 16)		Objenious
 				20 rue de Troyon
@@ -20690,12 +20528,6 @@ B047BF     (base 16)		Samsung Electronic
 				Gwangjiu-si  Gyeonggi-do  464-921
 				KR
 
-7C-FE-90   (hex)		Mellanox Technologies, Inc.
-7CFE90     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 0C-75-6C   (hex)		Anaren Microwave, Inc.
 0C756C     (base 16)		Anaren Microwave, Inc.
 				6635 Kirkville Road
@@ -35759,12 +35591,6 @@ A09805     (base 16)		OpenVox Communicat
 				Taejeon  Republic  of Korea 305
 				KR
 
-00-01-D7   (hex)		F5 Networks, Inc.
-0001D7     (base 16)		F5 Networks, Inc.
-				1322 N. Whitman Lane
-				Liberty Lake  WA  99019
-				US
-
 00-01-DE   (hex)		Trango Systems, Inc.
 0001DE     (base 16)		Trango Systems, Inc.
 				9939 V/A Pasar
@@ -40346,12 +40172,6 @@ CC115A     (base 16)		Apple, Inc.
 				Shenzhen   Guangdong  518040
 				CN
 
-18-95-78   (hex)		DENSO Corporation
-189578     (base 16)		DENSO Corporation
-				1-1, Showa-cho
-				Kariya  Aichi  448-8661
-				JP
-
 14-7F-67   (hex)		LG Innotek
 147F67     (base 16)		LG Innotek
 				26, HANAMSANDAN 5BEON-RO
@@ -40430,12 +40250,6 @@ FCB585     (base 16)		Shenzhen Water Wor
 				Shenzhen  Guangdong  518109
 				CN
 
-D4-24-DD   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-D424DD     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 6C-51-E4   (hex)		Huawei Device Co., Ltd.
 6C51E4     (base 16)		Huawei Device Co., Ltd.
 				No.2 of Xincheng Road, Songshan Lake Zone
@@ -40478,12 +40292,6 @@ F4D58A     (base 16)		Palo Alto Networks
 				Santa Clara  CA  95054
 				US
 
-C8-C6-FE   (hex)		eero inc.
-C8C6FE     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 18-89-DF   (hex)		OMNIVISION
 1889DF     (base 16)		OMNIVISION
 				18F Attend on tower, 2-8-12, Shin Yokohama
@@ -42251,12 +42059,6 @@ ECFC2F     (base 16)		Sagemcom Broadband
 				Rueil Malmaison Cedex  hauts de seine  92848
 				FR
 
-2C-56-83   (hex)		China Mobile Group Device Co.,Ltd.
-2C5683     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 30-E3-A4   (hex)		Intel Corporate
 30E3A4     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
@@ -43715,12 +43517,6 @@ F43392     (base 16)		Cisco Systems, Inc
 				ShenZhen    518100
 				CN
 
-7C-8C-09   (hex)		Mellanox Technologies, Inc.
-7C8C09     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 44-3E-8A   (hex)		Texas Instruments
 443E8A     (base 16)		Texas Instruments
 				12500 TI Blvd
@@ -44360,12 +44156,6 @@ F09602     (base 16)		Earda Technologies
 				FUZHOU  FUJIAN  350002
 				CN
 
-30-29-2B   (hex)		eero inc.
-30292B     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco    94107
-				US
-
 C0-49-BD   (hex)		EM Microelectronic
 C049BD     (base 16)		EM Microelectronic
 				Rue des Sors 3
@@ -44588,12 +44378,6 @@ D80A42     (base 16)		Shanghai Lixun Inf
 				Irvine  CA  92606
 				US
 
-2C-C1-F4   (hex)		Nokia Solution and Networks Pvt Ltd
-2CC1F4     (base 16)		Nokia Solution and Networks Pvt Ltd
-				Plot 45, Fathima Nagar, Nemilicherry
-				Chennai  Tamilnadu  600044
-				IN
-
 CC-68-B6   (hex)		TP-Link Systems Inc
 CC68B6     (base 16)		TP-Link Systems Inc
 				5 Peters Canyon Rd Suit 300
@@ -44858,12 +44642,6 @@ A401DE     (base 16)		SERCOMM PHILIPPINE
 				Singapore    408533
 				SG
 
-C8-90-09   (hex)		Budderfly, LLC
-C89009     (base 16)		Budderfly, LLC
-				2 Trap Falls Road
-				Shelton  CT  06484
-				US
-
 A8-ED-71   (hex)		Analogue Enterprises Limited
 A8ED71     (base 16)		Analogue Enterprises Limited
 				2-6 Foo Ming Street, 2J Po Ming Building
@@ -44912,6 +44690,42 @@ CC03D9     (base 16)		Cisco Meraki
 				San Francisco    94158
 				US
 
+F0-40-EC   (hex)		RainX PTE. LTD.
+F040EC     (base 16)		RainX PTE. LTD.
+				83B Tanjong Pagar Road
+				Singapore    088504
+				SG
+
+C8-77-F3   (hex)		VusionGroup
+C877F3     (base 16)		VusionGroup
+				Kalsdorfer Straße 12
+				Fernitz-Mellach  Steiermark  8072
+				AT
+
+40-24-D2   (hex)		Huawei Device Co., Ltd.
+4024D2     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+1C-0E-AF   (hex)		Huawei Device Co., Ltd.
+1C0EAF     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+3C-77-87   (hex)		Huawei Device Co., Ltd.
+3C7787     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+8C-4E-46   (hex)		Motorola Mobility LLC, a Lenovo Company
+8C4E46     (base 16)		Motorola Mobility LLC, a Lenovo Company
+				222 West Merchandise Mart Plaza
+				Chicago  IL  60654
+				US
+
 A8-46-9D   (hex)		Cisco Meraki
 A8469D     (base 16)		Cisco Meraki
 				500 Terry A. Francois Blvd
@@ -44924,24 +44738,990 @@ A8469D     (base 16)		Cisco Meraki
 				San Francisco    94158
 				US
 
-F0-40-EC   (hex)		RainX PTE. LTD.
-F040EC     (base 16)		RainX PTE. LTD.
-				83B Tanjong Pagar Road
-				Singapore    088504
+38-70-F2   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+3870F2     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+C4-BB-03   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+C4BB03     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+24-60-78   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+246078     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+BC-2E-C3   (hex)		Shenzhen Tianruixiang Communication Equipment Co.,Ltd
+BC2EC3     (base 16)		Shenzhen Tianruixiang Communication Equipment Co.,Ltd
+				12/F, Building B,Longhua Digital Innovation Center,Longhua District, Shenzhen,China.
+				Shenzhen  Guangdong  518000
+				CN
+
+D0-12-CB   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+D012CB     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+D4-24-DD   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+D424DD     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+08-9B-F1   (hex)		eero inc.
+089BF1     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+30-34-22   (hex)		eero inc.
+303422     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+9C-57-BC   (hex)		eero inc.
+9C57BC     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+98-9B-CB   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+989BCB     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+84-70-D7   (hex)		eero inc.
+8470D7     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+78-76-89   (hex)		eero inc.
+787689     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+60-5F-8D   (hex)		eero inc.
+605F8D     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+6C-AE-F6   (hex)		eero inc.
+6CAEF6     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+7C-FE-90   (hex)		Mellanox Technologies, Inc.
+7CFE90     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+00-02-C9   (hex)		Mellanox Technologies, Inc.
+0002C9     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+C4-33-06   (hex)		China Mobile Group Device Co.,Ltd.
+C43306     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+18-69-DA   (hex)		China Mobile Group Device Co.,Ltd.
+1869DA     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+44-C8-74   (hex)		China Mobile Group Device Co.,Ltd.
+44C874     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+AC-5A-EE   (hex)		China Mobile Group Device Co.,Ltd.
+AC5AEE     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+50-29-7B   (hex)		China Mobile Group Device Co.,Ltd.
+50297B     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+A8-61-DF   (hex)		China Mobile Group Device Co.,Ltd.
+A861DF     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+7C-6A-60   (hex)		China Mobile Group Device Co.,Ltd.
+7C6A60     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+7C-8C-09   (hex)		Mellanox Technologies, Inc.
+7C8C09     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+D8-94-24   (hex)		Mellanox Technologies, Inc.
+D89424     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100 
+				Sunnyvale  CA  94085
+				US
+
+04-3F-72   (hex)		Mellanox Technologies, Inc.
+043F72     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+E8-EB-D3   (hex)		Mellanox Technologies, Inc.
+E8EBD3     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+DC-7C-F7   (hex)		China Mobile Group Device Co.,Ltd.
+DC7CF7     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+2C-56-83   (hex)		China Mobile Group Device Co.,Ltd.
+2C5683     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+1C-41-76   (hex)		China Mobile Group Device Co.,Ltd.
+1C4176     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+94-FF-61   (hex)		China Mobile Group Device Co.,Ltd.
+94FF61     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+28-EC-22   (hex)		eero inc.
+28EC22     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+C8-C6-FE   (hex)		eero inc.
+C8C6FE     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+30-29-2B   (hex)		eero inc.
+30292B     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+14-08-08   (hex)		Espressif Inc.
+140808     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+8C-E4-DB   (hex)		Shenzhen MiaoMing Intelligent Technology Co.,Ltd
+8CE4DB     (base 16)		Shenzhen MiaoMing Intelligent Technology Co.,Ltd
+				3F, Building 2, No. 1310, Kukeng Sightseeing Road, Kukeng Community, Guanlan Street, Longhua District
+				Shenzhen  Guangdong  518110
+				CN
+
+30-24-50   (hex)		Hangzhou Huacheng Network Technology Co.,Ltd
+302450     (base 16)		Hangzhou Huacheng Network Technology Co.,Ltd
+				13th Floor, Building 3, No. 582, Liye Road, Changhe Street, Binjiang District, Hangzhou, China (Zhejiang) Pilot Free Trade Zone
+				Hangzhou    311200
+				CN
+
+34-09-C9   (hex)		Dongguan Huayin Electronic Technology Co., Ltd.
+3409C9     (base 16)		Dongguan Huayin Electronic Technology Co., Ltd.
+				Room 101, No.8 Xinglong 3rd Road, Shipai Town
+				Dongguan  Guangdong  523000
+				CN
+
+70-85-6C   (hex)		Ruijie Networks Co.,LTD
+70856C     (base 16)		Ruijie Networks Co.,LTD
+				Building 19,Juyuanzhou Industrial Park, No.618 Jinshan Avenue, Cangshan District
+				Fuzhou    35000
+				CN
+
+BC-9D-37   (hex)		Telink Micro LLC
+BC9D37     (base 16)		Telink Micro LLC
+				2975 Scott Blvd #120
+				Santa Clara    95054
+				US
+
+0C-27-79   (hex)		New H3C Technologies Co., Ltd
+0C2779     (base 16)		New H3C Technologies Co., Ltd
+				466 Changhe Road, Binjiang District
+				Hangzhou  Zhejiang  310052
+				CN
+
+8C-58-23   (hex)		SZ DJI TECHNOLOGY CO.,LTD
+8C5823     (base 16)		SZ DJI TECHNOLOGY CO.,LTD
+				DJI Sky City, No55 Xianyuan Road, Nanshan District
+				Shenzhen  Guangdong  518057
+				CN
+
+C4-33-96   (hex)		Dongguan Hele Electronics Co., Ltd.
+C43396     (base 16)		Dongguan Hele Electronics Co., Ltd.
+				Room101, Block1, No.38, DaojiaoDahouRoad, DaojiaoTown, 
+				Dongguan City  GuangdongProvince  523000
+				CN
+
+4C-D5-46   (hex)		Hewlett Packard Enterprise
+4CD546     (base 16)		Hewlett Packard Enterprise
+				6280 America Center Dr
+				San Jose  CA  95002
+				US
+
+98-9D-40   (hex)		MIWA LOCK CO.,LTD.
+989D40     (base 16)		MIWA LOCK CO.,LTD.
+				1028-1,Yamagami
+				Tamaki-tyou  Mie  519-0436
+				JP
+
+4C-AB-F3   (hex)		Universal Electronics, Inc.
+4CABF3     (base 16)		Universal Electronics, Inc.
+				201 E. Sandpointe Ave
+				Santa Ana    92707
+				US
+
+D4-9C-53   (hex)		NETCRAZE LLC
+D49C53     (base 16)		NETCRAZE LLC
+				Ostrovityanova 11/1
+				Moscow    117437
+				RU
+
+B8-70-29   (hex)		Shenzhen Ruiyuanchuangxin Technology Co.,Ltd.
+B87029     (base 16)		Shenzhen Ruiyuanchuangxin Technology Co.,Ltd.
+				Unit 512, 5th Floor, Building A, Rongfeng Center, Rongdechang Technology Building,Xiangjiaotang Community, Bantian Street, Longgang District,
+				Shenzhen  Guangdong  518116
+				CN
+
+28-CE-15   (hex)		Shenzhen Xinwei Intelligent Co., Ltd
+28CE15     (base 16)		Shenzhen Xinwei Intelligent Co., Ltd
+				Building A, Xinwangda Industrial Park, No. 18, Tangjia South Road, Gongming District
+				Shen zhen  Guangdong  518107 
+				CN
+
+84-94-59   (hex)		Hangzhou Hikvision Digital Technology Co.,Ltd.
+849459     (base 16)		Hangzhou Hikvision Digital Technology Co.,Ltd.
+				No.555 Qianmo Road 
+				Hangzhou  Zhejiang  310052
+				CN
+
+94-51-DC   (hex)		Espressif Inc.
+9451DC     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+94-8E-6D   (hex)		Nintendo Co.,Ltd
+948E6D     (base 16)		Nintendo Co.,Ltd
+				11-1 HOKOTATE-CHO KAMITOBA,MINAMI-KU
+				KYOTO  KYOTO  601-8501
+				JP
+
+C8-08-8B   (hex)		Arista Networks
+C8088B     (base 16)		Arista Networks
+				5453 Great America Parkway
+				Santa Clara  CA  95054
+				US
+
+10-D9-A2   (hex)		Google, Inc.
+10D9A2     (base 16)		Google, Inc.
+				1600 Amphitheatre Parkway
+				Mountain View  CA  94043
+				US
+
+E0-49-34   (hex)		Calix Inc.
+E04934     (base 16)		Calix Inc.
+				2777 Orchard Pkwy
+				San Jose  CA  95131
+				US
+
+00-94-A1   (hex)		F5 Inc.
+0094A1     (base 16)		F5 Inc.
+				401 Elliott Ave. W.
+				Seattle  WA  98119
+				US
+
+00-0A-49   (hex)		F5 Inc.
+000A49     (base 16)		F5 Inc.
+				401 Elliott Ave. W.
+				Seattle  WA  98119
+				US
+
+14-A9-D0   (hex)		F5 Inc.
+14A9D0     (base 16)		F5 Inc.
+				801 5th Avenue
+				Seattle  WA  98104
+				US
+
+00-01-D7   (hex)		F5 Inc.
+0001D7     (base 16)		F5 Inc.
+				1322 N. Whitman Lane
+				Liberty Lake  WA  99019
+				US
+
+78-CE-A5   (hex)		Vital link vietnam company limited
+78CEA5     (base 16)		Vital link vietnam company limited
+				Factory RBF.C1, Lot E1, Thuan Thanh III Industrial Park, Zone B, Gia Dong Ward, Thuan Thanh Town
+				Bac Ninh    16000
+				VN
+
+58-E6-C5   (hex)		Espressif Inc.
+58E6C5     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+B4-5B-86   (hex)		Funshion Online Technologies Co.,Ltd
+B45B86     (base 16)		Funshion Online Technologies Co.,Ltd
+				2101, Floor 1-2, Building 9, Anzhen Xili District 3, Chaoyang District, Beijing
+				Beijing     100029
+				CN
+
+AC-C9-FF   (hex)		Realme Chongqing Mobile Telecommunications Corp.,Ltd.
+ACC9FF     (base 16)		Realme Chongqing Mobile Telecommunications Corp.,Ltd.
+				No.178 Yulong Avenue, Yufengshan, Yubei District, Chongqing.
+				Chongqing   China  401120
+				CN
+
+80-E7-69   (hex)		Realme Chongqing Mobile Telecommunications Corp.,Ltd.
+80E769     (base 16)		Realme Chongqing Mobile Telecommunications Corp.,Ltd.
+				No.178 Yulong Avenue, Yufengshan, Yubei District, Chongqing.
+				Chongqing   China  401120
+				CN
+
+94-BA-06   (hex)		SHENZHEN BILIAN ELECTRONIC CO.，LTD
+94BA06     (base 16)		SHENZHEN BILIAN ELECTRONIC CO.，LTD
+				NO.268， Fuqian Rd, Jutang community, Guanlan Town, Longhua New district
+				shenzhen  guangdong  518000
+				CN
+
+AC-01-7A   (hex)		Sichuan Tianyi Comheart Telecom Co.,LTD
+AC017A     (base 16)		Sichuan Tianyi Comheart Telecom Co.,LTD
+				No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County
+				Chengdu  Sichuan  611330
+				CN
+
+CC-BA-BD   (hex)		TP-Link Systems Inc.
+CCBABD     (base 16)		TP-Link Systems Inc.
+				10 Mauchly
+				 Irvine  CA  92618
+				US
+
+78-0F-81   (hex)		Cisco Meraki
+780F81     (base 16)		Cisco Meraki
+				500 Terry A. Francois Blvd
+				San Francisco    94158
+				US
+
+5C-E7-53   (hex)		Private
+5CE753     (base 16)		Private
+
+B4-1F-4D   (hex)		Sony Interactive Entertainment Inc.
+B41F4D     (base 16)		Sony Interactive Entertainment Inc.
+				1-7-1 Konan
+				Minato-ku  Tokyo  108-0075
+				JP
+
+E8-9E-49   (hex)		Mellanox Technologies, Inc.
+E89E49     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+14-8F-79   (hex)		Apple, Inc.
+148F79     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+10-42-10   (hex)		Apple, Inc.
+104210     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+B8-05-33   (hex)		Apple, Inc.
+B80533     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+68-5E-DD   (hex)		Apple, Inc.
+685EDD     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+F8-D3-F0   (hex)		Apple, Inc.
+F8D3F0     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+A0-2B-44   (hex)		WaveGo Tech LLC
+A02B44     (base 16)		WaveGo Tech LLC
+				16192 CoastalHighway, Lewes,Sussex.DE 19958
+				Lewes  DE  19958
+				US
+
+00-D6-26   (hex)		Mist Systems, Inc.
+00D626     (base 16)		Mist Systems, Inc.
+				1601 South De Anza Blvd, Suite 248
+				Cupertino  CA  95014
+				US
+
+08-73-6F   (hex)		EM Microelectronic
+08736F     (base 16)		EM Microelectronic
+				Rue des Sors 3
+				Marin-Epagnier  Neuchatel  2074
+				CH
+
+C8-90-09   (hex)		Budderfly Inc.
+C89009     (base 16)		Budderfly Inc.
+				2 Trap Falls Road
+				Shelton  CT  06484
+				US
+
+F8-F7-D2   (hex)		Equal Optics, LLC
+F8F7D2     (base 16)		Equal Optics, LLC
+				2280 University Drive. Ste 102
+				Newport Beach  CA  92660
+				US
+
+A4-7B-52   (hex)		JoulWatt Technology Co., Ltd
+A47B52     (base 16)		JoulWatt Technology Co., Ltd
+				9th Floor, Chuangye Building, No.99 Huaxing Road, Xihu District, Hangzhou, China
+				Hangzhou  Zhejiang  311100
+				CN
+
+30-C9-CC   (hex)		Samsung Electronics Co.,Ltd
+30C9CC     (base 16)		Samsung Electronics Co.,Ltd
+				129, Samsung-ro, Youngtongl-Gu
+				Suwon  Gyeonggi-Do  16677
+				KR
+
+3C-C5-C7   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+3CC5C7     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+44-09-C6   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+4409C6     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+04-55-B2   (hex)		Huaqin Technology Co.,Ltd
+0455B2     (base 16)		Huaqin Technology Co.,Ltd
+				Pudong New Area
+				Shanghai    201203
+				CN
+
+FC-4C-EA   (hex)		Dell Inc.
+FC4CEA     (base 16)		Dell Inc.
+				One Dell Way
+				Round Rock   TX  78682
+				US
+
+3C-B6-E7   (hex)		Handheld Scientific, Inc.
+3CB6E7     (base 16)		Handheld Scientific, Inc.
+				5201 Great America Pkwy Suite 320
+				Santa Clara  CA  95054
+				US
+
+1C-D3-AF   (hex)		LG Innotek
+1CD3AF     (base 16)		LG Innotek
+				26, HANAMSANDAN 5BEON-RO
+				Gwangju  Gwangsan-gu  506-731
+				KR
+
+F4-4E-B4   (hex)		CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
+F44EB4     (base 16)		CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
+				B22 Building,NO.51 Tongle Road, Shajing Town, Jiangnan District, Nanning, Guangxi Province, China
+				Nanning  Guangxi  530007
+				CN
+
+90-4C-02   (hex)		vivo Mobile Communication Co., Ltd.
+904C02     (base 16)		vivo Mobile Communication Co., Ltd.
+				No.1, vivo Road, Chang'an
+				Dongguan  Guangdong  523860
+				CN
+
+04-1F-B8   (hex)		vivo Mobile Communication Co., Ltd.
+041FB8     (base 16)		vivo Mobile Communication Co., Ltd.
+				No.1, vivo Road, Chang'an
+				Dongguan  Guangdong  523860
+				CN
+
+80-AE-3C   (hex)		Taicang T&W Electronics
+80AE3C     (base 16)		Taicang T&W Electronics
+				89# Jiang Nan RD
+				Suzhou  Jiangsu  215412
+				CN
+
+F0-6F-CE   (hex)		Ruckus Wireless
+F06FCE     (base 16)		Ruckus Wireless
+				350 West Java Drive
+				Sunnyvale  CA  94089
+				US
+
+34-FD-70   (hex)		Intel Corporate
+34FD70     (base 16)		Intel Corporate
+				Lot 8, Jalan Hi-Tech 2/3  
+				Kulim  Kedah  09000
+				MY
+
+4C-BB-47   (hex)		NVIDIA Corporation
+4CBB47     (base 16)		NVIDIA Corporation
+				2701 San Tomas Expressway
+				Santa Clara  CA  95050
+				US
+
+B0-7C-8E   (hex)		Brother Industries, LTD.
+B07C8E     (base 16)		Brother Industries, LTD.
+				15-1, Naeshirocho, Mizuho-ku
+				NAGOYA    4678561
+				JP
+
+A0-1B-D6   (hex)		Nautitech Mining Systems Pty. Ltd.
+A01BD6     (base 16)		Nautitech Mining Systems Pty. Ltd.
+				3/9 Packard AvenueCastle Hill
+				CASTLE HILL    2154
+				AU
+
+90-F0-05   (hex)		Xi'an Molead Technology Co., Ltd
+90F005     (base 16)		Xi'an Molead Technology Co., Ltd
+				No.34 Fenghui South Road,High-Tech Zone
+				Xian  Shaanxi  710065
+				CN
+
+A0-1B-9E   (hex)		Samsung Electronics Co.,Ltd
+A01B9E     (base 16)		Samsung Electronics Co.,Ltd
+				#94-1, Imsoo-Dong
+				Gumi  Gyeongbuk  730-350
+				KR
+
+D8-71-54   (hex)		Samsung Electronics Co.,Ltd
+D87154     (base 16)		Samsung Electronics Co.,Ltd
+				#94-1, Imsoo-Dong
+				Gumi  Gyeongbuk  730-350
+				KR
+
+78-33-C6   (hex)		Samsung Electronics Co.,Ltd
+7833C6     (base 16)		Samsung Electronics Co.,Ltd
+				#94-1, Imsoo-Dong
+				Gumi  Gyeongbuk  730-350
+				KR
+
+C8-26-E2   (hex)		CHINA DRAGON TECHNOLOGY LIMITED
+C826E2     (base 16)		CHINA DRAGON TECHNOLOGY LIMITED
+				B4 Building,No.3 First industrial Zone,Nanpu Road,Lao Community,Xinqian Street,Baoan District,Shenzhen,City
+				ShenZhen    518100
+				CN
+
+E0-D5-5D   (hex)		Intel Corporate
+E0D55D     (base 16)		Intel Corporate
+				Lot 8, Jalan Hi-Tech 2/3  
+				Kulim  Kedah  09000
+				MY
+
+E4-4A-E0   (hex)		Intel Corporate
+E44AE0     (base 16)		Intel Corporate
+				Lot 8, Jalan Hi-Tech 2/3  
+				Kulim  Kedah  09000
+				MY
+
+A0-85-27   (hex)		Intel Corporate
+A08527     (base 16)		Intel Corporate
+				Lot 8, Jalan Hi-Tech 2/3  
+				Kulim  Kedah  09000
+				MY
+
+F0-7A-55   (hex)		zte corporation
+F07A55     (base 16)		zte corporation
+				12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China
+				shenzhen   guangdong  518057
+				CN
+
+D4-61-95   (hex)		zte corporation
+D46195     (base 16)		zte corporation
+				12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China
+				shenzhen   guangdong  518057
+				CN
+
+F4-AB-5C   (hex)		Quectel Wireless Solutions Co.,Ltd.
+F4AB5C     (base 16)		Quectel Wireless Solutions Co.,Ltd.
+				7th Floor, Hongye Building, No.1801 Hongmei Road, Xuhui District
+				Shanghai    200233
+				CN
+
+2C-C1-F4   (hex)		Nokia Solutions and Networks India Private Limited
+2CC1F4     (base 16)		Nokia Solutions and Networks India Private Limited
+				Plot 45, Fathima Nagar, Nemilicherry
+				Chennai  Tamilnadu  600044
+				IN
+
+5C-E1-A4   (hex)		Pleneo
+5CE1A4     (base 16)		Pleneo
+				9 RAFFLES PLACE #29-05
+				REPUBLIC PLAZA  SG  00000
 				SG
 
-C8-77-F3   (hex)		VusionGroup
-C877F3     (base 16)		VusionGroup
-				Kalsdorfer Straße 12
-				Fernitz-Mellach  Steiermark  8072
-				AT
+FC-E4-98   (hex)		IEEE Registration Authority
+FCE498     (base 16)		IEEE Registration Authority
+				445 Hoes Lane
+				Piscataway  NJ  08554
+				US
 
-8C-4E-46   (hex)		Motorola Mobility LLC, a Lenovo Company
-8C4E46     (base 16)		Motorola Mobility LLC, a Lenovo Company
+60-73-C8   (hex)		Voyetra Turtle Beach, Inc.
+6073C8     (base 16)		Voyetra Turtle Beach, Inc.
+				15822 Bernardo Center Drive, Suite 105
+				San Diego  CA  92127
+				US
+
+24-B5-B9   (hex)		Motorola Mobility LLC, a Lenovo Company
+24B5B9     (base 16)		Motorola Mobility LLC, a Lenovo Company
 				222 West Merchandise Mart Plaza
 				Chicago  IL  60654
 				US
 
+E4-67-DD   (hex)		ELA INNOVATION
+E467DD     (base 16)		ELA INNOVATION
+				297 RUE MAURICE BEJART
+				MONTPELLIER    34080
+				FR
+
+FC-9D-05   (hex)		Micro-Star INTL CO., LTD.
+FC9D05     (base 16)		Micro-Star INTL CO., LTD.
+				No.69, Lide St.,
+				Zhonghe Dist.,  New Taipei City  235
+				TW
+
+00-2B-90   (hex)		Zelus(Shenzhen) Technology Ltd.
+002B90     (base 16)		Zelus(Shenzhen) Technology Ltd.
+				503, Building No.4, Block No.1, Shenzhen Bay ECO-Technology Park, No.22, Gaoxin Nanhuan Road, Nanshan District, Shenzhen, China 
+				Shenzhen  Guangdong  518000
+				CN
+
+EC-BB-78   (hex)		Cisco Systems, Inc
+ECBB78     (base 16)		Cisco Systems, Inc
+				80 West Tasman Drive
+				San Jose  CA  95126
+				US
+
+68-D9-72   (hex)		Cisco Systems, Inc
+68D972     (base 16)		Cisco Systems, Inc
+				80 West Tasman Drive
+				San Jose  CA  95126
+				US
+
+10-2B-AA   (hex)		Sagemcom Broadband SAS
+102BAA     (base 16)		Sagemcom Broadband SAS
+				250, route de l'Empereur
+				Rueil Malmaison Cedex  hauts de seine  92848
+				FR
+
+50-62-45   (hex)		Annapurna labs
+506245     (base 16)		Annapurna labs
+				Matam Scientific Industries Center,   Building 8.2
+				Mail box 15123  Haifa  3508409
+				IL
+
+BC-21-06   (hex)		Adtran Inc
+BC2106     (base 16)		Adtran Inc
+				901 Explorer Blvd.
+				Huntsville  AL  35806-2807
+				US
+
+24-2D-4B   (hex)		F5 Inc.
+242D4B     (base 16)		F5 Inc.
+				801 5th Ave
+				Seattle  WA  98104
+				US
+
+38-B9-AF   (hex)		NXP Semiconductors Taiwan Ltd.
+38B9AF     (base 16)		NXP Semiconductors Taiwan Ltd.
+				No. 10, Jing 5th Rd., Nanzi Dist., Kaohsiung City 811643, Taiwan
+				Nanzi Dist.  Kaohsiung  811643
+				TW
+
+38-92-01   (hex)		Tianyi Telecom Terminals Company Limited
+389201     (base 16)		Tianyi Telecom Terminals Company Limited
+				12-19 floors inside 101, Floor 4-33, Building 1, Yard 1, Fenghuang Zui Street, Fengtai District, Beijing
+				Beijing    100073
+				CN
+
+D8-1F-65   (hex)		Private
+D81F65     (base 16)		Private
+
+D4-53-2A   (hex)		Beijing Xiaomi Mobile Software Co., Ltd
+D4532A     (base 16)		Beijing Xiaomi Mobile Software Co., Ltd
+				The Rainbow City Office Building, 68 Qinghe Middle Street Haidian District
+				Beijing  Beijing  100085
+				CN
+
+F0-57-8D   (hex)		JetHome LLC
+F0578D     (base 16)		JetHome LLC
+				Serebristy boulevard, 21, letter A, office 79-N
+				St. Petersburg    197341
+				RU
+
+78-C8-84   (hex)		Huawei Device Co., Ltd.
+78C884     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+98-7E-B5   (hex)		Huawei Device Co., Ltd.
+987EB5     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+68-95-1B   (hex)		Huawei Device Co., Ltd.
+68951B     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+54-9B-24   (hex)		Mellanox Technologies, Inc.
+549B24     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+18-95-78   (hex)		DENSO CORPORATION
+189578     (base 16)		DENSO CORPORATION
+				1-1, Showa-cho
+				Kariya  Aichi  448-8661
+				JP
+
+F8-D5-54   (hex)		GD Midea Air-Conditioning Equipment Co.,Ltd.
+F8D554     (base 16)		GD Midea Air-Conditioning Equipment Co.,Ltd.
+				Midea Global Innovation Center,Beijiao Town,Shunde
+				Foshan  Guangdong  528311
+				CN
+
+9C-57-66   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+9C5766     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+5C-0B-3B   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+5C0B3B     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+74-B3-EA   (hex)		EK INC.
+74B3EA     (base 16)		EK INC.
+				No. 55, Zhongzhun RoadCuiheng New District,Zhongshan City, China
+				zhongshan  guangdong  528403
+				CN
+
+14-D7-25   (hex)		Barrot Technology Co.,Ltd.
+14D725     (base 16)		Barrot Technology Co.,Ltd.
+				A1009,Block A,Jia Hua Building,No.9 Shangdi 3rd Street,Haidian District,Beijing
+				beijing  beijing  100000
+				CN
+
+00-50-CA   (hex)		Zhone Technologies, Inc.
+0050CA     (base 16)		Zhone Technologies, Inc.
+				680 CENTRAL AVENUE - STE. #301
+				DOVER  NH  03820
+				US
+
+4C-82-0C   (hex)		Apple, Inc.
+4C820C     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+10-A1-DA   (hex)		Apple, Inc.
+10A1DA     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+54-B8-DB   (hex)		Apple, Inc.
+54B8DB     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+F4-06-3C   (hex)		Texas Instruments
+F4063C     (base 16)		Texas Instruments
+				12500 TI Blvd
+				Dallas  TX  75243
+				US
+
+E0-DE-F2   (hex)		Texas Instruments
+E0DEF2     (base 16)		Texas Instruments
+				12500 TI Blvd
+				Dallas  TX  75243
+				US
+
+74-95-33   (hex)		Westala Technologies Inc.
+749533     (base 16)		Westala Technologies Inc.
+				3333 Preston Road STE 300 
+				FRISCO  TX  75034
+				US
+
+44-8D-D5   (hex)		Cisco Systems, Inc
+448DD5     (base 16)		Cisco Systems, Inc
+				80 West Tasman Drive
+				San Jose  CA  94568
+				US
+
+8C-91-A4   (hex)		Apple, Inc.
+8C91A4     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+94-97-4F   (hex)		Liteon Technology Corporation
+94974F     (base 16)		Liteon Technology Corporation
+				4F, 90, Chien 1 Road
+				New Taipei City  Taiwan  23585
+				TW
+
+28-25-5F   (hex)		HUMAX NETWORKS
+28255F     (base 16)		HUMAX NETWORKS
+				HUMAX VILLAGE, 216Hwangsaeul-ro, Bundang gu
+				Seongnam-si  Gyeonggi-do  13595
+				KR
+
+3C-78-95   (hex)		TP-Link Systems Inc.
+3C7895     (base 16)		TP-Link Systems Inc.
+				10 Mauchly
+				 Irvine  CA  92618
+				US
+
+F4-D7-E4   (hex)		Realme Chongqing Mobile Telecommunications Corp.,Ltd.
+F4D7E4     (base 16)		Realme Chongqing Mobile Telecommunications Corp.,Ltd.
+				No.178 Yulong Avenue, Yufengshan, Yubei District, Chongqing.
+				Chongqing   China  401120
+				CN
+
+20-0A-87   (hex)		Guangzhou On-Bright Electronics Co., Ltd.
+200A87     (base 16)		Guangzhou On-Bright Electronics Co., Ltd.
+				No. 1, Lianhuayan Road, Building A, Suite 2001, Huangpu District
+				Guangzhou  Guangdong  510520
+				CN
+
+BC-34-D6   (hex)		Extreme Networks Headquarters
+BC34D6     (base 16)		Extreme Networks Headquarters
+				2121 RDU Center Drive 
+				Morrisville  NC  27560
+				US
+
+E0-8C-FE   (hex)		Espressif Inc.
+E08CFE     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+38-C6-CE   (hex)		Nintendo Co.,Ltd
+38C6CE     (base 16)		Nintendo Co.,Ltd
+				11-1 HOKOTATE-CHO KAMITOBA,MINAMI-KU
+				KYOTO  KYOTO  601-8501
+				JP
+
+4C-C5-D9   (hex)		Dell Inc.
+4CC5D9     (base 16)		Dell Inc.
+				One Dell Way
+				Round Rock   TX  78682
+				US
+
+98-E0-81   (hex)		Beijing Xiaomi Mobile Software Co., Ltd
+98E081     (base 16)		Beijing Xiaomi Mobile Software Co., Ltd
+				The Rainbow City Office Building, 68 Qinghe Middle Street Haidian District
+				Beijing  Beijing  100085
+				CN
+
+04-AE-47   (hex)		Beijing Xiaomi Mobile Software Co., Ltd
+04AE47     (base 16)		Beijing Xiaomi Mobile Software Co., Ltd
+				The Rainbow City Office Building, 68 Qinghe Middle Street Haidian District
+				Beijing  Beijing  100085
+				CN
+
+E8-7E-EF   (hex)		Xiaomi Communications Co Ltd
+E87EEF     (base 16)		Xiaomi Communications Co Ltd
+				#019, 9th Floor, Building 6, 33 Xi'erqi Middle Road
+				Beijing  Haidian District  100085
+				CN
+
+88-2F-92   (hex)		Xiaomi Communications Co Ltd
+882F92     (base 16)		Xiaomi Communications Co Ltd
+				#019, 9th Floor, Building 6, 33 Xi'erqi Middle Road
+				Beijing  Haidian District  100085
+				CN
+
+18-16-28   (hex)		SharkNinja Operating LLC
+181628     (base 16)		SharkNinja Operating LLC
+				89 A Street, Suite 100 02494 Needham
+				Needham  MA  02494
+				US
+
+CC-E4-D1   (hex)		Arista Networks
+CCE4D1     (base 16)		Arista Networks
+				5453 Great America Parkway
+				Santa Clara  CA  95054
+				US
+
+0C-9A-E6   (hex)		SZ DJI TECHNOLOGY CO.,LTD
+0C9AE6     (base 16)		SZ DJI TECHNOLOGY CO.,LTD
+				DJI Sky City,No55 Xianyuan Road,Nanshan District
+				shenzhen  Guangdong  518057
+				CN
+
+88-56-A6   (hex)		Espressif Inc.
+8856A6     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+C0-40-8D   (hex)		ALPSALPINE CO,.LTD
+C0408D     (base 16)		ALPSALPINE CO,.LTD
+				nishida  6-1 
+				Kakuda-City  Miyagi-Pref  981-1595
+				JP
+
 00-01-30   (hex)		Extreme Networks Headquarters
 000130     (base 16)		Extreme Networks Headquarters
 				2121 RDU Center Drive 
@@ -45368,12 +46148,6 @@ BC8529     (base 16)		Jiangxi Remote lnt
 				Yingtan  Jiangxi   360600
 				CN
 
-64-DA-ED   (hex)		eero inc.
-64DAED     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 28-94-01   (hex)		NETGEAR
 289401     (base 16)		NETGEAR
 				350 East Plumeria Drive
@@ -45746,12 +46520,6 @@ A4CCB3     (base 16)		Xiaomi Communicati
 				Beijing  Haidian District  100085
 				CN
 
-EC-E7-C2   (hex)		China Mobile Group Device Co.,Ltd.
-ECE7C2     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 BC-31-98   (hex)		IEEE Registration Authority
 BC3198     (base 16)		IEEE Registration Authority
 				445 Hoes Lane
@@ -45782,12 +46550,6 @@ DCCD18     (base 16)		Nintendo Co.,Ltd
 				KYOTO  KYOTO  601-8501
 				JP
 
-70-93-C1   (hex)		eero inc.
-7093C1     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 54-49-FC   (hex)		Ubee Interactive Co., Limited
 5449FC     (base 16)		Ubee Interactive Co., Limited
 				Flat/RM 1202, 12/F, AT Tower 
@@ -45866,12 +46628,6 @@ D081C5     (base 16)		Juniper Networks
 				Sunnyvale  CA  94089
 				US
 
-F4-BF-BB   (hex)		China Mobile Group Device Co.,Ltd.
-F4BFBB     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 84-AC-60   (hex)		Guangxi Hesheng Electronics Co., Ltd.
 84AC60     (base 16)		Guangxi Hesheng Electronics Co., Ltd.
 				Hexin Tech Park, Binzhou Industrial Zone, Binyang County, Nanning City, Guangxi Zhuang Autonomous Region
@@ -46496,18 +47252,6 @@ F45433     (base 16)		Rockwell Automatio
 				Mayfield Heights  OH  44124-6118
 				US
 
-08-15-AE   (hex)		China Mobile Group Device Co.,Ltd.
-0815AE     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
-04-B4-FE   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-04B4FE     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 D4-53-47   (hex)		Merytronic 2012, S.L.
 D45347     (base 16)		Merytronic 2012, S.L.
 				Parque empresarial BoroaParcela 2C-1
@@ -46610,12 +47354,6 @@ C0517E     (base 16)		Hangzhou Hikvision
 				Hangzhou  Zhejiang  310052
 				CN
 
-9C-65-EE   (hex)		DZS Inc.
-9C65EE     (base 16)		DZS Inc.
-				DASAN Tower 8F, 49 Daewangpangyo-ro644beon-gil Bundang-gu
-				Seongnam-si  Gyeonggi-do  13493
-				KR
-
 9C-54-16   (hex)		Cisco Systems, Inc
 9C5416     (base 16)		Cisco Systems, Inc
 				80 West Tasman Drive
@@ -46766,12 +47504,6 @@ CC9F7A     (base 16)		Chiun Mai Communic
 				Chengdu  Sichuan Province  611731 
 				CN
 
-0C-72-74   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-0C7274     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 80-DB-17   (hex)		Juniper Networks
 80DB17     (base 16)		Juniper Networks
 				1133 Innovation Way
@@ -46952,12 +47684,6 @@ A0A3B3     (base 16)		Espressif Inc.
 				Taipei County 231    231141
 				CN
 
-B4-B9-E6   (hex)		eero inc.
-B4B9E6     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 30-B2-16   (hex)		Hitachi Energy Germany AG
 30B216     (base 16)		Hitachi Energy Germany AG
 				Havellandstr. 10-14
@@ -47330,12 +48056,6 @@ FCB0DE     (base 16)		CLOUD NETWORK TECH
 				DONG GUAN  GUANG DONG  523860
 				CN
 
-48-1F-66   (hex)		China Mobile Group Device Co.,Ltd.
-481F66     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 78-24-59   (hex)		Alcatel-Lucent Enterprise
 782459     (base 16)		Alcatel-Lucent Enterprise
 				26801 West Agoura Rd
@@ -48788,12 +49508,6 @@ E0798D     (base 16)		Silicon Laboratori
 				Hangzhou    310052
 				CN
 
-64-C2-69   (hex)		eero inc.
-64C269     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 AC-2A-A1   (hex)		Cisco Systems, Inc
 AC2AA1     (base 16)		Cisco Systems, Inc
 				80 West Tasman Drive
@@ -48902,12 +49616,6 @@ BC6E6D     (base 16)		EM Microelectronic
 				Kulim  Kedah  09000
 				MY
 
-B8-3F-D2   (hex)		Mellanox Technologies, Inc.
-B83FD2     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 30-CB-36   (hex)		Belden Singapore Pte. Ltd.
 30CB36     (base 16)		Belden Singapore Pte. Ltd.
 				151 Lorong Chuan #05-01 New Tech Park Singapore
@@ -48992,12 +49700,6 @@ B42875     (base 16)		Futecho Solutions
 				Shanghai     201206
 				CN
 
-0C-1C-1A   (hex)		eero inc.
-0C1C1A     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 48-51-D0   (hex)		Jiangsu Xinsheng Intelligent Technology Co., Ltd. 
 4851D0     (base 16)		Jiangsu Xinsheng Intelligent Technology Co., Ltd. 
 				18th Floor,Inno laser Building,18-69 Changwu Mid Road,Changzhou Science & Education Town,Wujin District,Changzhou,Jiangsu213000,China
@@ -49118,12 +49820,6 @@ D06DC9     (base 16)		Sagemcom Broadband
 				Rueil Malmaison Cedex  hauts de seine  92848
 				FR
 
-DC-15-2D   (hex)		China Mobile Group Device Co.,Ltd.
-DC152D     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 98-CA-20   (hex)		Shanghai SIMCOM Ltd.
 98CA20     (base 16)		Shanghai SIMCOM Ltd.
 				 Building A, SIM Technology Building, No.633, Jinzhong Road, Changning District
@@ -49280,12 +49976,6 @@ AC93C4     (base 16)		GD Midea Air-Condi
 				Taipei    114
 				TW
 
-EC-9B-2D   (hex)		China Mobile Group Device Co.,Ltd.
-EC9B2D     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 A8-13-06   (hex)		vivo Mobile Communication Co., Ltd.
 A81306     (base 16)		vivo Mobile Communication Co., Ltd.
 				No.1, vivo Road, Chang'an
@@ -49784,12 +50474,6 @@ FCAFBE     (base 16)		TireCheck GmbH
 				Reno  NV  89507
 				US
 
-20-20-27   (hex)		Shenzhen Sundray Technologies Company Limited
-202027     (base 16)		Shenzhen Sundray Technologies Company Limited
-				5th Floor, Block A4, Nanshan ipark,NO.1001 Xue Yuan Road, Nanshan District, Shenzhen 518055, P.R. China
-				Shenzhen  Guangdong  518057
-				CN
-
 68-67-25   (hex)		Espressif Inc.
 686725     (base 16)		Espressif Inc.
 				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
@@ -49988,12 +50672,6 @@ B0F7C4     (base 16)		Amazon Technologie
 				Dongguan    523808
 				CN
 
-6C-0F-0B   (hex)		China Mobile Group Device Co.,Ltd.
-6C0F0B     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 DC-2C-6E   (hex)		Routerboard.com
 DC2C6E     (base 16)		Routerboard.com
 				Mikrotikls SIA
@@ -50522,12 +51200,6 @@ D0B66F     (base 16)		SERNET (SUZHOU) TE
 				Chicago  IL  60654
 				US
 
-FC-2E-19   (hex)		China Mobile Group Device Co.,Ltd.
-FC2E19     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 50-F9-08   (hex)		Wizardlab Co., Ltd.
 50F908     (base 16)		Wizardlab Co., Ltd.
 				#1603, 5, Gasan digital 1-ro, Geumcheon-gu, Seoul
@@ -50720,12 +51392,6 @@ E8A730     (base 16)		Apple, Inc.
 				Cupertino  CA  95014
 				US
 
-AC-EC-85   (hex)		eero inc.
-ACEC85     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 10-6F-D9   (hex)		CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
 106FD9     (base 16)		CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
 				B22 Building,NO.51 Tongle Road, Shajing Town, Jiangnan District, Nanning, Guangxi Province, China
@@ -51158,18 +51824,6 @@ F44588     (base 16)		HUAWEI TECHNOLOGIE
 				Dongguan    523808
 				CN
 
-60-57-7D   (hex)		eero inc.
-60577D     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
-3C-37-12   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-3C3712     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 54-AE-D2   (hex)		CSL Dualcom Ltd
 54AED2     (base 16)		CSL Dualcom Ltd
 				Salamander Quay West, Park Lane
@@ -51542,12 +52196,6 @@ D85982     (base 16)		HUAWEI TECHNOLOGIE
 				Dongguan    523808
 				CN
 
-A4-1B-34   (hex)		China Mobile Group Device Co.,Ltd.
-A41B34     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 14-7D-05   (hex)		SERCOMM PHILIPPINES INC
 147D05     (base 16)		SERCOMM PHILIPPINES INC
 				Lot 1 & 5, Phase 1, Filinvest Technology Park 1, Brgy. Punta, Calamba City
@@ -51716,12 +52364,6 @@ DC0077     (base 16)		TP-LINK TECHNOLOGI
 				Rueil Malmaison Cedex  hauts de seine  92848
 				FR
 
-F0-21-E0   (hex)		eero inc.
-F021E0     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco    94107
-				US
-
 60-6C-63   (hex)		Hitron Technologies. Inc
 606C63     (base 16)		Hitron Technologies. Inc
 				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan, R.O.C
@@ -52346,12 +52988,6 @@ C03FDD     (base 16)		HUAWEI TECHNOLOGIE
 				Beijing  Beijing  100000
 				CN
 
-18-EE-86   (hex)		Novatel Wireless Solutions, Inc.
-18EE86     (base 16)		Novatel Wireless Solutions, Inc.
-				9710 Scranton Rd., Suite 200
-				San Diego  CA  92121
-				US
-
 00-13-91   (hex)		OUEN CO.,LTD.
 001391     (base 16)		OUEN CO.,LTD.
 				Gotanda NT Bldg.7F,
@@ -52646,12 +53282,6 @@ ECF22B     (base 16)		TECNO MOBILE LIMIT
 				Dongguan  Guangdong  523808
 				CN
 
-30-57-8E   (hex)		eero inc.
-30578E     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 FC-B3-BC   (hex)		Intel Corporate
 FCB3BC     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
@@ -53066,12 +53696,6 @@ C0A36E     (base 16)		SKY UK LIMITED
 				Taipei City    11268
 				TW
 
-3C-A6-2F   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-3CA62F     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 00-05-C9   (hex)		LG Innotek
 0005C9     (base 16)		LG Innotek
 				LG Component R&D Center
@@ -54074,12 +54698,6 @@ A84D4A     (base 16)		Audiowise Technolo
 				Hsincu  Taiwan  30076
 				TW
 
-74-B6-B6   (hex)		eero inc.
-74B6B6     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 7C-DF-A1   (hex)		Espressif Inc.
 7CDFA1     (base 16)		Espressif Inc.
 				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
@@ -54758,12 +55376,6 @@ B82ADC     (base 16)		EFR Europäische F
 				Munich    80335
 				DE
 
-00-AB-48   (hex)		eero inc.
-00AB48     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 A0-DF-15   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
 A0DF15     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
@@ -55778,12 +56390,6 @@ E0B655     (base 16)		Beijing Xiaomi Ele
 				Urbach    73660
 				DE
 
-F8-BB-BF   (hex)		eero inc.
-F8BBBF     (base 16)		eero inc.
-				500 Howard St Suite 900
-				San Francisco  CA  94105
-				US
-
 DC-FB-48   (hex)		Intel Corporate
 DCFB48     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3 
@@ -56804,12 +57410,6 @@ F05849     (base 16)		CareView Communica
 				Dania Beach  FL  33004
 				US
 
-4C-01-43   (hex)		eero inc.
-4C0143     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 E4-34-93   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
 E43493     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
@@ -57722,12 +58322,6 @@ A438CC     (base 16)		Nintendo Co.,Ltd
 				NO.68, Qinghe Middle Street  Haidian District, Beijing  100085
 				CN
 
-7C-FF-4D   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-7CFF4D     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 74-70-FD   (hex)		Intel Corporate
 7470FD     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3 
@@ -57800,12 +58394,6 @@ A8DA01     (base 16)		Shenzhen NUOLIJIA
 				Shenzhen    518040
 				CN
 
-70-3A-73   (hex)		Shenzhen Sundray Technologies Company Limited
-703A73     (base 16)		Shenzhen Sundray Technologies Company Limited
-				6th Floor,Block A1, Nanshan iPark, No.1001 XueYuan Road, Nanshan District
-				Shenzhen  Guangdong  518057
-				CN
-
 80-AD-16   (hex)		Xiaomi Communications Co Ltd
 80AD16     (base 16)		Xiaomi Communications Co Ltd
 				The Rainbow City of China Resources
@@ -58850,12 +59438,6 @@ FC8B97     (base 16)		SHENZHEN GONGJIN E
 				Shenzhen  Guangdong  518067
 				CN
 
-28-80-A2   (hex)		Novatel Wireless Solutions, Inc.
-2880A2     (base 16)		Novatel Wireless Solutions, Inc.
-				9710 Scranton Rd., Suite 200
-				San Diego  CA  92121
-				US
-
 84-A1-D1   (hex)		Sagemcom Broadband SAS
 84A1D1     (base 16)		Sagemcom Broadband SAS
 				250, route de l'Empereur
@@ -59522,12 +60104,6 @@ BCA042     (base 16)		SHANGHAI FLYCO ELE
 				Shanghai  Shanghai  201613
 				CN
 
-CC-CE-1E   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-CCCE1E     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 0C-F4-D5   (hex)		Ruckus Wireless
 0CF4D5     (base 16)		Ruckus Wireless
 				350 West Java Drive
@@ -59624,12 +60200,6 @@ BC3F8F     (base 16)		HUAWEI TECHNOLOGIE
 				Shenzhen  Guangdong  518054
 				CN
 
-A8-0C-CA   (hex)		Shenzhen Sundray Technologies Company Limited
-A80CCA     (base 16)		Shenzhen Sundray Technologies Company Limited
-				6th Floor,Block A1, Nanshan iPark, No.1001 XueYuan Road, Nanshan District
-				Shenzhen  Guangdong  518057
-				CN
-
 50-D2-13   (hex)		CviLux Corporation
 50D213     (base 16)		CviLux Corporation
 				9F,No.9,Lane 3,Sec.1,Chung-Cheng East Road, Tamshui
@@ -60098,12 +60668,6 @@ CC2D83     (base 16)		GUANGDONG OPPO MOB
 				DONG GUAN  GUANG DONG  523860
 				CN
 
-00-15-FF   (hex)		Novatel Wireless Solutions, Inc.
-0015FF     (base 16)		Novatel Wireless Solutions, Inc.
-				9710 Scranton Rd., Suite 200
-				San Diego  CA  92121
-				US
-
 D4-6E-0E   (hex)		TP-LINK TECHNOLOGIES CO.,LTD.
 D46E0E     (base 16)		TP-LINK TECHNOLOGIES CO.,LTD.
 				Building 24(floors 1,3,4,5)and 28(floors 1-4)Central Science and Technology Park,Shennan Road,Nanshan
@@ -62078,12 +62642,6 @@ A8E3EE     (base 16)		Sony Interactive E
 				Hui Zhou  Guang Dong  516006
 				CN
 
-0C-A2-F4   (hex)		Chameleon Technology (UK) Limited
-0CA2F4     (base 16)		Chameleon Technology (UK) Limited
-				Gardner House,  Hornbeam Park Avenue
-				Hornbeam Park  Harrogate  HG2 8NA
-				GB
-
 EC-43-8B   (hex)		YAPTV
 EC438B     (base 16)		YAPTV
 				623 GangNamDa-Ro
@@ -63320,12 +63878,6 @@ E8F1B0     (base 16)		Sagemcom Broadband
 				Palo Alto  CA  94301
 				US
 
-28-76-CD   (hex)		Funshion Online Technologies Co.,Ltd
-2876CD     (base 16)		Funshion Online Technologies Co.,Ltd
-				Tower B 1201, Jinqiu International Building, No.6, Zhichun Road, Haidian District
-				Beijing    100088
-				CN
-
 00-1A-11   (hex)		Google, Inc.
 001A11     (base 16)		Google, Inc.
 				1600 Amphitheater Parkway
@@ -85595,12 +86147,6 @@ B09E1B     (base 16)		Butlr Technologies
 				Burlingame  CA  94010
 				US
 
-14-A1-DF   (hex)		China Mobile Group Device Co.,Ltd.
-14A1DF     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 D0-A0-11   (hex)		IEEE Registration Authority
 D0A011     (base 16)		IEEE Registration Authority
 				445 Hoes Lane
@@ -86024,12 +86570,6 @@ AC1EA9     (base 16)		Intelbras
 				Shenzhen    518071
 				CN
 
-7C-5E-98   (hex)		eero inc.
-7C5E98     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 1C-64-F0   (hex)		Motorola Mobility LLC, a Lenovo Company
 1C64F0     (base 16)		Motorola Mobility LLC, a Lenovo Company
 				222 West Merchandise Mart Plaza
@@ -86186,12 +86726,6 @@ F84D8B     (base 16)		ecamtek
 				Round Rock   TX  78682
 				US
 
-60-F4-19   (hex)		eero inc.
-60F419     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 D0-67-26   (hex)		Hewlett Packard Enterprise 
 D06726     (base 16)		Hewlett Packard Enterprise 
 				8000 Foothills Blvd.
@@ -86660,12 +87194,6 @@ C05234     (base 16)		HUAWEI TECHNOLOGIE
 				Osaka  Osaka  532-0003
 				JP
 
-CC-96-A2   (hex)		China Mobile Group Device Co.,Ltd.
-CC96A2     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 54-3D-60   (hex)		Arcadyan Corporation
 543D60     (base 16)		Arcadyan Corporation
 				No.8, Sec.2, Guangfu Rd.
@@ -86912,12 +87440,6 @@ B41DC4     (base 16)		HUAWEI TECHNOLOGIE
 				San Jose  CA  94568
 				US
 
-CC-6C-52   (hex)		DZS Inc.
-CC6C52     (base 16)		DZS Inc.
-				5700 Tennyson Parkway, Suite 400
-				Plano  TX  75024
-				US
-
 C4-60-0A   (hex)		Huaqin Technology Co.LTD
 C4600A     (base 16)		Huaqin Technology Co.LTD
 				11th Floor,Unit 12,No.399 Keyuan Road,Pudong, Shanghai 
@@ -88091,12 +88613,6 @@ C02CED     (base 16)		Silicon Laboratori
 				Austin  TX  78701
 				US
 
-0C-93-A5   (hex)		eero inc.
-0C93A5     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 70-71-B3   (hex)		Brain Corporation
 7071B3     (base 16)		Brain Corporation
 				10182 Telesis Ct UNIT 100
@@ -88580,12 +89096,6 @@ B845EB     (base 16)		Apple, Inc.
 				San Jose  CA  95110
 				US
 
-84-6E-BC   (hex)		Nokia solutions and networks Pvt Ltd
-846EBC     (base 16)		Nokia solutions and networks Pvt Ltd
-				Radiance Ivy terrace, Block 4, 9R, Egattur, Chennai
-				Chennai  TamilNadu  600130
-				IN
-
 D4-6C-62   (hex)		MultiTracks.com, LLC
 D46C62     (base 16)		MultiTracks.com, LLC
 				1500 Arrow Point DriveBuilding 7, Suite 701
@@ -88832,12 +89342,6 @@ EC97E0     (base 16)		Hangzhou Ezviz Sof
 				REDMOND  WA  98052
 				US
 
-A8-13-0B   (hex)		eero inc.
-A8130B     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 A4-97-91   (hex)		Extreme Networks Headquarters
 A49791     (base 16)		Extreme Networks Headquarters
 				2121 RDU Center Drive 
@@ -89267,12 +89771,6 @@ A01AE3     (base 16)		Edgecore Americas
 				San Francisco    94158
 				US
 
-8C-DD-0B   (hex)		eero inc.
-8CDD0B     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 A4-AD-9E   (hex)		NEXAIOT
 A4AD9E     (base 16)		NEXAIOT
 				13F., No. 922, Zhongzheng Rd.,
@@ -89285,24 +89783,936 @@ A4AD9E     (base 16)		NEXAIOT
 				Shenzhen  Guangdong  518057
 				CN
 
+A8-0C-CA   (hex)		Shenzhen Sundray Technologies company Limited
+A80CCA     (base 16)		Shenzhen Sundray Technologies company Limited
+				6th Floor,Block A1, Nanshan iPark, No.1001 XueYuan Road, Nanshan District
+				Shenzhen  Guangdong  518057
+				CN
+
+70-3A-73   (hex)		Shenzhen Sundray Technologies company Limited
+703A73     (base 16)		Shenzhen Sundray Technologies company Limited
+				6th Floor,Block A1, Nanshan iPark, No.1001 XueYuan Road, Nanshan District
+				Shenzhen  Guangdong  518057
+				CN
+
+20-20-27   (hex)		Shenzhen Sundray Technologies company Limited
+202027     (base 16)		Shenzhen Sundray Technologies company Limited
+				5th Floor, Block A4, Nanshan ipark,NO.1001 Xue Yuan Road, Nanshan District, Shenzhen 518055, P.R. China
+				Shenzhen  Guangdong  518057
+				CN
+
+90-3F-C3   (hex)		Huawei Device Co., Ltd.
+903FC3     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+C4-49-3E   (hex)		Motorola Mobility LLC, a Lenovo Company
+C4493E     (base 16)		Motorola Mobility LLC, a Lenovo Company
+				222 West Merchandise Mart Plaza
+				Chicago  IL  60654
+				US
+
+94-EF-50   (hex)		TP-Link Systems Inc.
+94EF50     (base 16)		TP-Link Systems Inc.
+				10 Mauchly
+				 Irvine  CA  92618
+				US
+
 FC-A2-DF   (hex)		IEEE Registration Authority
 FCA2DF     (base 16)		IEEE Registration Authority
 				445 Hoes Lane
 				Piscataway  NJ  08554
 				US
 
-C4-49-3E   (hex)		Motorola Mobility LLC, a Lenovo Company
-C4493E     (base 16)		Motorola Mobility LLC, a Lenovo Company
-				222 West Merchandise Mart Plaza
-				Chicago  IL  60654
+CC-62-00   (hex)		Honor Device Co., Ltd.
+CC6200     (base 16)		Honor Device Co., Ltd.
+				Suite 3401, Unit A, Building 6, Shum Yip Sky Park, No. 8089, Hongli West Road, Xiangmihu Street, Futian District 
+				Shenzhen   Guangdong  518040
+				CN
+
+54-EA-E1   (hex)		Honor Device Co., Ltd.
+54EAE1     (base 16)		Honor Device Co., Ltd.
+				Suite 3401, Unit A, Building 6, Shum Yip Sky Park, No. 8089, Hongli West Road, Xiangmihu Street, Futian District 
+				Shenzhen   Guangdong  518040
+				CN
+
+7C-69-2B   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+7C692B     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+38-6E-B2   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+386EB2     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+7C-C8-82   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+7CC882     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+3C-A6-2F   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+3CA62F     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+3C-37-12   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+3C3712     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+0C-72-74   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+0C7274     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+04-B4-FE   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+04B4FE     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+C0-54-4D   (hex)		Nokia Shanghai Bell Co., Ltd.
+C0544D     (base 16)		Nokia Shanghai Bell Co., Ltd.
+				No.388 Ning Qiao Road,Jin Qiao Pudong Shanghai
+				Shanghai     201206
+				CN
+
+CC-CE-1E   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+CCCE1E     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+7C-FF-4D   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+7CFF4D     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+60-57-7D   (hex)		eero inc.
+60577D     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+AC-EC-85   (hex)		eero inc.
+ACEC85     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+0C-1C-1A   (hex)		eero inc.
+0C1C1A     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+64-C2-69   (hex)		eero inc.
+64C269     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
 				US
 
-60-98-49   (hex)		Nokia solutions and networks Pvt Ltd
-609849     (base 16)		Nokia solutions and networks Pvt Ltd
+74-B6-B6   (hex)		eero inc.
+74B6B6     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+30-57-8E   (hex)		eero inc.
+30578E     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+F0-21-E0   (hex)		eero inc.
+F021E0     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+4C-01-43   (hex)		eero inc.
+4C0143     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+F8-BB-BF   (hex)		eero inc.
+F8BBBF     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+00-AB-48   (hex)		eero inc.
+00AB48     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+18-CE-DF   (hex)		Quectel Wireless Solutions Co.,Ltd.
+18CEDF     (base 16)		Quectel Wireless Solutions Co.,Ltd.
+				7th Floor, Hongye Building, No.1801 Hongmei Road, Xuhui District
+				Shanghai    200233
+				CN
+
+00-33-7A   (hex)		Tuya Smart Inc.
+00337A     (base 16)		Tuya Smart Inc.
+				160 Greentree Drive, Suite 101
+				Dover  DE  19904
+				US
+
+48-1F-66   (hex)		China Mobile Group Device Co.,Ltd.
+481F66     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+08-15-AE   (hex)		China Mobile Group Device Co.,Ltd.
+0815AE     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+F4-BF-BB   (hex)		China Mobile Group Device Co.,Ltd.
+F4BFBB     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+EC-E7-C2   (hex)		China Mobile Group Device Co.,Ltd.
+ECE7C2     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+14-A1-DF   (hex)		China Mobile Group Device Co.,Ltd.
+14A1DF     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+CC-96-A2   (hex)		China Mobile Group Device Co.,Ltd.
+CC96A2     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+FC-2E-19   (hex)		China Mobile Group Device Co.,Ltd.
+FC2E19     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+6C-0F-0B   (hex)		China Mobile Group Device Co.,Ltd.
+6C0F0B     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+EC-9B-2D   (hex)		China Mobile Group Device Co.,Ltd.
+EC9B2D     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+DC-15-2D   (hex)		China Mobile Group Device Co.,Ltd.
+DC152D     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+70-93-C1   (hex)		eero inc.
+7093C1     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+64-DA-ED   (hex)		eero inc.
+64DAED     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+7C-5E-98   (hex)		eero inc.
+7C5E98     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+60-F4-19   (hex)		eero inc.
+60F419     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+54-92-6A   (hex)		GD Midea Air-Conditioning Equipment Co.,Ltd.
+54926A     (base 16)		GD Midea Air-Conditioning Equipment Co.,Ltd.
+				Midea Global Innovation Center,Beijiao Town,Shunde
+				Foshan  Guangdong  528311
+				CN
+
+0C-93-A5   (hex)		eero inc.
+0C93A5     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+A8-13-0B   (hex)		eero inc.
+A8130B     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+8C-DD-0B   (hex)		eero inc.
+8CDD0B     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+B8-3F-D2   (hex)		Mellanox Technologies, Inc.
+B83FD2     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+A4-1B-34   (hex)		China Mobile Group Device Co.,Ltd.
+A41B34     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+B4-B9-E6   (hex)		eero inc.
+B4B9E6     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+D8-3E-EF   (hex)		COOSEA GROUP (HK) COMPANY LIMITED
+D83EEF     (base 16)		COOSEA GROUP (HK) COMPANY LIMITED
+				Unit 56 16F Multifield Plaza,37A Part Avenue.Tsim Sha Tsui,KL,Hong Kong,SAR CHINA
+				Hong Kong    999077
+				CN
+
+70-7D-A1   (hex)		Sagemcom Broadband SAS
+707DA1     (base 16)		Sagemcom Broadband SAS
+				250, route de l'Empereur
+				Rueil Malmaison Cedex  hauts de seine  92848
+				FR
+
+04-58-5D   (hex)		IEEE Registration Authority
+04585D     (base 16)		IEEE Registration Authority
+				445 Hoes Lane
+				Piscataway  NJ  08554
+				US
+
+D0-78-9A   (hex)		Vantiva - Connected Home
+D0789A     (base 16)		Vantiva - Connected Home
+				4855 Peachtree Industrial Blvd, Suite 200
+				Norcross  GA  30902
+				US
+
+C4-86-4F   (hex)		Beijing BitIntelligence Information Technology Co. Ltd.
+C4864F     (base 16)		Beijing BitIntelligence Information Technology Co. Ltd.
+				Room 708, Founder International Building, No. 52, North Fourth Ring West Road, Haidian District
+				Beijing  Beijing  100080
+				CN
+
+E0-E6-E3   (hex)		TeamF1 Networks Pvt Limited
+E0E6E3     (base 16)		TeamF1 Networks Pvt Limited
+				Ascendas IT Park, Capella Block, Floor #2, Plot No: 17, Software Units Layout, Madhapur
+				Hyderabad  Telangana  500081
+				IN
+
+C8-7F-2B   (hex)		INGRAM MICRO SERVICES
+C87F2B     (base 16)		INGRAM MICRO SERVICES
+				100 CHEMIN DE BAILLOT
+				MONTAUBAN    82000
+				FR
+
+78-8E-45   (hex)		Jizaie inc.
+788E45     (base 16)		Jizaie inc.
+				 Inspired.Lab 569 Otemachi Building 5F, 1-6-1 Otemachi, Chiyoda-ku, Tokyo 100-0004
+				Tokyo  Tokyo   100-0004
+				JP
+
+4C-FA-C9   (hex)		BWS IoT
+4CFAC9     (base 16)		BWS IoT
+				Calçada Acácias, 31
+				Barueri  Sao Paulo  06453-054
+				BR
+
+68-24-99   (hex)		Quectel Wireless Solutions Co.,Ltd.
+682499     (base 16)		Quectel Wireless Solutions Co.,Ltd.
+				7th Floor, Hongye Building, No.1801 Hongmei Road, Xuhui District
+				Shanghai    200233
+				CN
+
+30-3B-49   (hex)		Cisco Meraki
+303B49     (base 16)		Cisco Meraki
+				500 Terry A. Francois Blvd
+				San Francisco    94158
+				US
+
+34-FA-1C   (hex)		Beijing Xiaomi Mobile Software Co., Ltd
+34FA1C     (base 16)		Beijing Xiaomi Mobile Software Co., Ltd
+				The Rainbow City Office Building, 68 Qinghe Middle Street Haidian District
+				Beijing  Beijing  100085
+				CN
+
+28-76-CD   (hex)		Funshion Online Technologies Co.,Ltd
+2876CD     (base 16)		Funshion Online Technologies Co.,Ltd
+				2101, Floor 1-2, Building 9, Anzhen Xili District 3, Chaoyang District, Beijing
+				Beijing     100029
+				CN
+
+44-35-B9   (hex)		NetComm Wireless Pty Ltd
+4435B9     (base 16)		NetComm Wireless Pty Ltd
+				Level 1, 18-20 Orion Road
+				Sydney  NSW  2066
+				AU
+
+4C-CF-7C   (hex)		HP Inc.
+4CCF7C     (base 16)		HP Inc.
+				10300 Energy Dr
+				Spring  TX  77389
+				US
+
+DC-BB-3D   (hex)		Extreme Networks Headquarters
+DCBB3D     (base 16)		Extreme Networks Headquarters
+				2121 RDU Center Drive 
+				Morrisville    27560
+				US
+
+20-3A-0C   (hex)		eero inc.
+203A0C     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+FC-B2-14   (hex)		Apple, Inc.
+FCB214     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+2C-95-20   (hex)		Apple, Inc.
+2C9520     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+00-15-FF   (hex)		Inseego Wireless, Inc
+0015FF     (base 16)		Inseego Wireless, Inc
+				9710 Scranton Rd., Suite 200
+				San Diego  CA  92121
+				US
+
+28-80-A2   (hex)		Inseego Wireless, Inc
+2880A2     (base 16)		Inseego Wireless, Inc
+				9710 Scranton Rd., Suite 200
+				San Diego  CA  92121
+				US
+
+18-EE-86   (hex)		Inseego Wireless, Inc
+18EE86     (base 16)		Inseego Wireless, Inc
+				9710 Scranton Rd., Suite 200
+				San Diego  CA  92121
+				US
+
+20-F4-D4   (hex)		Apple, Inc.
+20F4D4     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+30-C0-AE   (hex)		Apple, Inc.
+30C0AE     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+F8-E2-52   (hex)		Apple, Inc.
+F8E252     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+FC-9F-2A   (hex)		Zyxel Communications Corporation
+FC9F2A     (base 16)		Zyxel Communications Corporation
+				No. 6 Innovation Road II, Science Park
+				Hsichu  Taiwan  300
+				TW
+
+64-75-DA   (hex)		Arcadyan Corporation
+6475DA     (base 16)		Arcadyan Corporation
+				No.8, Sec.2, Guangfu Rd.
+				Hsinchu City  Hsinchu  30071
+				TW
+
+B0-CC-CE   (hex)		IEEE Registration Authority
+B0CCCE     (base 16)		IEEE Registration Authority
+				445 Hoes Lane
+				Piscataway  NJ  08554
+				US
+
+DC-B4-D9   (hex)		Espressif Inc.
+DCB4D9     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+98-32-68   (hex)		Silicon Laboratories
+983268     (base 16)		Silicon Laboratories
+				 400 West Cesar Chavez
+				Austin  TX  78701
+				US
+
+B8-9C-13   (hex)		Alps Alpine
+B89C13     (base 16)		Alps Alpine
+				20-1, Yoshima Industrial Park
+				Iwaki  Fukushima  970-1192
+				JP
+
+BC-76-F9   (hex)		Ubiquoss Inc
+BC76F9     (base 16)		Ubiquoss Inc
+				8F Ubiquoss B/D, 68, Pangyo-ro 255beon-gil, Bundang-gu
+				Seongnam-si  Gyeonggi-do  463-400
+				KR
+
+24-D1-A1   (hex)		Shenzhen Cultraview Digital Technology Co., Ltd
+24D1A1     (base 16)		Shenzhen Cultraview Digital Technology Co., Ltd
+				F6,M6,Maqueling, High-tech park, Nanshan district
+				Shenzhen  Guangdong  518057
+				CN
+
+44-9F-DA   (hex)		Silicon Laboratories
+449FDA     (base 16)		Silicon Laboratories
+				 400 West Cesar Chavez
+				Austin  TX  78701
+				US
+
+A8-1F-79   (hex)		Yingling Innovations Pte. Ltd.
+A81F79     (base 16)		Yingling Innovations Pte. Ltd.
+				24 Sin Ming Lane #06-97
+				Midview    573970
+				SG
+
+80-23-95   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+802395     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+04-8F-00   (hex)		Rong-Paisa Electronics Co., Ltd.
+048F00     (base 16)		Rong-Paisa Electronics Co., Ltd.
+				Carrera 43f #14A-112
+				Medellin  Antioquia  050021
+				CO
+
+8C-5C-53   (hex)		AltoBeam Inc.
+8C5C53     (base 16)		AltoBeam Inc.
+				B808, Tsinghua Tongfang Hi-Tech Plaza, Haidian
+				Beijing  Beijing  100083
+				CN
+
+EC-7C-BA   (hex)		Hewlett Packard Enterprise 
+EC7CBA     (base 16)		Hewlett Packard Enterprise 
+				1701 E Mossy Oaks Rd
+				Spring  TX  77389
+				US
+
+0C-A2-F4   (hex)		Chameleon Technology (UK) Limited
+0CA2F4     (base 16)		Chameleon Technology (UK) Limited
+				1st Floor, Central House Otley Road
+				Beckwith Knowle  Harrogate  HG3 1UF
+				GB
+
+50-2E-91   (hex)		AzureWave Technology Inc.
+502E91     (base 16)		AzureWave Technology Inc.
+				8F., No. 94, Baozhong Rd.
+				New Taipei City  Taiwan  231
+				TW
+
+E4-9F-7D   (hex)		Samsung Electronics Co.,Ltd
+E49F7D     (base 16)		Samsung Electronics Co.,Ltd
+				#94-1, Imsoo-Dong
+				Gumi  Gyeongbuk  730-350
+				KR
+
+E8-BF-E1   (hex)		Intel Corporate
+E8BFE1     (base 16)		Intel Corporate
+				Lot 8, Jalan Hi-Tech 2/3  
+				Kulim  Kedah  09000
+				MY
+
+64-4A-7D   (hex)		Intel Corporate
+644A7D     (base 16)		Intel Corporate
+				Lot 8, Jalan Hi-Tech 2/3  
+				Kulim  Kedah  09000
+				MY
+
+AC-3D-CB   (hex)		Intel Corporate
+AC3DCB     (base 16)		Intel Corporate
+				Lot 8, Jalan Hi-Tech 2/3  
+				Kulim  Kedah  09000
+				MY
+
+48-E1-50   (hex)		Intel Corporate
+48E150     (base 16)		Intel Corporate
+				Lot 8, Jalan Hi-Tech 2/3  
+				Kulim  Kedah  09000
+				MY
+
+B4-3A-96   (hex)		Arista Networks
+B43A96     (base 16)		Arista Networks
+				5453 Great America Parkway
+				Santa Clara  CA  95054
+				US
+
+94-CD-FD   (hex)		eero inc.
+94CDFD     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+74-67-5F   (hex)		COMPAL INFORMATION(KUNSHAN)CO.,LTD.
+74675F     (base 16)		COMPAL INFORMATION(KUNSHAN)CO.,LTD.
+				 NO. 25, THE 3RD Street KUNSHAN EXPORT PROCESSING ZON
+				KUNSHAN  SUZHOU  215300
+				CN
+
+6C-2F-1C   (hex)		Nexus Raytek Pty Ltd
+6C2F1C     (base 16)		Nexus Raytek Pty Ltd
+				160/425 Smith Street 
+				Fitzroy  Victoria  3065
+				AU
+
+60-98-49   (hex)		Nokia Solutions and Networks India Private Limited
+609849     (base 16)		Nokia Solutions and Networks India Private Limited
 				Radiance Ivy terrace, Block 4, 9R, Egattur, Chennai
 				Chennai  TamilNadu  600130
 				IN
 
+84-6E-BC   (hex)		Nokia Solutions and Networks India Private Limited
+846EBC     (base 16)		Nokia Solutions and Networks India Private Limited
+				Radiance Ivy terrace, Block 4, 9R, Egattur, Chennai
+				Chennai  TamilNadu  600130
+				IN
+
+68-F7-D8   (hex)		Microsoft Corporation
+68F7D8     (base 16)		Microsoft Corporation
+				One Microsoft Way
+				REDMOND  WA  98052
+				US
+
+BC-89-A6   (hex)		Nintendo Co.,Ltd
+BC89A6     (base 16)		Nintendo Co.,Ltd
+				11-1 HOKOTATE-CHO KAMITOBA,MINAMI-KU
+				KYOTO  KYOTO  601-8501
+				JP
+
+C0-CD-D6   (hex)		Espressif Inc.
+C0CDD6     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+50-51-4F   (hex)		Sapphire Brands Limited
+50514F     (base 16)		Sapphire Brands Limited
+				Hudsun Chambers, P.O.Box 986, Road Town
+				Tortola    VG1110
+				VG
+
+8C-7A-B3   (hex)		Guangzhou Shiyuan Electronic Technology Company Limited
+8C7AB3     (base 16)		Guangzhou Shiyuan Electronic Technology Company Limited
+				No.6, 4th Yunpu Road, Yunpu industry District
+				Guangzhou  Guangdong  510530
+				CN
+
+E8-CD-15   (hex)		Vantiva USA LLC
+E8CD15     (base 16)		Vantiva USA LLC
+				4855 Peachtree Industrial Blvd, Suite 200
+				Norcross  GA  30902
+				US
+
+60-75-6C   (hex)		LG Electronics
+60756C     (base 16)		LG Electronics
+				222 LG-ro, JINWI-MYEON
+				Pyeongtaek-si  Gyeonggi-do  451-713
+				KR
+
+3C-DC-75   (hex)		Espressif Inc.
+3CDC75     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+88-B9-51   (hex)		Xiaomi Communications Co Ltd
+88B951     (base 16)		Xiaomi Communications Co Ltd
+				#019, 9th Floor, Building 6, 33 Xi'erqi Middle Road
+				Beijing  Haidian District  100085
+				CN
+
+74-24-CA   (hex)		Guangzhou Shiyuan Electronic Technology Company Limited
+7424CA     (base 16)		Guangzhou Shiyuan Electronic Technology Company Limited
+				No.6, 4th Yunpu Road, Yunpu industry District
+				Guangzhou  Guangdong  510530
+				CN
+
+70-B2-58   (hex)		Ruckus Wireless
+70B258     (base 16)		Ruckus Wireless
+				350 West Java Drive
+				Sunnyvale  CA  94089
+				US
+
+00-6A-5E   (hex)		IEEE Registration Authority
+006A5E     (base 16)		IEEE Registration Authority
+				445 Hoes Lane
+				Piscataway  NJ  08554
+				US
+
+FC-50-D6   (hex)		Huawei Device Co., Ltd.
+FC50D6     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+60-5F-AA   (hex)		Huawei Device Co., Ltd.
+605FAA     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+24-76-45   (hex)		Huawei Device Co., Ltd.
+247645     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+EC-31-11   (hex)		Sichuan AI-Link Technology Co., Ltd.
+EC3111     (base 16)		Sichuan AI-Link Technology Co., Ltd.
+				Anzhou, Industrial Park
+				Mianyang  Sichuan  622650
+				CN
+
+D0-B1-CA   (hex)		Shenzhen Skyworth Digital  Technology  CO., Ltd
+D0B1CA     (base 16)		Shenzhen Skyworth Digital  Technology  CO., Ltd
+				4F,Block A, Skyworth?Building,
+				Shenzhen  Guangdong  518057
+				CN
+
+D8-01-EB   (hex)		Infinity Electronics Ltd
+D801EB     (base 16)		Infinity Electronics Ltd
+				167-169 Great Portland Street
+				London  Surrey  W1W 5PF
+				GB
+
+7C-C1-78   (hex)		Ericsson AB
+7CC178     (base 16)		Ericsson AB
+				Torshamnsgatan 36
+				Stockholm    SE-164 80
+				SE
+
+D0-68-27   (hex)		eero inc.
+D06827     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+C8-66-4B   (hex)		Aperion Technologies LLC
+C8664B     (base 16)		Aperion Technologies LLC
+				48383 Fremont Blvd, Ste 116
+				Fremont  CA  94538
+				US
+
+BC-45-29   (hex)		zte corporation
+BC4529     (base 16)		zte corporation
+				12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China
+				shenzhen   guangdong  518057
+				CN
+
+E8-7E-1C   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+E87E1C     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+C0-15-1B   (hex)		Sony Interactive Entertainment Inc.
+C0151B     (base 16)		Sony Interactive Entertainment Inc.
+				1-7-1 Konan
+				Minato-ku  Tokyo  108-0075
+				JP
+
+9C-65-EE   (hex)		Zhone Technologies, Inc.
+9C65EE     (base 16)		Zhone Technologies, Inc.
+				DASAN Tower 8F, 49 Daewangpangyo-ro644beon-gil Bundang-gu
+				Seongnam-si  Gyeonggi-do  13493
+				KR
+
+CC-6C-52   (hex)		Zhone Technologies, Inc.
+CC6C52     (base 16)		Zhone Technologies, Inc.
+				5700 Tennyson Parkway, Suite 400
+				Plano  TX  75024
+				US
+
+28-35-3A   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+28353A     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+60-30-B3   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+6030B3     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+8C-73-DA   (hex)		Silicon Laboratories
+8C73DA     (base 16)		Silicon Laboratories
+				 400 West Cesar Chavez
+				Austin  TX  78701
+				US
+
+D4-E9-F4   (hex)		Espressif Inc.
+D4E9F4     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+1C-DB-D4   (hex)		Espressif Inc.
+1CDBD4     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+68-44-06   (hex)		Texas Instruments
+684406     (base 16)		Texas Instruments
+				12500 TI Blvd
+				Dallas  TX  75243
+				US
+
+84-0C-6D   (hex)		Cisco Systems, Inc
+840C6D     (base 16)		Cisco Systems, Inc
+				80 West Tasman Drive
+				San Jose  CA  94568
+				US
+
+E4-B1-6C   (hex)		Apple, Inc.
+E4B16C     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+70-4C-A2   (hex)		Apple, Inc.
+704CA2     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+94-89-78   (hex)		Apple, Inc.
+948978     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+BC-5A-34   (hex)		New H3C Technologies Co., Ltd
+BC5A34     (base 16)		New H3C Technologies Co., Ltd
+				466 Changhe Road, Binjiang District
+				Hangzhou  Zhejiang  310052
+				CN
+
+28-D5-B1   (hex)		Apple, Inc.
+28D5B1     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+80-D1-CE   (hex)		Apple, Inc.
+80D1CE     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+2C-CC-7A   (hex)		AltoBeam Inc.
+2CCC7A     (base 16)		AltoBeam Inc.
+				B808, Tsinghua Tongfang Hi-Tech Plaza, Haidian
+				Beijing  Beijing  100083
+				CN
+
+6C-1A-EA   (hex)		Texas Instruments
+6C1AEA     (base 16)		Texas Instruments
+				12500 TI Blvd
+				Dallas  TX  75243
+				US
+
+34-55-06   (hex)		GUANGDONG GENIUS TECHNOLOGY CO., LTD.
+345506     (base 16)		GUANGDONG GENIUS TECHNOLOGY CO., LTD.
+				No.168, Middle Road Of East Gate
+				Xiaobian Community  Chang'an Town  523851
+				CN
+
+F0-68-E3   (hex)		AzureWave Technology Inc.
+F068E3     (base 16)		AzureWave Technology Inc.
+				8F., No. 94, Baozhong Rd.
+				New Taipei City  Taiwan  231
+				TW
+
+04-A9-24   (hex)		Mist Systems, Inc.
+04A924     (base 16)		Mist Systems, Inc.
+				1601 South De Anza Blvd, Suite 248
+				Cupertino  CA  95014
+				US
+
+14-D5-C6   (hex)		slash dev slash agents, inc
+14D5C6     (base 16)		slash dev slash agents, inc
+				334 Brannan St, Floor 2
+				San Francisco  CA  94107
+				US
+
+D8-85-AC   (hex)		Espressif Inc.
+D885AC     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+D4-7A-97   (hex)		Realme Chongqing Mobile Telecommunications Corp.,Ltd.
+D47A97     (base 16)		Realme Chongqing Mobile Telecommunications Corp.,Ltd.
+				No.178 Yulong Avenue, Yufengshan, Yubei District, Chongqing.
+				Chongqing   China  401120
+				CN
+
+4C-8E-19   (hex)		Xiaomi Communications Co Ltd
+4C8E19     (base 16)		Xiaomi Communications Co Ltd
+				#019, 9th Floor, Building 6, 33 Xi'erqi Middle Road
+				Beijing  Haidian District  100085
+				CN
+
+20-98-8E   (hex)		Shenzhen Feasycom Co., Ltd
+20988E     (base 16)		Shenzhen Feasycom Co., Ltd
+				Box 508, Building A, Phoenix Wisdom Valley, No. 50, Tiezi Road, Xixiang, Bao'an, Shenzhen
+				Shenzhen    518102
+				CN
+
+44-38-F3   (hex)		EM Microelectronic
+4438F3     (base 16)		EM Microelectronic
+				Rue des Sors 3
+				Marin-Epagnier  Neuchatel  2074
+				CH
+
+0C-3D-5E   (hex)		Nanjing Qinheng Microelectronics Co., Ltd.
+0C3D5E     (base 16)		Nanjing Qinheng Microelectronics Co., Ltd.
+				No.18, Ningshuang Road
+				 Nanjing  Jiangsu  210012
+				CN
+
 6C-87-20   (hex)		New H3C Technologies Co., Ltd
 6C8720     (base 16)		New H3C Technologies Co., Ltd
 				466 Changhe Road, Binjiang District
@@ -89531,18 +90941,6 @@ D0F405     (base 16)		Hon Hai Precision
 				ShenZhen  GuangDong  518109
 				CN
 
-58-A2-E1   (hex)		Mellanox Technologies, Inc.
-58A2E1     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
-B0-CF-0E   (hex)		Mellanox Technologies, Inc.
-B0CF0E     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 88-09-AF   (hex)		Masimo Corporation
 8809AF     (base 16)		Masimo Corporation
 				52 Discovery
@@ -90767,12 +92165,6 @@ D8E35E     (base 16)		LG Innotek
 				Gwangju  Gwangsan-gu  506-731
 				KR
 
-78-68-29   (hex)		eero inc.
-786829     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 14-A4-17   (hex)		Shenzhen Belon Technology CO.,LTD
 14A417     (base 16)		Shenzhen Belon Technology CO.,LTD
 				Tsinghua Information
@@ -90887,30 +92279,6 @@ BC9B5E     (base 16)		Hangzhou Hikvision
 				Shanghai    200233
 				CN
 
-30-4F-75   (hex)		DZS Inc.
-304F75     (base 16)		DZS Inc.
-				DASAN Tower 8F, 49 Daewangpangyo-ro644beon-gil Bundang-gu
-				Seongnam-si  Gyeonggi-do  13493
-				KR
-
-D0-96-FB   (hex)		DZS Inc.
-D096FB     (base 16)		DZS Inc.
-				DASAN Tower 8F, 49 Daewangpangyo-ro644beon-gil Bundang-gu
-				Seongnam-si  Gyeonggi-do  13493
-				KR
-
-00-01-47   (hex)		DZS Inc.
-000147     (base 16)		DZS Inc.
-				7001 Oakport Street
-				Oakland  CA  94621
-				US
-
-00-02-71   (hex)		DZS Inc.
-000271     (base 16)		DZS Inc.
-				7001 Oakport Street
-				Oakland  CA  94621
-				US
-
 18-68-CB   (hex)		Hangzhou Hikvision Digital Technology Co.,Ltd.
 1868CB     (base 16)		Hangzhou Hikvision Digital Technology Co.,Ltd.
 				No.469,Jianghui Road
@@ -91313,12 +92681,6 @@ E0D8C4     (base 16)		Qingdao Intelligen
 				Gangnam-gu  Seoul  06224
 				KR
 
-BC-9E-2C   (hex)		China Mobile Group Device Co.,Ltd.
-BC9E2C     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 88-C6-E8   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
 88C6E8     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
@@ -91409,12 +92771,6 @@ E88843     (base 16)		Xiaomi Communicati
 				Cupertino  CA  95014
 				US
 
-AC-FC-82   (hex)		Shenzhen Sundray Technologies Company Limited
-ACFC82     (base 16)		Shenzhen Sundray Technologies Company Limited
-				5th Floor, Block A4, Nanshan ipark,NO.1001 Xue Yuan Road, Nanshan District, Shenzhen 518055, P.R. China
-				Shenzhen  Guangdong  518057
-				CN
-
 70-5A-6F   (hex)		IEEE Registration Authority
 705A6F     (base 16)		IEEE Registration Authority
 				445 Hoes Lane
@@ -91715,12 +93071,6 @@ E426D5     (base 16)		Motorola Mobility
 				Chicago  IL  60654
 				US
 
-FC-3F-A6   (hex)		eero inc.
-FC3FA6     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 E0-4B-41   (hex)		Hangzhou Beilian Low Carbon Technology Co., Ltd.
 E04B41     (base 16)		Hangzhou Beilian Low Carbon Technology Co., Ltd.
 				Room 2502, area a, building 1, No. 57, jianger Road, Changhe street, Binjiang District,
@@ -92033,12 +93383,6 @@ E8EF22     (base 16)		Siemens Numerical
 				Reno  NV  89507
 				US
 
-94-BE-09   (hex)		China Mobile Group Device Co.,Ltd.
-94BE09     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 E0-75-26   (hex)		China Dragon Technology Limited
 E07526     (base 16)		China Dragon Technology Limited
 				B4 Bldg.Haoshan 1st Industry Park,
@@ -92621,12 +93965,6 @@ E46A35     (base 16)		Realme Chongqing M
 				Shenzhen    518000
 				CN
 
-9C-05-91   (hex)		Mellanox Technologies, Inc.
-9C0591     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 E4-B5-55   (hex)		Huawei Device Co., Ltd.
 E4B555     (base 16)		Huawei Device Co., Ltd.
 				No.2 of Xincheng Road, Songshan Lake Zone
@@ -92669,12 +94007,6 @@ D87E6F     (base 16)		CASCINATION AG
 				Bern  Bern  3008
 				CH
 
-04-4F-7A   (hex)		China Mobile Group Device Co.,Ltd.
-044F7A     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 FC-C7-37   (hex)		Shaanxi Gangsion Electronic Technology Co., Ltd
 FCC737     (base 16)		Shaanxi Gangsion Electronic Technology Co., Ltd
 				Room 12302, building 1, Greenland territorial sea, No. 6, Jinye Road, high tech Zone, Xi'an, Shaanxi
@@ -93455,12 +94787,6 @@ F412FA     (base 16)		Espressif Inc.
 				Shanghai  Shanghai  201203
 				CN
 
-B0-F2-08   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-B0F208     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 F0-B2-B9   (hex)		Intel Corporate
 F0B2B9     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
@@ -94289,12 +95615,6 @@ F8F7B9     (base 16)		HUAWEI TECHNOLOGIE
 				Fuzhou  Fujian  350002
 				CN
 
-94-14-57   (hex)		Shenzhen Sundray Technologies Company Limited
-941457     (base 16)		Shenzhen Sundray Technologies Company Limited
-				5th Floor, Block A4, Nanshan ipark,NO.1001 Xue Yuan Road, Nanshan District, Shenzhen 518055, P.R. China
-				Shenzhen  Guangdong  518057
-				CN
-
 BC-57-29   (hex)		Shenzhen KKM Co., Ltd
 BC5729     (base 16)		Shenzhen KKM Co., Ltd
 				Room 3B,Building 6A, BaoNeng Park, QingXiang Road, LongHua District
@@ -94805,12 +96125,6 @@ FCD908     (base 16)		Xiaomi Communicati
 				Beijing  Haidian District  100085
 				CN
 
-D0-16-7C   (hex)		eero inc.
-D0167C     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 84-14-4D   (hex)		Intel Corporate
 84144D     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
@@ -95651,12 +96965,6 @@ D8EB46     (base 16)		Google, Inc.
 				New York  NY  10001
 				US
 
-78-10-53   (hex)		China Mobile Group Device Co.,Ltd.
-781053     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 A8-43-97   (hex)		Innogrit Corporation
 A84397     (base 16)		Innogrit Corporation
 				1735 Technology Dr, Suite 620
@@ -95885,12 +97193,6 @@ C89402     (base 16)		CHONGQING FUGUI EL
 				Yuseong -gu  Daejeon  34129
 				KR
 
-DC-15-C8   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-DC15C8     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 6C-D6-30   (hex)		Rootous System Co.,Ltd
 6CD630     (base 16)		Rootous System Co.,Ltd
 				KT B/D 4Floor, 100, Ahopgeori-gil
@@ -96059,12 +97361,6 @@ D809D6     (base 16)		ZEXELON CO., LTD.
 				Matsudo-City  Chiba  270-0004
 				JP
 
-9C-A5-70   (hex)		eero inc.
-9CA570     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 74-04-F0   (hex)		Mobiwire Mobiles (NingBo) Co., LTD
 7404F0     (base 16)		Mobiwire Mobiles (NingBo) Co., LTD
 				No.999 Dacheng East Road, Fenghua District, Ningbo City , Zhejiang Province, PRC
@@ -96179,12 +97475,6 @@ EC75ED     (base 16)		Citrix Systems, In
 				GDYNIA    81-577
 				PL
 
-80-B9-7A   (hex)		eero inc.
-80B97A     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 A4-53-EE   (hex)		IEEE Registration Authority
 A453EE     (base 16)		IEEE Registration Authority
 				445 Hoes Lane
@@ -96509,12 +97799,6 @@ B40EDE     (base 16)		Intel Corporate
 				Dongguan    523808
 				CN
 
-4C-EF-56   (hex)		Shenzhen Sundray Technologies Company Limited
-4CEF56     (base 16)		Shenzhen Sundray Technologies Company Limited
-				5th Floor, Block A4, Nanshan ipark,NO.1001 Xue Yuan Road, Nanshan District, Shenzhen 518055, P.R. China
-				Shenzhen  Guangdong  518057
-				CN
-
 E8-4F-4B   (hex)		Shenzhen Delos Electronic Co., Ltd
 E84F4B     (base 16)		Shenzhen Delos Electronic Co., Ltd
 				Rm 603, Tower B, Galaxy World Building, No.1 Yabao Road,Longgang District,Shenzhen,P.R.China.
@@ -97619,12 +98903,6 @@ F0B022     (base 16)		TOHO Electronics I
 				Sagamihara-City  Kanagawa  252-0245
 				JP
 
-0C-14-D2   (hex)		China Mobile Group Device Co.,Ltd.
-0C14D2     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 98-7E-CA   (hex)		Inventus Power Eletronica do Brasil LTDA
 987ECA     (base 16)		Inventus Power Eletronica do Brasil LTDA
 				Av Buriti, 4285 Distrito Industrial
@@ -97871,12 +99149,6 @@ B86392     (base 16)		GUANGDONG GENIUS T
 				Irvine  CA  92618
 				US
 
-08-C0-EB   (hex)		Mellanox Technologies, Inc.
-08C0EB     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 E4-E1-12   (hex)		Texas Instruments
 E4E112     (base 16)		Texas Instruments
 				12500 TI Blvd
@@ -98195,12 +99467,6 @@ D80BCB     (base 16)		Telink Semiconduct
 				WAN CHAI    999077
 				HK
 
-2C-91-AB   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-2C91AB     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 80-7B-3E   (hex)		Samsung Electronics Co.,Ltd
 807B3E     (base 16)		Samsung Electronics Co.,Ltd
 				#94-1, Imsoo-Dong
@@ -98243,12 +99509,6 @@ A824B8     (base 16)		Nokia
 				Beijing  Beijing  100085
 				CN
 
-CC-5C-DE   (hex)		China Mobile Group Device Co.,Ltd.
-CC5CDE     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 4C-4F-EE   (hex)		OnePlus Technology (Shenzhen) Co., Ltd
 4C4FEE     (base 16)		OnePlus Technology (Shenzhen) Co., Ltd
 				18C02, 18C03, 18C04 ,18C05,TAIRAN BUILDING,
@@ -98471,12 +99731,6 @@ D8AED0     (base 16)		Shanghai Engineeri
 				Shanghai  Shanghai  200241
 				CN
 
-0C-42-A1   (hex)		Mellanox Technologies, Inc.
-0C42A1     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 E0-85-9A   (hex)		SHENZHEN RF-LINK TECHNOLOGY CO.,LTD.
 E0859A     (base 16)		SHENZHEN RF-LINK TECHNOLOGY CO.,LTD.
 				Bldg56A,6/F,Baotian Rd3,Xixiang Town,Baoan District,
@@ -99323,24 +100577,12 @@ D0C65B     (base 16)		HUAWEI TECHNOLOGIE
 				NO.68, Qinghe Middle Street  Haidian District, Beijing  100085
 				CN
 
-78-C3-13   (hex)		China Mobile Group Device Co.,Ltd.
-78C313     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 74-34-AE   (hex)		this is engineering Inc.
 7434AE     (base 16)		this is engineering Inc.
 				352, 815 Daewangpangyo-ro, Sujeong-gu
 				Seongnam-si  Gyeonggi-do  13449
 				KR
 
-74-AD-B7   (hex)		China Mobile Group Device Co.,Ltd.
-74ADB7     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street
-				Beijing    100053
-				CN
-
 78-CC-2B   (hex)		SINEWY TECHNOLOGY CO., LTD
 78CC2B     (base 16)		SINEWY TECHNOLOGY CO., LTD
 				2F., No.179, Dongmin Rd.
@@ -99551,12 +100793,6 @@ D8F15B     (base 16)		Espressif Inc.
 				Hangzhou  Zhejiang,P.R.China  310051
 				CN
 
-90-47-3C   (hex)		China Mobile Group Device Co.,Ltd.
-90473C     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 7C-21-D8   (hex)		Shenzhen Think Will Communication Technology co., LTD.
 7C21D8     (base 16)		Shenzhen Think Will Communication Technology co., LTD.
 				16F,Block A,Central Plaza,No.2002,Baoyuan Rd.,Baoan District
@@ -99641,12 +100877,6 @@ DC8C37     (base 16)		Cisco Systems, Inc
 				San Jose  CA  94568
 				US
 
-10-3D-3E   (hex)		China Mobile Group Device Co.,Ltd.
-103D3E     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 64-CC-22   (hex)		Arcadyan Corporation
 64CC22     (base 16)		Arcadyan Corporation
 				No.8, Sec.2, Guangfu Rd.
@@ -99791,12 +101021,6 @@ F47960     (base 16)		HUAWEI TECHNOLOGIE
 				NO.68, Qinghe Middle Street  Haidian District, Beijing  100085
 				CN
 
-AC-71-0C   (hex)		China Mobile Group Device Co.,Ltd.
-AC710C     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 A8-DB-03   (hex)		SAMSUNG ELECTRO-MECHANICS(THAILAND)
 A8DB03     (base 16)		SAMSUNG ELECTRO-MECHANICS(THAILAND)
 				93Moo5T. Bangsamak SEMTHAI, WELLGROW INDUSTRIAL ESTATE
@@ -99845,12 +101069,6 @@ A0BD1D     (base 16)		Zhejiang Dahua Tec
 				Hangzhou  Zhejiang  310053
 				CN
 
-B4-D0-A9   (hex)		China Mobile Group Device Co.,Ltd.
-B4D0A9     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 48-46-C1   (hex)		FN-LINK TECHNOLOGY LIMITED
 4846C1     (base 16)		FN-LINK TECHNOLOGY LIMITED
 				A Building,HuiXin industial park,No 31, YongHe road, Fuyong town, Bao'an District
@@ -101411,12 +102629,6 @@ DCAF68     (base 16)		WEIFANG GOERTEK EL
 				Bayan Lepas  Pulau Pinang  11900
 				MY
 
-70-89-CC   (hex)		China Mobile Group Device Co.,Ltd.
-7089CC     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 2C-5B-E1   (hex)		Centripetal Networks, Inc
 2C5BE1     (base 16)		Centripetal Networks, Inc
 				2251 Corporate Park Drive, Suite 150
@@ -102809,12 +104021,6 @@ D05995     (base 16)		Fiberhome Telecomm
 				Wuhan  Hubei  430074
 				CN
 
-18-CC-88   (hex)		Hitachi Johnson Controls Air 
-18CC88     (base 16)		Hitachi Johnson Controls Air 
-				390 Number
-				 Shimizu Village Village  Shizuoka Prefecture  424-0926
-				JP
-
 7C-DD-76   (hex)		Suzhou Hanming Technologies Co., Ltd.
 7CDD76     (base 16)		Suzhou Hanming Technologies Co., Ltd.
 				Suite 407, No. 166, Ren Ai Road
@@ -104999,12 +106205,6 @@ E8E5D6     (base 16)		Samsung Electronic
 				Palo Alto  CA  94306
 				US
 
-C8-0E-14   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-C80E14     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 AC-63-BE   (hex)		Amazon Technologies Inc.
 AC63BE     (base 16)		Amazon Technologies Inc.
 				P.O Box 8102
@@ -105431,12 +106631,6 @@ D013FD     (base 16)		LG Electronics (Mo
 				Seoul    153-801
 				KR
 
-00-25-8B   (hex)		Mellanox Technologies, Inc.
-00258B     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 88-79-7E   (hex)		Motorola Mobility LLC, a Lenovo Company
 88797E     (base 16)		Motorola Mobility LLC, a Lenovo Company
 				222 West Merchandise Mart Plaza
@@ -106763,12 +107957,6 @@ A0B9ED     (base 16)		Skytap
 				Seoul    153-801
 				KR
 
-38-10-D5   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-3810D5     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 00-60-16   (hex)		CLARIION
 006016     (base 16)		CLARIION
 				COSLIN DRIVE
@@ -110285,12 +111473,6 @@ E4907E     (base 16)		Motorola Mobility
 				HungHom  Kowloon  00000
 				HK
 
-F4-15-63   (hex)		F5 Networks, Inc.
-F41563     (base 16)		F5 Networks, Inc.
-				1322 North Whitman Lane
-				Liberty Lake  WA  99019
-				US
-
 8C-8B-83   (hex)		Texas Instruments
 8C8B83     (base 16)		Texas Instruments
 				12500 TI Blvd
@@ -113012,12 +114194,6 @@ F8F082     (base 16)		NAGTECH LLC
 				San Francisco  CA  94105
 				US
 
-F4-52-14   (hex)		Mellanox Technologies, Inc.
-F45214     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 10-F4-9A   (hex)		T3 Innovation
 10F49A     (base 16)		T3 Innovation
 				808 Calle Plano
@@ -129362,12 +130538,6 @@ EC6E79     (base 16)		InHand Networks, I
 				Dulles  VA  20166
 				US
 
-C8-0C-53   (hex)		China Mobile Group Device Co.,Ltd.
-C80C53     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 A4-00-4E   (hex)		Cisco Systems, Inc
 A4004E     (base 16)		Cisco Systems, Inc
 				80 West Tasman Drive
@@ -130157,12 +131327,6 @@ B8876E     (base 16)		Intertech Services
 				Sunnyvale  CA  94089
 				US
 
-C8-A2-3B   (hex)		Shenzhen Sundray Technologies Company Limited
-C8A23B     (base 16)		Shenzhen Sundray Technologies Company Limited
-				5th Floor, Block A4, Nanshan ipark,NO.1001 Xue Yuan Road, Nanshan District, Shenzhen 518055, P.R. China
-				Shenzhen  Guangdong  518057
-				CN
-
 9C-9E-D5   (hex)		Xiaomi Communications Co Ltd
 9C9ED5     (base 16)		Xiaomi Communications Co Ltd
 				#019, 9th Floor, Building 6, 33 Xi'erqi Middle Road
@@ -130655,12 +131819,6 @@ F8C3F1     (base 16)		Raytron Photonics
 				Wuxi    214000 
 				CN
 
-E0-08-55   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-E00855     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 D8-95-63   (hex)		Taiwan Digital Streaming Co.
 D89563     (base 16)		Taiwan Digital Streaming Co.
 				No. 50-15, Ln. 60, Jianping 9th St., Anping Dist.
@@ -131633,12 +132791,6 @@ E8F673     (base 16)		Microsoft Corporat
 				Shenzhen  Guangdong  518057
 				CN
 
-D0-CB-DD   (hex)		eero inc.
-D0CBDD     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 44-B4-23   (hex)		HANWHA VISION VIETNAM COMPANY LIMITED
 44B423     (base 16)		HANWHA VISION VIETNAM COMPANY LIMITED
 				LOT O-2, QUE VO INDUSTRIAL ZONE EXTENDED AREA, NAM SON WARD
@@ -131957,12 +133109,6 @@ D450EE     (base 16)		GD Midea Air-Condi
 				Shanghai  Shanghai  201203
 				CN
 
-54-4D-D4   (hex)		China Mobile Group Device Co.,Ltd.
-544DD4     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 E8-05-DC   (hex)		Verifone, Inc.
 E805DC     (base 16)		Verifone, Inc.
 				2560 North First Street, Suite 220
@@ -132059,12 +133205,6 @@ D8B061     (base 16)		SHENZHEN WENXUN TE
 				SHENZHEN     518048
 				CN
 
-F4-85-AE   (hex)		Senbiosys SA
-F485AE     (base 16)		Senbiosys SA
-				rue de la Pierre-à-Mazel 39, c/o Microcity
-				Neuchâtel    2000
-				CH
-
 08-DD-03   (hex)		GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 08DD03     (base 16)		GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 				NO.18 HAIBIN ROAD,
@@ -132719,24 +133859,12 @@ C8FB54     (base 16)		iMin Technology Pt
 				Zhuhai  Guangdong  519070
 				CN
 
-C0-2D-2E   (hex)		China Mobile Group Device Co.,Ltd.
-C02D2E     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 C0-F8-53   (hex)		Tuya Smart Inc.
 C0F853     (base 16)		Tuya Smart Inc.
 				160 Greentree Drive, Suite 101
 				Dover  DE  19904
 				US
 
-44-AC-85   (hex)		eero inc.
-44AC85     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 00-BC-2F   (hex)		Actiontec Electronics Inc.
 00BC2F     (base 16)		Actiontec Electronics Inc.
 				2445 Augustine Dr #501
@@ -133337,12 +134465,6 @@ B0C61C     (base 16)		HUAWEI TECHNOLOGIE
 				Hong Kong  KOWLOON  999077
 				HK
 
-24-7B-A4   (hex)		China Mobile Group Device Co.,Ltd.
-247BA4     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 28-43-DC   (hex)		United Memory Technology (Jiangsu) Limited
 2843DC     (base 16)		United Memory Technology (Jiangsu) Limited
 				C5-401-03,Fuli Center,Xinyuan Road,Wuxi Economic Development Zone
@@ -133403,12 +134525,6 @@ EC1BFA     (base 16)		EM Microelectronic
 				San Jose  CA  94568
 				US
 
-18-A9-ED   (hex)		eero inc.
-18A9ED     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 A8-79-71   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
 A87971     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
@@ -133961,17 +135077,29 @@ A4D530     (base 16)		Avaya LLC
 				San Francisco    94158
 				US
 
-B8-07-56   (hex)		Cisco Meraki
-B80756     (base 16)		Cisco Meraki
-				500 Terry A. Francois Blvd
-				San Francisco    94158
-				US
+4C-EF-56   (hex)		Shenzhen Sundray Technologies company Limited
+4CEF56     (base 16)		Shenzhen Sundray Technologies company Limited
+				5th Floor, Block A4, Nanshan ipark,NO.1001 Xue Yuan Road, Nanshan District, Shenzhen 518055, P.R. China
+				Shenzhen  Guangdong  518057
+				CN
 
-A4-DB-4C   (hex)		RAI Institute
-A4DB4C     (base 16)		RAI Institute
-				145 Broadway
-				Cambridge  MA  02142
-				US
+94-14-57   (hex)		Shenzhen Sundray Technologies company Limited
+941457     (base 16)		Shenzhen Sundray Technologies company Limited
+				5th Floor, Block A4, Nanshan ipark,NO.1001 Xue Yuan Road, Nanshan District, Shenzhen 518055, P.R. China
+				Shenzhen  Guangdong  518057
+				CN
+
+AC-FC-82   (hex)		Shenzhen Sundray Technologies company Limited
+ACFC82     (base 16)		Shenzhen Sundray Technologies company Limited
+				5th Floor, Block A4, Nanshan ipark,NO.1001 Xue Yuan Road, Nanshan District, Shenzhen 518055, P.R. China
+				Shenzhen  Guangdong  518057
+				CN
+
+C8-A2-3B   (hex)		Shenzhen Sundray Technologies company Limited
+C8A23B     (base 16)		Shenzhen Sundray Technologies company Limited
+				5th Floor, Block A4, Nanshan ipark,NO.1001 Xue Yuan Road, Nanshan District, Shenzhen 518055, P.R. China
+				Shenzhen  Guangdong  518057
+				CN
 
 A0-88-5E   (hex)		Anhui Xiangyao New Energy Technology Co., Ltd.
 A0885E     (base 16)		Anhui Xiangyao New Energy Technology Co., Ltd.
@@ -133979,12 +135107,858 @@ A0885E     (base 16)		Anhui Xiangyao New
 				Huaibei City  Anhui Province  235065
 				CN
 
+7C-15-2D   (hex)		Renesas Electronics (Penang) Sdn. Bhd.
+7C152D     (base 16)		Renesas Electronics (Penang) Sdn. Bhd.
+				Phase 3, Bayan Lepas FIZ
+				Bayan Lepas  Penang  11900
+				MY
+
+A4-DB-4C   (hex)		RAI Institute
+A4DB4C     (base 16)		RAI Institute
+				145 Broadway
+				Cambridge  MA  02142
+				US
+
 34-BC-5E   (hex)		eero inc.
 34BC5E     (base 16)		eero inc.
 				660 3rd Street
 				San Francisco  CA  94107
 				US
 
+B8-07-56   (hex)		Cisco Meraki
+B80756     (base 16)		Cisco Meraki
+				500 Terry A. Francois Blvd
+				San Francisco    94158
+				US
+
+F8-EF-B1   (hex)		Hangzhou Zhongxinhui lntelligent Technology Co.,Ltd.
+F8EFB1     (base 16)		Hangzhou Zhongxinhui lntelligent Technology Co.,Ltd.
+				Room 809, Building B, No. 567 Yueming Road, Xixing Street,
+				Hangzhou  Binjiang Distric  310000
+				CN
+
+2C-91-AB   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+2C91AB     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+DC-15-C8   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+DC15C8     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+B0-F2-08   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+B0F208     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+BC-35-1E   (hex)		Tuya Smart Inc.
+BC351E     (base 16)		Tuya Smart Inc.
+				160 Greentree Drive, Suite 101
+				Dover  DE  19904
+				US
+
+38-10-D5   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+3810D5     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+C8-0E-14   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+C80E14     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+00-84-97   (hex)		Shenzhen MiaoMing Intelligent Technology Co.,Ltd
+008497     (base 16)		Shenzhen MiaoMing Intelligent Technology Co.,Ltd
+				3F, Building 2, No. 1310, Kukeng Sightseeing Road, Kukeng Community, Guanlan Street, Longhua District
+				Shenzhen  Guangdong  518110
+				CN
+
+28-7A-B4   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+287AB4     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+78-DC-87   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+78DC87     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+E0-08-55   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+E00855     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+D8-F1-2E   (hex)		TP-Link Systems Inc.
+D8F12E     (base 16)		TP-Link Systems Inc.
+				10 Mauchly
+				 Irvine  CA  92618
+				US
+
+90-47-3C   (hex)		China Mobile Group Device Co.,Ltd.
+90473C     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+74-AD-B7   (hex)		China Mobile Group Device Co.,Ltd.
+74ADB7     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+78-C3-13   (hex)		China Mobile Group Device Co.,Ltd.
+78C313     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+CC-5C-DE   (hex)		China Mobile Group Device Co.,Ltd.
+CC5CDE     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+0C-14-D2   (hex)		China Mobile Group Device Co.,Ltd.
+0C14D2     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+78-10-53   (hex)		China Mobile Group Device Co.,Ltd.
+781053     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+70-89-CC   (hex)		China Mobile Group Device Co.,Ltd.
+7089CC     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+B4-D0-A9   (hex)		China Mobile Group Device Co.,Ltd.
+B4D0A9     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+AC-71-0C   (hex)		China Mobile Group Device Co.,Ltd.
+AC710C     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+10-3D-3E   (hex)		China Mobile Group Device Co.,Ltd.
+103D3E     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+D0-CB-DD   (hex)		eero inc.
+D0CBDD     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+44-AC-85   (hex)		eero inc.
+44AC85     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+18-A9-ED   (hex)		eero inc.
+18A9ED     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+80-B9-7A   (hex)		eero inc.
+80B97A     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+9C-A5-70   (hex)		eero inc.
+9CA570     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+FC-3F-A6   (hex)		eero inc.
+FC3FA6     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+78-68-29   (hex)		eero inc.
+786829     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+10-1D-6E   (hex)		Hewlett Packard Enterprise
+101D6E     (base 16)		Hewlett Packard Enterprise
+				3333 Scott Blvd
+				6280 America Center Dr  CA  95002
+				US
+
+04-4F-7A   (hex)		China Mobile Group Device Co.,Ltd.
+044F7A     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+D0-16-7C   (hex)		eero inc.
+D0167C     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+24-7B-A4   (hex)		China Mobile Group Device Co.,Ltd.
+247BA4     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+F4-52-14   (hex)		Mellanox Technologies, Inc.
+F45214     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+00-25-8B   (hex)		Mellanox Technologies, Inc.
+00258B     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+0C-42-A1   (hex)		Mellanox Technologies, Inc.
+0C42A1     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+08-C0-EB   (hex)		Mellanox Technologies, Inc.
+08C0EB     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+9C-05-91   (hex)		Mellanox Technologies, Inc.
+9C0591     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+58-A2-E1   (hex)		Mellanox Technologies, Inc.
+58A2E1     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+B0-CF-0E   (hex)		Mellanox Technologies, Inc.
+B0CF0E     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+94-BE-09   (hex)		China Mobile Group Device Co.,Ltd.
+94BE09     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+BC-9E-2C   (hex)		China Mobile Group Device Co.,Ltd.
+BC9E2C     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+C8-0C-53   (hex)		China Mobile Group Device Co.,Ltd.
+C80C53     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+54-4D-D4   (hex)		China Mobile Group Device Co.,Ltd.
+544DD4     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+C0-2D-2E   (hex)		China Mobile Group Device Co.,Ltd.
+C02D2E     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+88-57-21   (hex)		Espressif Inc.
+885721     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+E4-96-52   (hex)		vivo Mobile Communication Co., Ltd.
+E49652     (base 16)		vivo Mobile Communication Co., Ltd.
+				No.1, vivo Road, Chang'an
+				Dongguan  Guangdong  523860
+				CN
+
+D4-A5-B4   (hex)		Hengji Jiaye (Hangzhou) Technology Co., Ltd
+D4A5B4     (base 16)		Hengji Jiaye (Hangzhou) Technology Co., Ltd
+				Room 809, Building B, Yingfeite Technology Park, No. 459 Jianghong Road, Changhe Street, Binjiang District, Hangzhou City, Zhejiang Province
+				Hangzhou  Zhejiang  310000
+				CN
+
+20-4D-52   (hex)		Mellanox Technologies, Inc.
+204D52     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100 
+				Sunnyvale  CA  94085
+				US
+
+F0-2C-59   (hex)		Chipsea Technologies (Shenzhen) Crop.
+F02C59     (base 16)		Chipsea Technologies (Shenzhen) Crop.
+				Room 301, Building 1, Shenzhen Bay Innovation and Technology Center, Keyuan Avenue, High-tech Zone Community, Yuehai Subdistrict, Nanshan District, Shenzhen
+				Shenzhen    518000
+				CN
+
+04-4A-69   (hex)		Shenzhen Phaten Tech. LTD
+044A69     (base 16)		Shenzhen Phaten Tech. LTD
+				C-6 ideamonto industril 7002 Songbai Road Guangming District Shenzhen City Guangdong, China
+				Shenzhen    518108
+				CN
+
+58-7A-B1   (hex)		Shanghai Lixun Information Technology Co., Ltd.
+587AB1     (base 16)		Shanghai Lixun Information Technology Co., Ltd.
+				Room 2111-L, No. 89 Yunling East Road
+				Putuo District  Shanghai  200333
+				CN
+
+04-B5-C1   (hex)		ITEL MOBILE LIMITED
+04B5C1     (base 16)		ITEL MOBILE LIMITED
+				RM B3 & B4 BLOCK B, KO FAI INDUSTRIAL BUILDING  NO.7 KO FAI ROAD, YAU TONG, KLN, H.K
+				Hong Kong  KOWLOON  999077
+				HK
+
+28-C9-7A   (hex)		New H3C Technologies Co., Ltd
+28C97A     (base 16)		New H3C Technologies Co., Ltd
+				466 Changhe Road, Binjiang District
+				Hangzhou  Zhejiang  310052
+				CN
+
+A0-3C-20   (hex)		Sagemcom Broadband SAS
+A03C20     (base 16)		Sagemcom Broadband SAS
+				250, route de l'Empereur
+				Rueil Malmaison Cedex  hauts de seine  92848
+				FR
+
+C4-9A-89   (hex)		Suzhou K-Hiragawa Electronic Technology Co.,Ltd
+C49A89     (base 16)		Suzhou K-Hiragawa Electronic Technology Co.,Ltd
+				No.1 Zhipu Road, Qiandeng Town
+				Suzhou  Jiangsu  215341
+				CN
+
+AC-BD-F7   (hex)		Cisco Meraki
+ACBDF7     (base 16)		Cisco Meraki
+				500 Terry A. Francois Blvd
+				San Francisco    94158
+				US
+
+FC-39-5A   (hex)		SonicWall 
+FC395A     (base 16)		SonicWall 
+				1033 McCarthy Blvd
+				Milpitas  CA  95035
+				US
+
+0C-FE-7B   (hex)		Vantiva USA LLC
+0CFE7B     (base 16)		Vantiva USA LLC
+				4855 Peachtree Industrial Blvd, Suite 200
+				Norcross  GA  30902
+				US
+
+B0-D5-FB   (hex)		Google, Inc.
+B0D5FB     (base 16)		Google, Inc.
+				1600 Amphitheatre Parkway
+				Mountain View  CA  94043
+				US
+
+48-D0-1C   (hex)		AltoBeam Inc.
+48D01C     (base 16)		AltoBeam Inc.
+				B808, Tsinghua Tongfang Hi-Tech Plaza, Haidian
+				Beijing  Beijing  100083
+				CN
+
+C8-17-F5   (hex)		Nanjing Qinheng Microelectronics Co., Ltd.
+C817F5     (base 16)		Nanjing Qinheng Microelectronics Co., Ltd.
+				No.18, Ningshuang Road
+				 Nanjing  Jiangsu  210012
+				CN
+
+D8-B2-AA   (hex)		zte corporation
+D8B2AA     (base 16)		zte corporation
+				12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China
+				shenzhen   guangdong  518057
+				CN
+
+90-14-AF   (hex)		Cambium Networks Limited
+9014AF     (base 16)		Cambium Networks Limited
+				Unit B2, Linhay Business Park,
+				Ashburton  Devon  TQ13 7UP
+				GB
+
+F4-15-63   (hex)		F5 Inc.
+F41563     (base 16)		F5 Inc.
+				1322 North Whitman Lane
+				Liberty Lake  WA  99019
+				US
+
+34-DA-A1   (hex)		Apple, Inc.
+34DAA1     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+CC-22-FE   (hex)		Apple, Inc.
+CC22FE     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+CC-67-D8   (hex)		Telin Semiconductor (Wuhan) Co.,Ltd
+CC67D8     (base 16)		Telin Semiconductor (Wuhan) Co.,Ltd
+				Room 1003 Buliding 5 , 2377 Shenkun Road ,Minhang District
+				Shanghai    201106
+				CN
+
+2C-F8-14   (hex)		Cisco Systems, Inc
+2CF814     (base 16)		Cisco Systems, Inc
+				80 West Tasman Drive
+				San Jose  CA  94568
+				US
+
+88-DA-04   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+88DA04     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+04-74-9E   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+04749E     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+CC-FA-F1   (hex)		Sagemcom Broadband SAS
+CCFAF1     (base 16)		Sagemcom Broadband SAS
+				250, route de l'Empereur
+				Rueil Malmaison Cedex  hauts de seine  92848
+				FR
+
+2C-9D-5A   (hex)		Flaircomm Microelectronics,Inc.
+2C9D5A     (base 16)		Flaircomm Microelectronics,Inc.
+				7F，Guomai Building,Guomai Science and Technology Park,116 Jiangbin East Avenue,Mawei District,Fuzhou City
+				Fuzhou  FUJIAN  350015
+				CN
+
+24-34-08   (hex)		Edgecore Americas Networking Corporation
+243408     (base 16)		Edgecore Americas Networking Corporation
+				20 Mason
+				Irvine  CA  92618
+				US
+
+64-AC-2B   (hex)		Juniper Networks
+64AC2B     (base 16)		Juniper Networks
+				1133 Innovation Way
+				Sunnyvale  CA  94089
+				US
+
+84-D0-DB   (hex)		Guangdong Juan Intelligent Technology Joint Stock Co., Ltd.
+84D0DB     (base 16)		Guangdong Juan Intelligent Technology Joint Stock Co., Ltd.
+				The first and second floors of Building 2  (Plant No. 2), West Side of Shanxi Village, Dashi Street,Panyu District, Guangzhou
+				Guangzhou  Guangdong  510000
+				CN
+
+8C-8B-5B   (hex)		Wistron Neweb Corporation
+8C8B5B     (base 16)		Wistron Neweb Corporation
+				No.20,Park Avenue II,Hsinchu Science Park
+				Hsin-Chu  R.O.C.  308
+				TW
+
+A8-6D-04   (hex)		Siemens AG
+A86D04     (base 16)		Siemens AG
+				Hermann-Papst-Strasse 1 
+				St. Georgen    78112
+				DE
+
+4C-46-D1   (hex)		Guangzhou V-Solution Telecommunication Technology Co.,Ltd.
+4C46D1     (base 16)		Guangzhou V-Solution Telecommunication Technology Co.,Ltd.
+				601,Building B2,No.162,Science Avenue,Science City,Guangzhou High-tech Industrial Development Zone,Guangdong Province,China
+				Guangzhou  Guangdong  510663
+				CN
+
+44-38-8C   (hex)		Sumitomo Electric Industries, Ltd
+44388C     (base 16)		Sumitomo Electric Industries, Ltd
+				1-1-3, Shimaya, Konohana-ku
+				Osaka    554-0024
+				JP
+
+7C-7B-BF   (hex)		Samsung Electronics Co.,Ltd
+7C7BBF     (base 16)		Samsung Electronics Co.,Ltd
+				#94-1, Imsoo-Dong
+				Gumi  Gyeongbuk  730-350
+				KR
+
+8C-2E-72   (hex)		Samsung Electronics Co.,Ltd
+8C2E72     (base 16)		Samsung Electronics Co.,Ltd
+				#94-1, Imsoo-Dong
+				Gumi  Gyeongbuk  730-350
+				KR
+
+DC-70-35   (hex)		Shengzhen Gongjin Electronics
+DC7035     (base 16)		Shengzhen Gongjin Electronics
+				No. 2 Danzi North Road, Kengzi Street, Pingshan District
+				Shenzhen  Guangdong  518122
+				CN
+
+EC-ED-04   (hex)		Intel Corporate
+ECED04     (base 16)		Intel Corporate
+				Lot 8, Jalan Hi-Tech 2/3  
+				Kulim  Kedah  09000
+				MY
+
+9C-97-1B   (hex)		Intel Corporate
+9C971B     (base 16)		Intel Corporate
+				Lot 8, Jalan Hi-Tech 2/3  
+				Kulim  Kedah  09000
+				MY
+
+F8-CF-52   (hex)		Intel Corporate
+F8CF52     (base 16)		Intel Corporate
+				Lot 8, Jalan Hi-Tech 2/3  
+				Kulim  Kedah  09000
+				MY
+
+5C-67-83   (hex)		Intel Corporate
+5C6783     (base 16)		Intel Corporate
+				Lot 8, Jalan Hi-Tech 2/3  
+				Kulim  Kedah  09000
+				MY
+
+BC-51-5F   (hex)		Nokia Solutions and Networks India Private Limited
+BC515F     (base 16)		Nokia Solutions and Networks India Private Limited
+				Plot 45, Fathima NagarNemilicherry,Chrompet
+				Chennai  Taminadu  600044
+				IN
+
+28-D4-1E   (hex)		Barrot Technology Co.,Ltd.
+28D41E     (base 16)		Barrot Technology Co.,Ltd.
+				A1009,Block A,Jia Hua Building,No.9 Shangdi 3rd Street,Haidian District,Beijing
+				beijing  beijing  100000
+				CN
+
+D4-9D-9D   (hex)		Shenzhen Goodocom lnformation Technology Co.,Ltd.
+D49D9D     (base 16)		Shenzhen Goodocom lnformation Technology Co.,Ltd.
+				3rd Floor, Xia Valley,Meisheng Huigu Science and Technology Industrial Park, 83 Dabao Road, Baoan District 33, Shenzhen
+				Shenzhen    518000
+				CN
+
+80-F1-B2   (hex)		Espressif Inc.
+80F1B2     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+88-12-7D   (hex)		Shenzhen Melon Electronics Co.,Ltd
+88127D     (base 16)		Shenzhen Melon Electronics Co.,Ltd
+				2F, Building E, Digital Silicon Valley, No.89 Hengping Road, Yuanshan Subdistrict, Longgang District, Shenzhen, Guangdong, China
+				Shenzhen  Guangdong  518100
+				CN
+
+00-70-07   (hex)		Espressif Inc.
+007007     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+44-CB-AD   (hex)		Xiaomi Communications Co Ltd
+44CBAD     (base 16)		Xiaomi Communications Co Ltd
+				#019, 9th Floor, Building 6, 33 Xi'erqi Middle Road
+				Beijing  Haidian District  100085
+				CN
+
+54-4E-F0   (hex)		Roku, Inc
+544EF0     (base 16)		Roku, Inc
+				1173 Coleman Ave
+				San Jose  CA  95110
+				US
+
+0C-80-2F   (hex)		Murata Manufacturing Co., Ltd.
+0C802F     (base 16)		Murata Manufacturing Co., Ltd.
+				1-10-1, Higashikotari
+				Nagaokakyo-shi  Kyoto  617-8555
+				JP
+
+58-87-85   (hex)		Adtran Inc
+588785     (base 16)		Adtran Inc
+				901 Explorer Blvd.
+				Huntsville  AL  35806-2807
+				US
+
+EC-9E-EA   (hex)		Xtra Technology LLC
+EC9EEA     (base 16)		Xtra Technology LLC
+				3422 Old Capitol Trail, Suite 700
+				WiImington    19808-6124
+				US
+
+10-65-19   (hex)		Shenzhen iComm Semiconductor CO.,LTD
+106519     (base 16)		Shenzhen iComm Semiconductor CO.,LTD
+				Room204,scientific research building,Tsinghua Hi-Tech Park,No.13 Langshan Road,Nanshan District
+				Shenzhen  Guangdong  518067
+				CN
+
+18-EB-D4   (hex)		Shenzhen Skyworth Digital  Technology  CO., Ltd
+18EBD4     (base 16)		Shenzhen Skyworth Digital  Technology  CO., Ltd
+				4F,Block A, Skyworth?Building,
+				Shenzhen  Guangdong  518057
+				CN
+
+E4-B7-31   (hex)		Hangzhou Advance IOT Connectivity System Co., Ltd. 
+E4B731     (base 16)		Hangzhou Advance IOT Connectivity System Co., Ltd. 
+				Room 406, building 1, No. 4280, South Ring Road, Puyan street, Binjiang District
+				Hangzhou  Zhejiang  310051
+				CN
+
+FC-38-82   (hex)		Infinix mobility limited
+FC3882     (base 16)		Infinix mobility limited
+				RMS 05-15, 13A/F SOUTH TOWER WORLD FINANCE CTR HARBOUR CITY 17 CANTON RD TST KLN HONG KONG
+				HongKong  HongKong  999077
+				HK
+
+48-A4-8C   (hex)		Shanghai Zenchant Electornics Co.,LTD
+48A48C     (base 16)		Shanghai Zenchant Electornics Co.,LTD
+				Room 1202, building a, Noble international, 908 Xiuwen Road, Minhang District
+				ShangHai  ShangHai  201199
+				CN
+
+C4-DB-AD   (hex)		Ring LLC
+C4DBAD     (base 16)		Ring LLC
+				12515 Cerise Ave
+				Hawthorne  CA  12515
+				US
+
+94-FF-7D   (hex)		AltoBeam Inc.
+94FF7D     (base 16)		AltoBeam Inc.
+				B808, Tsinghua Tongfang Hi-Tech Plaza, Haidian
+				Beijing  Beijing  100083
+				CN
+
+40-1C-D4   (hex)		Huawei Device Co., Ltd.
+401CD4     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+00-4B-0D   (hex)		Huawei Device Co., Ltd.
+004B0D     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+E0-40-27   (hex)		Huawei Device Co., Ltd.
+E04027     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+00-02-71   (hex)		Zhone Technologies, Inc.
+000271     (base 16)		Zhone Technologies, Inc.
+				7001 Oakport Street
+				Oakland  CA  94621
+				US
+
+00-01-47   (hex)		Zhone Technologies, Inc.
+000147     (base 16)		Zhone Technologies, Inc.
+				7001 Oakport Street
+				Oakland  CA  94621
+				US
+
+F8-83-06   (hex)		Beijing Xiaomi Mobile Software Co., Ltd
+F88306     (base 16)		Beijing Xiaomi Mobile Software Co., Ltd
+				The Rainbow City Office Building, 68 Qinghe Middle Street Haidian District
+				Beijing  Beijing  100085
+				CN
+
+7C-C5-18   (hex)		vivo Mobile Communication Co., Ltd.
+7CC518     (base 16)		vivo Mobile Communication Co., Ltd.
+				No.1, vivo Road, Chang'an
+				Dongguan  Guangdong  523860
+				CN
+
+7C-7D-21   (hex)		zte corporation
+7C7D21     (base 16)		zte corporation
+				12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China
+				shenzhen   guangdong  518057
+				CN
+
+D0-96-FB   (hex)		Zhone Technologies, Inc.
+D096FB     (base 16)		Zhone Technologies, Inc.
+				DASAN Tower 8F, 49 Daewangpangyo-ro644beon-gil Bundang-gu
+				Seongnam-si  Gyeonggi-do  13493
+				KR
+
+30-4F-75   (hex)		Zhone Technologies, Inc.
+304F75     (base 16)		Zhone Technologies, Inc.
+				DASAN Tower 8F, 49 Daewangpangyo-ro644beon-gil Bundang-gu
+				Seongnam-si  Gyeonggi-do  13493
+				KR
+
+D4-7B-6B   (hex)		Shanghai Cygnus Semiconductor Co., Ltd.
+D47B6B     (base 16)		Shanghai Cygnus Semiconductor Co., Ltd.
+				Rooms 401 and 402, Building 5, 690 Bibo Road, China (Shanghai) Pilot Free Trade Zone
+				Shanghai  Shanghai  201203
+				CN
+
+98-61-10   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+986110     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+F4-85-AE   (hex)		Senbiosys SA
+F485AE     (base 16)		Senbiosys SA
+				Route des Gouttes-d'Or 40
+				Neuchâtel    2000
+				CH
+
+60-55-56   (hex)		Jiangxi Risound Electronics Co.,LTD
+605556     (base 16)		Jiangxi Risound Electronics Co.,LTD
+				No 271,innovation Avenue, Jinggangshan economic and Technological Development Zone
+				Ji'an  Jiangxi  343100
+				CN
+
+AC-82-F0   (hex)		Apple, Inc.
+AC82F0     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+0C-CC-5D   (hex)		Apple, Inc.
+0CCC5D     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+34-0E-22   (hex)		Apple, Inc.
+340E22     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+A8-9A-8C   (hex)		zte corporation
+A89A8C     (base 16)		zte corporation
+				12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China
+				shenzhen   guangdong  518057
+				CN
+
+68-4A-5F   (hex)		Apple, Inc.
+684A5F     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+E8-98-EE   (hex)		Apple, Inc.
+E898EE     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+34-28-65   (hex)		Juniper Networks
+342865     (base 16)		Juniper Networks
+				1133 Innovation Way
+				Sunnyvale  CA  94089
+				US
+
+10-5A-95   (hex)		TP-Link Systems Inc.
+105A95     (base 16)		TP-Link Systems Inc.
+				10 Mauchly
+				 Irvine  CA  92618
+				US
+
+F8-20-97   (hex)		Aditya Infotech Ltd.
+F82097     (base 16)		Aditya Infotech Ltd.
+				Khemka Square, A-12, Sector-4,
+				Noida  Uttar Pradesh  201301
+				IN
+
+5C-7B-6C   (hex)		Tradit Co., Ltd 
+5C7B6C     (base 16)		Tradit Co., Ltd 
+				#617, 416 Hwagok-ro, Gangseo-gu
+				Seoul    07548
+				KR
+
+A0-7E-16   (hex)		EM Microelectronic
+A07E16     (base 16)		EM Microelectronic
+				Rue des Sors 3
+				Marin-Epagnier  Neuchatel  2074
+				CH
+
+18-CC-88   (hex)		Hitachi Air Conditioning Shimizu, Inc.
+18CC88     (base 16)		Hitachi Air Conditioning Shimizu, Inc.
+				390, Muramatsu,
+				 Shimizu Village   Shizuoka Prefecture  424-0926
+				JP
+
+CC-5E-A5   (hex)		Palo Alto Networks
+CC5EA5     (base 16)		Palo Alto Networks
+				3000 Tannery Way
+				Santa Clara  CA  95054
+				US
+
+D8-1D-13   (hex)		Texas Instruments
+D81D13     (base 16)		Texas Instruments
+				12500 TI Blvd
+				Dallas  TX  75243
+				US
+
+14-75-E5   (hex)		ELMAX Srl
+1475E5     (base 16)		ELMAX Srl
+				Via dei Parietai, 2
+				Molfetta  BA  70056
+				IT
+
+E0-23-3B   (hex)		IEEE Registration Authority
+E0233B     (base 16)		IEEE Registration Authority
+				445 Hoes Lane
+				Piscataway  NJ  08554
+				US
+
+88-33-74   (hex)		ASKEY COMPUTER CORP
+883374     (base 16)		ASKEY COMPUTER CORP
+				10F,No.119,JIANKANG RD,ZHONGHE DIST
+				NEW TAIPEI  TAIWAN  23585
+				TW
+
+E4-56-CA   (hex)		Fractal BMS
+E456CA     (base 16)		Fractal BMS
+				8656 W Hwy 71
+				AUSTIN  TX  78735
+				US
+
+48-08-EB   (hex)		IEEE Registration Authority
+4808EB     (base 16)		IEEE Registration Authority
+				445 Hoes Lane
+				Piscataway  NJ  08554
+				US
+
 B0-0C-9D   (hex)		Quectel Wireless Solutions Co.,Ltd.
 B00C9D     (base 16)		Quectel Wireless Solutions Co.,Ltd.
 				7th Floor, Hongye Building, No.1801 Hongmei Road, Xuhui District
@@ -134081,12 +136055,6 @@ CC14BC     (base 16)		Edifier Internatio
 				Hong Kong    070
 				CN
 
-E8-D3-EB   (hex)		eero inc.
-E8D3EB     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 B0-10-4B   (hex)		Fiberhome Telecommunication Technologies Co.,LTD
 B0104B     (base 16)		Fiberhome Telecommunication Technologies Co.,LTD
 				No.5 DongXin Road
@@ -135188,12 +137156,6 @@ B09738     (base 16)		Shenzhen Skyworth
 				Shenzhen  Guangdong  518057
 				CN
 
-B8-60-61   (hex)		China Mobile Group Device Co.,Ltd.
-B86061     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 8C-DF-2C   (hex)		vivo Mobile Communication Co., Ltd.
 8CDF2C     (base 16)		vivo Mobile Communication Co., Ltd.
 				No.1, vivo Road, Chang'an
@@ -135260,12 +137222,6 @@ F8B8B4     (base 16)		Shenzhen Skyworth
 				Shenzhen  Guangdong  518057
 				CN
 
-D8-8E-D4   (hex)		eero inc.
-D88ED4     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 94-3F-D6   (hex)		Apple, Inc.
 943FD6     (base 16)		Apple, Inc.
 				1 Infinite Loop
@@ -135791,30 +137747,6 @@ C8787D     (base 16)		D-Link Corporation
 				Taipei City     114
 				TW
 
-40-F2-1C   (hex)		DZS Inc.
-40F21C     (base 16)		DZS Inc.
-				5700 Tennyson Parkway, Suite 400
-				Plano  TX  75024
-				US
-
-00-18-0C   (hex)		DZS Inc.
-00180C     (base 16)		DZS Inc.
-				22A-1051 Baxter Road
-				Ottawa  Ontario  K2C 3P2
-				CA
-
-00-E0-DF   (hex)		DZS Inc.
-00E0DF     (base 16)		DZS Inc.
-				Wohlenbergstrasse. 3
-				Hannover    30179
-				DE
-
-00-A0-1B   (hex)		DZS Inc.
-00A01B     (base 16)		DZS Inc.
-				48664 MILMONT DRIVE
-				FREMONT  CA  94538
-				US
-
 D0-93-95   (hex)		IEEE Registration Authority
 D09395     (base 16)		IEEE Registration Authority
 				445 Hoes Lane
@@ -136709,12 +138641,6 @@ B0E5EF     (base 16)		Apple, Inc.
 				Cupertino  CA  95014
 				US
 
-50-27-A9   (hex)		eero inc.
-5027A9     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 10-BB-F3   (hex)		HUNAN FN-LINK TECHNOLOGY LIMITED
 10BBF3     (base 16)		HUNAN FN-LINK TECHNOLOGY LIMITED
 				No.8, Litong Road, Liuyan Economic & Tec
@@ -137327,12 +139253,6 @@ C8848C     (base 16)		Ruckus Wireless
 				Sunnyvale  CA  94089
 				US
 
-20-E6-DF   (hex)		eero inc.
-20E6DF     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 F4-93-1C   (hex)		Universal Electronics, Inc.
 F4931C     (base 16)		Universal Electronics, Inc.
 				201 E. Sandpointe Ave
@@ -137369,12 +139289,6 @@ A08CF2     (base 16)		YINUOLINK CO.,LTD
 				Shenzhen  Guangdong  518103
 				CN
 
-40-47-5E   (hex)		eero inc.
-40475E     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 5C-3E-1B   (hex)		Apple, Inc.
 5C3E1B     (base 16)		Apple, Inc.
 				1 Infinite Loop
@@ -137447,12 +139361,6 @@ B4BA9D     (base 16)		SKY UK LIMITED
 				Brentwood  Essex  08854
 				GB
 
-E0-86-14   (hex)		Novatel Wireless Solutions, Inc.
-E08614     (base 16)		Novatel Wireless Solutions, Inc.
-				9710 Scranton Rd., Suite 200
-				San Diego  CA  92121
-				US
-
 40-F8-DF   (hex)		CANON INC.
 40F8DF     (base 16)		CANON INC.
 				30-2 Shimomaruko 3-chome,
@@ -137711,12 +139619,6 @@ B49F4D     (base 16)		Fiberhome Telecomm
 				Wuhan  Hubei  430074
 				CN
 
-E8-3A-4B   (hex)		China Mobile Group Device Co.,Ltd.
-E83A4B     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 60-E9-AA   (hex)		CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
 60E9AA     (base 16)		CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
 				B22 Building,NO.51 Tongle Road, Shajing Town, Jiangnan District, Nanning, Guangxi Province, China
@@ -137849,12 +139751,6 @@ AC2929     (base 16)		Infinix mobility l
 				HongKong  HongKong  999077
 				HK
 
-50-E6-36   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-50E636     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 7C-E1-52   (hex)		THE GOODYEAR TIRE & RUBBER COMPANY
 7CE152     (base 16)		THE GOODYEAR TIRE & RUBBER COMPANY
 				200 Innovation Way
@@ -138083,12 +139979,6 @@ E84DEC     (base 16)		Xerox Corporation
 				Webster  NY  14450
 				US
 
-C8-B8-2F   (hex)		eero inc.
-C8B82F     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 A4-1E-E1   (hex)		Taicang T&W Electronics
 A41EE1     (base 16)		Taicang T&W Electronics
 				89# Jiang Nan RD
@@ -139649,12 +141539,6 @@ F02A2B     (base 16)		IEEE Registration
 				Piscataway  NJ  08554
 				US
 
-20-BE-CD   (hex)		eero inc.
-20BECD     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 04-EC-D8   (hex)		Intel Corporate
 04ECD8     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
@@ -140063,12 +141947,6 @@ C0238D     (base 16)		Samsung Electronic
 				Suwon  Gyeonggi-Do  16677
 				KR
 
-50-70-97   (hex)		China Mobile Group Device Co.,Ltd.
-507097     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 0C-60-46   (hex)		vivo Mobile Communication Co., Ltd.
 0C6046     (base 16)		vivo Mobile Communication Co., Ltd.
 				No.1, vivo Road, Chang'an
@@ -140375,12 +142253,6 @@ C8B6FE     (base 16)		Fitbit, Inc.
 				San Francisco  CA  94105
 				US
 
-18-7C-AA   (hex)		China Mobile Group Device Co.,Ltd.
-187CAA     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 00-1C-C5   (hex)		3Com Ltd
 001CC5     (base 16)		3Com Ltd
 				Peoplebuilding 2
@@ -140615,12 +142487,6 @@ E0E37C     (base 16)		Huawei Device Co.,
 				San Jose  CA  94568
 				US
 
-64-97-14   (hex)		eero inc.
-649714     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 B4-10-7B   (hex)		Texas Instruments
 B4107B     (base 16)		Texas Instruments
 				12500 TI Blvd
@@ -140669,12 +142535,6 @@ E44164     (base 16)		Nokia
 				Shanghai    200001
 				CN
 
-C4-F1-74   (hex)		eero inc.
-C4F174     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 28-D0-EA   (hex)		Intel Corporate
 28D0EA     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
@@ -141827,12 +143687,6 @@ FC449F     (base 16)		zte corporation
 				Irvine  CA  92618
 				US
 
-00-23-E9   (hex)		F5 Networks, Inc.
-0023E9     (base 16)		F5 Networks, Inc.
-				401 Elliott Ave. W.
-				Seattle  WA  98119
-				US
-
 3C-7C-3F   (hex)		ASUSTek COMPUTER INC.
 3C7C3F     (base 16)		ASUSTek COMPUTER INC.
 				15,Li-Te Rd., Peitou, Taipei 112, Taiwan
@@ -142073,12 +143927,6 @@ A83759     (base 16)		Huawei Device Co.,
 				Seoul  Seocho-dong,Seocho-gu  137-863
 				KR
 
-3C-E3-E7   (hex)		China Mobile Group Device Co.,Ltd.
-3CE3E7     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 54-88-DE   (hex)		Cisco Systems, Inc
 5488DE     (base 16)		Cisco Systems, Inc
 				80 West Tasman Drive
@@ -142499,12 +144347,6 @@ AC2334     (base 16)		Infinix mobility l
 				HongKong  HongKong  999077
 				HK
 
-F8-BC-0E   (hex)		eero inc.
-F8BC0E     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 E0-19-95   (hex)		Nutanix
 E01995     (base 16)		Nutanix
 				1740 Technology Drive Ste #150
@@ -143063,12 +144905,6 @@ DC9840     (base 16)		Microsoft Corporat
 				REDMOND    98052
 				US
 
-B8-CE-F6   (hex)		Mellanox Technologies, Inc.
-B8CEF6     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 B4-F1-8C   (hex)		Huawei Device Co., Ltd.
 B4F18C     (base 16)		Huawei Device Co., Ltd.
 				No.2 of Xincheng Road, Songshan Lake Zone
@@ -143087,12 +144923,6 @@ C432D1     (base 16)		Farlink Technology
 				Gumi  Gyeongbuk  730-350
 				KR
 
-18-6F-2D   (hex)		Shenzhen Sundray Technologies Company Limited
-186F2D     (base 16)		Shenzhen Sundray Technologies Company Limited
-				5th Floor, Block A4, Nanshan ipark,NO.1001 Xue Yuan Road, Nanshan District, Shenzhen 518055, P.R. China
-				Shenzhen  Guangdong  518057
-				CN
-
 F8-4F-AD   (hex)		Hui Zhou Gaoshengda Technology Co.,LTD
 F84FAD     (base 16)		Hui Zhou Gaoshengda Technology Co.,LTD
 				No.75,Zhongkai High-Tech Development District,Huizhou
@@ -143195,12 +145025,6 @@ D06544     (base 16)		Apple, Inc.
 				Piscataway  NJ  08554
 				US
 
-C8-53-E1   (hex)		Beijing Bytedance Network Technology Co., Ltd
-C853E1     (base 16)		Beijing Bytedance Network Technology Co., Ltd
-				No.1 Building, Zhonghang Square, West Road of the Northern 3rd Circuit, Haidian Distrct
-				Beijing  Beijing  100098
-				CN
-
 FC-39-64   (hex)		ITEL MOBILE LIMITED
 FC3964     (base 16)		ITEL MOBILE LIMITED
 				RM B3 & B4 BLOCK B, KO FAI INDUSTRIAL BUILDING  NO.7 KO FAI ROAD, YAU TONG, KLN, H.K
@@ -143255,12 +145079,6 @@ F008D1     (base 16)		Espressif Inc.
 				Yantai  Shandong  264000
 				CN
 
-3C-5C-F1   (hex)		eero inc.
-3C5CF1     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 CC-D4-2E   (hex)		Arcadyan Corporation
 CCD42E     (base 16)		Arcadyan Corporation
 				No.8, Sec.2, Guangfu Rd.
@@ -143471,12 +145289,6 @@ D45D64     (base 16)		ASUSTek COMPUTER I
 				Cupertino  CA  95014
 				US
 
-48-DD-0C   (hex)		eero inc.
-48DD0C     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 94-0C-98   (hex)		Apple, Inc.
 940C98     (base 16)		Apple, Inc.
 				1 Infinite Loop
@@ -144125,12 +145937,6 @@ DCF8B9     (base 16)		zte corporation
 				shenzhen  guangdong  518057
 				CN
 
-18-90-88   (hex)		eero inc.
-189088     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 2C-64-1F   (hex)		Vizio, Inc
 2C641F     (base 16)		Vizio, Inc
 				39 Tesla
@@ -144221,12 +146027,6 @@ F43E66     (base 16)		Bee Computing (HK)
 				Hong Kong    100043
 				HK
 
-DC-39-6F   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-DC396F     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 B4-C4-76   (hex)		Wuhan Maritime Communication Research Institute
 B4C476     (base 16)		Wuhan Maritime Communication Research Institute
 				No.312 Luoyu road, Hongshan District
@@ -144239,12 +146039,6 @@ B4C476     (base 16)		Wuhan Maritime Com
 				South Bend  IN  46601
 				US
 
-9C-3A-9A   (hex)		Shenzhen Sundray Technologies Company Limited
-9C3A9A     (base 16)		Shenzhen Sundray Technologies Company Limited
-				5th Floor, Block A4, Nanshan ipark,NO.1001 Xue Yuan Road, Nanshan District, Shenzhen 518055, P.R. China
-				Shenzhen  Guangdong  518057
-				CN
-
 B4-6C-47   (hex)		Panasonic Appliances Company
 B46C47     (base 16)		Panasonic Appliances Company
 				2-3-1-2 Noji-higashi
@@ -144659,12 +146453,6 @@ AC00D0     (base 16)		zte corporation
 				Beijing    100102
 				CN
 
-14-22-DB   (hex)		eero inc.
-1422DB     (base 16)		eero inc.
-				230 9th St.
-				San Francisco  CA  94103
-				US
-
 18-BC-5A   (hex)		Zhejiang Tmall Technology Co., Ltd.
 18BC5A     (base 16)		Zhejiang Tmall Technology Co., Ltd.
 				Ali Center,No.3331 Keyuan South RD (Shenzhen bay), Nanshan District, 
@@ -145031,12 +146819,6 @@ D0EC35     (base 16)		Cisco Systems, Inc
 				Bruchsal    76646
 				DE
 
-8C-53-D2   (hex)		China Mobile Group Device Co.,Ltd.
-8C53D2     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 D0-58-C0   (hex)		Qingdao Haier Multimedia Limited. 
 D058C0     (base 16)		Qingdao Haier Multimedia Limited. 
 				Pingban Building, Haier Industry Park, Laoshan District,
@@ -146189,12 +147971,6 @@ A09351     (base 16)		Cisco Systems, Inc
 				San Jose  CA  94568
 				US
 
-98-03-9B   (hex)		Mellanox Technologies, Inc.
-98039B     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100
-				Sunnyvale  CA  94085
-				US
-
 B8-88-E3   (hex)		COMPAL INFORMATION (KUNSHAN) CO., LTD. 
 B888E3     (base 16)		COMPAL INFORMATION (KUNSHAN) CO., LTD. 
 				No.25, Third Avenue, A Zone, Kunshan Comprehensive Free Trade Zone,, Jiangsu, 
@@ -149315,12 +151091,6 @@ F43C96     (base 16)		Ericsson AB
 				Stockholm    SE-164 80
 				SE
 
-5C-49-79   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-5C4979     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 C4-41-1E   (hex)		Belkin International Inc.
 C4411E     (base 16)		Belkin International Inc.
 				12045 East Waterfront Drive
@@ -150689,12 +152459,6 @@ F40F24     (base 16)		Apple, Inc.
 				Cupertino  CA  95014
 				US
 
-E4-1D-2D   (hex)		Mellanox Technologies, Inc.
-E41D2D     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 24-0A-11   (hex)		TCT mobile ltd
 240A11     (base 16)		TCT mobile ltd
 				No.86 hechang 7th road, zhongkai, Hi-Tech District
@@ -150935,12 +152699,6 @@ BC9889     (base 16)		Fiberhome Telecomm
 				Wuhan City  Hubei Province  430074
 				CN
 
-24-61-5A   (hex)		China Mobile Group Device Co.,Ltd.
-24615A     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 04-A3-16   (hex)		Texas Instruments
 04A316     (base 16)		Texas Instruments
 				12500 TI Blvd
@@ -151049,12 +152807,6 @@ DC4D23     (base 16)		MRV Comunications
 				Lund    223 70
 				SE
 
-24-8A-07   (hex)		Mellanox Technologies, Inc.
-248A07     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 40-5E-E1   (hex)		Shenzhen H&T Intelligent Control Co.,Ltd.
 405EE1     (base 16)		Shenzhen H&T Intelligent Control Co.,Ltd.
 				D-Zone,10/F,Shenzhen Academy of Aerospace Technology,Hi-Tech Park at Nanshan District,Shenzhen,China 
@@ -154553,12 +156305,6 @@ B89ACD     (base 16)		ELITE OPTOELECTRON
 				Liaobu  dongguan /guangdong  523400
 				CN
 
-D4-68-BA   (hex)		Shenzhen Sundray Technologies Company Limited
-D468BA     (base 16)		Shenzhen Sundray Technologies Company Limited
-				6th Floor,Block A1, Nanshan iPark, 
-				Nanshan District, Shenzhen 518055  Guangdong  
-				CN
-
 F0-1E-34   (hex)		ORICO Technologies Co., Ltd
 F01E34     (base 16)		ORICO Technologies Co., Ltd
 				F-9, Block14A, Zhonghaixin Science &Technology Zone
@@ -169496,12 +171242,6 @@ A06A00     (base 16)		Verilink Corporati
 				Moscow\    117335
 				RU
 
-00-04-32   (hex)		Voyetra Turtle Beach, Inc.
-000432     (base 16)		Voyetra Turtle Beach, Inc.
-				150 Clearbrook Road, Suite 162
-				Elmsford  NY  10523
-				US
-
 00-04-37   (hex)		Powin Information Technology, Inc.
 000437     (base 16)		Powin Information Technology, Inc.
 				8F, No. 70, Zhou-Z St.
@@ -174302,12 +176042,6 @@ EC462C     (base 16)		Infinix mobility l
 				Shenzhen  Guangdong  518057
 				CN
 
-C8-75-F4   (hex)		China Mobile Group Device Co.,Ltd.
-C875F4     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 2C-53-2B   (hex)		TCT mobile ltd
 2C532B     (base 16)		TCT mobile ltd
 				No.86 hechang 7th road, zhongkai, Hi-Tech District
@@ -174464,12 +176198,6 @@ D829F8     (base 16)		HUAWEI TECHNOLOGIE
 				Piscataway  NJ  08554
 				US
 
-8C-1A-50   (hex)		China Mobile Group Device Co.,Ltd.
-8C1A50     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 D4-00-68   (hex)		Fiberhome Telecommunication Technologies Co.,LTD
 D40068     (base 16)		Fiberhome Telecommunication Technologies Co.,LTD
 				No.5 DongXin Road
@@ -175034,12 +176762,6 @@ C4B25B     (base 16)		Ruijie Networks Co
 				Minhang District  Shanghai  201112
 				CN
 
-C0-6F-98   (hex)		eero inc.
-C06F98     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 D8-A0-E6   (hex)		Chongqing Yipingfang Technology Co., Ltd.
 D8A0E6     (base 16)		Chongqing Yipingfang Technology Co., Ltd.
 				No. 1-10, Tieshan Road, Biquan Street, Bishan District, Chongqing
@@ -175217,12 +176939,6 @@ D47F35     (base 16)		Cisco Systems, Inc
 				San Jose  CA  94568
 				US
 
-88-DA-18   (hex)		China Mobile Group Device Co.,Ltd.
-88DA18     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 98-CB-38   (hex)		Boxin Communications Limited Liability Company
 98CB38     (base 16)		Boxin Communications Limited Liability Company
 				NO.22,Changsheng,Street,LuquanEconomic DevelopmentZone
@@ -175727,18 +177443,6 @@ D8D261     (base 16)		GD Midea Air-Condi
 				Foshan  Guangdong  528311
 				CN
 
-C4-70-BD   (hex)		Mellanox Technologies, Inc.
-C470BD     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
-B8-E9-24   (hex)		Mellanox Technologies, Inc.
-B8E924     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 8C-12-C2   (hex)		GLBB Japan
 8C12C2     (base 16)		GLBB Japan
 				225-1 Hamagawa
@@ -175841,12 +177545,6 @@ A8BA25     (base 16)		Hewlett Packard En
 				San Jose  CA  95002
 				US
 
-40-BC-68   (hex)		Funshion Online Technologies Co.,Ltd
-40BC68     (base 16)		Funshion Online Technologies Co.,Ltd
-				5th Floor,Financial Port Building A9,No.77 Optical Valley Avenue, East Lake High-Tech Development Zone, Wuhan
-				Wuhan  CN/Hubei  430000
-				CN
-
 8C-08-AA   (hex)		Apple, Inc.
 8C08AA     (base 16)		Apple, Inc.
 				1 Infinite Loop
@@ -175913,12 +177611,6 @@ B03B1B     (base 16)		Kontrolnext Techno
 				Beijing    100041
 				CN
 
-58-FC-E3   (hex)		Funshion Online Technologies Co.,Ltd
-58FCE3     (base 16)		Funshion Online Technologies Co.,Ltd
-				2101, Floor 1-2, Building 9, Anzhen Xili District 3, Chaoyang District, Beijing
-				Beijing    100029
-				CN
-
 48-A1-70   (hex)		Cisco Systems, Inc
 48A170     (base 16)		Cisco Systems, Inc
 				80 West Tasman Drive
@@ -176111,12 +177803,6 @@ C095CF     (base 16)		Amazon Technologie
 				Guangzhou  Guangdong  510530
 				CN
 
-60-B5-8D   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-60B58D     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 6C-3A-FF   (hex)		Apple, Inc.
 6C3AFF     (base 16)		Apple, Inc.
 				1 Infinite Loop
@@ -176525,12 +178211,6 @@ E47F3C     (base 16)		zte corporation
 				Shenzhen  Guangdong  518000
 				CN
 
-2C-5E-AB   (hex)		Mellanox Technologies, Inc.
-2C5EAB     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 40-B2-15   (hex)		Extreme Networks Headquarters
 40B215     (base 16)		Extreme Networks Headquarters
 				2121 RDU Center Drive 
@@ -179000,12 +180680,6 @@ B81D1F     (base 16)		HUAWEI TECHNOLOGIE
 				Beijing  Beijing  100085
 				CN
 
-2C-9D-4B   (hex)		Lavelle Network Private Limited
-2C9D4B     (base 16)		Lavelle Network Private Limited
-				3155, Srinivasan Towers, 3rd Floor Paramahansa Yogananda Road, Indiranagar
-				Bengaluru  Karnataka  560038
-				IN
-
 F8-94-97   (hex)		BUFFALO.INC
 F89497     (base 16)		BUFFALO.INC
 				AKAMONDORI Bld.,30-20,Ohsu 3-chome,Naka-ku
@@ -179144,11 +180818,71 @@ F89E28     (base 16)		Cisco Meraki
 				Minturno  Latina  04026
 				IT
 
-6C-15-DB   (hex)		Arcadyan Corporation
-6C15DB     (base 16)		Arcadyan Corporation
-				No.8, Sec.2, Guangfu Rd.
-				Hsinchu City  Hsinchu  30071
-				TW
+D4-68-BA   (hex)		Shenzhen Sundray Technologies company Limited
+D468BA     (base 16)		Shenzhen Sundray Technologies company Limited
+				6th Floor,Block A1, Nanshan iPark, 
+				Nanshan District, Shenzhen 518055  Guangdong  
+				CN
+
+9C-3A-9A   (hex)		Shenzhen Sundray Technologies company Limited
+9C3A9A     (base 16)		Shenzhen Sundray Technologies company Limited
+				5th Floor, Block A4, Nanshan ipark,NO.1001 Xue Yuan Road, Nanshan District, Shenzhen 518055, P.R. China
+				Shenzhen  Guangdong  518057
+				CN
+
+18-6F-2D   (hex)		Shenzhen Sundray Technologies company Limited
+186F2D     (base 16)		Shenzhen Sundray Technologies company Limited
+				5th Floor, Block A4, Nanshan ipark,NO.1001 Xue Yuan Road, Nanshan District, Shenzhen 518055, P.R. China
+				Shenzhen  Guangdong  518057
+				CN
+
+78-2B-60   (hex)		Huawei Device Co., Ltd.
+782B60     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+70-B5-1A   (hex)		Huawei Device Co., Ltd.
+70B51A     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+FC-79-DD   (hex)		Huawei Device Co., Ltd.
+FC79DD     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+F4-14-BF   (hex)		LG Innotek
+F414BF     (base 16)		LG Innotek
+				26, HANAMSANDAN 5BEON-RO
+				Gwangju  Gwangsan-gu  506-731
+				KR
+
+5C-49-79   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+5C4979     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+DC-39-6F   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+DC396F     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+C8-53-E1   (hex)		Douyin Vision Co., Ltd
+C853E1     (base 16)		Douyin Vision Co., Ltd
+				No.1 Building, Zhonghang Square, West Road of the Northern 3rd Circuit, Haidian Distrct
+				Beijing  Beijing  100098
+				CN
+
+08-B3-D6   (hex)		Huawei Device Co., Ltd.
+08B3D6     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
 
 2C-6F-37   (hex)		Nokia
 2C6F37     (base 16)		Nokia
@@ -179162,6 +180896,846 @@ F89E28     (base 16)		Cisco Meraki
 				Kanata  Ontario  K2K 2E6
 				CA
 
+6C-15-DB   (hex)		Arcadyan Corporation
+6C15DB     (base 16)		Arcadyan Corporation
+				No.8, Sec.2, Guangfu Rd.
+				Hsinchu City  Hsinchu  30071
+				TW
+
+58-79-61   (hex)		Microsoft Corporation
+587961     (base 16)		Microsoft Corporation
+				One Microsoft Way
+				REDMOND  WA  98052
+				US
+
+60-B5-8D   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+60B58D     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+34-E1-A9   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+34E1A9     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+3C-5C-F1   (hex)		eero inc.
+3C5CF1     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+F8-BC-0E   (hex)		eero inc.
+F8BC0E     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+C4-F1-74   (hex)		eero inc.
+C4F174     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+64-97-14   (hex)		eero inc.
+649714     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+40-47-5E   (hex)		eero inc.
+40475E     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+20-E6-DF   (hex)		eero inc.
+20E6DF     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+50-27-A9   (hex)		eero inc.
+5027A9     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+D8-8E-D4   (hex)		eero inc.
+D88ED4     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+14-22-DB   (hex)		eero inc.
+1422DB     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+18-90-88   (hex)		eero inc.
+189088     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+48-DD-0C   (hex)		eero inc.
+48DD0C     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+50-E6-36   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+50E636     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+E8-D3-EB   (hex)		eero inc.
+E8D3EB     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+C0-6F-98   (hex)		eero inc.
+C06F98     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+20-BE-CD   (hex)		eero inc.
+20BECD     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+C8-B8-2F   (hex)		eero inc.
+C8B82F     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+24-61-5A   (hex)		China Mobile Group Device Co.,Ltd.
+24615A     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+AC-F7-0D   (hex)		China Mobile Group Device Co.,Ltd.
+ACF70D     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District
+				Beijing    100053
+				CN
+
+24-8A-07   (hex)		Mellanox Technologies, Inc.
+248A07     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+E4-1D-2D   (hex)		Mellanox Technologies, Inc.
+E41D2D     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+98-03-9B   (hex)		Mellanox Technologies, Inc.
+98039B     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+F8-5C-24   (hex)		Sonos Inc.
+F85C24     (base 16)		Sonos Inc.
+				301 Coromar Drive
+				Goleta  CA  93117
+				US
+
+B8-60-61   (hex)		China Mobile Group Device Co.,Ltd.
+B86061     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+C8-75-F4   (hex)		China Mobile Group Device Co.,Ltd.
+C875F4     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+8C-1A-50   (hex)		China Mobile Group Device Co.,Ltd.
+8C1A50     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+88-DA-18   (hex)		China Mobile Group Device Co.,Ltd.
+88DA18     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+B8-CE-F6   (hex)		Mellanox Technologies, Inc.
+B8CEF6     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+C4-70-BD   (hex)		Mellanox Technologies, Inc.
+C470BD     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+B8-E9-24   (hex)		Mellanox Technologies, Inc.
+B8E924     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+50-70-97   (hex)		China Mobile Group Device Co.,Ltd.
+507097     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+E8-3A-4B   (hex)		China Mobile Group Device Co.,Ltd.
+E83A4B     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+3C-E3-E7   (hex)		China Mobile Group Device Co.,Ltd.
+3CE3E7     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+18-7C-AA   (hex)		China Mobile Group Device Co.,Ltd.
+187CAA     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+6C-C3-6A   (hex)		vivo Mobile Communication Co., Ltd.
+6CC36A     (base 16)		vivo Mobile Communication Co., Ltd.
+				No.1, vivo Road, Chang'an
+				Dongguan  Guangdong  523860
+				CN
+
+2C-5E-AB   (hex)		Mellanox Technologies, Inc.
+2C5EAB     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+8C-53-D2   (hex)		China Mobile Group Device Co.,Ltd.
+8C53D2     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+38-E5-63   (hex)		GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+38E563     (base 16)		GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+				NO.18 HAIBIN ROAD,
+				DONG GUAN  GUANG DONG  523860
+				CN
+
+58-72-C9   (hex)		zte corporation
+5872C9     (base 16)		zte corporation
+				12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China
+				shenzhen   guangdong  518057
+				CN
+
+30-C5-99   (hex)		ASUSTek COMPUTER INC.
+30C599     (base 16)		ASUSTek COMPUTER INC.
+				15,Li-Te Rd., Peitou, Taipei 112, Taiwan
+				Taipei  Taiwan  112
+				TW
+
+3C-16-40   (hex)		Qingdao Haier Technology Co.,Ltd
+3C1640     (base 16)		Qingdao Haier Technology Co.,Ltd
+				Building C01,Haier Information Park,No.1 Haier Road
+				Qingdao    266101
+				CN
+
+B8-DD-E8   (hex)		Sichuan Tianyi Comheart Telecom Co.,LTD
+B8DDE8     (base 16)		Sichuan Tianyi Comheart Telecom Co.,LTD
+				No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County
+				Chengdu  Sichuan  611330
+				CN
+
+30-FE-FA   (hex)		Cisco Systems, Inc
+30FEFA     (base 16)		Cisco Systems, Inc
+				80 West Tasman Drive
+				San Jose  CA  94568
+				US
+
+6C-4F-A1   (hex)		Cisco Systems, Inc
+6C4FA1     (base 16)		Cisco Systems, Inc
+				80 West Tasman Drive
+				San Jose  CA  94568
+				US
+
+40-BC-68   (hex)		Funshion Online Technologies Co.,Ltd
+40BC68     (base 16)		Funshion Online Technologies Co.,Ltd
+				2101, Floor 1-2, Building 9, Anzhen Xili District 3, Chaoyang District, Beijing
+				Beijing     100029
+				CN
+
+88-9A-FF   (hex)		SystemX Co.,Ltd.
+889AFF     (base 16)		SystemX Co.,Ltd.
+				102, Gosan-ro
+				Gunpo-si  Gyeonggi-do  15849
+				KR
+
+78-A1-D8   (hex)		ShenzhenEnjoyTechnologyCo.,Ltd
+78A1D8     (base 16)		ShenzhenEnjoyTechnologyCo.,Ltd
+				Building A, No.1 Qianwan 1st Road, QianHai Shenzhen HongKong Cooperation Zone, Shenzhen,China
+				shenzhen  guangdong  518108
+				CN
+
+58-FC-E3   (hex)		Funshion Online Technologies Co.,Ltd
+58FCE3     (base 16)		Funshion Online Technologies Co.,Ltd
+				2101, Floor 1-2, Building 9, Anzhen Xili District 3, Chaoyang District, Beijing
+				Beijing     100029
+				CN
+
+40-95-95   (hex)		TP-Link Systems Inc.
+409595     (base 16)		TP-Link Systems Inc.
+				10 Mauchly
+				 Irvine  CA  92618
+				US
+
+00-23-E9   (hex)		F5 Inc.
+0023E9     (base 16)		F5 Inc.
+				401 Elliott Ave. W.
+				Seattle  WA  98119
+				US
+
+48-CA-68   (hex)		Apple, Inc.
+48CA68     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+74-77-86   (hex)		Apple, Inc.
+747786     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+D8-42-F7   (hex)		Tozed Kangwei Tech Co.,Ltd
+D842F7     (base 16)		Tozed Kangwei Tech Co.,Ltd
+				Room 1301, NO. 37 Jinlong , Nansha Street, Xiangjiang Financial Business Center, Nansha District
+				GuangZhou    511466
+				CN
+
+E0-86-14   (hex)		Inseego Wireless, Inc
+E08614     (base 16)		Inseego Wireless, Inc
+				9710 Scranton Rd., Suite 200
+				San Diego  CA  92121
+				US
+
+18-86-C3   (hex)		Nokia
+1886C3     (base 16)		Nokia
+				600 March Road
+				Kanata  Ontario  K2K 2E6
+				CA
+
+08-76-71   (hex)		Juniper Networks
+087671     (base 16)		Juniper Networks
+				1133 Innovation Way
+				Sunnyvale  CA  94089
+				US
+
+A4-6B-1F   (hex)		eero inc.
+A46B1F     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+E8-CA-50   (hex)		Bouffalo Lab (Nanjing) Co., Ltd.
+E8CA50     (base 16)		Bouffalo Lab (Nanjing) Co., Ltd.
+				5F, Gongxiang Space, No.100 Tuanjie Road, Nanjing, China
+				Nanjing  Jiangsu  211800
+				CN
+
+28-01-CD   (hex)		Mellanox Technologies, Inc.
+2801CD     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+68-FE-71   (hex)		Espressif Inc.
+68FE71     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+D8-6B-83   (hex)		Nintendo Co.,Ltd
+D86B83     (base 16)		Nintendo Co.,Ltd
+				11-1 HOKOTATE-CHO KAMITOBA,MINAMI-KU
+				KYOTO  KYOTO  601-8501
+				JP
+
+40-EB-21   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+40EB21     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+A8-C4-07   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+A8C407     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+50-8D-62   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+508D62     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+DC-12-1D   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+DC121D     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+2C-03-69   (hex)		ACCTON TECHNOLOGY CORPORATION
+2C0369     (base 16)		ACCTON TECHNOLOGY CORPORATION
+				No.1, Creation Road 3, Hsinchu Science Park,
+				Hsinchu    30077
+				TW
+
+C0-74-15   (hex)		IntelPro Inc.
+C07415     (base 16)		IntelPro Inc.
+				19F.-1, No. 168, Sec. 2, Fuxing 3rd Rd.,
+				Zhubei City, Hsinchu County    302052
+				TW
+
+30-30-5F   (hex)		Valeo Schalter und Sensoren GmbH
+30305F     (base 16)		Valeo Schalter und Sensoren GmbH
+				Valeostr. 1
+				Wemding    86650
+				DE
+
+78-78-35   (hex)		IEEE Registration Authority
+787835     (base 16)		IEEE Registration Authority
+				445 Hoes Lane
+				Piscataway  NJ  08554
+				US
+
+8C-96-A5   (hex)		New H3C Technologies Co., Ltd
+8C96A5     (base 16)		New H3C Technologies Co., Ltd
+				466 Changhe Road, Binjiang District
+				Hangzhou  Zhejiang  310052
+				CN
+
+54-78-F0   (hex)		zte corporation
+5478F0     (base 16)		zte corporation
+				12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China
+				shenzhen   guangdong  518057
+				CN
+
+BC-D2-2C   (hex)		Intel Corporate
+BCD22C     (base 16)		Intel Corporate
+				Lot 8, Jalan Hi-Tech 2/3  
+				Kulim  Kedah  09000
+				MY
+
+E0-3A-AA   (hex)		Intel Corporate
+E03AAA     (base 16)		Intel Corporate
+				Lot 8, Jalan Hi-Tech 2/3  
+				Kulim  Kedah  09000
+				MY
+
+50-99-03   (hex)		Meta Platforms, Inc.
+509903     (base 16)		Meta Platforms, Inc.
+				1601 Willow Road
+				Menlo Park  CA  94025
+				US
+
+40-26-8E   (hex)		Shenzhen Photon Leap Technology Co., Ltd.
+40268E     (base 16)		Shenzhen Photon Leap Technology Co., Ltd.
+				15/F, Building 2, Yongxin Times Square, Interchange of Dongbin Road and Nanguang Road
+				Shenzhen    518054
+				CN
+
+74-F4-41   (hex)		Samsung Electronics Co.,Ltd
+74F441     (base 16)		Samsung Electronics Co.,Ltd
+				#94-1, Imsoo-Dong
+				Gumi  Gyeongbuk  730-350
+				KR
+
+34-39-16   (hex)		Google, Inc.
+343916     (base 16)		Google, Inc.
+				1600 Amphitheatre Parkway
+				Mountain View  CA  94043
+				US
+
+64-68-1A   (hex)		DASAN Network Solutions
+64681A     (base 16)		DASAN Network Solutions
+				401, 20, Gwacheon-daero 7-gil,
+				Gwacheon-si  Gyeonggi-do  13493
+				KR
+
+20-E7-C8   (hex)		Espressif Inc.
+20E7C8     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+00-04-32   (hex)		Voyetra Turtle Beach, Inc.
+000432     (base 16)		Voyetra Turtle Beach, Inc.
+				15822 Bernardo Center Drive Suite 105
+				San Diego  CA  92127
+				US
+
+64-D9-C2   (hex)		eero inc.
+64D9C2     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+80-82-FE   (hex)		Arcadyan Corporation
+8082FE     (base 16)		Arcadyan Corporation
+				No.8, Sec.2, Guangfu Rd.
+				Hsinchu City  Hsinchu  30071
+				TW
+
+CC-CF-FE   (hex)		Henan Lingyunda Information Technology Co., Ltd
+CCCFFE     (base 16)		Henan Lingyunda Information Technology Co., Ltd
+				Block B, Hanhai North Gold Commercial Center, No.73 North Third Ring Road, Jinshui District, Zhengzhou City, Henan Province
+				Zhengzhou  Henan Province  450000
+				CN
+
+28-87-61   (hex)		LG Innotek
+288761     (base 16)		LG Innotek
+				26, HANAMSANDAN 5BEON-RO
+				Gwangju  Gwangsan-gu  506-731
+				KR
+
+78-0C-71   (hex)		Inseego Wireless, Inc
+780C71     (base 16)		Inseego Wireless, Inc
+				9710 Scranton Rd., Suite 200
+				San Diego  CA  92121
+				US
+
+D4-27-FF   (hex)		Sagemcom Broadband SAS
+D427FF     (base 16)		Sagemcom Broadband SAS
+				250, route de l'Empereur
+				Rueil Malmaison Cedex  hauts de seine  92848
+				FR
+
+40-49-7C   (hex)		eero inc.
+40497C     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+A8-2B-DD   (hex)		LCFC(Hefei) Electronics Technology co., ltd
+A82BDD     (base 16)		LCFC(Hefei) Electronics Technology co., ltd
+				No. 3188-1 Yungu Road (Comprehensive Bonded Zone), Hefei Economic & Technological Development Area，Anhui
+				HEFEI  ANHUI  230601
+				CN
+
+34-B5-F3   (hex)		IEEE Registration Authority
+34B5F3     (base 16)		IEEE Registration Authority
+				445 Hoes Lane
+				Piscataway  NJ  08554
+				US
+
+F8-55-4B   (hex)		WirelessMobility Engineering Centre SDN. BHD
+F8554B     (base 16)		WirelessMobility Engineering Centre SDN. BHD
+				SummerSkye Square, NO. 1-2-13 & 1-2, 13A, Jalan Sungai Tiram 8, 11900 Bayan Lepas
+				Penang    11900
+				MY
+
+BC-2A-33   (hex)		Quectel Wireless Solutions Co.,Ltd.
+BC2A33     (base 16)		Quectel Wireless Solutions Co.,Ltd.
+				7th Floor, Hongye Building, No.1801 Hongmei Road, Xuhui District
+				Shanghai    200233
+				CN
+
+8C-91-3A   (hex)		Mellanox Technologies, Inc.
+8C913A     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+E4-89-CA   (hex)		Cisco Systems, Inc
+E489CA     (base 16)		Cisco Systems, Inc
+				80 West Tasman Drive
+				San Jose  CA  95126
+				US
+
+C0-AF-F2   (hex)		Dyson Limited
+C0AFF2     (base 16)		Dyson Limited
+				Tetbury Hill
+				Malmesbury  Wiltshire  SN16 0RP
+				GB
+
+14-BC-68   (hex)		Cisco Systems, Inc
+14BC68     (base 16)		Cisco Systems, Inc
+				80 West Tasman Drive
+				San Jose  CA  95126
+				US
+
+0C-EE-20   (hex)		FBC
+0CEE20     (base 16)		FBC
+				NO.1 Kangjian Road
+				Shanghai    200000
+				CN
+
+AC-84-FA   (hex)		Zhejiang Weilai Jingling Artificial Intelligence Technology Co., Ltd.
+AC84FA     (base 16)		Zhejiang Weilai Jingling Artificial Intelligence Technology Co., Ltd.
+				B2, 6th Floor (6-7 section), Xixi Campus, Ai Cheng Street, Wuchang Sub-district, Yuhang District, Hangzhou, Zhejiang Province, China
+				Hangzhou  Zhejiang  310024
+				CN
+
+00-A0-1B   (hex)		Zhone Technologies, Inc.
+00A01B     (base 16)		Zhone Technologies, Inc.
+				48664 MILMONT DRIVE
+				FREMONT  CA  94538
+				US
+
+00-E0-DF   (hex)		Zhone Technologies, Inc.
+00E0DF     (base 16)		Zhone Technologies, Inc.
+				Wohlenbergstrasse. 3
+				Hannover    30179
+				DE
+
+00-18-0C   (hex)		Zhone Technologies, Inc.
+00180C     (base 16)		Zhone Technologies, Inc.
+				22A-1051 Baxter Road
+				Ottawa  Ontario  K2C 3P2
+				CA
+
+40-F2-1C   (hex)		Zhone Technologies, Inc.
+40F21C     (base 16)		Zhone Technologies, Inc.
+				5700 Tennyson Parkway, Suite 400
+				Plano  TX  75024
+				US
+
+3C-40-15   (hex)		12mm Health Technology (Hainan) Co., Ltd.
+3C4015     (base 16)		12mm Health Technology (Hainan) Co., Ltd.
+				Room A20-860, 5th Floor, Building A,Entrepreneurship Incubation Center,No. 266 Nanhai Avenue,National Hi-Tech Industrial Development Zone,Haikou City, Hainan Province, China
+				Haikou  Hainan  570100
+				CN
+
+20-10-B1   (hex)		Amazon Technologies Inc.
+2010B1     (base 16)		Amazon Technologies Inc.
+				P.O Box 8102 
+				Reno  NV  89507
+				US
+
+84-53-CD   (hex)		China Mobile Group Device Co.,Ltd.
+8453CD     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+98-F6-7A   (hex)		Chipsea Technologies (Shenzhen) Crop.
+98F67A     (base 16)		Chipsea Technologies (Shenzhen) Crop.
+				Room 301, Building 1, Shenzhen Bay Innovation and Technology Center, Keyuan Avenue, High-tech Zone Community, Yuehai Subdistrict, Nanshan District, Shenzhen
+				Shenzhen    518000
+				CN
+
+C4-9A-31   (hex)		Zyxel Communications Corporation
+C49A31     (base 16)		Zyxel Communications Corporation
+				No. 6 Innovation Road II, Science Park
+				Hsichu  Taiwan  300
+				TW
+
+0C-1A-61   (hex)		Neox FZCO
+0C1A61     (base 16)		Neox FZCO
+				S60517 Jebel Ali Freezone
+				Dubai    00000
+				AE
+
+C0-09-25   (hex)		FN-LINK TECHNOLOGY Ltd.
+C00925     (base 16)		FN-LINK TECHNOLOGY Ltd.
+				No.8, Litong Road, Liuyang Economic & Technical Development Zone, Changsha, Hunan,China
+				Changsha  Hunan  410329
+				CN
+
+B8-D8-2D   (hex)		Qingdao Intelligent&Precise Electronics Co.,Ltd.
+B8D82D     (base 16)		Qingdao Intelligent&Precise Electronics Co.,Ltd.
+				No.218 Qianwangang Road
+				Qingdao  Shangdong  266510
+				CN
+
+84-A1-B7   (hex)		Honor Device Co., Ltd.
+84A1B7     (base 16)		Honor Device Co., Ltd.
+				Suite 3401, Unit A, Building 6, Shum Yip Sky Park, No. 8089, Hongli West Road, Xiangmihu Street, Futian District 
+				Shenzhen   Guangdong  518040
+				CN
+
+DC-A2-81   (hex)		Honor Device Co., Ltd.
+DCA281     (base 16)		Honor Device Co., Ltd.
+				Suite 3401, Unit A, Building 6, Shum Yip Sky Park, No. 8089, Hongli West Road, Xiangmihu Street, Futian District 
+				Shenzhen   Guangdong  518040
+				CN
+
+FC-AB-D0   (hex)		vivo Mobile Communication Co., Ltd.
+FCABD0     (base 16)		vivo Mobile Communication Co., Ltd.
+				No.1, vivo Road, Chang'an
+				Dongguan  Guangdong  523860
+				CN
+
+54-85-C1   (hex)		Siliconwaves Technologies Co.,Ltd
+5485C1     (base 16)		Siliconwaves Technologies Co.,Ltd
+				Room 711, 712, 713, Block C, Cygnus, 111 Linghu Avenue, Xinwu District, Wuxi City
+				Wuxi  jiangsu  214000
+				CN
+
+F4-28-9D   (hex)		CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
+F4289D     (base 16)		CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
+				B22 Building,NO.51 Tongle Road, Shajing Town, Jiangnan District, Nanning, Guangxi Province, China
+				Nanning  Guangxi  530007
+				CN
+
+48-0E-13   (hex)		ittim
+480E13     (base 16)		ittim
+				1202, No.6, Zhongguancun South Street, Haidian District,
+				beijing    100080
+				CN
+
+74-34-91   (hex)		Shenzhen Kings IoT Co., Ltd
+743491     (base 16)		Shenzhen Kings IoT Co., Ltd
+				D102, Yibao Garden, Hangcheng Road, Xixiang, BaoanBaoan district
+				Shenzhen City    518126
+				CN
+
+08-D9-45   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+08D945     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+9C-C3-94   (hex)		Apple, Inc.
+9CC394     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+4C-AD-35   (hex)		Apple, Inc.
+4CAD35     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+64-2E-41   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+642E41     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+E0-26-11   (hex)		Apple, Inc.
+E02611     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+F4-97-9D   (hex)		IEEE Registration Authority
+F4979D     (base 16)		IEEE Registration Authority
+				445 Hoes Lane
+				Piscataway  NJ  08554
+				US
+
+E8-A5-5A   (hex)		Juniper Networks
+E8A55A     (base 16)		Juniper Networks
+				1133 Innovation Way
+				Sunnyvale  CA  94089
+				US
+
+68-F2-1F   (hex)		Bose Corporation
+68F21F     (base 16)		Bose Corporation
+				The Mountain
+				Framingham  MA  01701-9168
+				US
+
+2C-9D-4B   (hex)		Lavelle Networks Private Limited
+2C9D4B     (base 16)		Lavelle Networks Private Limited
+				3155, Srinivasan Towers, 3rd Floor Paramahansa Yogananda Road, Indiranagar
+				Bengaluru  Karnataka  560038
+				IN
+
+E8-40-74   (hex)		Barrot Technology Co.,Ltd.
+E84074     (base 16)		Barrot Technology Co.,Ltd.
+				A1009,Block A,Jia Hua Building,No.9 Shangdi 3rd Street,Haidian District,Beijing
+				beijing  beijing  100000
+				CN
+
+B0-BC-8E   (hex)		SkyMirr
+B0BC8E     (base 16)		SkyMirr
+				930 South Harbor City Blvd, Suite 503
+				Melbourne  FL  32901
+				US
+
+9C-3B-91   (hex)		VSSL
+9C3B91     (base 16)		VSSL
+				192 North Old Highway 91, Building 1
+				Hurricane  UT  84737
+				US
+
+88-54-6B   (hex)		Texas Instruments
+88546B     (base 16)		Texas Instruments
+				12500 TI Blvd
+				Dallas  TX  75243
+				US
+
+B0-14-DF   (hex)		MitraStar Technology Corp.
+B014DF     (base 16)		MitraStar Technology Corp.
+				No. 6, Innovation Road II,
+				Hsinchu    300
+				TW
+
+10-E6-6B   (hex)		Kaon Broadband CO., LTD.
+10E66B     (base 16)		Kaon Broadband CO., LTD.
+				884-3, Seongnam-daero, Bundang-gu
+				Seongnam-si    13517
+				KR
+
+28-05-A5   (hex)		Espressif Inc.
+2805A5     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+B0-F1-AE   (hex)		eero inc.
+B0F1AE     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+0C-58-7B   (hex)		Quectel Wireless Solutions Co.,Ltd.
+0C587B     (base 16)		Quectel Wireless Solutions Co.,Ltd.
+				7th Floor, Hongye Building, No.1801 Hongmei Road, Xuhui District
+				Shanghai    200233
+				CN
+
+D8-E0-16   (hex)		Extreme Networks Headquarters
+D8E016     (base 16)		Extreme Networks Headquarters
+				2121 RDU Center Drive 
+				Morrisville  NC  27560
+				US
+
+AC-F4-66   (hex)		HP Inc.
+ACF466     (base 16)		HP Inc.
+				10300 Energy Dr
+				Spring  TX  77389
+				US
+
+74-68-59   (hex)		SUNITEC TECHNOLOGY CO.,LIMITED
+746859     (base 16)		SUNITEC TECHNOLOGY CO.,LIMITED
+				Floor 1-4, building C, Weixlangtal industrial park, no, 725, Dasan Village、Xingfu community, Fucheng Street, Longhua district
+				Shenzhen    518110
+				CN
+
 C8-5C-E2   (hex)		IEEE Registration Authority
 C85CE2     (base 16)		IEEE Registration Authority
 				445 Hoes Lane
@@ -181025,12 +183599,6 @@ F492BF     (base 16)		Ubiquiti Inc
 				New York  NY  New York NY 10017
 				US
 
-00-30-52   (hex)		DZS Inc.
-003052     (base 16)		DZS Inc.
-				6120 WINDWARD PARKWAY -STE#100
-				ALPHARETTA  GA  30005
-				US
-
 50-45-94   (hex)		Radisys
 504594     (base 16)		Radisys
 				8900 NE Walker Road, Suite 130
@@ -181295,12 +183863,6 @@ F4B52F     (base 16)		Juniper Networks
 				Shanghai  Shanghai  201306
 				CN
 
-A0-8E-24   (hex)		eero inc.
-A08E24     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 24-78-23   (hex)		Panasonic Entertainment & Communication Co., Ltd.
 247823     (base 16)		Panasonic Entertainment & Communication Co., Ltd.
 				3-1-1 Yagumo-naka-machi
@@ -181511,18 +184073,6 @@ DCC2C9     (base 16)		CANON INC.
 				DONG GUAN  GUANG DONG  523860
 				CN
 
-FC-6A-1C   (hex)		Mellanox Technologies, Inc.
-FC6A1C     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
-A0-88-C2   (hex)		Mellanox Technologies, Inc.
-A088C2     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 E4-62-C4   (hex)		Cisco Systems, Inc
 E462C4     (base 16)		Cisco Systems, Inc
 				80 West Tasman Drive
@@ -181619,12 +184169,6 @@ B4AC9D     (base 16)		Texas Instruments
 				Dallas  TX  75243
 				US
 
-D4-3F-32   (hex)		eero inc.
-D43F32     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 F8-34-51   (hex)		Comcast-SRL
 F83451     (base 16)		Comcast-SRL
 				Alejo Martinez 17
@@ -181673,12 +184217,6 @@ BC9307     (base 16)		Samsung Electronic
 				ShenZHEN  GuangDong  518104
 				CN
 
-78-D6-D6   (hex)		eero inc.
-78D6D6     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 A4-3F-51   (hex)		Shenzhen Benew Technology  Co.,Ltd.
 A43F51     (base 16)		Shenzhen Benew Technology  Co.,Ltd.
 				No.2001, Building 2, Sunmax Technology Park, Kehua Road No.8, Nanshan District
@@ -181733,12 +184271,6 @@ F82229     (base 16)		Nokia Shanghai Bel
 				Shanghai     201206
 				CN
 
-48-5D-35   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-485D35     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 98-AC-EF   (hex)		Realme Chongqing Mobile Telecommunications Corp.,Ltd.
 98ACEF     (base 16)		Realme Chongqing Mobile Telecommunications Corp.,Ltd.
 				No.178 Yulong Avenue, Yufengshan, Yubei District, Chongqing.
@@ -181985,12 +184517,6 @@ ACCF7B     (base 16)		INGRAM MICRO SERVI
 				MONTAUBAN    82000
 				FR
 
-C8-E3-06   (hex)		eero inc.
-C8E306     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 AC-3E-B1   (hex)		Google, Inc.
 AC3EB1     (base 16)		Google, Inc.
 				1600 Amphitheatre Parkway
@@ -182219,12 +184745,6 @@ B83DFB     (base 16)		Bouffalo Lab (Nanj
 				Seoul  Seoul  04789
 				KR
 
-EC-74-27   (hex)		eero inc.
-EC7427     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 68-E1-DC   (hex)		BUFFALO.INC
 68E1DC     (base 16)		BUFFALO.INC
 				AKAMONDORI Bld.,30-20,Ohsu 3-chome,Naka-ku
@@ -182393,12 +184913,6 @@ F4F19E     (base 16)		Wistron InforComm
 				DONG GUAN  GUANG DONG  523860
 				CN
 
-44-8E-EC   (hex)		China Mobile Group Device Co.,Ltd.
-448EEC     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 F0-26-F8   (hex)		Worldcns Co.,Ltd.
 F026F8     (base 16)		Worldcns Co.,Ltd.
 				B-1813 67, Saebitgongwon-ro, Gwangmyeong-si, Gyeonggi-do, Republic of Korea
@@ -182705,12 +185219,6 @@ D44D77     (base 16)		Nokia
 				Kanata  Ontario  K2K 2E6
 				CA
 
-94-6D-AE   (hex)		Mellanox Technologies, Inc.
-946DAE     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 E0-F3-18   (hex)		Sichuan Tianyi Comheart Telecom Co.,LTD
 E0F318     (base 16)		Sichuan Tianyi Comheart Telecom Co.,LTD
 				No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County
@@ -183209,12 +185717,6 @@ B06E72     (base 16)		Realme Chongqing M
 				Dongguan  Guangdong  523808
 				CN
 
-64-C5-82   (hex)		China Mobile Group Device Co.,Ltd.
-64C582     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 88-FC-5D   (hex)		Cisco Systems, Inc
 88FC5D     (base 16)		Cisco Systems, Inc
 				80 West Tasman Drive
@@ -183773,12 +186275,6 @@ E0FFF1     (base 16)		Texas Instruments
 				Dallas  TX  75243
 				US
 
-9C-0B-05   (hex)		eero inc.
-9C0B05     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 40-F6-BC   (hex)		Amazon Technologies Inc.
 40F6BC     (base 16)		Amazon Technologies Inc.
 				P.O Box 8102 
@@ -184133,24 +186629,12 @@ FC777B     (base 16)		Hitron Technologie
 				Tokyo    105-8001
 				JP
 
-D4-05-DE   (hex)		eero inc.
-D405DE     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 FC-0F-E7   (hex)		Microchip Technology Inc.
 FC0FE7     (base 16)		Microchip Technology Inc.
 				2355 W. Chandler Blvd.
 				Chandler  AZ  85224
 				US
 
-24-12-81   (hex)		China Mobile Group Device Co.,Ltd.
-241281     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 50-C0-F0   (hex)		Artek Microelectronics Co.,Ltd.
 50C0F0     (base 16)		Artek Microelectronics Co.,Ltd.
 				202,NO.1 Building,Software Park,KeJiZhongEr Road,GaoXinQu,NanShan,
@@ -184451,12 +186935,6 @@ DC0E96     (base 16)		Palo Alto Networks
 				Shanghai  Shanghai  201203
 				CN
 
-C0-36-53   (hex)		eero inc.
-C03653     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco    94107
-				US
-
 94-02-30   (hex)		Logitech
 940230     (base 16)		Logitech
 				7700 Gateway Blvd
@@ -184619,12 +187097,6 @@ A09F7A     (base 16)		D-Link Middle East
 				Dubai    18224
 				AE
 
-B4-20-46   (hex)		eero inc.
-B42046     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 E8-6E-44   (hex)		zte corporation
 E86E44     (base 16)		zte corporation
 				12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China
@@ -184643,12 +187115,6 @@ B06A41     (base 16)		Google, Inc.
 				Mountain View  CA  94043
 				US
 
-1C-ED-6F   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-1CED6F     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 D8-1F-12   (hex)		Tuya Smart Inc.
 D81F12     (base 16)		Tuya Smart Inc.
 				160 Greentree Drive, Suite 101
@@ -184823,12 +187289,6 @@ FC1D2A     (base 16)		vivo Mobile Commun
 				Hsinchu    300
 				TW
 
-5C-75-C6   (hex)		China Mobile Group Device Co.,Ltd.
-5C75C6     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 90-09-D0   (hex)		Synology Incorporated
 9009D0     (base 16)		Synology Incorporated
 				9F., No.1, Yuandong Rd., Banqiao Dist.,
@@ -186449,12 +188909,6 @@ A86E4E     (base 16)		Huawei Device Co.,
 				Plano  TX  75074
 				US
 
-78-2E-56   (hex)		China Mobile Group Device Co.,Ltd.
-782E56     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 C4-0B-31   (hex)		Apple, Inc.
 C40B31     (base 16)		Apple, Inc.
 				1 Infinite Loop
@@ -186587,12 +189041,6 @@ AC6784     (base 16)		Google, Inc.
 				Mountain View  CA  94043
 				US
 
-A8-B0-88   (hex)		eero inc.
-A8B088     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 EC-7E-91   (hex)		ITEL MOBILE LIMITED
 EC7E91     (base 16)		ITEL MOBILE LIMITED
 				RM B3 & B4 BLOCK B, KO FAI INDUSTRIAL BUILDING  NO.7 KO FAI ROAD, YAU TONG, KLN, H.K
@@ -186755,12 +189203,6 @@ B4BA12     (base 16)		China Mobile (Hang
 				Hangzhou  Zhejiang  311100
 				CN
 
-E0-E0-C2   (hex)		China Mobile Group Device Co.,Ltd.
-E0E0C2     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 6C-1E-D7   (hex)		vivo Mobile Communication Co., Ltd.
 6C1ED7     (base 16)		vivo Mobile Communication Co., Ltd.
 				No.1, vivo Road, Chang'an
@@ -186899,12 +189341,6 @@ A0FBC5     (base 16)		Apple, Inc.
 				Cupertino  CA  95014
 				US
 
-74-42-7F   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-74427F     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 00-1C-45   (hex)		Chenbro Micom Co., Ltd.
 001C45     (base 16)		Chenbro Micom Co., Ltd.
 				15Fl., No. 150, Jian Yi Road
@@ -187439,12 +189875,6 @@ F0D7AF     (base 16)		IEEE Registration
 				Bengaluru  Karnataka  560100
 				IN
 
-5C-A5-BC   (hex)		eero inc.
-5CA5BC     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco    94107
-				US
-
 D8-4F-37   (hex)		Proxis, spol. s r.o.
 D84F37     (base 16)		Proxis, spol. s r.o.
 				Slovenska 1
@@ -187529,12 +189959,6 @@ D0768F     (base 16)		Calix Inc.
 				San Jose  CA  95131
 				US
 
-00-E2-2C   (hex)		China Mobile Group Device Co.,Ltd.
-00E22C     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 C0-39-5A   (hex)		Zhejiang Dahua Technology Co., Ltd.
 C0395A     (base 16)		Zhejiang Dahua Technology Co., Ltd.
 				No.1199,Waterfront Road 
@@ -187871,12 +190295,6 @@ BC2DEF     (base 16)		Realme Chongqing M
 				Suwon  Gyeonggi-Do  16677
 				KR
 
-C0-16-92   (hex)		China Mobile Group Device Co.,Ltd.
-C01692     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 BC-FF-21   (hex)		Smart Code(shenzhen)Technology Co.,Ltd
 BCFF21     (base 16)		Smart Code(shenzhen)Technology Co.,Ltd
 				Room 1206, Satellite Building,2002 Keyuan Road, Nanshan 
@@ -188597,12 +191015,6 @@ F0EF86     (base 16)		Google, Inc.
 				Mountain View  CA  94043
 				US
 
-E4-C0-CC   (hex)		China Mobile Group Device Co.,Ltd.
-E4C0CC     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 A0-94-6A   (hex)		Shenzhen XGTEC Technology Co,.Ltd.
 A0946A     (base 16)		Shenzhen XGTEC Technology Co,.Ltd.
 				Room 312, Changhong Science and Technology Building, No.18, South 12 Rd., High-tech Community, Yuehai Street, Nanshan District, Shenzhen
@@ -190325,12 +192737,6 @@ D49E05     (base 16)		zte corporation
 				Gif sur Yvette    91193
 				FR
 
-50-8C-F5   (hex)		China Mobile Group Device Co.,Ltd.
-508CF5     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 1C-54-9E   (hex)		Universal Electronics, Inc.
 1C549E     (base 16)		Universal Electronics, Inc.
 				201 E. Sandpointe Ave
@@ -190733,12 +193139,6 @@ D80D17     (base 16)		TP-LINK TECHNOLOGI
 				Jinan  Shandong  250101
 				CN
 
-E0-45-6D   (hex)		China Mobile Group Device Co.,Ltd.
-E0456D     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 18-81-0E   (hex)		Apple, Inc.
 18810E     (base 16)		Apple, Inc.
 				1 Infinite Loop
@@ -190775,12 +193175,6 @@ E0C286     (base 16)		Aisai Communicatio
 				Kwai Chung  N.T.  852
 				HK
 
-F0-B0-14   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-F0B014     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 18-C2-BF   (hex)		BUFFALO.INC
 18C2BF     (base 16)		BUFFALO.INC
 				AKAMONDORI Bld.,30-20,Ohsu 3-chome,Naka-ku
@@ -190931,12 +193325,6 @@ DC9088     (base 16)		HUAWEI TECHNOLOGIE
 				Shenzhen  GuangDong  518057
 				CN
 
-40-62-EA   (hex)		China Mobile Group Device Co.,Ltd.
-4062EA     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 44-65-7F   (hex)		Calix Inc.
 44657F     (base 16)		Calix Inc.
 				2777 Orchard Pkwy
@@ -191555,12 +193943,6 @@ D47226     (base 16)		zte corporation
 				Tokyo    190-0003
 				US
 
-00-CF-C0   (hex)		China Mobile Group Device Co.,Ltd.
-00CFC0     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 AC-35-EE   (hex)		FN-LINK TECHNOLOGY LIMITED
 AC35EE     (base 16)		FN-LINK TECHNOLOGY LIMITED
 				A Building,HuiXin industial park,No 31, YongHe road, Fuyong town, Bao'an District
@@ -191867,12 +194249,6 @@ A039EE     (base 16)		Sagemcom Broadband
 				anyang  Gyeonggi-do  14042
 				KR
 
-3C-57-4F   (hex)		China Mobile Group Device Co.,Ltd.
-3C574F     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 84-74-60   (hex)		zte corporation
 847460     (base 16)		zte corporation
 				12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China
@@ -192173,12 +194549,6 @@ D07FC4     (base 16)		Ou Wei Technology
 				Shenzhen  Guangdong  518057
 				CN
 
-14-79-F3   (hex)		China Mobile Group Device Co.,Ltd.
-1479F3     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 48-55-5C   (hex)		Wu Qi Technologies,Inc.
 48555C     (base 16)		Wu Qi Technologies,Inc.
 				Xiantao street data on the 19th East Road
@@ -192764,12 +195134,6 @@ A8BE27     (base 16)		Apple, Inc.
 				Collingwood  Victoria  3066
 				AU
 
-44-4E-6D   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-444E6D     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 90-B1-E0   (hex)		Beijing Nebula Link Technology Co., Ltd
 90B1E0     (base 16)		Beijing Nebula Link Technology Co., Ltd
 				Room 1201, Building C, Caizhi International Plaza, Haidian District
@@ -194561,12 +196925,6 @@ ACAB2E     (base 16)		Beijing LasNubes T
 				Sunnyvale  CA  94089
 				US
 
-E0-28-6D   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-E0286D     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 C8-B2-1E   (hex)		CHIPSEA TECHNOLOGIES (SHENZHEN) CORP.
 C8B21E     (base 16)		CHIPSEA TECHNOLOGIES (SHENZHEN) CORP.
 				9F,BLOCK A,GARDEN CITY DIGITAL BUILDING,NO.1079 NANHAI ROAD,NANSHAN DISTRICT
@@ -201041,9 +203399,6 @@ E4F4C6     (base 16)		NETGEAR
 				Tokyo    108-0075
 				JP
 
-B0-25-AA   (hex)		Private
-B025AA     (base 16)		Private
-
 D4-B4-3E   (hex)		Messcomp Datentechnik GmbH
 D4B43E     (base 16)		Messcomp Datentechnik GmbH
 				Neudecker Str. 11
@@ -218837,12 +221192,6 @@ C0D60A     (base 16)		Texas Instruments
 				Dallas  TX  75243
 				US
 
-7C-49-CF   (hex)		eero inc.
-7C49CF     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 28-83-C9   (hex)		Apple, Inc.
 2883C9     (base 16)		Apple, Inc.
 				1 Infinite Loop
@@ -219107,12 +221456,6 @@ CC1B5A     (base 16)		Ruckus Wireless
 				Sunnyvale  CA  94089
 				US
 
-24-2D-6C   (hex)		eero inc.
-242D6C     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 38-90-AF   (hex)		zte corporation
 3890AF     (base 16)		zte corporation
 				12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China
@@ -220022,12 +222365,6 @@ B8D0F0     (base 16)		FCNT LLC
 				Yamato  Kanagawa  242-8588
 				JP
 
-10-2F-6E   (hex)		Shenzhen Sundray Technologies Company Limited
-102F6E     (base 16)		Shenzhen Sundray Technologies Company Limited
-				5th Floor, Block A4, Nanshan ipark,NO.1001 Xue Yuan Road, Nanshan District, Shenzhen 518055, P.R. China
-				Shenzhen  Guangdong  518057
-				CN
-
 70-2A-D7   (hex)		New H3C Intelligence Terminal Co., Ltd.
 702AD7     (base 16)		New H3C Intelligence Terminal Co., Ltd.
 				Room 406-100, 1 Yichuang Street, China-Singapore Guangzhou Knowledge City, Huangpu District, Guangzhou.
@@ -220046,12 +222383,6 @@ ECC342     (base 16)		zte corporation
 				Gunpo-si  Gyeonggi-do  15880
 				KR
 
-50-CF-56   (hex)		China Mobile Group Device Co.,Ltd.
-50CF56     (base 16)		China Mobile Group Device Co.,Ltd.
-				32 Xuanwumen West Street,Xicheng District
-				Beijing    100053
-				CN
-
 AC-07-75   (hex)		Apple, Inc.
 AC0775     (base 16)		Apple, Inc.
 				1 Infinite Loop
@@ -220196,12 +222527,6 @@ C4BD8D     (base 16)		SHENZHEN CHUANGWEI
 				Kulim  Kedah  09000
 				MY
 
-30-3A-4A   (hex)		eero inc.
-303A4A     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 AC-39-71   (hex)		Realme Chongqing Mobile Telecommunications Corp.,Ltd.
 AC3971     (base 16)		Realme Chongqing Mobile Telecommunications Corp.,Ltd.
 				No.178 Yulong Avenue, Yufengshan, Yubei District, Chongqing.
@@ -220826,12 +223151,6 @@ BC9424     (base 16)		TCT mobile ltd
 				Cupertino  CA  95014
 				US
 
-DC-69-B5   (hex)		eero inc.
-DC69B5     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 10-23-81   (hex)		Barrot Technology Co.,LTD
 102381     (base 16)		Barrot Technology Co.,LTD
 				A1009, Block A, Jia Hua Building, No.9 Shangdisanjie St, Haidian District, 
@@ -220850,18 +223169,6 @@ E8B723     (base 16)		Shenzhen Vatilon E
 				Wuhan  CN/Hubei  430000
 				CN
 
-98-3F-66   (hex)		Funshion Online Technologies Co.,Ltd
-983F66     (base 16)		Funshion Online Technologies Co.,Ltd
-				5th Floor,Financial Port Building A9,No.77 Optical Valley Avenue, East Lake High-Tech Development Zone, Wuhan
-				Wuhan  CN/Hubei  430000
-				CN
-
-84-31-A8   (hex)		Funshion Online Technologies Co.,Ltd
-8431A8     (base 16)		Funshion Online Technologies Co.,Ltd
-				5th Floor,Financial Port Building A9,No.77 Optical Valley Avenue, East Lake High-Tech Development Zone, Wuhan
-				Wuhan  CN/Hubei  430000
-				CN
-
 7C-2C-67   (hex)		Espressif Inc.
 7C2C67     (base 16)		Espressif Inc.
 				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
@@ -221459,12 +223766,6 @@ ACB480     (base 16)		Dell Inc.
 				Shenzhen   Guangdong  518040
 				CN
 
-E0-9D-73   (hex)		Mellanox Technologies, Inc.
-E09D73     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 60-2D-74   (hex)		Extreme Networks Headquarters
 602D74     (base 16)		Extreme Networks Headquarters
 				2121 RDU Center Drive 
@@ -221747,12 +224048,6 @@ E4B107     (base 16)		Huawei Device Co.,
 				Beijing    100000
 				CN
 
-88-67-46   (hex)		eero inc.
-886746     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 68-7D-00   (hex)		Shenzhen YOUHUA Technology Co., Ltd
 687D00     (base 16)		Shenzhen YOUHUA Technology Co., Ltd
 				Room 407 Shenzhen University-town Business Park,Lishan Road,Taoyuan Street,Nanshan District
@@ -222413,12 +224708,6 @@ F0FCC8     (base 16)		Commscope
 				Shenzhen  GD  518000
 				CN
 
-B4-FC-7D   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-B4FC7D     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 30-29-4B   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
 30294B     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
@@ -222593,12 +224882,6 @@ FCC2E5     (base 16)		HOLOWITS TECHNOLOG
 				Shenzhen  GuangDong  518057
 				CN
 
-98-A9-65   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-98A965     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
-				Alt-Moabit 95
-				Berlin  Berlin  10559
-				DE
-
 4C-DA-38   (hex)		Texas Instruments
 4CDA38     (base 16)		Texas Instruments
 				12500 TI Blvd
@@ -222653,12 +224936,6 @@ DC88A1     (base 16)		ITEL MOBILE LIMITE
 				Minato-ku  Tokyo  108-0075
 				JP
 
-50-00-E6   (hex)		Mellanox Technologies, Inc.
-5000E6     (base 16)		Mellanox Technologies, Inc.
-				350 Oakmead Parkway, Suite 100 
-				Sunnyvale  CA  94085
-				US
-
 38-AA-09   (hex)		Cisco Systems, Inc
 38AA09     (base 16)		Cisco Systems, Inc
 				80 West Tasman Drive
@@ -222848,12 +225125,6 @@ F8388D     (base 16)		New H3C Technologi
 				Irvine  CA  92618
 				US
 
-24-F3-E3   (hex)		eero inc.
-24F3E3     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 40-2F-51   (hex)		Maxtek Optoelectronics Ltd
 402F51     (base 16)		Maxtek Optoelectronics Ltd
 				8 Wing Hong Road 
@@ -223538,12 +225809,6 @@ DC6279     (base 16)		TP-Link Systems In
 				Irvine  CA  92606
 				US
 
-E4-19-7F   (hex)		eero inc.
-E4197F     (base 16)		eero inc.
-				660 3rd Street
-				San Francisco  CA  94107
-				US
-
 EC-34-E2   (hex)		Private
 EC34E2     (base 16)		Private
 
@@ -223613,12 +225878,6 @@ C8102F     (base 16)		NETGEAR
 				San Jose  CA  95134
 				US
 
-D4-7A-EC   (hex)		Funshion Online Technologies Co.,Ltd
-D47AEC     (base 16)		Funshion Online Technologies Co.,Ltd
-				2101, Floor 1-2, Building 9, Anzhen Xili District 3, Chaoyang District, Beijing
-				Beijing    100029
-				CN
-
 A4-C7-88   (hex)		Xiaomi Communications Co Ltd
 A4C788     (base 16)		Xiaomi Communications Co Ltd
 				#019, 9th Floor, Building 6, 33 Xi'erqi Middle Road
@@ -223840,3 +226099,963 @@ A083B4     (base 16)		Velorum B.V
 				Kalkhofseweg 20
 				Haps    5443NA
 				NL
+
+8C-05-72   (hex)		Huawei Device Co., Ltd.
+8C0572     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+9C-7D-C0   (hex)		Tech4home, Lda
+9C7DC0     (base 16)		Tech4home, Lda
+				Rua de Fundoes N151
+				Sao Joao da Madeira  Aveiro  3700-121
+				PT
+
+60-0A-8C   (hex)		Shenzhen Sundray Technologies company Limited
+600A8C     (base 16)		Shenzhen Sundray Technologies company Limited
+				1st Floor Building A1, Nanshan i Park, No.1001 Xueyuan Road, Nanshan District, Shenzhen, Guangdong Province, P. R. China
+				Shenzhen  GuangDong  518057
+				CN
+
+10-2F-6E   (hex)		Shenzhen Sundray Technologies company Limited
+102F6E     (base 16)		Shenzhen Sundray Technologies company Limited
+				5th Floor, Block A4, Nanshan ipark,NO.1001 Xue Yuan Road, Nanshan District, Shenzhen 518055, P.R. China
+				Shenzhen  Guangdong  518057
+				CN
+
+B0-0B-22   (hex)		Huawei Device Co., Ltd.
+B00B22     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+10-25-CE   (hex)		ELKA - Torantriebe GmbH u. Co. Betriebs KG
+1025CE     (base 16)		ELKA - Torantriebe GmbH u. Co. Betriebs KG
+				Dithmarscher Straße 9
+				Tönning    25832
+				DE
+
+B4-E5-3E   (hex)		Ruckus Wireless
+B4E53E     (base 16)		Ruckus Wireless
+				350 West Java Drive
+				Sunnyvale  CA  94089
+				US
+
+20-A7-16   (hex)		Silicon Laboratories
+20A716     (base 16)		Silicon Laboratories
+				 400 West Cesar Chavez
+				Austin  TX  78701
+				US
+
+C0-9B-9E   (hex)		Silicon Laboratories
+C09B9E     (base 16)		Silicon Laboratories
+				 400 West Cesar Chavez
+				Austin  TX  78701
+				US
+
+DC-EC-4F   (hex)		Guangzhou Shiyuan Electronic Technology Company Limited
+DCEC4F     (base 16)		Guangzhou Shiyuan Electronic Technology Company Limited
+				No.6, 4th Yunpu Road, Yunpu industry District
+				Guangzhou  Guangdong  510530
+				CN
+
+D8-5A-49   (hex)		INGCHIPS Technology Co., Ltd
+D85A49     (base 16)		INGCHIPS Technology Co., Ltd
+				1009 ShuGuang Building,South 12th Road
+				Shenzhen  Nanshan District  518000
+				CN
+
+54-A6-37   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+54A637     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+30-61-A2   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+3061A2     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+E0-28-6D   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+E0286D     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+44-4E-6D   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+444E6D     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+F0-B0-14   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+F0B014     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+EC-74-27   (hex)		eero inc.
+EC7427     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+C8-E3-06   (hex)		eero inc.
+C8E306     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+78-D6-D6   (hex)		eero inc.
+78D6D6     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+D4-3F-32   (hex)		eero inc.
+D43F32     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+A0-8E-24   (hex)		eero inc.
+A08E24     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+74-42-7F   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+74427F     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+1C-ED-6F   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+1CED6F     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+48-5D-35   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+485D35     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+B4-20-46   (hex)		eero inc.
+B42046     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+C0-36-53   (hex)		eero inc.
+C03653     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+D4-05-DE   (hex)		eero inc.
+D405DE     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+9C-0B-05   (hex)		eero inc.
+9C0B05     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+7C-49-CF   (hex)		eero inc.
+7C49CF     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+24-2D-6C   (hex)		eero inc.
+242D6C     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+30-3A-4A   (hex)		eero inc.
+303A4A     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+DC-69-B5   (hex)		eero inc.
+DC69B5     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+B4-FC-7D   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+B4FC7D     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+98-A9-65   (hex)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+98A965     (base 16)		AVM Audiovisuelles Marketing und Computersysteme GmbH
+				Alt-Moabit 95 
+				Berlin  Berlin  10559
+				DE
+
+5C-A5-BC   (hex)		eero inc.
+5CA5BC     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+A8-B0-88   (hex)		eero inc.
+A8B088     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+88-67-46   (hex)		eero inc.
+886746     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+24-F3-E3   (hex)		eero inc.
+24F3E3     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+E4-19-7F   (hex)		eero inc.
+E4197F     (base 16)		eero inc.
+				660 3rd Street 
+				San Francisco  CA  94107
+				US
+
+FC-3D-73   (hex)		eero inc.
+FC3D73     (base 16)		eero inc.
+				660 3rd Street
+				San Francisco  CA  94107
+				US
+
+14-79-F3   (hex)		China Mobile Group Device Co.,Ltd.
+1479F3     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+3C-57-4F   (hex)		China Mobile Group Device Co.,Ltd.
+3C574F     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+E4-C0-CC   (hex)		China Mobile Group Device Co.,Ltd.
+E4C0CC     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+C0-16-92   (hex)		China Mobile Group Device Co.,Ltd.
+C01692     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+00-E2-2C   (hex)		China Mobile Group Device Co.,Ltd.
+00E22C     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+E0-E0-C2   (hex)		China Mobile Group Device Co.,Ltd.
+E0E0C2     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+78-2E-56   (hex)		China Mobile Group Device Co.,Ltd.
+782E56     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+00-CF-C0   (hex)		China Mobile Group Device Co.,Ltd.
+00CFC0     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+40-62-EA   (hex)		China Mobile Group Device Co.,Ltd.
+4062EA     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+E0-45-6D   (hex)		China Mobile Group Device Co.,Ltd.
+E0456D     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+50-8C-F5   (hex)		China Mobile Group Device Co.,Ltd.
+508CF5     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+5C-75-C6   (hex)		China Mobile Group Device Co.,Ltd.
+5C75C6     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+24-12-81   (hex)		China Mobile Group Device Co.,Ltd.
+241281     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+64-C5-82   (hex)		China Mobile Group Device Co.,Ltd.
+64C582     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+44-8E-EC   (hex)		China Mobile Group Device Co.,Ltd.
+448EEC     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+94-6D-AE   (hex)		Mellanox Technologies, Inc.
+946DAE     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+FC-6A-1C   (hex)		Mellanox Technologies, Inc.
+FC6A1C     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+A0-88-C2   (hex)		Mellanox Technologies, Inc.
+A088C2     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+E0-9D-73   (hex)		Mellanox Technologies, Inc.
+E09D73     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+50-00-E6   (hex)		Mellanox Technologies, Inc.
+5000E6     (base 16)		Mellanox Technologies, Inc.
+				350 Oakmead Parkway, Suite 100  
+				Sunnyvale  CA  94085
+				US
+
+50-CF-56   (hex)		China Mobile Group Device Co.,Ltd.
+50CF56     (base 16)		China Mobile Group Device Co.,Ltd.
+				32 Xuanwumen West Street,Xicheng District 
+				Beijing    100053
+				CN
+
+C8-24-78   (hex)		Edifier International
+C82478     (base 16)		Edifier International
+				Suit 2207, 22nd floor, Tower II, Lippo centre, 89 Queensway
+				Hong Kong    070
+				CN
+
+D4-A0-FB   (hex)		IEEE Registration Authority
+D4A0FB     (base 16)		IEEE Registration Authority
+				445 Hoes Lane
+				Piscataway  NJ  08554
+				US
+
+E0-42-6D   (hex)		GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+E0426D     (base 16)		GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+				NO.18 HAIBIN ROAD,
+				DONG GUAN  GUANG DONG  523860
+				CN
+
+F8-F2-95   (hex)		Annapurna labs
+F8F295     (base 16)		Annapurna labs
+				Matam Scientific Industries Center,   Building 8.2
+				Mail box 15123  Haifa  3508409
+				IL
+
+80-03-0D   (hex)		CANON INC.
+80030D     (base 16)		CANON INC.
+				30-2 Shimomaruko 3-chome,
+				Ohta-ku  Tokyo  146-8501
+				JP
+
+18-C1-E2   (hex)		Qolsys Inc.
+18C1E2     (base 16)		Qolsys Inc.
+				1919 S Bascom Ave Suit 600
+				Campbell  CA  95008
+				US
+
+F8-43-EF   (hex)		Xiaomi Communications Co Ltd
+F843EF     (base 16)		Xiaomi Communications Co Ltd
+				#019, 9th Floor, Building 6, 33 Xi'erqi Middle Road
+				Beijing  Haidian District  100085
+				CN
+
+A4-FF-9F   (hex)		Xiaomi Communications Co Ltd
+A4FF9F     (base 16)		Xiaomi Communications Co Ltd
+				#019, 9th Floor, Building 6, 33 Xi'erqi Middle Road
+				Beijing  Haidian District  100085
+				CN
+
+20-25-CC   (hex)		Xiaomi Communications Co Ltd
+2025CC     (base 16)		Xiaomi Communications Co Ltd
+				#019, 9th Floor, Building 6, 33 Xi'erqi Middle Road
+				Beijing  Haidian District  100085
+				CN
+
+B0-F3-E9   (hex)		PATEO CONNECT (Xiamen) Co., Ltd.
+B0F3E9     (base 16)		PATEO CONNECT (Xiamen) Co., Ltd.
+				No. 11-29, Fangyang West Road, Xiang’an District
+				Xiamen  fujian  361115
+				CN
+
+30-4A-C4   (hex)		Barrot Technology Co.,LTD
+304AC4     (base 16)		Barrot Technology Co.,LTD
+				A1009, Block A, Jia Hua Building, No.9 Shangdisanjie St, Haidian District, 
+				beijing  beijing  100000
+				CN
+
+64-75-20   (hex)		zte corporation
+647520     (base 16)		zte corporation
+				12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China
+				shenzhen   guangdong  518057
+				CN
+
+00-C8-4E   (hex)		Hewlett Packard Enterprise
+00C84E     (base 16)		Hewlett Packard Enterprise
+				6280 America Center Dr
+				San Jose  CA  95002
+				US
+
+9C-13-9E   (hex)		Espressif Inc.
+9C139E     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+84-31-A8   (hex)		Funshion Online Technologies Co.,Ltd
+8431A8     (base 16)		Funshion Online Technologies Co.,Ltd
+				2101, Floor 1-2, Building 9, Anzhen Xili District 3, Chaoyang District, Beijing
+				Beijing     100029
+				CN
+
+98-3F-66   (hex)		Funshion Online Technologies Co.,Ltd
+983F66     (base 16)		Funshion Online Technologies Co.,Ltd
+				2101, Floor 1-2, Building 9, Anzhen Xili District 3, Chaoyang District, Beijing
+				Beijing     100029
+				CN
+
+40-A7-86   (hex)		TECNO MOBILE LIMITED
+40A786     (base 16)		TECNO MOBILE LIMITED
+				ROOMS 05-15, 13A/F., SOUTH TOWER, WORLD FINANCE CENTRE, HARBOUR CITY, 17 CANTON ROAD, TSIM SHA TSUI, KOWLOON, HONG KONG
+				Hong Kong  Hong Kong  999077
+				HK
+
+D4-7A-EC   (hex)		Funshion Online Technologies Co.,Ltd
+D47AEC     (base 16)		Funshion Online Technologies Co.,Ltd
+				2101, Floor 1-2, Building 9, Anzhen Xili District 3, Chaoyang District, Beijing
+				Beijing     100029
+				CN
+
+88-DA-36   (hex)		Calix Inc.
+88DA36     (base 16)		Calix Inc.
+				2777 Orchard Pkwy
+				San Jose  CA  95131
+				US
+
+40-10-ED   (hex)		G.Tech Technology Ltd.
+4010ED     (base 16)		G.Tech Technology Ltd.
+				No.8,Jinyuan 1st Road,Tangjiawan Town, High-tech Zone
+				Zhuhai  Guangdong  519085
+				CN
+
+EC-10-55   (hex)		Beijing Xiaomi Electronics Co.,Ltd
+EC1055     (base 16)		Beijing Xiaomi Electronics Co.,Ltd
+				Xiaomi Campus
+				Beijing  Beijing  100085
+				CN
+
+20-6E-F1   (hex)		Espressif Inc.
+206EF1     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+98-17-1A   (hex)		Beijing Xiaomi Mobile Software Co., Ltd
+98171A     (base 16)		Beijing Xiaomi Mobile Software Co., Ltd
+				The Rainbow City Office Building, 68 Qinghe Middle Street Haidian District
+				Beijing  Beijing  100085
+				CN
+
+2C-DC-C1   (hex)		EM Microelectronic
+2CDCC1     (base 16)		EM Microelectronic
+				Rue des Sors 3
+				Marin-Epagnier  Neuchatel  2074
+				CH
+
+A4-97-00   (hex)		Cisco Systems, Inc
+A49700     (base 16)		Cisco Systems, Inc
+				80 West Tasman Drive
+				San Jose  CA  94568
+				US
+
+94-4F-DB   (hex)		Nokia
+944FDB     (base 16)		Nokia
+				600 March Road
+				Kanata  Ontario  K2K 2E6
+				CA
+
+D8-53-AD   (hex)		Cisco Meraki
+D853AD     (base 16)		Cisco Meraki
+				500 Terry A. Francois Blvd
+				San Francisco    94158
+				US
+
+30-F8-56   (hex)		Extreme Networks Headquarters
+30F856     (base 16)		Extreme Networks Headquarters
+				2121 RDU Center Drive 
+				Morrisville    27560
+				US
+
+80-40-05   (hex)		Guangdong COROS Sports Technology Co.,Ltd
+804005     (base 16)		Guangdong COROS Sports Technology Co.,Ltd
+				Room 601 & 701, Bld. 2, No.2, Science and Technology 9 Rd, Songshan Lake Hi-Tech Zone, Dongguan 523808, Guandong, China
+				Dongguan  Guangdong  523808
+				CN
+
+68-A5-93   (hex)		Apple, Inc.
+68A593     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+A8-2C-89   (hex)		Apple, Inc.
+A82C89     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+80-12-42   (hex)		Apple, Inc.
+801242     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+B8-01-1F   (hex)		Apple, Inc.
+B8011F     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+14-14-16   (hex)		Hui Zhou Gaoshengda Technology Co.,LTD
+141416     (base 16)		Hui Zhou Gaoshengda Technology Co.,LTD
+				No.2,Jin-da Road,Huinan Industrial Park
+				Hui Zhou  Guangdong  516025
+				CN
+
+B0-25-AA   (hex)		AIstone Global Limited
+B025AA     (base 16)		AIstone Global Limited
+				29/F. , One Exchange Square 8 
+				Connaught Place  Centa  Hong Kong  999077
+				CN
+
+DC-93-96   (hex)		Apple, Inc.
+DC9396     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+18-E6-71   (hex)		Apple, Inc.
+18E671     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+CC-EA-27   (hex)		GE Appliances
+CCEA27     (base 16)		GE Appliances
+				4000 Buechel Bank Road
+				Louisville  KY  40225
+				US
+
+8C-3D-16   (hex)		Shenzhen Four Seas Global Link Network Technology Co.,Ltd
+8C3D16     (base 16)		Shenzhen Four Seas Global Link Network Technology Co.,Ltd
+				9/F, Block H, South China Digital Valley, No.1 South China Road, Longhua District, Shenzhen ,China
+				Shenzhen    518000
+				CN
+
+48-F6-EE   (hex)		Espressif Inc.
+48F6EE     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+7C-31-FA   (hex)		Silicon Laboratories
+7C31FA     (base 16)		Silicon Laboratories
+				 400 West Cesar Chavez
+				Austin  TX  78701
+				US
+
+C0-88-40   (hex)		GD Midea Air-Conditioning Equipment Co.,Ltd.
+C08840     (base 16)		GD Midea Air-Conditioning Equipment Co.,Ltd.
+				Midea Global Innovation Center,Beijiao Town,Shunde
+				Foshan  Guangdong  528311
+				CN
+
+D0-C6-7F   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+D0C67F     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+98-F3-F6   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+98F3F6     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+A0-39-F9   (hex)		Sagemcom Broadband SAS
+A039F9     (base 16)		Sagemcom Broadband SAS
+				250, route de l'Empereur
+				Rueil Malmaison Cedex  hauts de seine  92848
+				FR
+
+B4-89-31   (hex)		Silicon Laboratories
+B48931     (base 16)		Silicon Laboratories
+				 400 West Cesar Chavez
+				Austin  TX  78701
+				US
+
+10-5E-AE   (hex)		New H3C Technologies Co., Ltd
+105EAE     (base 16)		New H3C Technologies Co., Ltd
+				466 Changhe Road, Binjiang District
+				Hangzhou  Zhejiang  310052
+				CN
+
+4C-AD-DF   (hex)		Công ty Cổ phần Thiết bị Công nghiệp GEIC
+4CADDF     (base 16)		Công ty Cổ phần Thiết bị Công nghiệp GEIC
+				52 Lê Đại Hành, phường Lê Đại Hành, quận Hai Bà Trưng
+				Thành phố Hà Nội    000084
+				VN
+
+64-CD-C2   (hex)		Amazon Technologies Inc.
+64CDC2     (base 16)		Amazon Technologies Inc.
+				P.O Box 8102 
+				Reno  NV  89507
+				US
+
+4C-60-AD   (hex)		Amazon Technologies Inc.
+4C60AD     (base 16)		Amazon Technologies Inc.
+				P.O Box 8102 
+				Reno  NV  89507
+				US
+
+08-EB-21   (hex)		Intel Corporate
+08EB21     (base 16)		Intel Corporate
+				Lot 8, Jalan Hi-Tech 2/3  
+				Kulim  Kedah  09000
+				MY
+
+3C-A0-70   (hex)		Blink by Amazon 
+3CA070     (base 16)		Blink by Amazon 
+				100 Riverpark Drive
+				North Reading   MA  01864
+				US
+
+E8-C9-13   (hex)		Samsung Electronics Co.,Ltd
+E8C913     (base 16)		Samsung Electronics Co.,Ltd
+				#94-1, Imsoo-Dong
+				Gumi  Gyeongbuk  730-350
+				KR
+
+24-F4-0A   (hex)		Samsung Electronics Co.,Ltd
+24F40A     (base 16)		Samsung Electronics Co.,Ltd
+				#94-1, Imsoo-Dong
+				Gumi  Gyeongbuk  730-350
+				KR
+
+58-E4-EB   (hex)		FN-LINK TECHNOLOGY Ltd.
+58E4EB     (base 16)		FN-LINK TECHNOLOGY Ltd.
+				No.8, Litong Road, Liuyang Economic & Technical Development Zone, Changsha, Hunan,China
+				Changsha  Hunan  410329
+				CN
+
+78-C1-1D   (hex)		Samsung Electronics Co.,Ltd
+78C11D     (base 16)		Samsung Electronics Co.,Ltd
+				#94-1, Imsoo-Dong
+				Gumi  Gyeongbuk  730-350
+				KR
+
+4C-A9-54   (hex)		Intel Corporate
+4CA954     (base 16)		Intel Corporate
+				Lot 8, Jalan Hi-Tech 2/3  
+				Kulim  Kedah  09000
+				MY
+
+14-C2-4D   (hex)		ATW TECHNOLOGY, INC.
+14C24D     (base 16)		ATW TECHNOLOGY, INC.
+				1F, No.236 Ba’ai Street, Shulin District
+				New Taipei City    23845
+				TW
+
+14-05-89   (hex)		Motorola Mobility LLC, a Lenovo Company
+140589     (base 16)		Motorola Mobility LLC, a Lenovo Company
+				222 West Merchandise Mart Plaza
+				Chicago  IL  60654
+				US
+
+98-3A-1F   (hex)		Google, Inc.
+983A1F     (base 16)		Google, Inc.
+				1600 Amphitheatre Parkway
+				Mountain View  CA  94043
+				US
+
+F8-47-E3   (hex)		Shenzhen Skyworth Digital  Technology  CO., Ltd
+F847E3     (base 16)		Shenzhen Skyworth Digital  Technology  CO., Ltd
+				4F,Block A, Skyworth?Building,
+				Shenzhen  Guangdong  518057
+				CN
+
+08-92-72   (hex)		Espressif Inc.
+089272     (base 16)		Espressif Inc.
+				Room 204, Building 2, 690 Bibo Rd, Pudong New Area
+				Shanghai  Shanghai  201203
+				CN
+
+B0-6B-11   (hex)		Hui Zhou Gaoshengda Technology Co.,LTD
+B06B11     (base 16)		Hui Zhou Gaoshengda Technology Co.,LTD
+				No.2,Jin-da Road,Huinan Industrial Park
+				Hui Zhou  Guangdong  516025
+				CN
+
+2C-0D-CF   (hex)		Xiaomi Communications Co Ltd
+2C0DCF     (base 16)		Xiaomi Communications Co Ltd
+				#019, 9th Floor, Building 6, 33 Xi'erqi Middle Road
+				Beijing  Haidian District  100085
+				CN
+
+AC-10-65   (hex)		KT Micro, Inc.
+AC1065     (base 16)		KT Micro, Inc.
+				Building 76, National Cybersecurity Industry Park, Beiwucun Road 23, Haidian District, Beijing
+				Beijing    100195
+				CN
+
+D4-FF-26   (hex)		OHSUNG
+D4FF26     (base 16)		OHSUNG
+				335-4,SANHODAERO,GUMI,GYEONG BUK,KOREA
+				GUMI  GYEONG BUK  730-030
+				KR
+
+00-86-21   (hex)		Amazon Technologies Inc.
+008621     (base 16)		Amazon Technologies Inc.
+				P.O Box 8102 
+				Reno  NV  89507
+				US
+
+80-6A-34   (hex)		Bouffalo Lab (Nanjing) Co., Ltd.
+806A34     (base 16)		Bouffalo Lab (Nanjing) Co., Ltd.
+				5F, Gongxiang Space, No.100 Tuanjie Road, Nanjing, China
+				Nanjing  Jiangsu  211800
+				CN
+
+54-DD-21   (hex)		Huawei Device Co., Ltd.
+54DD21     (base 16)		Huawei Device Co., Ltd.
+				No.2 of Xincheng Road, Songshan Lake Zone
+				Dongguan  Guangdong  523808
+				CN
+
+A8-24-50   (hex)		Beijing Huadianzhongxin Tech.Co.,Ltd
+A82450     (base 16)		Beijing Huadianzhongxin Tech.Co.,Ltd
+				Room 318,the 3rd Floorl,Xingtianhaiyuan Building,Xianghuangqi East Rd,Nongda South Rd, Haidian District,Beijing,P.R.C
+				Bei Jing    100193
+				CN
+
+8C-44-BB   (hex)		SHEN ZHEN TENDA TECHNOLOGY CO.,LTD
+8C44BB     (base 16)		SHEN ZHEN TENDA TECHNOLOGY CO.,LTD
+				6-8 Floor, Tower E3, No. 1001, Zhongshanyuan Road, Nanshan District, Shenzhen,China
+				Shenzhen    518052
+				CN
+
+C8-E3-1D   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+C8E31D     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+50-AC-B9   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+50ACB9     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				Dongguan    523808
+				CN
+
+E4-56-AC   (hex)		Silicon Laboratories
+E456AC     (base 16)		Silicon Laboratories
+				 400 West Cesar Chavez
+				Austin  TX  78701
+				US
+
+0C-33-1B   (hex)		TydenBrooks
+0C331B     (base 16)		TydenBrooks
+				2727 Paces Ferry Rd, Building 2, Suite 300
+				Atlanta  GA  30339
+				US
+
+24-2B-D6   (hex)		Ring LLC
+242BD6     (base 16)		Ring LLC
+				1523 26th St
+				Santa Monica  CA  90404
+				US
+
+00-30-52   (hex)		Zhone Technologies, Inc.
+003052     (base 16)		Zhone Technologies, Inc.
+				6120 WINDWARD PARKWAY -STE#100
+				ALPHARETTA  GA  30005
+				US
+
+2C-4C-7D   (hex)		New H3C Technologies Co., Ltd
+2C4C7D     (base 16)		New H3C Technologies Co., Ltd
+				466 Changhe Road, Binjiang District
+				Hangzhou  Zhejiang  310052
+				CN
+
+E4-6E-8A   (hex)		BYD Lithium Battery Co., Ltd.
+E46E8A     (base 16)		BYD Lithium Battery Co., Ltd.
+				No. 3001 Baohe Road, Baolong Industrial City, Longgang Street, Longgang District
+				Shen Zhen  Guang Dong  518100
+				CN
+
+C8-C8-3F   (hex)		Texas Instruments
+C8C83F     (base 16)		Texas Instruments
+				12500 TI Blvd
+				Dallas  TX  75243
+				US
+
+E0-D4-91   (hex)		Cisco Systems, Inc
+E0D491     (base 16)		Cisco Systems, Inc
+				80 West Tasman Drive
+				San Jose  CA  94568
+				US
+
+A4-DC-D5   (hex)		Cisco Systems, Inc
+A4DCD5     (base 16)		Cisco Systems, Inc
+				80 West Tasman Drive
+				San Jose  CA  94568
+				US
+
+D8-52-FA   (hex)		Texas Instruments
+D852FA     (base 16)		Texas Instruments
+				12500 TI Blvd
+				Dallas  TX  75243
+				US
+
+38-E2-C4   (hex)		Texas Instruments
+38E2C4     (base 16)		Texas Instruments
+				12500 TI Blvd
+				Dallas  TX  75243
+				US
+
+28-57-5D   (hex)		Apple, Inc.
+28575D     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+34-10-BE   (hex)		Apple, Inc.
+3410BE     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+54-91-E1   (hex)		Vitalacy Inc.
+5491E1     (base 16)		Vitalacy Inc.
+				11859 Wilshire Blvd #500
+				Los Angeles  CA  90025
+				US
+
+F4-33-B7   (hex)		Apple, Inc.
+F433B7     (base 16)		Apple, Inc.
+				1 Infinite Loop
+				Cupertino  CA  95014
+				US
+
+D4-BE-D7   (hex)		Dell Inc.
+D4BED7     (base 16)		Dell Inc.
+				One Dell Way
+				Round Rock   TX  78682
+				US
+
+D4-2F-4B   (hex)		Hon Hai Precision Industry Co.,LTD
+D42F4B     (base 16)		Hon Hai Precision Industry Co.,LTD
+				66.Chung Shan RD, TU-CHENG Industrial , district new TAIPEI CITY,23678 , TAIWAN CHINA 
+				TAIPEI  66.Chung Shan RD, TU-CHENG Industrial , district new TAIPEI   33859
+				CN
+
+20-0E-0F   (hex)		Panasonic Marketing Middle East & Africa FZE
+200E0F     (base 16)		Panasonic Marketing Middle East & Africa FZE
+				P.OBox17985JebelAli
+				Dubai  Dubai  17985
+				AE
+
+90-29-62   (hex)		Linkpower Microelectronics Co., Ltd.
+902962     (base 16)		Linkpower Microelectronics Co., Ltd.
+				905, B1, 999-8, Gaolang East Road, Wuxi Economic Development Zone, Jiangsu Province
+				wuxi  jiangsu  214131
+				CN
+
+84-9D-4B   (hex)		Shenzhen Boomtech Industrial Corporation
+849D4B     (base 16)		Shenzhen Boomtech Industrial Corporation
+				905/906,BuildingA, Huizhi R&D Center. Xixiang,Bao'an District
+				Shenzhen    518100
+				CN
+
+54-FB-66   (hex)		ASRock Incorporation
+54FB66     (base 16)		ASRock Incorporation
+				2F., No.37, Sec. 2, Jhongyang S. Rd., Beitou District,
+				Taipei    112
+				TW
+
+2C-15-7E   (hex)		RADIODATA GmbH
+2C157E     (base 16)		RADIODATA GmbH
+				Newtonstraße 18
+				Berlin    12489
+				DE
+
+A4-3A-39   (hex)		AURORA TECHNOLOGIES CO.,LTD.
+A43A39     (base 16)		AURORA TECHNOLOGIES CO.,LTD.
+				ROOM 1006, BLOCK B, QIANHAI ECONOMIC AND TRADE CENTER, CHINA MERCHANTS GROUP, NO.151 WEST FREE TRADE STREET, QIANHAI,
+				SHENZHEN    518000
+				CN
+
+70-A3-A4   (hex)		Beijing Guming Communication Technology Co., Ltd.
+70A3A4     (base 16)		Beijing Guming Communication Technology Co., Ltd.
+				Room 202-6, 2nd Floor, Building 1, No. 8 Courtyard, Yongchang Middle Road, Beijing Economic and Technological Development Area, Beijing 
+				Beijing  Beijing  100176
+				CN
+
+94-EF-97   (hex)		Edgecore Americas Networking Corporation
+94EF97     (base 16)		Edgecore Americas Networking Corporation
+				20 Mason
+				Irvine  CA  92618
+				US
+
+2C-59-17   (hex)		Arcadyan Corporation
+2C5917     (base 16)		Arcadyan Corporation
+				No.8, Sec.2, Guangfu Rd.
+				Hsinchu City  Hsinchu  30071
+				TW
diff -pruN 257.7-1/hwdb.d/ma-medium.txt 257.9-0ubuntu2/hwdb.d/ma-medium.txt
--- 257.7-1/hwdb.d/ma-medium.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/ma-medium.txt	2025-09-03 18:35:40.000000000 +0000
@@ -872,12 +872,6 @@ C4-A1-0E   (hex)		Ayla Networks (Shenzhe
 				Shenzhen    518000
 				CN
 
-70-50-E7   (hex)		Shenzhen Dangs Science and Technology CO.,Ltd.
-800000-8FFFFF     (base 16)		Shenzhen Dangs Science and Technology CO.,Ltd.
-				9th Floor of GDC Building, Gaoxin Middle 3rd St.,Nanshan District
-				Shenzhen  GuangDong  518063
-				CN
-
 C4-A1-0E   (hex)		Connectlab SRL
 D00000-DFFFFF     (base 16)		Connectlab SRL
 				via donatello 30
@@ -7181,17 +7175,155 @@ F0-12-04   (hex)		MetaX
 				Xi'An  Shaanxi  710000
 				CN
 
+FC-A2-DF   (hex)		TiGHT AV
+C00000-CFFFFF     (base 16)		TiGHT AV
+				Uggledalsvägen 23
+				Billdal    427 40
+				SE
+
+FC-A2-DF   (hex)		PAVONE SISTEMI SRL
+300000-3FFFFF     (base 16)		PAVONE SISTEMI SRL
+				Via Tiberio Bianchi 11-13-15
+				Concorezzo  MB  20863
+				IT
+
 FC-A2-DF   (hex)		Solink Corporation
 000000-0FFFFF     (base 16)		Solink Corporation
 				110-390 March Road
 				Ottawa  Ontario  K2K 0G7
 				CA
 
-FC-A2-DF   (hex)		TiGHT AV
-C00000-CFFFFF     (base 16)		TiGHT AV
-				Uggledalsvägen 23
-				Billdal    427 40
-				SE
+FC-A2-DF   (hex)		Lumentum
+B00000-BFFFFF     (base 16)		Lumentum
+				60/129 Moo 19, Klongnueng
+				Klongluang  Pathumthani  12120
+				TH
+
+04-58-5D   (hex)		Chengdu Juxun Electronic Technology Co.,Ltd
+B00000-BFFFFF     (base 16)		Chengdu Juxun Electronic Technology Co.,Ltd
+				No.327 Xingye Road, Industrial East District, Xindu District, Chengdu City, China
+				Chengdu  Sichuan  610500
+				CN
+
+04-58-5D   (hex)		Shenzhen C & D Electronics Co., Ltd.
+E00000-EFFFFF     (base 16)		Shenzhen C & D Electronics Co., Ltd.
+				9th FIoor, Building 9, No.1 Qingxiang road, BaoNeng Science and TechnoIogy Industrial Park, Longhua New District
+				ShenZhen  GuangDong  518000
+				CN
+
+B0-CC-CE   (hex)		Steelco SpA
+000000-0FFFFF     (base 16)		Steelco SpA
+				via Balegante 27
+				Riese Pio X (TV)    31039
+				IT
+
+B0-CC-CE   (hex)		MULTI-FIELD LOW TEMPERATURE TECHNOLOGY(BEIJING) CO., LTD.
+600000-6FFFFF     (base 16)		MULTI-FIELD LOW TEMPERATURE TECHNOLOGY(BEIJING) CO., LTD.
+				Room 505, 5th Floor, Building 2, No. 11, Xingke East Street, Yanqi Economic Development Zone, Huairou District, Beijing, P.R.China 
+				北京    101400
+				CN
+
+B0-CC-CE   (hex)		4MOD Technology
+200000-2FFFFF     (base 16)		4MOD Technology
+				4 Rue de la Cornouaille
+				Nantes    44300
+				FR
+
+70-50-E7   (hex)		Shenzhen Dangs Science and Technology CO.,Ltd. 
+800000-8FFFFF     (base 16)		Shenzhen Dangs Science and Technology CO.,Ltd. 
+				9th Floor of GDC Building, Gaoxin Middle 3rd St.,Nanshan District
+				Shenzhen  GuangDong  518063
+				CN
+
+B0-CC-CE   (hex)		Shanghai CloudPrime.ai Technology Co, Ltd
+800000-8FFFFF     (base 16)		Shanghai CloudPrime.ai Technology Co, Ltd
+				Room 202, Building 11, No. 789, Puxing Road, Minhang District
+				Shanghai    200000
+				CN
+
+78-78-35   (hex)		Jiaxing Cyber Sensor Intelligent Technology Co., Ltd.
+400000-4FFFFF     (base 16)		Jiaxing Cyber Sensor Intelligent Technology Co., Ltd.
+				Room 301, Building 9, No.89 YueMing Road
+				Tongxiang  Zhejiang  314500
+				CN
+
+78-78-35   (hex)		MAICUN Information Technology(Shanghai)Co.,Ltd
+600000-6FFFFF     (base 16)		MAICUN Information Technology(Shanghai)Co.,Ltd
+				Room 312,No. 2525, Chun shen Road, Minhang District
+				shanghai    210000
+				CN
+
+FC-E4-98   (hex)		SATEL Ltd
+A00000-AFFFFF     (base 16)		SATEL Ltd
+				21, Balakirevsky pereulok
+				Moscow    105082
+				RU
+
+FC-E4-98   (hex)		TIH Microelectronics Technology Co. Ltd.
+E00000-EFFFFF     (base 16)		TIH Microelectronics Technology Co. Ltd.
+				Room 3611, 36th Floor, Building A, Shandong Big Data Industry Base, Jinan City, Shandong Province, China
+				Jinan  SHANDONG  250101
+				CN
+
+34-B5-F3   (hex)		Bethlabs(Tianjin)Technology Co.,Ltd.
+A00000-AFFFFF     (base 16)		Bethlabs(Tianjin)Technology Co.,Ltd.
+				Suite 109, 24 Minhe Road, Xiqing Economic and Technological Development Zone
+				Tianjin  Tianjin  300380
+				CN
+
+34-B5-F3   (hex)		ADDSOFT TECHNOLOGIES LIMITED
+000000-0FFFFF     (base 16)		ADDSOFT TECHNOLOGIES LIMITED
+				647/2219, NUAPATNA, TELENGAPENTHA
+				CUTTACK  ODISHA  754001
+				IN
+
+00-6A-5E   (hex)		Jiangsu Alstom NUG Propulsion System Co., Ltd
+700000-7FFFFF     (base 16)		Jiangsu Alstom NUG Propulsion System Co., Ltd
+				No.199 South Fenglin Rd.,WujinNational Hi-tech Development Zone
+				CHANGZHOU  JIANGSU  213166
+				CN
+
+00-6A-5E   (hex)		Hilti Corporation
+800000-8FFFFF     (base 16)		Hilti Corporation
+				Feldkircherstrasse 100
+				Schaan    9494
+				LI
+
+00-6A-5E   (hex)		Oppermann Regelgeräte GmbH
+E00000-EFFFFF     (base 16)		Oppermann Regelgeräte GmbH
+				Im Spitzhau 1
+				Leinfelden-Echterdingen    70771
+				DE
+
+F4-97-9D   (hex)		Infinite X Co., Ltd.
+200000-2FFFFF     (base 16)		Infinite X Co., Ltd.
+				144/15 M.1 T. Chang Phuek A. Mueang
+				Chiang Mai    50300
+				TH
+
+F4-97-9D   (hex)		Frame the space
+100000-1FFFFF     (base 16)		Frame the space
+				128 rue la Boetie
+				PARIS    75008
+				FR
+
+E0-23-3B   (hex)		ShenZhen Chainway Information Technology Co., Ltd.
+A00000-AFFFFF     (base 16)		ShenZhen Chainway Information Technology Co., Ltd.
+				 9F Building2, Phase2, Gaoxinqi Industrial Park ,  Bao'an District
+				ShenZhen  GuangDong  518102
+				CN
+
+E0-23-3B   (hex)		IOFAC
+500000-5FFFFF     (base 16)		IOFAC
+				Hyundaitera Tower 1628, 8, Ori-ro 651beon-gil
+				Gwangmyeong-si  Gyeonggi-do  14303
+				KR
+
+48-08-EB   (hex)		Silicon Dynamic Networks
+D00000-DFFFFF     (base 16)		Silicon Dynamic Networks
+				Floor 2, Building 14, Section C, St. Moritz Garden, Yulong Road, Longhua New District
+				Shenzhen  Guangdong  518131
+				CN
 
 B8-4C-87   (hex)		Shenzhen Link-all Technology Co., Ltd
 300000-3FFFFF     (base 16)		Shenzhen Link-all Technology Co., Ltd
@@ -13826,6 +13958,186 @@ FC-A2-DF   (hex)		Hangzhou Laizhi Techno
 				hangzhou  zhejiang  310011
 				CN
 
+04-58-5D   (hex)		HKC Security Ltd.
+700000-7FFFFF     (base 16)		HKC Security Ltd.
+				Parkway Business Centre
+				Ballymount  Dublin  D24 WY49
+				IE
+
+04-58-5D   (hex)		TELEPLATFORMS
+A00000-AFFFFF     (base 16)		TELEPLATFORMS
+				Polbina st., 3/1
+				Moscow    109388
+				RU
+
+D4-A0-FB   (hex)		Parpro System Corporation
+800000-8FFFFF     (base 16)		Parpro System Corporation
+				6F, No. 478, Sec. 5, ZhongShan N. Rd.,
+				Taipei  Select State  111005
+				TW
+
+D4-A0-FB   (hex)		Hangteng (HK) Technology Co., Limited
+900000-9FFFFF     (base 16)		Hangteng (HK) Technology Co., Limited
+				銅鑼灣 伊榮街9號欣榮商業大廈 16 樓 1602 室
+				HONGKONG    1
+				HK
+
+B0-CC-CE   (hex)		Faaftech
+C00000-CFFFFF     (base 16)		Faaftech
+				Rua 90, N 929, Setor Sul
+				Goiânia  Goias  74093020
+				BR
+
+B0-CC-CE   (hex)		Shenzhen Xtooltech Intelligent Co.,Ltd.
+400000-4FFFFF     (base 16)		Shenzhen Xtooltech Intelligent Co.,Ltd.
+				17&18/F, A2 Building, Creative City, Liuxian Avenue, Nanshan District, Shenzhen, China
+				Shenzhen  Guangdong  518052
+				CN
+
+B0-CC-CE   (hex)		EBI Patient Care, Inc.
+700000-7FFFFF     (base 16)		EBI Patient Care, Inc.
+				484 Calle E
+				Guaynabo  PR  00969
+				US
+
+78-78-35   (hex)		Skylight
+A00000-AFFFFF     (base 16)		Skylight
+				101a Clay Street #144
+				San Francisco  CA  94111
+				US
+
+B0-CC-CE   (hex)		MICROTEST
+E00000-EFFFFF     (base 16)		MICROTEST
+				14 F.-6, No. 79, Sec. 1, Xintai 5th Rd., Xizhi Dist.
+				New Taipei    221432
+				TW
+
+78-78-35   (hex)		EHTech (Beijing)Co., Ltd.
+200000-2FFFFF     (base 16)		EHTech (Beijing)Co., Ltd.
+				2nd Floor, Building 6 (Block D), No.5 Shengfang Road, Daxing District
+				Beijing    102627
+				CN
+
+FC-E4-98   (hex)		GIGA Copper Networks GmbH
+B00000-BFFFFF     (base 16)		GIGA Copper Networks GmbH
+				Rückerstraße 10
+				Düsseldorf    40470
+				DE
+
+FC-E4-98   (hex)		Shenzhen C & D Electronics Co., Ltd.
+300000-3FFFFF     (base 16)		Shenzhen C & D Electronics Co., Ltd.
+				9th FIoor, Building 9, No.1 Qingxiang road, BaoNeng Science and TechnoIogy Industrial Park, Longhua New District
+				ShenZhen  GuangDong  518000
+				CN
+
+FC-E4-98   (hex)		TScale Electronics Mfg. (Kunshan) Co., Ltd
+400000-4FFFFF     (base 16)		TScale Electronics Mfg. (Kunshan) Co., Ltd
+				No. 99 Jingwei Road, Zhoushi
+				Kunshan    215300
+				CN
+
+FC-E4-98   (hex)		ART Finex Co.,Ltd.
+200000-2FFFFF     (base 16)		ART Finex Co.,Ltd.
+				6-1-33,KAMIKOBATACHO,SABAE-SHI
+				Fukui-ken    916-0037
+				JP
+
+FC-E4-98   (hex)		NTCSOFT
+000000-0FFFFF     (base 16)		NTCSOFT
+				A925, A926, Gwangmyeong G-Tower, 190, Soha-Ro 
+				Gwangmyeong-Si,   Gyeonggi-do  14322
+				KR
+
+34-B5-F3   (hex)		JENESIS(SHEN ZHEN)CO.,LTD.
+600000-6FFFFF     (base 16)		JENESIS(SHEN ZHEN)CO.,LTD.
+				6th Floor, Building A, Tiange Science and Technology Park, No. 2 Luo Zu Industrial Avenue, Luo Zu Community, Shiyan Street, Bao'an District
+				Shenzhen  Guangdong  518108
+				CN
+
+34-B5-F3   (hex)		Kyokuto Solutions Inc.
+500000-5FFFFF     (base 16)		Kyokuto Solutions Inc.
+				5-9-3 Nishitenma Kita-ku 
+				Osaka-shi  Osaka  530-0047
+				JP
+
+F4-97-9D   (hex)		Kaiware (Shenzhen) Technologies Co.,Ltd
+B00000-BFFFFF     (base 16)		Kaiware (Shenzhen) Technologies Co.,Ltd
+				B716, Key Laboratory Platform Building, Shenzhen Virtual University Park, No. 1 Yuexing 2nd Road, High-tech Park Community, Yuehai Street, Nanshan District, Shenzhen, Guangdong 518057, China
+				Shenzhen  Guangdong  518057
+				CN
+
+00-6A-5E   (hex)		Annapurna labs
+A00000-AFFFFF     (base 16)		Annapurna labs
+				Matam Scientific Industries Center,   Building 8.2
+				Mail box 15123  Haifa  3508409
+				IL
+
+00-6A-5E   (hex)		Shenzhen Lightx Technology Co., Ltd
+600000-6FFFFF     (base 16)		Shenzhen Lightx Technology Co., Ltd
+				RM 1006, 10/F PO YIP BLDG, 23 HING YIP ST, Kwun Tong, Kowloon, Hong Kong
+				Hong Kong    000
+				HK
+
+00-6A-5E   (hex)		CYBERTEL BRIDGE
+C00000-CFFFFF     (base 16)		CYBERTEL BRIDGE
+				9th floor, Hansin IT Tower, 272, Digital-ro,Guro-gu
+				Seoul    08389
+				KR
+
+00-6A-5E   (hex)		Beijing Lingji Innovations technology Co,LTD.
+D00000-DFFFFF     (base 16)		Beijing Lingji Innovations technology Co,LTD.
+				Room 106, 1st Floor, A-1 Building, Zhongguancun Dongsheng Science and Technology Park, No. 66 Xixiaokou Road, Haidian District, Beijing
+				Beijing  Beijing  100190
+				CN
+
+F4-97-9D   (hex)		Teenage Engineering AB
+E00000-EFFFFF     (base 16)		Teenage Engineering AB
+				Textilgatan 31
+				Stockholm  n/a  12030 
+				SE
+
+F4-97-9D   (hex)		Warner Technology Corp
+500000-5FFFFF     (base 16)		Warner Technology Corp
+				421 Shepherds Way
+				Morrow  OH  45152
+				US
+
+F4-97-9D   (hex)		MARKT Co., Ltd
+A00000-AFFFFF     (base 16)		MARKT Co., Ltd
+				320, 8, Seongnam-daero 331beon-gil, Bundang-gu
+				Seongnam-si  Gyeonggi-do  13558
+				KR
+
+48-08-EB   (hex)		Hangzhou Jianan Technology Co.,Ltd
+500000-5FFFFF     (base 16)		Hangzhou Jianan Technology Co.,Ltd
+				Room-4606, Building 3, Sijiqing Street, Shangcheng District
+				Hangzhou  Zhejiang Province  310000
+				CN
+
+48-08-EB   (hex)		ZHEJIANG AIKE INTELLIGENTTECHNOLOGY CO.LTD
+C00000-CFFFFF     (base 16)		ZHEJIANG AIKE INTELLIGENTTECHNOLOGY CO.LTD
+				No. 18, Chunjiang Road, Ningwei Street, Xiaoshan District, Hangzhou City, Zhejiang
+				Hangzhou  Zhejiang  311200
+				CN
+
+E0-23-3B   (hex)		Ugreen Group Limited
+E00000-EFFFFF     (base 16)		Ugreen Group Limited
+				4F, Plant 6, 1F-6/F, Block 7, YuAn Zone, Gaofeng Community, Dalang Street, Longhua District
+				Shenzhen  Guangdong  518109
+				CN
+
+E0-23-3B   (hex)		Suzhou Visrgb Technology Co., Ltd
+800000-8FFFFF     (base 16)		Suzhou Visrgb Technology Co., Ltd
+				Room 511,New Building, Xunlilndustrial Park,No.29 Xixia Road,Yuexi Town, Wuzhong District 
+				Suzhou  Jiangsu  215104
+				CN
+
+E0-23-3B   (hex)		Magosys Systems LTD
+D00000-DFFFFF     (base 16)		Magosys Systems LTD
+				Gad Feinstein 13
+				Rehovot    7638517
+				IL
+
 B8-4C-87   (hex)		Altronix , Corp
 A00000-AFFFFF     (base 16)		Altronix , Corp
 				140 58th St. Bldg A, Ste 2N
@@ -18512,12 +18824,6 @@ A4-58-0F   (hex)		Ksenia Security srl
 				Mail box 15123  Haifa  3508409
 				IL
 
-7C-CB-E2   (hex)		Aplex Technology Inc.
-E00000-EFFFFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
 7C-CB-E2   (hex)		Hangzhou Haohaokaiche Technology Co.,Ltd.
 900000-9FFFFF     (base 16)		Hangzhou Haohaokaiche Technology Co.,Ltd.
 				Building 7, Haichuang Park, No.998 Wenyi West Road, Yuhang District
@@ -20189,12 +20495,6 @@ C4-CC-37   (hex)		KAIS Co.,Ltd.
 				Farmingdale  NY  11735
 				US
 
-60-A4-34   (hex)		Hangzhou Zhongxinhui lntelligent Technology Co.,Ltd.
-200000-2FFFFF     (base 16)		Hangzhou Zhongxinhui lntelligent Technology Co.,Ltd.
-				Room 17337, No. 260 Jiangshu Road, Xixing Street, Binjiang District, Hangzhou City, Zhejiang Province
-				Hangzhou    310000
-				CN
-
 C8-FF-BF   (hex)		Cognizant Mobility GmbH
 200000-2FFFFF     (base 16)		Cognizant Mobility GmbH
 				Ingolstädter Str. 45
@@ -20843,12 +21143,6 @@ A00000-AFFFFF     (base 16)		TECHWIN SOL
 				NEW DELHI  DELHI  110020
 				IN
 
-F8-2B-E6   (hex)		Maia Tech, Inc
-C00000-CFFFFF     (base 16)		Maia Tech, Inc
-				77 S. Bedford Street
-				Burlington  MA  01803
-				US
-
 F8-2B-E6   (hex)		Hitek Electronics Co.,Ltd
 800000-8FFFFF     (base 16)		Hitek Electronics Co.,Ltd
 				203-404,397 Seokcheon-ro,Ojeong-gu,Bucheon-si,Gyeonggi-do,14449,Republic of korea
@@ -20945,12 +21239,240 @@ B00000-BFFFFF     (base 16)		Arira Platf
 				San Jose  CA  95110
 				US
 
+FC-A2-DF   (hex)		shenzhen zovoton electronic co.,ltd
+600000-6FFFFF     (base 16)		shenzhen zovoton electronic co.,ltd
+				1F 4 Blok, jinrui zhonghe industrial park, huarong road, tongsheng community, dalang street, longhua district, Shenzhen city, Guangdong province, china
+				shenzhen  guangdong  518100
+				CN
+
 FC-A2-DF   (hex)		Beijing KSL Electromechanical Technology Development Co.,Ltd
 900000-9FFFFF     (base 16)		Beijing KSL Electromechanical Technology Development Co.,Ltd
 				Room 501-1, 5th Floor, Building 23, Courtyard 6, Haiying Road, Fengtai District, Beijing, China
 				Beijing    100071
 				CN
 
+60-A4-34   (hex)		Hangzhou Zhongxinhui lntelligent Technology Co.,Ltd.
+200000-2FFFFF     (base 16)		Hangzhou Zhongxinhui lntelligent Technology Co.,Ltd.
+				Room 809, Building B, No. 567 Yueming Road, Xixing Street,
+				Hangzhou  Binjiang Distric  310000
+				CN
+
+FC-A2-DF   (hex)		Orion Power Systems, Inc.
+E00000-EFFFFF     (base 16)		Orion Power Systems, Inc.
+				2939 W. Beaver Street
+				Jacksonville  FL  32254
+				US
+
+04-58-5D   (hex)		VERTE Elektronik San. Ve Tic. A.Ş.
+600000-6FFFFF     (base 16)		VERTE Elektronik San. Ve Tic. A.Ş.
+				Ankara Teknopark, Serhat Mahallesi, 2224. Cadde, No:1/43, (Z13) F Blok Zemin Kat Tax Office: İvedik Tax Number: 9250982676
+				Yenimahalle  ANKARA  06374
+				TR
+
+04-58-5D   (hex)		Research Laboratory of Design Automation, Ltd.
+100000-1FFFFF     (base 16)		Research Laboratory of Design Automation, Ltd.
+				8 Birzhevoy Spusk
+				Taganrog    347900
+				RU
+
+04-58-5D   (hex)		Rexon Technology
+C00000-CFFFFF     (base 16)		Rexon Technology
+				No. 261, Renhua Rd., Dali Dist.
+				Taichung City     412037
+				TW
+
+D4-A0-FB   (hex)		Skyfri Corp
+700000-7FFFFF     (base 16)		Skyfri Corp
+				800 North State Street Suite 403
+				City of Dover  DE  19901
+				US
+
+D4-A0-FB   (hex)		Snap-on Tools
+C00000-CFFFFF     (base 16)		Snap-on Tools
+				19220 San Jose Ave.
+				City of Industry  CA  91748
+				US
+
+B0-CC-CE   (hex)		Watermark Systems (India) Private Limited
+B00000-BFFFFF     (base 16)		Watermark Systems (India) Private Limited
+				1010, Maker Chambers 5, Nariman Point, Mumbai 
+				Mumbai  Maharashtra  400021 
+				IN
+
+B0-CC-CE   (hex)		Gateview Technologies
+300000-3FFFFF     (base 16)		Gateview Technologies
+				2616 Port Industrial Drive
+				JACKSONVILLE  FL  32226
+				US
+
+B0-CC-CE   (hex)		Xiaomi EV Technology Co., Ltd.
+D00000-DFFFFF     (base 16)		Xiaomi EV Technology Co., Ltd.
+				Room 618, Floor 6, Building 5, Yard 15, Kechuang Tenth Street, Beijing Economic and Technological Development Zone, Beijing
+				Beijing  Beijing  100176
+				CN
+
+B0-CC-CE   (hex)		Beijing Viazijing Technology Co., Ltd.
+500000-5FFFFF     (base 16)		Beijing Viazijing Technology Co., Ltd.
+				9 Xue Qing Road, Hai Dian District
+				Beijing    100085
+				CN
+
+F8-2B-E6   (hex)		MaiaEdge, Inc.
+C00000-CFFFFF     (base 16)		MaiaEdge, Inc.
+				77 S. Bedford Street
+				Burlington  MA  01803
+				US
+
+78-78-35   (hex)		Ambient Life Inc.
+700000-7FFFFF     (base 16)		Ambient Life Inc.
+				321 Walnut St, #325Newton MA 02460
+				Newton  MA  02460
+				US
+
+FC-E4-98   (hex)		Siretta Ltd
+C00000-CFFFFF     (base 16)		Siretta Ltd
+				Basingstoke Rd, Spencers Wood, Reading
+				Reading    RG7 1PW
+				GB
+
+FC-E4-98   (hex)		SM Instruments
+500000-5FFFFF     (base 16)		SM Instruments
+				20, Yuseong-daero 1184beon-gil
+				Daejeon  Yuseong-gu  34109
+				KR
+
+78-78-35   (hex)		BLOOM VIEW LIMITED
+900000-9FFFFF     (base 16)		BLOOM VIEW LIMITED
+				Room 1502 ,Easey Commercial Building
+				WANCHAI    HONG KONG
+				HK
+
+FC-E4-98   (hex)		Changzhou Leading Weighing Technology Co., Ltd
+800000-8FFFFF     (base 16)		Changzhou Leading Weighing Technology Co., Ltd
+				Builing 31, No.9 Caoxi Road, Changzhou,Jiangsu
+				Changzhou    213000
+				CN
+
+7C-CB-E2   (hex)		Aplex Technology Inc.
+E00000-EFFFFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+34-B5-F3   (hex)		WEAD GmbH
+300000-3FFFFF     (base 16)		WEAD GmbH
+				Retzfeld 7
+				Sankt Georgen an der Gusen    4222
+				AT
+
+34-B5-F3   (hex)		Digicom
+D00000-DFFFFF     (base 16)		Digicom
+				The 4th floor, Building No.4, Xiangshan South Road 105#, Shijingshan, Beijing, China
+				BEIJING    100144
+				CN
+
+34-B5-F3   (hex)		Shanghai Sigen New Energy Technology Co., Ltd
+800000-8FFFFF     (base 16)		Shanghai Sigen New Energy Technology Co., Ltd
+				Room 514 The 5th Floor, No.175 Weizhan Road China (Shanghai) Plilot Free Trade Zone
+				Shanghai    201306
+				CN
+
+00-6A-5E   (hex)		Rayneo (wuxi) ltd
+500000-5FFFFF     (base 16)		Rayneo (wuxi) ltd
+				No. 6 Huaqing Innovation Park, Huishan District, Wuxi City
+				WUXI  JiangSu  214100
+				CN
+
+34-B5-F3   (hex)		Shenzhen Mifasuolla Smart Co.,Ltd
+C00000-CFFFFF     (base 16)		Shenzhen Mifasuolla Smart Co.,Ltd
+				 No. 15 Hongbu Road, Majialong Community, Nantou Subdistrict, Nanshan District
+				Shenzhen  Guangdong  518052
+				CN
+
+34-B5-F3   (hex)		Viettel Manufacturing Corporation One Member Limited Liability Company
+E00000-EFFFFF     (base 16)		Viettel Manufacturing Corporation One Member Limited Liability Company
+				An Binh Hamlet, An Khanh Commune
+				Ha Noi  Ha Noi  100000
+				VN
+
+00-6A-5E   (hex)		Creative Communication
+200000-2FFFFF     (base 16)		Creative Communication
+				113/1, Parahupur, Mughalsarai,
+				Mughalsarai  Uttar Pradesh(UP)  232101
+				IN
+
+04-58-5D   (hex)		HDS Otomasyon Güvenlik ve Yazılım Teknolojileri Sanayi Ticaret Limited Şirketi
+D00000-DFFFFF     (base 16)		HDS Otomasyon Güvenlik ve Yazılım Teknolojileri Sanayi Ticaret Limited Şirketi
+				Merkez Mahallesi Sadabad Cad. Kapı No:20
+				İstanbul  Kağıthane  34406
+				TR
+
+00-6A-5E   (hex)		Shenzhen yeahmoo Technology Co., Ltd.
+300000-3FFFFF     (base 16)		Shenzhen yeahmoo Technology Co., Ltd.
+				Room 103, 1st Floor, Building 4, Yunli Intelligent Park, No. 3 Changfa Middle Road,Yangmei Community, Bantian Street, Longgang District,
+				Shenzhen  Guangdong Province  518100
+				CN
+
+00-6A-5E   (hex)		Continental Brasil Indústria Automotiva Ltda.
+B00000-BFFFFF     (base 16)		Continental Brasil Indústria Automotiva Ltda.
+				Av. Senador Adolf Schindling, 131
+				Guarulhos  São Paulo  07042-020
+				BR
+
+F4-97-9D   (hex)		Shanghai Kanghai Infomation System CO.,LTD
+800000-8FFFFF     (base 16)		Shanghai Kanghai Infomation System CO.,LTD
+				Room 207, Building 1, 6055 Songze Avenue , Qingpu District, Shanghai
+				Shanghai    201706
+				CN
+
+F4-97-9D   (hex)		LUXSHARE - ICT(NGHE AN) LIMITED
+700000-7FFFFF     (base 16)		LUXSHARE - ICT(NGHE AN) LIMITED
+				No. 18, Road No. 03, VSIP Nghe An Industrial Park, Hung Nguyen Commune, Nghe An Province, Vietnam
+				Nghe An  Nghe An  460000 
+				VN
+
+F4-97-9D   (hex)		camnex innovation pvt ltd
+600000-6FFFFF     (base 16)		camnex innovation pvt ltd
+				8th floor, platina Heights,C24,Sector 62
+				Noida  UTTAR PRADESH  201301
+				IN
+
+F4-97-9D   (hex)		Tardis Technology
+000000-0FFFFF     (base 16)		Tardis Technology
+				2-30, Maenser Space, 145 Shindae-ro
+				Jejusi  Jejudo  63134
+				KR
+
+F4-97-9D   (hex)		MERRY ELECTRONICS CO., LTD.
+400000-4FFFFF     (base 16)		MERRY ELECTRONICS CO., LTD.
+				NO.22,23RD ROAD,TAICHUNG INDUSTRIAL PARKTAICHUNG,TAIWAN,R.O.C.
+				TAICHUNG    408213
+				TW
+
+E0-23-3B   (hex)		Rehear Audiology Company LTD.
+700000-7FFFFF     (base 16)		Rehear Audiology Company LTD.
+				2F., No.57, Xingzhong Rd., Neihu Dist.,
+				Taipei    114
+				TW
+
+E0-23-3B   (hex)		PluralFusion INC
+200000-2FFFFF     (base 16)		PluralFusion INC
+				1717 E Cary Street
+				Richmond  VA  23223
+				US
+
+48-08-EB   (hex)		Quanta Storage Inc.
+400000-4FFFFF     (base 16)		Quanta Storage Inc.
+				3F. No.188, Wenhua 2nd Rd
+				Taoyuan City  Guishan District  33383
+				TW
+
+48-08-EB   (hex)		Tianjin Jinmu Intelligent Control Technology Co., Ltd
+100000-1FFFFF     (base 16)		Tianjin Jinmu Intelligent Control Technology Co., Ltd
+				Room 3271, Building 1, Collaborative Development Center, West Ring North Road, Beijing-Tianjin Zhongguancun Science Park, BaoDi District, Tianjin, China.
+				Tianjin    301800
+				CN
+
 D0-14-11   (hex)		P.B. Elettronica srl
 100000-1FFFFF     (base 16)		P.B. Elettronica srl
 				Via Santorelli, 8
@@ -27824,6 +28346,186 @@ FC-A2-DF   (hex)		SpacemiT
 				zhuhai  guangdong  519000
 				CN
 
+04-58-5D   (hex)		Wetatronics Limited
+000000-0FFFFF     (base 16)		Wetatronics Limited
+				45 Bath StreetParnell
+				Auckland  Auckland  1052
+				NZ
+
+04-58-5D   (hex)		JRK VISION
+800000-8FFFFF     (base 16)		JRK VISION
+				A-1107, 135, Gasan digital 2-ro, Geumcheon-gu
+				SEOUL    08504
+				KR
+
+D4-A0-FB   (hex)		Corelase Oy
+500000-5FFFFF     (base 16)		Corelase Oy
+				Kauhakorvenkatu 52
+				Tampere  Pirkanmaa  33720
+				FI
+
+D4-A0-FB   (hex)		Shenzhen Dijiean Technology Co., Ltd
+400000-4FFFFF     (base 16)		Shenzhen Dijiean Technology Co., Ltd
+				Floor 6,Building B,Tongxie Industrial Zone,No.80 Shilong Road,Shiyan Street,Baoan District
+				Shenzhen City  Guangdong  518000
+				CN
+
+D4-A0-FB   (hex)		M2MD Technologies, Inc.
+000000-0FFFFF     (base 16)		M2MD Technologies, Inc.
+				525 Chestnut Rose Ln
+				Atlanta  GA  30327
+				US
+
+D4-A0-FB   (hex)		NEXXUS NETWORKS INDIA PRIVATE LIMITED
+300000-3FFFFF     (base 16)		NEXXUS NETWORKS INDIA PRIVATE LIMITED
+				HD-592, C-001/A2 MAX TOWER SECTOR-16B We Work Berger Delhi One Noida Gautam Buddha Nagar U.P
+				GAUTAM BUDDHA NAGAR  UTTAR PRADESH  201301
+				IN
+
+D4-A0-FB   (hex)		Spatial Hover  Inc
+B00000-BFFFFF     (base 16)		Spatial Hover  Inc
+				10415 A Westpark Dr.
+				Houston  TX  77042
+				US
+
+D4-A0-FB   (hex)		Huizhou Jiemeisi Technology Co.,Ltd.
+600000-6FFFFF     (base 16)		Huizhou Jiemeisi Technology Co.,Ltd.
+				NO.63, HUMEI STREET, DASHULING, XIAOJINKOU HUICHENG
+				Huizhou  Guangdong  516023
+				CN
+
+B0-CC-CE   (hex)		Agrisys A/S
+100000-1FFFFF     (base 16)		Agrisys A/S
+				Cypresvej 3
+				Herning    7400
+				DK
+
+78-78-35   (hex)		Shandong Xintong Electronics Co., Ltd
+800000-8FFFFF     (base 16)		Shandong Xintong Electronics Co., Ltd
+				No. 18 Liuyishan Road
+				Zibo High-tech Zone  Shandong  255000
+				CN
+
+78-78-35   (hex)		IRISS Inc.
+500000-5FFFFF     (base 16)		IRISS Inc.
+				10306 Technology Terrace
+				Bradenton  FL  34211
+				US
+
+78-78-35   (hex)		ATsens
+000000-0FFFFF     (base 16)		ATsens
+				TOWER GALLERY 6F,321 Hwangsaeul-ro, Bundang-gu, Seongnam-si, Gyeonggi-do
+				Seongnam    13590
+				KR
+
+FC-E4-98   (hex)		Infinity Electronics Ltd
+D00000-DFFFFF     (base 16)		Infinity Electronics Ltd
+				167-169 Great Portland Street
+				London  Surrey  W1W 5PF
+				GB
+
+D4-A0-FB   (hex)		Intersvyaz IT
+100000-1FFFFF     (base 16)		Intersvyaz IT
+				Prospekt Pobedy, 288, room 7
+				Chelyabinsk    454112
+				RU
+
+FC-E4-98   (hex)		AVCON Information Technology Co.,Ltd.
+900000-9FFFFF     (base 16)		AVCON Information Technology Co.,Ltd.
+				Building A6, Wangu Science and Technology Park, 1688 Guoquan North Road, Yangpu District
+				Shanghai  Shanghai  021-55666588
+				CN
+
+FC-E4-98   (hex)		QuEL, Inc.
+100000-1FFFFF     (base 16)		QuEL, Inc.
+				ON Build. 5F 4-7-14 Myojincho
+				Hachioji  Tokyo  192-0046
+				JP
+
+34-B5-F3   (hex)		Hyatta Digital Technology Co., Ltd.
+700000-7FFFFF     (base 16)		Hyatta Digital Technology Co., Ltd.
+				1405, Building A, Huizhi R&D Center, No. 287 Guangshen Road, Xixiang Street, Bao'an District
+				Shenzhen  Guangdong  518101
+				CN
+
+34-B5-F3   (hex)		Aeterlink Corp.
+B00000-BFFFFF     (base 16)		Aeterlink Corp.
+				13th Floor, Mitsubishi Building, 2-5-2 Marunouchi
+				 Chiyoda-ku  Tokyo  100-0005
+				JP
+
+34-B5-F3   (hex)		Inspired Flight
+200000-2FFFFF     (base 16)		Inspired Flight
+				225 SUBURBAN RD
+				SAN LUIS OBISPO  CA  93401
+				US
+
+34-B5-F3   (hex)		Shenzhen PeakVic Technology Co.,Ltd
+900000-9FFFFF     (base 16)		Shenzhen PeakVic Technology Co.,Ltd
+				Room 310, 3rd Floor, Zhenhua Times Square, No. 21 Heping Road, Qinghua Community, Longhua Street, Longhua District
+				Shenzhen  Guangdong  518000
+				CN
+
+00-6A-5E   (hex)		Evercomm (Pty) Ltd
+400000-4FFFFF     (base 16)		Evercomm (Pty) Ltd
+				363 Rivonia Boulevard, 1st Floor, Euro Centre Building, Edenburg
+				Johannesburg  Gauteng  2128
+				ZA
+
+F4-97-9D   (hex)		Lab241 Co.,Ltd.
+C00000-CFFFFF     (base 16)		Lab241 Co.,Ltd.
+				1402Ho, 286, Beotkkot-ro, Geumcheon-gu
+				Seoul    08511
+				KR
+
+E0-23-3B   (hex)		Quality Pay Systems S.L.
+000000-0FFFFF     (base 16)		Quality Pay Systems S.L.
+				21 Forja Avenue, Cañada de la Fuente Industrial Park 
+				Martos  Jaen  23600
+				ES
+
+F4-97-9D   (hex)		Beijing Jiaxin Technology Co., Ltd
+900000-9FFFFF     (base 16)		Beijing Jiaxin Technology Co., Ltd
+				北京市海淀区丹棱SOHO 7层728室
+				Beijing    100080
+				CN
+
+F4-97-9D   (hex)		Equinox Power
+300000-3FFFFF     (base 16)		Equinox Power
+				108-5108 NORTH FRASER WAY
+				Burnaby  BC  V5J 0H1
+				CA
+
+F4-97-9D   (hex)		Huitec printer solution co., 
+D00000-DFFFFF     (base 16)		Huitec printer solution co., 
+				2f#104 Minchuan Rd. Hisdean district 
+				New Taipei   Taiwan   23141
+				TW
+
+E0-23-3B   (hex)		356 Productions
+300000-3FFFFF     (base 16)		356 Productions
+				1881 West Traverse Pkwy
+				LEHI  UT  84043
+				US
+
+E0-23-3B   (hex)		Elvys s.r.o
+100000-1FFFFF     (base 16)		Elvys s.r.o
+				Polska 9
+				Kosice    04011
+				SK
+
+E0-23-3B   (hex)		Kiwimoore(Shanghai) Semiconductor Co.,Ltd
+600000-6FFFFF     (base 16)		Kiwimoore(Shanghai) Semiconductor Co.,Ltd
+				9F, Block B, No. 800 Naxian Road, Pudong New District
+				Shanghai    201210
+				CN
+
+E0-23-3B   (hex)		Chengdu ChengFeng   Technology co,. Ltd.
+C00000-CFFFFF     (base 16)		Chengdu ChengFeng   Technology co,. Ltd.
+				High-tech Zone TianfuSoftwarePark,B6-103,CHENGDU, 610000
+				CHENGDU  SICHUAN  610000
+				CN
+
 C8-5C-E2   (hex)		Fela Management AG 
 000000-0FFFFF     (base 16)		Fela Management AG 
 				Basadingerstrasse 18
@@ -34828,3 +35530,195 @@ A00000-AFFFFF     (base 16)		BPL MEDICAL
 				11KM BANNERGHATTA MAIN ROAD ARAKERE BANGALORE
 				BANGALORE  KARNATAKA  560076
 				IN
+
+FC-A2-DF   (hex)		Annapurna labs
+500000-5FFFFF     (base 16)		Annapurna labs
+				Matam Scientific Industries Center,   Building 8.2
+				Mail box 15123  Haifa  3508409
+				IL
+
+FC-A2-DF   (hex)		PDI COMMUNICATION SYSTEMS INC.
+200000-2FFFFF     (base 16)		PDI COMMUNICATION SYSTEMS INC.
+				40 GREENWOOD LN
+				SPRINGBORO  OH  45066
+				US
+
+FC-A2-DF   (hex)		MBio Diagnostics, Inc.
+D00000-DFFFFF     (base 16)		MBio Diagnostics, Inc.
+				4550 Byrd Dr
+				Loveland    80538
+				US
+
+04-58-5D   (hex)		Dron Edge India Private Limited
+900000-9FFFFF     (base 16)		Dron Edge India Private Limited
+				A 93 SECTOR 65 NOIDA 201301
+				201301  Uttar Pradesh  201301
+				IN
+
+04-58-5D   (hex)		Integrated Technical Vision Ltd
+400000-4FFFFF     (base 16)		Integrated Technical Vision Ltd
+				Mykoly Hrinchenka str. 2/1
+				Kyiv  Kyiv  03038
+				UA
+
+04-58-5D   (hex)		REXXON GmbH
+300000-3FFFFF     (base 16)		REXXON GmbH
+				Mads-Clausen-Str. 7
+				Flensburg  Schleswig-Holstein  24939 
+				DE
+
+04-58-5D   (hex)		Foxconn Brasil Industria e Comercio Ltda
+200000-2FFFFF     (base 16)		Foxconn Brasil Industria e Comercio Ltda
+				Av. Marginal da Rodovia dos Bandeirantes, 800 - Distrito Industrial
+				Jundiaí  Sao Paulo  13213-008
+				BR
+
+04-58-5D   (hex)		Sercomm Japan Corporation
+500000-5FFFFF     (base 16)		Sercomm Japan Corporation
+				8F, 3-1, YuanQu St., NanKang, Taipei 115, Taiwan
+				Taipei     115
+				TW
+
+D4-A0-FB   (hex)		IMPULSE CCTV NETWORKS INDIA PVT. LTD.
+A00000-AFFFFF     (base 16)		IMPULSE CCTV NETWORKS INDIA PVT. LTD.
+				H.O:- 4th Floor, Tower-A1,Flat No 402Eros Sampoornam, Sec-2,Greater Noida,Gautambuddha Nagar, Uttar Pradesh, 201306
+				GREATER NOIDA WEST  UTTAR PRADESH  201306
+				IN
+
+D4-A0-FB   (hex)		FASTWEL ELECTRONICS INDIA PRIVATE LIMITED
+D00000-DFFFFF     (base 16)		FASTWEL ELECTRONICS INDIA PRIVATE LIMITED
+				DORASWANIPALYA , NO 3, ARKER MICOLAYOUT, ARKERE , BENGALURE(BANGLORE) URBAN
+				BENGALURU  KARNATAKA  560076
+				IN
+
+D4-A0-FB   (hex)		Beijing Lingji Innovations technology Co,LTD.
+200000-2FFFFF     (base 16)		Beijing Lingji Innovations technology Co,LTD.
+				Room 106, 1st Floor, A-1 Building, Zhongguancun Dongsheng Science and Technology Park, No. 66 Xixiaokou Road, Haidian District, Beijing
+				Beijing  Beijing  100190
+				CN
+
+D4-A0-FB   (hex)		GTEK GLOBAL CO.,LTD
+E00000-EFFFFF     (base 16)		GTEK GLOBAL CO.,LTD
+				No3/2/13 Ta Thanh Oai, Thanh Tri district
+				Hanoi  Vietnam  10000
+				VN
+
+B0-CC-CE   (hex)		Shenzhen Dangs Science and Technology CO.,Ltd. 
+A00000-AFFFFF     (base 16)		Shenzhen Dangs Science and Technology CO.,Ltd. 
+				9th Floor of GDC Building, Gaoxin Middle 3rd St.,Nanshan District 
+				Shenzhen  Guangdong  518063
+				CN
+
+B0-CC-CE   (hex)		Taiv Inc
+900000-9FFFFF     (base 16)		Taiv Inc
+				400-321 McDermot Ave
+				Winnipeg  Manitoba  R3A 0A3
+				CA
+
+78-78-35   (hex)		ENQT GmbH
+100000-1FFFFF     (base 16)		ENQT GmbH
+				Spaldingstrasse 210
+				Hamburg  Hamburg  20097
+				DE
+
+78-78-35   (hex)		DBG Communications Technology Co.,Ltd.
+C00000-CFFFFF     (base 16)		DBG Communications Technology Co.,Ltd.
+				Building A, No.5(DBG Factory), Yongda Road, Xiangshui River Industrial Area, Daya Bay, Huizhou
+				Huizhou  Gangdong  516083
+				CN
+
+78-78-35   (hex)		Suzhou Chena Information Technology Co., Ltd.
+D00000-DFFFFF     (base 16)		Suzhou Chena Information Technology Co., Ltd.
+				3rd Floor, Building B6, No. 8 Yanghua Road, Suzhou Industrial Park
+				Suzhou Free Trade Zone  Jiangsu Province  215000
+				CN
+
+78-78-35   (hex)		Shanghai Intchains Technology Co., Ltd.
+B00000-BFFFFF     (base 16)		Shanghai Intchains Technology Co., Ltd.
+				Building 1&2, No.333 Haiyang No.1 Road Lingang Science and Technology Park Pudon
+				shanghai  shanghai  200120
+				CN
+
+78-78-35   (hex)		NEOARK Corporation
+E00000-EFFFFF     (base 16)		NEOARK Corporation
+				Nakano-machi2073-1
+				Hachioji  Tokyo  1920015
+				JP
+
+78-78-35   (hex)		SHENZHEN CHUANGWEI ELECTRONIC APPLIANCE TECH CO., LTD.
+300000-3FFFFF     (base 16)		SHENZHEN CHUANGWEI ELECTRONIC APPLIANCE TECH CO., LTD.
+				6F Floor, Overseas Factory, Skyworth Technology Industrial Park, Tangtou Community, Shiyan Street, Bao'an District
+				Shenzhen  Guangdong  518000
+				CN
+
+FC-E4-98   (hex)		Videonetics Technology Private Limited
+600000-6FFFFF     (base 16)		Videonetics Technology Private Limited
+				Videonetics Technology Private LimitedPlot No. AI/154/1,  Action Area - 1A, 4th Floor, Utility Building
+				Kolkata  West Bengal  700156
+				IN
+
+FC-E4-98   (hex)		E Haute Intelligent Technology Co., Ltd
+700000-7FFFFF     (base 16)		E Haute Intelligent Technology Co., Ltd
+				Room 01-05, 40/F, Building C, Longhua Digital Innovation Center, Longhua District
+				Shenzhen  Guangdong  518000
+				CN
+
+34-B5-F3   (hex)		LAUMAS Elettronica s.r.l.
+400000-4FFFFF     (base 16)		LAUMAS Elettronica s.r.l.
+				via I Maggio, 6 - IT01661140341 
+				Montechiarugolo    43022
+				IT
+
+00-6A-5E   (hex)		BroadMaster Biotech Corp
+100000-1FFFFF     (base 16)		BroadMaster Biotech Corp
+				No. 91 Xiyuan RD. Zhongli City
+				Taoyuan  Select State  32057
+				TW
+
+34-B5-F3   (hex)		Satco Europe GmbH
+100000-1FFFFF     (base 16)		Satco Europe GmbH
+				Waidhauserstr. 3
+				Vohenstrauß    92546
+				DE
+
+00-6A-5E   (hex)		Annapurna labs
+900000-9FFFFF     (base 16)		Annapurna labs
+				Matam Scientific Industries Center,   Building 8.2
+				Mail box 15123  Haifa  3508409
+				IL
+
+00-6A-5E   (hex)		TRULY ELECTRONICS MFG.,LTD
+000000-0FFFFF     (base 16)		TRULY ELECTRONICS MFG.,LTD
+				Truly industry city，shanwei guangdong，P.R.C
+				shanwei  guangdong  516600
+				CN
+
+E0-23-3B   (hex)		Shenzhen C & D Electronics Co., Ltd.
+B00000-BFFFFF     (base 16)		Shenzhen C & D Electronics Co., Ltd.
+				9th FIoor, Building 9, No.1 Qingxiang road, BaoNeng Science and TechnoIogy Industrial Park, Longhua New District
+				ShenZhen  GuangDong  518000
+				CN
+
+E0-23-3B   (hex)		The KIE
+400000-4FFFFF     (base 16)		The KIE
+				6F, 619, 42, Changeop-ro, Sujeong-gu, Seongnam-si
+				Gyeonggi-do    13449
+				KR
+
+E0-23-3B   (hex)		HANET TECHNOLOGY
+900000-9FFFFF     (base 16)		HANET TECHNOLOGY
+				13th Floor, G-Group Tower Building, No. 5 Nguyen Thi Due, Yen Hoa Ward
+				HANOI    70000
+				VN
+
+48-08-EB   (hex)		Guangdong Three Link Technology Co., Ltd
+200000-2FFFFF     (base 16)		Guangdong Three Link Technology Co., Ltd
+				3 floor, A1 Building, No. 75 Jianshe Road, Nankeng Village, Qishi Town
+				Dongguan  Guangdong  523507
+				CN
+
+48-08-EB   (hex)		ELOC8 SRO
+000000-0FFFFF     (base 16)		ELOC8 SRO
+				3 javorova
+				Velka Lomnica  Presov  05952
+				SK
diff -pruN 257.7-1/hwdb.d/ma-small.txt 257.9-0ubuntu2/hwdb.d/ma-small.txt
--- 257.7-1/hwdb.d/ma-small.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/ma-small.txt	2025-09-03 18:35:40.000000000 +0000
@@ -812,12 +812,6 @@ C57000-C57FFF     (base 16)		Strategic R
 				Redmond  WA  98052
 				US
 
-8C-1F-64   (hex)		Potter Electric Signal Company
-316000-316FFF     (base 16)		Potter Electric Signal Company
-				1609 Park 370 Place
-				Hazelwood  MO  63042
-				US
-
 8C-1F-64   (hex)		Tunstall A/S
 F2C000-F2CFFF     (base 16)		Tunstall A/S
 				Niels Bohrs vej 42
@@ -1010,12 +1004,6 @@ FF6000-FF6FFF     (base 16)		Ascon Tecno
 				Vigevano  PV  27029
 				IT
 
-8C-1F-64   (hex)		Shenzhen zhushida Technology lnformation Co.,Ltd
-A5D000-A5DFFF     (base 16)		Shenzhen zhushida Technology lnformation Co.,Ltd
-				1309, Block A, Innovation Building, Majialong Industrial Zone, Nantou Street, Nanshan District, 
-				SHENZHEN    518000
-				CN
-
 8C-1F-64   (hex)		Magnet-Physik Dr. Steingroever GmbH
 C97000-C97FFF     (base 16)		Magnet-Physik Dr. Steingroever GmbH
 				Emil-Hoffmann Str. 3
@@ -4856,12 +4844,6 @@ F8D000-F8DFFF     (base 16)		Flextronics
 				Niemce  lubelskie  21-025
 				PL
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-9B1000-9B1FFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
 70-B3-D5   (hex)		Netemera Sp. z o.o.
 CA4000-CA4FFF     (base 16)		Netemera Sp. z o.o.
 				Ostrobramska 83/1208A
@@ -5024,12 +5006,6 @@ ABE000-ABEFFF     (base 16)		MART NETWOR
 				Bucuresti  Romania  014142
 				RO
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-986000-986FFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
 70-B3-D5   (hex)		CRDE
 6EC000-6ECFFF     (base 16)		CRDE
 				ZI DES GRANDS CAMPS
@@ -5474,12 +5450,6 @@ D60000-D60FFF     (base 16)		Flintab AB
 				Carbondale  IL  62901
 				US
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-605000-605FFF     (base 16)		Aplex Technology Inc.
-				2nd Floor,Tower3,District5,HongHuaLing industrial park,  Nanshan District
-				Shenzhen  Guangdong  518055
-				CN
-
 70-B3-D5   (hex)		Kopis Mobile LLC
 A06000-A06FFF     (base 16)		Kopis Mobile LLC
 				3010 Lakeland Cv Suite M
@@ -5702,12 +5672,6 @@ E7A000-E7AFFF     (base 16)		ART SPA
 				PASSIGNANO SUL TRASIMENO  PG  06065
 				IT
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-F00000-F00FFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
 70-B3-D5   (hex)		Elektro-System s.c.
 343000-343FFF     (base 16)		Elektro-System s.c.
 				Sienkiewicza 25
@@ -5756,12 +5720,6 @@ D57000-D57FFF     (base 16)		TRIUMPH BOA
 				CHIERI  TO  10023
 				IT
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-2EE000-2EEFFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
 70-B3-D5   (hex)		ID Lock AS
 F2D000-F2DFFF     (base 16)		ID Lock AS
 				Stasjonsveien 46
@@ -7745,12 +7703,6 @@ D1E000-D1EFFF     (base 16)		Tycon Syste
 				LAKE FOREST  CA  92630
 				US
 
-8C-1F-64   (hex)		EPC Power Corporation
-875000-875FFF     (base 16)		EPC Power Corporation
-				13250 Gregg St suite a-2 
-				Poway  CA  92064
-				US
-
 8C-1F-64   (hex)		develogic GmbH
 76E000-76EFFF     (base 16)		develogic GmbH
 				Hammer Deich 70
@@ -7799,17 +7751,203 @@ D3F000-D3FFFF     (base 16)		Schnoor Ind
 				Suisio  Lombardy  24040
 				IT
 
+8C-1F-64   (hex)		OnDis Solutions Ltd
+EDD000-EDDFFF     (base 16)		OnDis Solutions Ltd
+				Unit 18, Kensington Industrial Estate
+				Southport    PR9 0NY
+				GB
+
 8C-1F-64   (hex)		Ibercomp SA
 7A3000-7A3FFF     (base 16)		Ibercomp SA
 				Lluis Alemany i Pujol 4
 				Palma de Mallorca  Spain  07010
 				ES
 
-8C-1F-64   (hex)		OnDis Solutions Ltd
-EDD000-EDDFFF     (base 16)		OnDis Solutions Ltd
-				Unit 18, Kensington Industrial Estate
-				Southport    PR9 0NY
-				GB
+8C-1F-64   (hex)		Xylon
+2C4000-2C4FFF     (base 16)		Xylon
+				Fallerovo setaliste 22
+				Zagreb    10000
+				HR
+
+8C-1F-64   (hex)		Inspur Digital Enterprise Technology Co., Ltd.
+45A000-45AFFF     (base 16)		Inspur Digital Enterprise Technology Co., Ltd.
+				No.1036 Langchao Road
+				Jinan  Shandong  250101
+				CN
+
+8C-1F-64   (hex)		SHIELD-CCTV CO.,LTD.
+DD2000-DD2FFF     (base 16)		SHIELD-CCTV CO.,LTD.
+				1F., No. 80. Gong'an St.
+				Pingtung City    900026
+				TW
+
+8C-1F-64   (hex)		EPC Power Corporation
+875000-875FFF     (base 16)		EPC Power Corporation
+				13250 Gregg St suite a-2   
+				Poway  CA  92064
+				US
+
+8C-1F-64   (hex)		Shenzhen zhushida Technology lnformation Co.,Ltd
+A5D000-A5DFFF     (base 16)		Shenzhen zhushida Technology lnformation Co.,Ltd
+				701, Building D, Zone B, Junxing Industrial Zone, Junxing Industrial Zone, Oyster Road, Zhancheng Community, Fuhai Street,
+				SHENZHEN  Bao'an District  518000
+				CN
+
+8C-1F-64   (hex)		Shenzhen zhushida Technology lnformation Co.,Ltd
+231000-231FFF     (base 16)		Shenzhen zhushida Technology lnformation Co.,Ltd
+				701, Building D, Zone B, Junxing Industrial Zone, Junxing Industrial Zone, Oyster Road, Zhancheng Community, Fuhai Street,
+				SHENZHEN  Bao'an District  518000
+				CN
+
+8C-1F-64   (hex)		Taicang T&W Electronics
+FFB000-FFBFFF     (base 16)		Taicang T&W Electronics
+				89# Jiang Nan RD
+				Suzhou  Jiangsu  215412
+				CN
+
+8C-1F-64   (hex)		Breas Medical AB
+5A1000-5A1FFF     (base 16)		Breas Medical AB
+				Företagsvägen 1
+				Mölnlycke    SE-435 33
+				SE
+
+8C-1F-64   (hex)		Oriux
+20A000-20AFFF     (base 16)		Oriux
+				5825 N. Sam Houston Pkwy WSuite 220 Houston TX 77086 United S
+				Houston  TX  77086
+				US
+
+8C-1F-64   (hex)		ENBIK Technology Co., Ltd
+85A000-85AFFF     (base 16)		ENBIK Technology Co., Ltd
+				2F., No.542, Sec. 1, Minsheng N. Rd.,
+				Taoyuan City  Taoyuan City  333016
+				TW
+
+8C-1F-64   (hex)		ibg Prüfcomputer GmbH
+627000-627FFF     (base 16)		ibg Prüfcomputer GmbH
+				Pretzfelder Str. 27
+				Ebermannstadt    91320
+				DE
+
+8C-1F-64   (hex)		Amazon Robotics MTAC Matrix NPI
+DC4000-DC4FFF     (base 16)		Amazon Robotics MTAC Matrix NPI
+				50 Otis Street
+				Westborough  MA  01581
+				US
+
+8C-1F-64   (hex)		Potter Electric Signal Co. LLC
+316000-316FFF     (base 16)		Potter Electric Signal Co. LLC
+				1609 Park 370 Place
+				Hazelwood  MO  63042
+				US
+
+8C-1F-64   (hex)		Eiden Co.,Ltd.
+3D7000-3D7FFF     (base 16)		Eiden Co.,Ltd.
+				2-7-1 kurigi,asao-ku,kawasaki-shi
+				kanagawa    215-0033
+				JP
+
+8C-1F-64   (hex)		S.E.I. CO.,LTD.
+C09000-C09FFF     (base 16)		S.E.I. CO.,LTD.
+				59 Nirayama Tada
+				Izunokuni  Shizuoka  4102133
+				JP
+
+8C-1F-64   (hex)		Boon Arthur Engineering Pte Ltd
+D8A000-D8AFFF     (base 16)		Boon Arthur Engineering Pte Ltd
+				629 Aljunied Road #06-06 Cititech Industrial Building
+				Singapore    389838
+				SG
+
+8C-1F-64   (hex)		Primalucelab S.p.A.
+497000-497FFF     (base 16)		Primalucelab S.p.A.
+				Via Roveredo 20/B
+				Pordenone  PN  33170
+				IT
+
+8C-1F-64   (hex)		DUNASYS INGENIERIE
+006000-006FFF     (base 16)		DUNASYS INGENIERIE
+				10 RUE DE PENTHIEVRE
+				PARIS    75008
+				FR
+
+8C-1F-64   (hex)		Nippon Techno Lab Inc
+C74000-C74FFF     (base 16)		Nippon Techno Lab Inc
+				PMO Hanzomon,2-1 Kojimachi,Chiyoda-ku
+				Chiyoda-ku  Tokyo   102-0083
+				JP
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+986000-986FFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+605000-605FFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+F00000-F00FFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+2EE000-2EEFFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+9B1000-9B1FFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+8C-1F-64   (hex)		Viewpixel Pvt. Ltd.
+8B1000-8B1FFF     (base 16)		Viewpixel Pvt. Ltd.
+				Plot-22 & 23 ,G/F KH, NO-27/24, MOHIT NAGAR Kakrola,New Delhi, South West Dehli,
+				NEW DEHLI  Dehli  110078
+				IN
+
+8C-1F-64   (hex)		SHENZHEN sunforest Co.LTD
+6E9000-6E9FFF     (base 16)		SHENZHEN sunforest Co.LTD
+				Room 1717, Building 2, Jiaxin Huihuang Times Building, Zhongkang Road, Meidu Community, Meilin Street, Futian District, Shenzhen
+				深圳  GUANGDONG  518000
+				CN
+
+8C-1F-64   (hex)		MITSUBISHI ELECTRIC INDIA PVT. LTD.
+37B000-37BFFF     (base 16)		MITSUBISHI ELECTRIC INDIA PVT. LTD.
+				Plot No B-3, Talegaon Industrial Area,Phase-II, Badhalwadi MIDC, Talegoan,,
+				Pune  Maharashtra  410507
+				IN
+
+8C-1F-64   (hex)		Tiptop Platform P. Ltd
+CCF000-CCFFFF     (base 16)		Tiptop Platform P. Ltd
+				A-3 Sardar Patel Marg
+				Jaipur  Rajasthan  302001
+				IN
+
+8C-1F-64   (hex)		Taesung Media
+8DB000-8DBFFF     (base 16)		Taesung Media
+				Room 20, 306, Dalseo-daero 109-gil
+				Dalseo-gu  Daegu   42709
+				KR
+
+8C-1F-64   (hex)		Thermaco Incorporated
+F20000-F20FFF     (base 16)		Thermaco Incorporated
+				646 GREENSBORO ST
+				ASHEBORO  NC  27203-4739
+				US
+
+8C-1F-64   (hex)		Kite Rise Technologies GmbH
+508000-508FFF     (base 16)		Kite Rise Technologies GmbH
+				Kaerntner Strasse 355B/1.OG
+				Graz    8054
+				AT
 
 8C-1F-64   (hex)		Jacobs Technology, Inc.
 A98000-A98FFF     (base 16)		Jacobs Technology, Inc.
@@ -9065,12 +9203,6 @@ DCA000-DCAFFF     (base 16)		Porsche eng
 				Praha 5    158 00
 				CZ
 
-8C-1F-64   (hex)		Potter Electric Signal Company
-57B000-57BFFF     (base 16)		Potter Electric Signal Company
-				1609 Park 370 Place
-				Hazelwood  MO  63042
-				US
-
 70-B3-D5   (hex)		Tabology
 85C000-85CFFF     (base 16)		Tabology
 				4 Gleneagles Court
@@ -11231,12 +11363,6 @@ B9A000-B9AFFF     (base 16)		Potter Elec
 				Lancaster  PA  17601
 				US
 
-70-B3-D5   (hex)		CAPTEMP, Lda
-49E000-49EFFF     (base 16)		CAPTEMP, Lda
-				Rua São João, s/n - Ladeira das Leais
-				Pombal    3100-346
-				PT
-
 70-B3-D5   (hex)		Digital Way
 437000-437FFF     (base 16)		Digital Way
 				1 Chemin des CHAUX
@@ -12959,24 +13085,12 @@ ABA000-ABAFFF     (base 16)		CL Internat
 				Seongnam   Kyeonggi-do   462-806
 				KR
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-35F000-35FFFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
 70-B3-D5   (hex)		Siemens AG
 C87000-C87FFF     (base 16)		Siemens AG
 				MO TPE RE PI
 				Erlangen  Bavaria  91052
 				DE
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-18B000-18BFFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
 70-B3-D5   (hex)		MiraeSignal Co., Ltd
 38C000-38CFFF     (base 16)		MiraeSignal Co., Ltd
 				#701,C-dong Bundang Techno Park Pangyoro 744
@@ -13097,12 +13211,6 @@ D63000-D63FFF     (base 16)		CRDE
 				Ardrossan  Alberta  T8E2K4
 				CA
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-4B7000-4B7FFF     (base 16)		Aplex Technology Inc.
-				2nd Floor,Tower3,District5,HongHuaLing industrial park,  Nanshan District
-				Shenzhen  Guangdong  518055
-				CN
-
 70-B3-D5   (hex)		Cubro Acronet GesmbH
 01A000-01AFFF     (base 16)		Cubro Acronet GesmbH
 				Geiselberstraße 17 / 6 Floor
@@ -13169,12 +13277,6 @@ CBE000-CBEFFF     (base 16)		Ensura Solu
 				Ulft  Gelderland  7071 KB
 				NL
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-BFE000-BFEFFF     (base 16)		Aplex Technology Inc.
-				2nd Floor,Tower3,District5,HongHuaLing industrial park,  Nanshan District
-				Shenzhen  Guangdong  518055
-				CN
-
 70-B3-D5   (hex)		Robert Bosch, LLC
 652000-652FFF     (base 16)		Robert Bosch, LLC
 				256 Raceway Drive, Suite 4
@@ -13367,12 +13469,6 @@ F85000-F85FFF     (base 16)		Solystic
 				Bagneux  Region Parisienne  92227
 				FR
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-817000-817FFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
 70-B3-D5   (hex)		BroadSoft Inc
 F11000-F11FFF     (base 16)		BroadSoft Inc
 				550 S Winchester Blvd
@@ -13427,12 +13523,6 @@ E0D000-E0DFFF     (base 16)		Sigma Conne
 				Lund  Skane  SE- 221 00
 				SE
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-D90000-D90FFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
 70-B3-D5   (hex)		TATTILE SRL
 2F6000-2F6FFF     (base 16)		TATTILE SRL
 				VIA DONIZETTI, 1/3/5
@@ -14978,12 +15068,6 @@ EFD000-EFDFFF     (base 16)		Novatera(Sh
 				Shenzhen  Guangdong  518118
 				CN
 
-8C-1F-64   (hex)		Potter Electric Signal Co LLC
-442000-442FFF     (base 16)		Potter Electric Signal Co LLC
-				1609 Park 370 Place
-				Hazelwood  MO  63043
-				US
-
 8C-1F-64   (hex)		Savant Group
 021000-021FFF     (base 16)		Savant Group
 				4800 James Savage
@@ -15164,12 +15248,6 @@ AC1000-AC1FFF     (base 16)		KA Imaging
 				Boulder  CO  80301
 				US
 
-8C-1F-64   (hex)		Potter Electric Signal Company
-8FE000-8FEFFF     (base 16)		Potter Electric Signal Company
-				5757 Phantom Drive
-				Hazelwood  MO  63042
-				US
-
 8C-1F-64   (hex)		Private
 48D000-48DFFF     (base 16)		Private
 
@@ -15551,12 +15629,6 @@ D30000-D30FFF     (base 16)		FMC Technol
 				Erie  PA  16510-1444
 				US
 
-8C-1F-64   (hex)		HWASUNG
-888000-888FFF     (base 16)		HWASUNG
-				947, Hanam-daero
-				Hanam-si  Gyeonggi-do  12982
-				KR
-
 8C-1F-64   (hex)		Peter Huber Kaeltemaschinenbau SE
 8BC000-8BCFFF     (base 16)		Peter Huber Kaeltemaschinenbau SE
 				Werner-von-Siemens-Str. 1
@@ -15635,6 +15707,210 @@ E3B000-E3BFFF     (base 16)		Neways Tech
 				Calgary  AB  T2P0M6
 				CA
 
+8C-1F-64   (hex)		Faust ApS
+F03000-F03FFF     (base 16)		Faust ApS
+				Vester Fjordvej 2
+				Storvorde    9280
+				DK
+
+8C-1F-64   (hex)		Richie Ltd
+14A000-14AFFF     (base 16)		Richie Ltd
+				Jääkärinkatu 4 LT 1
+				Helsinki    00150
+				FI
+
+8C-1F-64   (hex)		NARI TECH Co., Ltd
+888000-888FFF     (base 16)		NARI TECH Co., Ltd
+				947, Hanam-daero
+				Hanam-si  Gyeonggi-do  12982
+				KR
+
+8C-1F-64   (hex)		Mitsubishi Electric System & Service Co., Ltd.
+E05000-E05FFF     (base 16)		Mitsubishi Electric System & Service Co., Ltd.
+				1-26-43 Yada, Higashi-ku,
+				Nagoya  Aichi  461-0040
+				JP
+
+8C-1F-64   (hex)		NSK Co.,Ltd.
+2A3000-2A3FFF     (base 16)		NSK Co.,Ltd.
+				1-10-15 Daiko,Higashi-ku
+				Nagoya-shi  Aichi  4610043
+				JP
+
+8C-1F-64   (hex)		STATE GRID INTELLIGENCE TECHNOLOGY CO.,LTD.
+B41000-B41FFF     (base 16)		STATE GRID INTELLIGENCE TECHNOLOGY CO.,LTD.
+				No. 715 Kexing Road, High tech Zone, Jinan , Shandong Province, China 
+				Jinan  Shandong  250101
+				CN
+
+8C-1F-64   (hex)		Nanjing Aotong Intelligent Technology Co.,Ltd
+607000-607FFF     (base 16)		Nanjing Aotong Intelligent Technology Co.,Ltd
+				No. 9 Mozhou East Road, Jiangning Development Zone, Nanjing City, Jiangsu Province, China 
+				Nanjing  Jiangsu  211106
+				CN
+
+8C-1F-64   (hex)		IGEMA GmbH
+297000-297FFF     (base 16)		IGEMA GmbH
+				Antwerpener Str. 1
+				Muenster  North Rhine-Westphalia  48163
+				DE
+
+8C-1F-64   (hex)		BK LAB
+F8C000-F8CFFF     (base 16)		BK LAB
+				#1309, Daeryung Technotown 15, Simin-daero 401, Dongan-gu
+				Anyang-si  Gyonggi-do  14057
+				KR
+
+8C-1F-64   (hex)		TECZZ LLC
+D95000-D95FFF     (base 16)		TECZZ LLC
+				17 Forest AvenueSuite 017
+				Fond Du Lac  WI  54935
+				US
+
+8C-1F-64   (hex)		Potter Electric Signal Co. LLC
+57B000-57BFFF     (base 16)		Potter Electric Signal Co. LLC
+				1609 Park 370 Place
+				Hazelwood  MO  63042
+				US
+
+8C-1F-64   (hex)		Potter Electric Signal Co. LLC
+442000-442FFF     (base 16)		Potter Electric Signal Co. LLC
+				1609 Park 370 Place
+				Hazelwood  MO  63043
+				US
+
+8C-1F-64   (hex)		Potter Electric Signal Co. LLC
+8FE000-8FEFFF     (base 16)		Potter Electric Signal Co. LLC
+				5757 Phantom Drive
+				Hazelwood  MO  63042
+				US
+
+8C-1F-64   (hex)		Eyecloud, Inc
+072000-072FFF     (base 16)		Eyecloud, Inc
+				171 Branham Ln, Ste 10-243
+				San Jose  CA  95136
+				US
+
+70-B3-D5   (hex)		CAPTEMP, Lda
+49E000-49EFFF     (base 16)		CAPTEMP, Lda
+				Rua Dr. José António Varela Pinto, 1A
+				Pombal  Zona industrial da Formiga  3100-513
+				PT
+
+8C-1F-64   (hex)		Codasip s.r.o.
+16F000-16FFFF     (base 16)		Codasip s.r.o.
+				Šumavská 416/15, 602 00 Brno-Královo Pole
+				Brno    60200
+				CZ
+
+8C-1F-64   (hex)		Hangzhou Zhongchuan Digital Equipment Co., Ltd.
+45E000-45EFFF     (base 16)		Hangzhou Zhongchuan Digital Equipment Co., Ltd.
+				Building 1, 5th Floor, Zone 1, Zhuantang Science and Technology Economic Block 8, Zhuantang Street, Xihu District, Hangzhou, Zhejiang, China.
+				Hangzhou    310024
+				CN
+
+8C-1F-64   (hex)		Shenzhen Arctec Innovation Technology Co.,Ltd
+199000-199FFF     (base 16)		Shenzhen Arctec Innovation Technology Co.,Ltd
+				Room711-713, Yuefu Square, No.481, Fenghuang Street, Guangming Area
+				Shenzhen  Guangdong  518107
+				CN
+
+8C-1F-64   (hex)		Private
+1A8000-1A8FFF     (base 16)		Private
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+4B7000-4B7FFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+BFE000-BFEFFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+18B000-18BFFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+817000-817FFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+D90000-D90FFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+35F000-35FFFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+8C-1F-64   (hex)		Wuhan YiValley Opto-electric technology Co.,Ltd
+271000-271FFF     (base 16)		Wuhan YiValley Opto-electric technology Co.,Ltd
+				A104,1st stage Juxian Building, Hongshan internatinoal enterprise center
+				Wuhan  Hubei  430073
+				CN
+
+8C-1F-64   (hex)		Mobileye Vision Technologies LTD
+B6A000-B6AFFF     (base 16)		Mobileye Vision Technologies LTD
+				7-9 Hacharutzim St.
+				Petach Tiqwa  Israel  4929909
+				IL
+
+8C-1F-64   (hex)		Kitagawa Corporation
+C58000-C58FFF     (base 16)		Kitagawa Corporation
+				77-1 Motomachi
+				Fuchu-shi  Hiroshima  726-0003
+				JP
+
+8C-1F-64   (hex)		Druck Ltd.
+781000-781FFF     (base 16)		Druck Ltd.
+				Firtree Lane, Groby, Leicester
+				Le6 0FH  England  
+				GB
+
+8C-1F-64   (hex)		Private
+CE5000-CE5FFF     (base 16)		Private
+
+8C-1F-64   (hex)		Discover Energy Systems Corp.
+E9B000-E9BFFF     (base 16)		Discover Energy Systems Corp.
+				320-13711 International Place
+				Richmond  BC  V6V 2Z8
+				CA
+
+8C-1F-64   (hex)		elysia GmbH
+BBA000-BBAFFF     (base 16)		elysia GmbH
+				Am Panneschopp 18
+				Nettetal    41334
+				DE
+
+8C-1F-64   (hex)		QUANZHOU RADIOBOSS TECHNOLOGY CO., LTD
+D12000-D12FFF     (base 16)		QUANZHOU RADIOBOSS TECHNOLOGY CO., LTD
+				NO. 8, CHUANGZAO ROAD, OPTOELECTRONICS-INFORMATION INDUSTRY BASE, NAN'AN, QUANZHOU, FUJIAN 
+				Nan'an  Fujian  362300
+				CN
+
+8C-1F-64   (hex)		GeneSys Elektronik GmbH
+123000-123FFF     (base 16)		GeneSys Elektronik GmbH
+				Maria-und-Georg-Dietrich-Str. 6
+				Offenburg    77652
+				DE
+
+8C-1F-64   (hex)		COPELION INTERNATIONAL INC
+7F9000-7F9FFF     (base 16)		COPELION INTERNATIONAL INC
+				9 F., No. 202, Sec. 2, Yanping N. Rd., Datong Dist.
+				Taipei City    103606
+				TW
+
 8C-1F-64   (hex)		Vision Systems Safety Tech
 E6F000-E6FFFF     (base 16)		Vision Systems Safety Tech
 				5 Chemin de Chiradie
@@ -17033,12 +17309,6 @@ B82000-B82FFF     (base 16)		Seed Core C
 				Krakow    30-552
 				PL
 
-8C-1F-64   (hex)		Potter Electric Signal Company
-6AD000-6ADFFF     (base 16)		Potter Electric Signal Company
-				5757 Phantom Drive
-				Hazelwood  MO  63042
-				US
-
 8C-1F-64   (hex)		victtron
 DB5000-DB5FFF     (base 16)		victtron
 				68, Saemal 2-gil, Daedeok-gu
@@ -17183,12 +17453,6 @@ DFA000-DFAFFF     (base 16)		ATSE LLC
 				Leeuwarden    8938 AG
 				NL
 
-8C-1F-64   (hex)		Potter Electric Signal Company
-FE0000-FE0FFF     (base 16)		Potter Electric Signal Company
-				1609 Park 370 Place
-				Hazelwood  MO  63042
-				US
-
 8C-1F-64   (hex)		INSEVIS GmbH
 414000-414FFF     (base 16)		INSEVIS GmbH
 				Am Weichselgarten 7
@@ -20696,24 +20960,6 @@ C91000-C91FFF     (base 16)		Grossenbach
 				Valdivia  Los Rios  5090000
 				CL
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-906000-906FFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
-70-B3-D5   (hex)		Aplex Technology Inc.
-65A000-65AFFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
-70-B3-D5   (hex)		Aplex Technology Inc.
-7CE000-7CEFFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
 70-B3-D5   (hex)		CTG sp. z o. o.
 396000-396FFF     (base 16)		CTG sp. z o. o.
 				ul. Katowicka 24
@@ -21164,12 +21410,6 @@ C92000-C92FFF     (base 16)		Unitro Flei
 				Backnang    71522
 				DE
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-F57000-F57FFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
 70-B3-D5   (hex)		Sienna Corporation
 13B000-13BFFF     (base 16)		Sienna Corporation
 				475 Horizon drive
@@ -23171,12 +23411,6 @@ E92000-E92FFF     (base 16)		EA Elektro-
 				Viersen  Nordrhein-Westfalen  41747
 				DE
 
-8C-1F-64   (hex)		Potter Electric Signal Company
-965000-965FFF     (base 16)		Potter Electric Signal Company
-				5757 Phantom Drive
-				Hazelwood  MO  63042
-				US
-
 8C-1F-64   (hex)		Fluid Components Intl
 47B000-47BFFF     (base 16)		Fluid Components Intl
 				1755 La Costa Meadows Dr.
@@ -23291,24 +23525,12 @@ EBE000-EBEFFF     (base 16)		Trafag Ital
 				Carlsbad  CA  92008
 				US
 
-8C-1F-64   (hex)		EPC Power Corporation
-263000-263FFF     (base 16)		EPC Power Corporation
-				13250 Gregg St suite a-2 
-				Poway  CA  92064
-				US
-
 8C-1F-64   (hex)		KEYLINE S.P.A.
 16A000-16AFFF     (base 16)		KEYLINE S.P.A.
 				VIA CAMILLO BIANCHI, 2
 				CONEGLIANO  TV  31015
 				IT
 
-8C-1F-64   (hex)		NYIEN-YI TECHNOLOGY(ZHUHAI)CO.,LTD.
-86B000-86BFFF     (base 16)		NYIEN-YI TECHNOLOGY(ZHUHAI)CO.,LTD.
-				广东省珠海市斗门区白蕉镇桥湖南路321号厂房二手层
-				珠海市    519125
-				CN
-
 8C-1F-64   (hex)		Schippers Europe BV
 4E6000-4E6FFF     (base 16)		Schippers Europe BV
 				Smaragdweg 60
@@ -23363,12 +23585,348 @@ A14000-A14FFF     (base 16)		UPLUSIT
 				Yeongdeungpo-gu  Seoul  07207
 				KR
 
+8C-1F-64   (hex)		NYIEN-YI TECHNOLOGY(ZHUHAI)CO.,LTD.
+86B000-86BFFF     (base 16)		NYIEN-YI TECHNOLOGY(ZHUHAI)CO.,LTD.
+				First Floor, Workshop Building 2,No.321,Qiaohu South Road ,Baijiao Town
+				Doumen District Zhuhai City  GuangDong  519125
+				CN
+
 8C-1F-64   (hex)		ComVetia AG
 E5B000-E5BFFF     (base 16)		ComVetia AG
 				Wittenwilerstrasse 31
 				Aadorf  TG  8355
 				CH
 
+8C-1F-64   (hex)		inomatic GmbH
+7BE000-7BEFFF     (base 16)		inomatic GmbH
+				Karl-Braun-Straße 12-13
+				Nordhorn  Germany  48531
+				DE
+
+8C-1F-64   (hex)		EPC Power Corporation
+263000-263FFF     (base 16)		EPC Power Corporation
+				13250 Gregg St suite a-2   
+				Poway  CA  92064
+				US
+
+8C-1F-64   (hex)		EPC Power Corporation
+9D9000-9D9FFF     (base 16)		EPC Power Corporation
+				13250 Gregg St suite a-2   
+				Poway  CA  92064
+				US
+
+8C-1F-64   (hex)		CAITRON GmbH
+526000-526FFF     (base 16)		CAITRON GmbH
+				Gewerbepark Edelweiss 4
+				Weissensberg    88138
+				DE
+
+8C-1F-64   (hex)		UrbanChain Group Co., Ltd
+506000-506FFF     (base 16)		UrbanChain Group Co., Ltd
+				1-2-32, Tsurumai, Showa-ku, Nagoya-shi, Aichi, Japan
+				nagoya    466-0064
+				JP
+
+8C-1F-64   (hex)		ODTech Co., Ltd.
+C36000-C36FFF     (base 16)		ODTech Co., Ltd.
+				87, Wanjusandan 5-ro, Bongdong-eup
+				Wanju_gun  Jeonbuk-do  55322
+				KR
+
+8C-1F-64   (hex)		Inspinia Technology s.r.o.
+595000-595FFF     (base 16)		Inspinia Technology s.r.o.
+				Paleckeho 493
+				Holesov    76901
+				CZ
+
+8C-1F-64   (hex)		Xi’an Sunway Communication Co., Ltd.
+CB1000-CB1FFF     (base 16)		Xi’an Sunway Communication Co., Ltd.
+				 Room 12003,20F,Unit 1 Building 6,Gaoke Shang du Moka, zhang ba 5
+				Road,High-Tech Zone  Xi’an   710000
+				CN
+
+8C-1F-64   (hex)		Tecsys do Brasil Industrial Ltda
+7D0000-7D0FFF     (base 16)		Tecsys do Brasil Industrial Ltda
+				Rua Oros, 146
+				Sao Jose dos Campos  SP  12237150
+				BR
+
+8C-1F-64   (hex)		Season Electronics Ltd
+37D000-37DFFF     (base 16)		Season Electronics Ltd
+				600 Nest Business Park 
+				Havant  Hampshire  PO9 5TL
+				GB
+
+8C-1F-64   (hex)		SURYA ELECTRONICS
+3F2000-3F2FFF     (base 16)		SURYA ELECTRONICS
+				Plot no115 ALEAP Industrial Estate Gajularamaram village, Quthubullapur Mandal
+				HYDERABAD  Telangana  500055
+				IN
+
+8C-1F-64   (hex)		TelecomWadi
+1F9000-1F9FFF     (base 16)		TelecomWadi
+				First Al Sheikh Zayed, Giza Governorate 3244530
+				Giza    3244530
+				EG
+
+8C-1F-64   (hex)		Efftronics Systems (P) Ltd
+063000-063FFF     (base 16)		Efftronics Systems (P) Ltd
+				Plot No.4, IT Park, Auto Nagar
+				Mangalagiri  Andhra Pradesh  520010
+				IN
+
+8C-1F-64   (hex)		Vantageo Private Limited
+96B000-96BFFF     (base 16)		Vantageo Private Limited
+				617, Lodha Supremus II, Wagle Estate, Thane,
+				Mumbai  Maharastra  400604
+				IN
+
+8C-1F-64   (hex)		DEUTA Werke GmbH
+5ED000-5EDFFF     (base 16)		DEUTA Werke GmbH
+				ET
+				Bergisch Gladbach  NRW  51465
+				DE
+
+8C-1F-64   (hex)		Shenzhen Angstrom Excellence Technology Co., Ltd
+277000-277FFF     (base 16)		Shenzhen Angstrom Excellence Technology Co., Ltd
+				Angstrom Excellence Building, No. 1310,Guanguang Road,Longhua District
+				Shenzhen  Guangdong  518110
+				CN
+
+8C-1F-64   (hex)		Potter Electric Signal Co. LLC
+FE0000-FE0FFF     (base 16)		Potter Electric Signal Co. LLC
+				1609 Park 370 Place
+				Hazelwood  MO  63042
+				US
+
+8C-1F-64   (hex)		Potter Electric Signal Co. LLC
+6AD000-6ADFFF     (base 16)		Potter Electric Signal Co. LLC
+				5757 Phantom Drive
+				Hazelwood  MO  63042
+				US
+
+8C-1F-64   (hex)		Samwell International Inc
+3EB000-3EBFFF     (base 16)		Samwell International Inc
+				No. 317-1, Sec.2, An Kang Rd., Hsintien Dist
+				New Taipei City    231
+				TW
+
+8C-1F-64   (hex)		Potter Electric Signal Co. LLC
+965000-965FFF     (base 16)		Potter Electric Signal Co. LLC
+				5757 Phantom Drive
+				Hazelwood  MO  63042
+				US
+
+8C-1F-64   (hex)		Potter Electric Signal Co. LLC
+EBB000-EBBFFF     (base 16)		Potter Electric Signal Co. LLC
+				5757 Phantom Drive
+				Hazelwood  MO  63042
+				US
+
+8C-1F-64   (hex)		Potter Electric Signal Co. LLC
+81B000-81BFFF     (base 16)		Potter Electric Signal Co. LLC
+				5757 Phantom Drive
+				Hazelwood  MO  63042
+				US
+
+8C-1F-64   (hex)		SUS Corporation
+F69000-F69FFF     (base 16)		SUS Corporation
+				6F, S-patio Bldg. 14-25 Minami-cho, Suruga-ku,
+				Shizuoka city,  Shizuoka  422-8067
+				JP
+
+8C-1F-64   (hex)		CS-Tech s.r.o.
+ED7000-ED7FFF     (base 16)		CS-Tech s.r.o.
+				Lazenska
+				Usti nad Orlici  Czech Republic  56201
+				CZ
+
+8C-1F-64   (hex)		SARV WEBS PRIVATE LIMITED
+CA0000-CA0FFF     (base 16)		SARV WEBS PRIVATE LIMITED
+				IT-10,EPIP RIICO INDUSTRIAL AREA SITAPURA JAIPUR 302022
+				JAIPUR  RAJASTHAN  302022
+				IN
+
+8C-1F-64   (hex)		Wi-Tronix, LLC
+D8D000-D8DFFF     (base 16)		Wi-Tronix, LLC
+				631 E Boughton Rd, Suite 240
+				Bolingbrook  IL  60440
+				US
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+F57000-F57FFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+8C-1F-64   (hex)		YUYAMA MFG Co.,Ltd
+24E000-24EFFF     (base 16)		YUYAMA MFG Co.,Ltd
+				1-4-30
+				MEISHINGUCHI,TOYONAKA  OSAKA  561-0841
+				JP
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+65A000-65AFFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+7CE000-7CEFFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+906000-906FFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+8C-1F-64   (hex)		Observable Space
+B96000-B96FFF     (base 16)		Observable Space
+				2228 cotner ave
+				Los Angeles  CA  90064
+				US
+
+8C-1F-64   (hex)		CHUGOKU ELECTRICAL INSTRUMENTS Co.,LTD.
+DD3000-DD3FFF     (base 16)		CHUGOKU ELECTRICAL INSTRUMENTS Co.,LTD.
+				2-4-6,Tsurue,Fuchu-cho,Aki-gun,
+				Hiroshima  Japan  735-0008
+				JP
+
+8C-1F-64   (hex)		Leap Info Systems Pvt. Ltd.
+FEE000-FEEFFF     (base 16)		Leap Info Systems Pvt. Ltd.
+				301 Melinkeri, Plot no.4, Survey No.149/1A, ITI Road,Parihar Chowk, Aundh, Pune – 411007
+				Pune  Maharashtra  411007
+				IN
+
+8C-1F-64   (hex)		BOE Smart IoT Technology Co.,Ltd
+761000-761FFF     (base 16)		BOE Smart IoT Technology Co.,Ltd
+				3rd Floor, Building 1, No. 12 West Ring Middle Road, Beijing Economic and Technological Development Zone
+				Beijing  Beijing  100176
+				CN
+
+8C-1F-64   (hex)		Yu Heng Electric CO. TD 
+1FC000-1FCFFF     (base 16)		Yu Heng Electric CO. TD 
+				No. 8, Gongye 2nd Road, Renwu District, 
+				Kaohiung  City   Taiwan   814 
+				CN
+
+8C-1F-64   (hex)		TRATON AB
+741000-741FFF     (base 16)		TRATON AB
+				Lärlingsvägen 3
+				Södertälje    15165
+				SE
+
+8C-1F-64   (hex)		Shanghai Jupper Technology Co.Ltd
+ED0000-ED0FFF     (base 16)		Shanghai Jupper Technology Co.Ltd
+				Room511,building D10, Lane 3188, Xiupu road, Pudong New District
+				Shanghai    201315
+				CN
+
+8C-1F-64   (hex)		Potter Electric Signal Co. LLC
+4A4000-4A4FFF     (base 16)		Potter Electric Signal Co. LLC
+				1609 Park 370 Place
+				Hazelwood  MO  63042
+				US
+
+8C-1F-64   (hex)		Intenseye Inc.
+A20000-A20FFF     (base 16)		Intenseye Inc.
+				1250 Broadway Suite 401
+				New York  NY  10001
+				US
+
+8C-1F-64   (hex)		Smith meter Inc 
+6D1000-6D1FFF     (base 16)		Smith meter Inc 
+				1602 Wagner Ave
+				Erie    16510
+				US
+
+8C-1F-64   (hex)		REO AG
+CD0000-CD0FFF     (base 16)		REO AG
+				Brühlerstr. 100
+				Solingen    42657
+				DE
+
+8C-1F-64   (hex)		Racelogic Ltd
+FB6000-FB6FFF     (base 16)		Racelogic Ltd
+				Unit 10-11 Osier Way,Swan Business Centre
+				Buckingham    MK18 1TB
+				GB
+
+8C-1F-64   (hex)		Vinfast Trading and Production JSC
+C99000-C99FFF     (base 16)		Vinfast Trading and Production JSC
+				Dinh Vu - Cat Hai Economic Zone, Cai Hai Island, Cat Hai Sepcial Administrative Zone
+				Hai Phong  Hai Phong  180000
+				VN
+
+8C-1F-64   (hex)		GreenTally LLC
+459000-459FFF     (base 16)		GreenTally LLC
+				15 Beaver Drive
+				Saint Louis  MO  63141
+				US
+
+8C-1F-64   (hex)		Newin Tech
+0B9000-0B9FFF     (base 16)		Newin Tech
+				Room 405, 56 Songdo-gwahak-ro, Yeonsu-gu
+				Incheon    21984
+				KR
+
+8C-1F-64   (hex)		Beijing Fuzheng Transportation Technology Co., Ltd
+BA9000-BA9FFF     (base 16)		Beijing Fuzheng Transportation Technology Co., Ltd
+				03, Building 3, Courtyard 10, Jingsheng South 2nd Street
+				Beijing  Beijing Economic-Technological Development Area  101111
+				CN
+
+8C-1F-64   (hex)		Sicon srl
+269000-269FFF     (base 16)		Sicon srl
+				Via Sila 1/3
+				Isola Vicentina  Vicenza  36033
+				IT
+
+8C-1F-64   (hex)		GV Technology Co.,Ltd.
+4B2000-4B2FFF     (base 16)		GV Technology Co.,Ltd.
+				Registered/Production Add: Room 302A, Tower B, Huizhi Building, No.9 XueQing Road, Haidian District, Beijing
+				Beijing    100085
+				CN
+
+8C-1F-64   (hex)		Computech International
+D71000-D71FFF     (base 16)		Computech International
+				110 Crossways Park Drive
+				Woodbury  NY  11797
+				US
+
+8C-1F-64   (hex)		Pneumax Spa
+FA0000-FA0FFF     (base 16)		Pneumax Spa
+				via cascina barbellina, 10
+				Lurano  Bergamo  24050
+				IT
+
+8C-1F-64   (hex)		Coral Infratel Pvt Ltd
+750000-750FFF     (base 16)		Coral Infratel Pvt Ltd
+				First Floor, 144 Subhash  Nagar
+				Rohtak  Haryana  124001
+				IN
+
+8C-1F-64   (hex)		Fortus
+9A3000-9A3FFF     (base 16)		Fortus
+				32 Lavery Avenue
+				Dublin  Dublin  D12 A611
+				IE
+
+8C-1F-64   (hex)		AMC Europe Kft.
+A2F000-A2FFFF     (base 16)		AMC Europe Kft.
+				Csiri utca 13
+				Törökbálint    2045
+				HU
+
+8C-1F-64   (hex)		Guangzhou Vannove Technology Co., Ltd
+6C1000-6C1FFF     (base 16)		Guangzhou Vannove Technology Co., Ltd
+				No. 728 Kaichuang Avenue, Guangzhou, China.
+				GuangZhou  GuangDong  51000
+				CN
+
 8C-1F-64   (hex)		Flow Power
 82B000-82BFFF     (base 16)		Flow Power
 				Suite 2, Level 3, 18 - 20 York St
@@ -28250,12 +28808,6 @@ C86000-C86FFF     (base 16)		Woodam Co.,
 				Gimpo  Gyeonggi-do  10048
 				KR
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-666000-666FFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
 70-B3-D5   (hex)		ATEME
 607000-607FFF     (base 16)		ATEME
 				6 rue Dewoitine
@@ -28478,12 +29030,6 @@ F9A000-F9AFFF     (base 16)		Krabbenhøf
 				Fuzhou  Fujian  350001
 				CN
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-106000-106FFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
 70-B3-D5   (hex)		Diamante Lighting Srl
 925000-925FFF     (base 16)		Diamante Lighting Srl
 				via Einaudi, 8
@@ -28568,30 +29114,12 @@ F4F000-F4FFFF     (base 16)		Power Elect
 				Paterna  Valencia  46980
 				ES
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-B33000-B33FFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
 70-B3-D5   (hex)		NextEV Co., Ltd.
 200000-200FFF     (base 16)		NextEV Co., Ltd.
 				20 Building, No. 56 AnTuo Road, Anting Town, Jiading
 				Shanghai  Shanghai  201805
 				CN
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-3D9000-3D9FFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
-70-B3-D5   (hex)		Aplex Technology Inc.
-E7C000-E7CFFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
 70-B3-D5   (hex)		Active Research Limited
 6A0000-6A0FFF     (base 16)		Active Research Limited
 				21 Harwell Road
@@ -28694,12 +29222,6 @@ AB4000-AB4FFF     (base 16)		SYS TEC ele
 				Portsmouth  Hampshire  PO3 5PQ
 				GB
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-528000-528FFF     (base 16)		Aplex Technology Inc.
-				2nd Floor,Tower3,District5,HongHuaLing industrial park,  Nanshan District
-				Shenzhen  Guangdong  518055
-				CN
-
 70-B3-D5   (hex)		YUYAMA MFG Co.,Ltd
 742000-742FFF     (base 16)		YUYAMA MFG Co.,Ltd
 				3-3-1
@@ -29105,12 +29627,6 @@ D8C000-D8CFFF     (base 16)		Damerell De
 				Aldershot  Hampshire  GU12 4JW
 				GB
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-C21000-C21FFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
 70-B3-D5   (hex)		Bunka Shutter Co., Ltd.
 5A9000-5A9FFF     (base 16)		Bunka Shutter Co., Ltd.
 				644-1 Tenjingoe,Ooaza-Kamiishizuka
@@ -30761,12 +31277,6 @@ F60000-F60FFF     (base 16)		Portrait Di
 				Pleasanton  CA  94588
 				US
 
-8C-1F-64   (hex)		Potter Electric Signal Company
-073000-073FFF     (base 16)		Potter Electric Signal Company
-				5757 Phantom Drive
-				Hazelwood  MO  63042
-				US
-
 8C-1F-64   (hex)		Messung Systems Pvt Ltd
 EAD000-EADFFF     (base 16)		Messung Systems Pvt Ltd
 				501, Lunkad Sky Vista, Viman Nagar
@@ -30857,12 +31367,6 @@ F19000-F19FFF     (base 16)		Hurry-tech
 				ESENYURT  İstanbul  34522
 				TR
 
-8C-1F-64   (hex)		Potter Electric Signal Company
-FDF000-FDFFFF     (base 16)		Potter Electric Signal Company
-				5757 Phantom Drive
-				Hazelwood  MO  63042
-				US
-
 8C-1F-64   (hex)		SiFive Inc
 E88000-E88FFF     (base 16)		SiFive Inc
 				2625 Augustine DriveSuite 101
@@ -31082,12 +31586,6 @@ CFE000-CFEFFF     (base 16)		Instrument
 				Gelang Patah    81550
 				MY
 
-8C-1F-64   (hex)		Potter Electric Signal Company
-6CE000-6CEFFF     (base 16)		Potter Electric Signal Company
-				5757 Phantom Drive
-				Hazelwood  MO  63042
-				US
-
 8C-1F-64   (hex)		Genius Sports SS LLC
 BED000-BEDFFF     (base 16)		Genius Sports SS LLC
 				312 E. 1st St5th Floor
@@ -31157,12 +31655,6 @@ B8B000-B8BFFF     (base 16)		DogWatch In
 				MEISHINGUCHI,TOYONAKA  OSAKA  561-0841
 				JP
 
-8C-1F-64   (hex)		Potter Electric Signal Company
-CE0000-CE0FFF     (base 16)		Potter Electric Signal Company
-				5757 Phantom Drive
-				Hazelwood  MO  63042
-				US
-
 8C-1F-64   (hex)		Lewitt GmbH
 61D000-61DFFF     (base 16)		Lewitt GmbH
 				Schanzstrasse 14 
@@ -31223,6 +31715,204 @@ AB3000-AB3FFF     (base 16)		VELVU TECHN
 				JAIPUR  RAJASTHAN  302012
 				IN
 
+8C-1F-64   (hex)		EMRI
+4DF000-4DFFFF     (base 16)		EMRI
+				Meterbuen 27C
+				Skovlunde    2740
+				DK
+
+8C-1F-64   (hex)		wincker international enterprise co., ltd
+B1F000-B1FFFF     (base 16)		wincker international enterprise co., ltd
+				1FL No. 345 Yen Shou St., Taipei, Taiwan
+				Taipei    10577
+				TW
+
+8C-1F-64   (hex)		Chengdu Xiuwei TechnologyDevelopment Co., Ltd
+870000-870FFF     (base 16)		Chengdu Xiuwei TechnologyDevelopment Co., Ltd
+				10th Floor, Building 10, No. 8 Guangfu Road, Qingyang District
+				Chengdu City  Please Select  610073
+				CN
+
+8C-1F-64   (hex)		IQ Tools LLC
+FF5000-FF5FFF     (base 16)		IQ Tools LLC
+				Zemlyanoy Val, 64, building 2
+				Moscow  Moscow  109004
+				RU
+
+8C-1F-64   (hex)		Vision Systems Safety Tech
+2E4000-2E4FFF     (base 16)		Vision Systems Safety Tech
+				5 Chemin de Chiradie
+				Brignais    69530
+				FR
+
+8C-1F-64   (hex)		NEC Asia Pacific Pte Ltd
+85F000-85FFFF     (base 16)		NEC Asia Pacific Pte Ltd
+				80 Bendemeer Road #05-01
+				Singapore  Singapore  339949
+				SG
+
+8C-1F-64   (hex)		3Egreen tech. Co. Ltd.
+583000-583FFF     (base 16)		3Egreen tech. Co. Ltd.
+				16F.-3,NO.700,Zhongzheng Rd.,Zhonghe Dist.,
+				New Taipei City    235
+				TW
+
+8C-1F-64   (hex)		Gogo BA 
+D3B000-D3BFFF     (base 16)		Gogo BA 
+				105 Edgeview Drive
+				Broomfield  CO  80021
+				US
+
+8C-1F-64   (hex)		Micronova srl
+DF6000-DF6FFF     (base 16)		Micronova srl
+				Via Niedda 3
+				Vigonza(PD)    35010
+				IT
+
+8C-1F-64   (hex)		Potter Electric Signal Co. LLC
+073000-073FFF     (base 16)		Potter Electric Signal Co. LLC
+				5757 Phantom Drive
+				Hazelwood  MO  63042
+				US
+
+8C-1F-64   (hex)		Potter Electric Signal Co. LLC
+FDF000-FDFFFF     (base 16)		Potter Electric Signal Co. LLC
+				5757 Phantom Drive
+				Hazelwood  MO  63042
+				US
+
+8C-1F-64   (hex)		Potter Electric Signal Co. LLC
+6CE000-6CEFFF     (base 16)		Potter Electric Signal Co. LLC
+				5757 Phantom Drive
+				Hazelwood  MO  63042
+				US
+
+8C-1F-64   (hex)		Potter Electric Signal Co. LLC
+CE0000-CE0FFF     (base 16)		Potter Electric Signal Co. LLC
+				5757 Phantom Drive
+				Hazelwood  MO  63042
+				US
+
+8C-1F-64   (hex)		EA Elektro-Automatik GmbH
+A2E000-A2EFFF     (base 16)		EA Elektro-Automatik GmbH
+				Helmholtzstraße 31-37
+				Viersen  Nordrhein-Westfalen  41747
+				DE
+
+8C-1F-64   (hex)		POLON-ALFA S.A.
+C78000-C78FFF     (base 16)		POLON-ALFA S.A.
+				Glinki 155
+				Bydgoszcz    85-861
+				PL
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+C21000-C21FFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+B33000-B33FFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+106000-106FFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+8C-1F-64   (hex)		Boeing India Private Limited
+533000-533FFF     (base 16)		Boeing India Private Limited
+				Plot No: 55-B,56,57,59  Hitech-Defence and Aerospace park, Aerospace Sector, Unachur Village, Yelahanka Taluk, Bangaloe North
+				Bengaluru  Karnataka  562149
+				IN
+
+8C-1F-64   (hex)		Jemac Sweden AB
+42D000-42DFFF     (base 16)		Jemac Sweden AB
+				Trångsundsvägen 20A
+				Kalmar    39356
+				SE
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+3D9000-3D9FFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+E7C000-E7CFFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+528000-528FFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+666000-666FFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+8C-1F-64   (hex)		U -MEI-DAH INT'L ENTERPRISE CO.,LTD.
+A45000-A45FFF     (base 16)		U -MEI-DAH INT'L ENTERPRISE CO.,LTD.
+				11F., No. 365, Fude 3rd Rd., Xizhi Dist., New Taipei City 221011 , Taiwan (R.O.C.)
+				New Taipei City    221011
+				TW
+
+8C-1F-64   (hex)		Ambarella Inc.
+C31000-C31FFF     (base 16)		Ambarella Inc.
+				Santa Clara office3101 Jay Street
+				Santa Clara  CA  95054
+				US
+
+8C-1F-64   (hex)		Aegex Technologies LLC Magyarországi Fióktelepe
+A9D000-A9DFFF     (base 16)		Aegex Technologies LLC Magyarországi Fióktelepe
+				Tildy Zoltán utca
+				Pécs  Baranya  7632
+				HU
+
+8C-1F-64   (hex)		Q (Cue), Inc.
+6A6000-6A6FFF     (base 16)		Q (Cue), Inc.
+				Abba Hillel Silver Rd 21
+				Ramat Gan    5252213
+				IL
+
+8C-1F-64   (hex)		Beijing Diwei Shuangxing Communication Technology Co., Ltd.
+1D5000-1D5FFF     (base 16)		Beijing Diwei Shuangxing Communication Technology Co., Ltd.
+				3rd Floor, Building 19, Guanghua Pioneer Park, No. 18, Anningzhuang East Road,
+				Beijing  Haidian District  100085
+				CN
+
+8C-1F-64   (hex)		Automation Displays Inc.
+4F2000-4F2FFF     (base 16)		Automation Displays Inc.
+				3533 White Ave
+				Eau Claire  WI  54703
+				US
+
+8C-1F-64   (hex)		delResearch, LLC
+719000-719FFF     (base 16)		delResearch, LLC
+				128 Route 6A
+				Sandwich  MA  02563
+				US
+
+8C-1F-64   (hex)		Sept-S
+916000-916FFF     (base 16)		Sept-S
+				364  rue jean Monnet 
+				Crolles     38920
+				FR
+
+8C-1F-64   (hex)		Rowan Tools Office
+F54000-F54FFF     (base 16)		Rowan Tools Office
+				171-5, Hachiman-cho, Chuo-ku
+				Hamamatsu  Shizuoka  4300918
+				JP
+
 8C-1F-64   (hex)		Mobileye
 D63000-D63FFF     (base 16)		Mobileye
 				13 Hartom st.
@@ -31976,12 +32666,6 @@ F12000-F12FFF     (base 16)		CAITRON Gmb
 				cheonan     31208
 				KR
 
-8C-1F-64   (hex)		Potter Electric Signal Company
-14B000-14BFFF     (base 16)		Potter Electric Signal Company
-				1609 Park 370 Place
-				Hazelwood, MO    63042
-				US
-
 8C-1F-64   (hex)		KEYLINE S.P.A.
 7B6000-7B6FFF     (base 16)		KEYLINE S.P.A.
 				VIA CAMILLO BIANCHI, 2
@@ -32672,12 +33356,6 @@ A4E000-A4EFFF     (base 16)		Syscom Inst
 				Sainte-Croix    1450
 				CH
 
-8C-1F-64   (hex)		Yu-Heng Electric Co., LTD 
-575000-575FFF     (base 16)		Yu-Heng Electric Co., LTD 
-				No 8 , Gongye 2nd Rd., Renwu Industry Park
-				Kaohsiung  Kaohsiung City  814
-				TW
-
 8C-1F-64   (hex)		Hikari Alphax Inc.
 166000-166FFF     (base 16)		Hikari Alphax Inc.
 				2-2-2, Nakanoshima, Kita-ku
@@ -33998,12 +34676,6 @@ F48000-F48FFF     (base 16)		HEITEC AG
 				Eckental  Bavaria  90542
 				DE
 
-70-B3-D5   (hex)		Technological Application and Production One Member Liability Company (Tecapro company)
-456000-456FFF     (base 16)		Technological Application and Production One Member Liability Company (Tecapro company)
-				18A Cong Hoa street
-				Ho Chi Minh city  Ho Chi Minh city  700000
-				VN
-
 70-B3-D5   (hex)		KRONOTECH SRL
 D56000-D56FFF     (base 16)		KRONOTECH SRL
 				VIALE UNGHERIA 125
@@ -34916,12 +35588,6 @@ F5F000-F5FFFF     (base 16)		RFRain LLC
 				Hornsyld  Denmark  8783
 				DK
 
-70-B3-D5   (hex)		Lab241 Co.,Ltd.
-21B000-21BFFF     (base 16)		Lab241 Co.,Ltd.
-				25Dong 241Ho, 97, Siheung-daero, Geumcheon-gu
-				Seoul  Seoul  08639
-				KR
-
 70-B3-D5   (hex)		Infodev Electronic Designers Intl.
 DBF000-DBFFFF     (base 16)		Infodev Electronic Designers Intl.
 				1995 rue Frank-Carrel Suite 202
@@ -36134,18 +36800,6 @@ B99000-B99FFF     (base 16)		DomoSafety
 				Lausanne    1015
 				CH
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-FF3000-FF3FFF     (base 16)		Aplex Technology Inc.
-				501-5B01,Xintianxia phase 2 building,Wankecheng community,Bantian township,Longgang district
-				Shenzhen City  Guangdong  518129
-				CN
-
-70-B3-D5   (hex)		Aplex Technology Inc.
-65C000-65CFFF     (base 16)		Aplex Technology Inc.
-				2Q , NanYouTianAn industrial park Tower4 ,Nanshan District
-				Shenzhen  Guangdong  518054
-				CN
-
 70-B3-D5   (hex)		MobiPromo
 1FE000-1FEFFF     (base 16)		MobiPromo
 				10, 64-72 Beresford Rd
@@ -36254,12 +36908,6 @@ B26000-B26FFF     (base 16)		INTEC Inter
 				Hechingen    72379
 				DE
 
-70-B3-D5   (hex)		Aplex Technology Inc.
-8E4000-8E4FFF     (base 16)		Aplex Technology Inc.
-				2nd Floor,Tower3,District5,HongHuaLing industrial park,  Nanshan District
-				Shenzhen  Guangdong  518055
-				CN
-
 70-B3-D5   (hex)		PMT Corporation
 804000-804FFF     (base 16)		PMT Corporation
 				1705-1 Satani,Sue
@@ -37028,12 +37676,6 @@ AF3000-AF3FFF     (base 16)		New Japan R
 				Fujimino  Saitama  356-8510
 				JP
 
-70-B3-D5   (hex)		Teenage Engineering AB
-1AF000-1AFFFF     (base 16)		Teenage Engineering AB
-				Katarina Bangata 71
-				Stockholm  n/a  11642
-				SE
-
 70-B3-D5   (hex)		CDR SRL
 BDD000-BDDFFF     (base 16)		CDR SRL
 				VIA DEGLI ARTIGIANI 6
@@ -38447,12 +39089,6 @@ A49000-A49FFF     (base 16)		Integer.pl
 				Krakow    30-552
 				PL
 
-8C-1F-64   (hex)		Potter Electric Signal Company
-7A5000-7A5FFF     (base 16)		Potter Electric Signal Company
-				5757 Phantom Drive
-				Hazelwood  MO  63042
-				US
-
 8C-1F-64   (hex)		Smart Monitoring Innovations Private Limited
 4BF000-4BFFFF     (base 16)		Smart Monitoring Innovations Private Limited
 				HR 7, Anand Parbat Industrial Area, New Delhi - 110005
@@ -38693,12 +39329,6 @@ F4B000-F4BFFF     (base 16)		JOREX LOREX
 				GREATER NOIDA  UTTAR PRDESH  201306
 				IN
 
-8C-1F-64   (hex)		Potter Electric Signal Company
-D64000-D64FFF     (base 16)		Potter Electric Signal Company
-				5757 Phantom Drive
-				Hazelwood  MO  63042
-				US
-
 8C-1F-64   (hex)		Landis+Gyr Equipamentos de Medição Ltda
 95E000-95EFFF     (base 16)		Landis+Gyr Equipamentos de Medição Ltda
 				Hasdrubal Bellegard, 400, CIC
@@ -38956,3 +39586,189 @@ FEB000-FEBFFF     (base 16)		Zhejiang Sa
 				Wielicka 28
 				Krakow    30-552
 				PL
+
+8C-1F-64   (hex)		Guoqing (shangdong) Information Technology Co.,Ltd
+57E000-57EFFF     (base 16)		Guoqing (shangdong) Information Technology Co.,Ltd
+				Floor 12, Building C, Big Data Industrial Base, High-Tech Zone 
+				Jinan  Shandong  250101
+				CN
+
+8C-1F-64   (hex)		Abbott Diagnostics Technologies AS
+C75000-C75FFF     (base 16)		Abbott Diagnostics Technologies AS
+				P. O.  Box 6863 Rodeløkka
+				Oslo  Oslo  0504
+				NO
+
+8C-1F-64   (hex)		Oriental Electronics, Inc.
+68E000-68EFFF     (base 16)		Oriental Electronics, Inc.
+				2-4-1 Tanabe-Chuo
+				Kyo-Tanabe  Kyoto  610-0334
+				JP
+
+8C-1F-64   (hex)		OOO Mig Trading
+C19000-C19FFF     (base 16)		OOO Mig Trading
+				B-r Kronshtadtsky, 7a
+				Moscow    125212
+				RU
+
+8C-1F-64   (hex)		MB connect line GmbH
+7C4000-7C4FFF     (base 16)		MB connect line GmbH
+				Winnettener Strasse 6
+				Dinkelsbuehl  Bavaria  91550
+				DE
+
+8C-1F-64   (hex)		OnAsset Intelligence
+415000-415FFF     (base 16)		OnAsset Intelligence
+				8407 Sterling Street
+				Irving  TX  75063
+				US
+
+8C-1F-64   (hex)		Digitella Inc.
+0CE000-0CEFFF     (base 16)		Digitella Inc.
+				RM1314, IS Biz Tower A, 25, Deokcheon-ro 152beon-gil, Manan-gu
+				Anyang-si  Gyeonggi-do  14084
+				KR
+
+8C-1F-64   (hex)		Pulcro.io LLC
+C22000-C22FFF     (base 16)		Pulcro.io LLC
+				551 S IH 35, Ste 300
+				Round Rock  TX  78664
+				US
+
+8C-1F-64   (hex)		Melissa Climate Jsc
+6CA000-6CAFFF     (base 16)		Melissa Climate Jsc
+				Gen. Gurko 4 Street
+				Sofia    1000
+				BG
+
+8C-1F-64   (hex)		IGL
+8F0000-8F0FFF     (base 16)		IGL
+				1, Allée des Chevreuils,
+				Lissieu    69380
+				FR
+
+8C-1F-64   (hex)		wonder meditec
+B2D000-B2DFFF     (base 16)		wonder meditec
+				2F, 12-11, Seonjam-ro, Seongbuk-gu
+				Seoul, Korea    02836
+				KR
+
+70-B3-D5   (hex)		Teenage Engineering AB
+1AF000-1AFFFF     (base 16)		Teenage Engineering AB
+				Textilgatan 31
+				Stockholm  n/a  12030 
+				SE
+
+8C-1F-64   (hex)		Potter Electric Signal Co. LLC
+14B000-14BFFF     (base 16)		Potter Electric Signal Co. LLC
+				1609 Park 370 Place
+				Hazelwood, MO    63042
+				US
+
+8C-1F-64   (hex)		Potter Electric Signal Co. LLC
+7A5000-7A5FFF     (base 16)		Potter Electric Signal Co. LLC
+				5757 Phantom Drive
+				Hazelwood  MO  63042
+				US
+
+8C-1F-64   (hex)		Potter Electric Signal Co. LLC
+D64000-D64FFF     (base 16)		Potter Electric Signal Co. LLC
+				5757 Phantom Drive
+				Hazelwood  MO  63042
+				US
+
+8C-1F-64   (hex)		In-lite Design BV
+F4A000-F4AFFF     (base 16)		In-lite Design BV
+				Stephensonweg 18
+				Gorinchem  Zuid-Holland  4207 HB
+				NL
+
+8C-1F-64   (hex)		IDA North America Inc.
+275000-275FFF     (base 16)		IDA North America Inc.
+				16 16th Street S
+				Fargo  ND  58103
+				US
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+8E4000-8E4FFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+FF3000-FF3FFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+70-B3-D5   (hex)		Aplex Technology Inc.
+65C000-65CFFF     (base 16)		Aplex Technology Inc.
+				15F-1, No.186, Jian Yi Road 
+				Zhonghe District  New Taipei City 235   -
+				TW
+
+8C-1F-64   (hex)		Shenzhen Broadradio RFID Technology Co., Ltd
+057000-057FFF     (base 16)		Shenzhen Broadradio RFID Technology Co., Ltd
+				B222, 2nd Floor, Building B, Fuhai Technology Industrial Park
+				shenzhen  guangdong  5178000
+				CN
+
+8C-1F-64   (hex)		Yu Heng Electric CO. TD 
+575000-575FFF     (base 16)		Yu Heng Electric CO. TD 
+				No 8 , Gongye 2nd Rd., Renwu Industry Park
+				Kaohsiung  Kaohsiung City  814
+				TW
+
+8C-1F-64   (hex)		SPX Flow Technology BV
+CDA000-CDAFFF     (base 16)		SPX Flow Technology BV
+				Munnikenheiweg 41
+				Etten-Leur  Noord-Braband  4879NE
+				NL
+
+70-B3-D5   (hex)		Technological Application And Production One Member Liability Company (Tecapro Company)
+456000-456FFF     (base 16)		Technological Application And Production One Member Liability Company (Tecapro Company)
+				18A Cong Hoa street
+				Ho Chi Minh city  Ho Chi Minh city  700000
+				VN
+
+8C-1F-64   (hex)		Electronic Equipment Company Pvt. Ltd.
+48C000-48CFFF     (base 16)		Electronic Equipment Company Pvt. Ltd.
+				146/2, Old China Bazar Street,
+				Kolkata  West Bengal  700001
+				IN
+
+70-B3-D5   (hex)		Lab241 Co.,Ltd.
+21B000-21BFFF     (base 16)		Lab241 Co.,Ltd.
+				1402Ho, 286, Beotkkot-ro, Geumcheon-gu
+				Seoul  Seoul  08511
+				KR
+
+8C-1F-64   (hex)		Dualcomm Technology, Inc.
+01F000-01FFFF     (base 16)		Dualcomm Technology, Inc.
+				2415 San Ramon Valley Blvd., #4182
+				San Ramon  CA  94583
+				US
+
+8C-1F-64   (hex)		Pneumax Spa
+B15000-B15FFF     (base 16)		Pneumax Spa
+				via cascina barbellina, 10
+				Lurano  Bergamo  24050
+				IT
+
+8C-1F-64   (hex)		Raco Universal Technology Co., Ltd.
+7DB000-7DBFFF     (base 16)		Raco Universal Technology Co., Ltd.
+				Room 2003, Block A, Yintai Plaza,Hongqiao District, Tianjin 
+				Tianjin  Tianjin  300131
+				CN
+
+8C-1F-64   (hex)		Invertek Drives Ltd
+FC6000-FC6FFF     (base 16)		Invertek Drives Ltd
+				Offa's Dyke Business Park 
+				Welshpool  Powys  SY21 8JF
+				GB
+
+8C-1F-64   (hex)		Pazzk
+686000-686FFF     (base 16)		Pazzk
+				7, Geombae-ro404, 4F
+				Guri-si    11929
+				KR
diff -pruN 257.7-1/hwdb.d/meson.build 257.9-0ubuntu2/hwdb.d/meson.build
--- 257.7-1/hwdb.d/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -31,6 +31,7 @@ hwdb_files_test = files(
         '70-cameras.hwdb',
         '70-hardware-wallets.hwdb',
         '70-joystick.hwdb',
+        '70-maker-tools.hwdb',
         '70-mouse.hwdb',
         '70-pda.hwdb',
         '70-pointingstick.hwdb',
@@ -41,7 +42,6 @@ hwdb_files_test = files(
 
 if conf.get('ENABLE_HWDB') == 1
         auto_suspend_rules = custom_target(
-                '60-autosuspend-chromiumos.hwdb',
                 output : '60-autosuspend-chromiumos.hwdb',
                 command : make_autosuspend_rules_py,
                 capture : true,
diff -pruN 257.7-1/hwdb.d/pci.ids 257.9-0ubuntu2/hwdb.d/pci.ids
--- 257.7-1/hwdb.d/pci.ids	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/pci.ids	2025-09-03 18:35:40.000000000 +0000
@@ -1,8 +1,8 @@
 #
 #	List of PCI ID's
 #
-#	Version: 2025.04.23
-#	Date:    2025-04-23 03:15:02
+#	Version: 2025.07.11
+#	Date:    2025-07-11 03:15:02
 #
 #	Maintained by Albert Pool, Martin Mares, and other volunteers from
 #	the PCI ID Project at https://pci-ids.ucw.cz/.
@@ -114,6 +114,8 @@
 	0b70  NVMe DC SSD [Yorktown controller]
 	2b59  NVMe DC SSD [Atomos Prime]
 		025e 0008  NVMe DC SSD U.2-SFF 15mm [D7-PS1010]
+		025e 000c  NVMe DC SSD E1.S 9.5mm [D7-PS1010]
+		025e 000d  NVMe DC SSD E1.S 15mm [D7-PS1010]
 		025e 0019  NVMe DC SSD E3.S-1T 7.5mm [D7-PS1010]
 		025e 0108  NVMe DC SSD U.2-SFF 15mm [D7-PS1030]
 		025e 0119  NVMe DC SSD E3.S-1T 7.5mm [D7-PS1030]
@@ -154,6 +156,14 @@
 	0202  GP202
 0721  Sapphire, Inc.
 0731  Jingjia Microelectronics Co Ltd
+	1100  JM1100
+		0731 1101  JM1100-C
+		0731 1102  JM1100-II
+		0731 1103  JM1100-I
+		0731 1104  JM1100-M
+		0731 1105  JM1100-Y
+		0731 1106  JM1100-EI
+		0731 1107  JM1100-EM
 	7200  JM7200 Series GPU
 		0731 7201  JM7201
 		0731 7202  JM7202
@@ -191,6 +201,9 @@
 		0731 930b  JH930-M
 		0731 930c  JH930
 	930b  JH930-M
+	f011  JM1100-IV
+	f111  JM1100-MV
+	ff11  JM1100-YV
 0777  Ubiquiti Networks, Inc.
 0795  Wired Inc.
 	6663  Butane II (MPEG2 encoder board)
@@ -642,7 +655,7 @@
 		1bd4 000e  6G SAS2008IR
 		1bd4 000f  6G SAS2008IT SA5248
 		1bd4 0010  6G SAS2008IR SA5248
-		4c52 96c8  LRSA96C8 8-Port SATA3(6Gb/s)Exchange Adapter (with Raid)
+		4c52 96c8  LRSA96C8 8-Port SATA3 (6Gb/s) Exchange Adapter (with RAID)
 		8086 350f  RMS2LL040 RAID Controller
 		8086 3700  SSD 910 Series
 	0073  MegaRAID SAS 2008 [Falcon]
@@ -775,6 +788,9 @@
 		1000 30a0  SAS9300-8e
 		1000 30e0  SAS9300-8i
 		1000 3130  SAS 9300-16i
+		1000 3170  SAS9302-16e
+# IBM SAS3008 HBA controller
+		1014 0457  9302-8i [N2215]
 		1028 1f45  HBA330 Adapter
 		1028 1f46  12Gbps HBA
 		1028 1f53  HBA330 Mini
@@ -869,6 +885,9 @@
 		1000 5030  eHBA 9700-16e 24G SAS/PCIe Storage Adapter
 		1028 22d2  PERC H975i Front
 		1028 22d3  PERC H975i Adapter
+		1028 23cb  PERC H975i Front
+		1028 23cd  PERC H975i Adapter
+		1028 2446  PERC H976i Front
 		1d49 020b  ThinkSystem 460-16e SAS/SATA PCIe Gen5 24Gb HBA
 	00b5  Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx
 # 9760W 32 internal port RAID controller
@@ -883,6 +902,11 @@
 		1000 5021  eHBA 9700W-16i 24G SAS/PCIe Storage Adapter
 # 9700 16 external port Storage controller
 		1000 5030  eHBA 9700-16e 24G SAS/PCIe Storage Adapter
+		1028 22d2  PERC H975i Front - Virtual
+		1028 22d3  PERC H975i Adapter - Virtual
+		1028 23cb  PERC H975i Front - Virtual
+		1028 23cd  PERC H975i Adapter - Virtual
+		1028 2446  PERC H976i Front - Virtual
 # Broadcom next-gen MPT PCIe switch
 	00b8  Fusion-MPT Switch SAS50xx/SAS51xx
 	00be  SAS3504 Fusion-MPT Tri-Mode RAID On Chip (ROC)
@@ -1293,12 +1317,12 @@
 	15ff  Fenghuang [Zhongshan Subor Z+]
 	1607  Arden
 	1636  Renoir [Radeon Vega Series / Radeon Vega Mobile Series]
-	1637  Renoir Radeon High Definition Audio Controller
+	1637  Renoir/Cezanne HDMI/DP Audio Controller
 	1638  Cezanne [Radeon Vega Series / Radeon Vega Mobile Series]
 		1043 16c2  Radeon Vega 8
 # Used in the Steam Deck LCD
 	163f  VanGogh [AMD Custom GPU 0405]
-	1640  Rembrandt Radeon High Definition Audio Controller
+	1640  Radeon High Definition Audio Controller [Rembrandt/Strix]
 	164c  Lucienne
 	164d  Rembrandt
 	164e  Raphael
@@ -1306,8 +1330,9 @@
 	1681  Rembrandt [Radeon 680M]
 	1714  BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series]
 		103c 168b  ProBook 4535s
-	1900  Phoenix3
-	1901  Phoenix4
+	1900  HawkPoint1
+	1901  HawkPoint2
+	1902  Krackan2
 	3150  RV380/M24 [Mobility Radeon X600]
 		103c 0934  nx8220
 	3151  RV380 GL [FireMV 2400]
@@ -3054,6 +3079,7 @@
 		1458 22ed  Radeon RX 560
 		148c 2381  Radeon RX 560
 		1682 9560  Radeon RX 560
+		1849 5037  PHANTOM G R RX550 2G/M/ASRK
 		1da2 e348  Radeon RX 560
 		1da2 e367  Radeon RX 550 640SP
 	6800  Wimbledon XT [Radeon HD 7970M]
@@ -3284,6 +3310,7 @@
 		1002 6b76  AMD Radeon RX Vega 56 8GB
 # ROG-STRIX-RXVEGA64-O8G-GAMING
 		1043 04c4  Radeon RX Vega 64
+		1043 0555  ROG STRIX RX Vega 56 8GB
 		1458 230c  Radeon RX VEGA 56 GAMING OC 8G
 		1da2 e376  Radeon RX VEGA 56 Pulse 8GB OC HBM2
 	6880  Lexington [Radeon HD 6550M]
@@ -3993,6 +4020,7 @@
 		1da2 e410  Sapphire NITRO+ RX 5700 XT
 		1da2 e411  Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT]Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT]
 	7340  Navi 14 [Radeon RX 5500/5500M / Pro 5500M]
+		106b 0210  Radeon Pro 5300M
 	7341  Navi 14 [Radeon Pro W5500]
 	7347  Navi 14 [Radeon Pro W5500M]
 	734f  Navi 14 [Radeon Pro W5300M]
@@ -4085,6 +4113,7 @@
 	7461  Navi 32 [AMD Radeon PRO V710]
 	7470  Navi 32 [Radeon PRO W7700]
 	747e  Navi 32 [Radeon RX 7700 XT / 7800 XT]
+		148c 2427  RX 7800 XT [Hellhound / Red Devil]
 	7480  Navi 33 [Radeon RX 7600/7600 XT/7600M XT/7600S/7700S / PRO W7600]
 		1849 5313  RX 7600 Challenger OC
 	7481  Navi 33 [Radeon Graphics]
@@ -4093,14 +4122,20 @@
 	7489  Navi 33 [Radeon Pro W7500]
 	748b  Navi 33 [Radeon Graphics]
 	7499  Navi 33 [Radeon RX 7400/7300/Pro W7400]
+	749f  Navi 33 [Radeon RX 7500]
 	74a0  Aqua Vanjaram [Instinct MI300A]
 	74a1  Aqua Vanjaram [Instinct MI300X]
 	74a2  Aqua Vanjaram [Instinct MI308X]
 	74a5  Aqua Vanjaram [Instinct MI325X]
 	74a9  Aqua Vanjaram [Instinct MI300X HF]
 	74b5  Aqua Vanjaram [Instinct MI300X VF]
+	74b9  Aqua Vanjaram [Instinct MI325X VF]
 	74bd  Aqua Vanjaram [Instinct MI300X HF]
-	7550  Navi 48 [RX 9070/9070 XT]
+	7550  Navi 48 [Radeon RX 9070/9070 XT/9070 GRE]
+		148c 2435  Reaper Radeon RX 9070 XT 16GB GDDR6 (RX9070XT 16G-A)
+		1da2 e490  Navi 48 XTX [Sapphire Pulse Radeon RX 9070 XT]
+	7551  Navi 48 [Radeon AI PRO R9700]
+	7590  Navi 44 [Radeon RX 9060 XT]
 	7833  RS350 Host Bridge
 	7834  RS350 [Radeon 9100 PRO/XT IGP]
 	7835  RS350M [Mobility Radeon 9000 IGP]
@@ -4505,6 +4540,7 @@
 	ab28  Navi 21/23 HDMI/DP Audio Controller
 	ab30  Navi 31 HDMI/DP Audio
 	ab38  Navi 10 HDMI Audio
+	ab40  Navi 48 HDMI/DP Audio Controller
 	ac00  Theater 506 World-Wide Analog Decoder
 	ac01  Theater 506 World-Wide Analog Decoder
 	ac02  TV Wonder HD 600 PCIe
@@ -4948,6 +4984,7 @@
 		1014 04fc  PCIe3 x8 12Gb Quad SAS RAID+ Adapter(580A)
 	04ed  Internal Shared Memory (ISM) virtual PCI device
 	0611  4769 Cryptographic Adapter
+	06a2  4770 Cryptographic Adapter
 	06a7  Spyre Accelerator
 	06a8  Spyre Accelerator Virtual Function
 	3022  QLA3022 Network Adapter
@@ -5295,6 +5332,8 @@
 	1514  Family 14h Processor Root Port
 	1515  Family 14h Processor Root Port
 	1516  Family 14h Processor Root Port
+	151c  USB4 Router 0
+	151d  USB4 Router 1
 	1530  Family 16h Processor Function 0
 	1531  Family 16h Processor Function 1
 	1532  Family 16h Processor Function 2
@@ -5364,6 +5403,12 @@
 	1583  Family 16h (Models 30h-3fh) Processor Function 3
 	1584  Family 16h (Models 30h-3fh) Processor Function 4
 	1585  Family 16h (Models 30h-3fh) Processor Function 5
+	1587  Strix Halo USB 3.1 xHCI
+	1588  Strix Halo USB 3.1 xHCI
+	1589  Strix Halo USB 3.1 xHCI
+	158b  Strix Halo USB 3.1 xHCI
+	158d  Strix Halo USB4 Host Router
+	158e  Strix Halo USB4 Host Router
 	1590  Amur/Nolan HT Configuration
 	1591  Amur/Nolan Address Maps
 	1592  Amur/Nolan DRAM Configuration
@@ -5410,7 +5455,7 @@
 	15dc  Raven/Raven2 Internal PCIe GPP Bridge 0 to Bus B
 		ea50 ce19  mCOM10-L1900
 	15de  Raven/Raven2/FireFlight HD Audio Controller
-	15df  Family 17h (Models 10h-1fh) Platform Security Processor
+	15df  Raven/Raven2/FireFlight/Renoir/Cezanne Platform Security Processor
 		1043 876b  PRIME Motherboard
 		17aa 5124  ThinkPad E595
 		ea50 ce19  mCOM10-L1900
@@ -5424,7 +5469,7 @@
 		1043 876b  PRIME Motherboard
 		17aa 5124  ThinkPad E595
 		ea50 ce19  mCOM10-L1900
-	15e2  ACP/ACP3X/ACP6x Audio Coprocessor
+	15e2  Audio Coprocessor
 		17aa 5124  ThinkPad E595
 		ea50 ce19  mCOM10-L1900
 	15e3  Family 17h/19h/1ah HD Audio Controller
@@ -5653,9 +5698,11 @@
 	43c8  400 Series Chipset SATA Controller
 	43d5  400 Series Chipset USB 3.1 xHCI Compliant Host Controller
 	43e9  500 Series Chipset Switch Upstream Port
+	43ea  500 Series Chipset Switch Downstream Port
 	43eb  500 Series Chipset SATA Controller
 # or ASM106X Serial ATA Controller
 		1b21 1062  ASM1062 Serial ATA Controller
+	43ec  A520 Series Chipset USB 3.1 XHCI Controller
 	43ee  500 Series Chipset USB 3.1 XHCI Controller
 # maybe
 		1b21 1142  ASM1042A USB 3.0 Host Controller
@@ -5663,6 +5710,7 @@
 	43f5  600 Series Chipset PCIe Switch Downstream Port
 	43f6  600 Series Chipset SATA Controller
 	43f7  600 Series Chipset USB 3.2 Controller
+	43fc  800 Series Chipset USB 3.x XHCI Controller
 	43fd  800 Series Chipset USB 3.x XHCI Controller
 	57a3  Matisse PCIe GPP Bridge
 	57a4  Matisse PCIe GPP Bridge
@@ -5998,6 +6046,7 @@
 		1028 1f24  PERC S300 Controller
 # NV-RAM Adapter used in Dell DR appliances
 	0073  NV-RAM Adapter
+	0c46  PERC S160 RAID controller
 	1028  PCIe Bridge riser
 	2600  ENT NVMe RT1
 		1028 215e  ENT NVMe RT1 RI 3.84TB
@@ -7225,6 +7274,7 @@
 	8004  DTL-H2500 [Playstation development board]
 	8009  CXD1947Q i.LINK Controller
 	800c  DTL-H800 [PS1 sound development board]
+	800d  DVBK-2000(E) DV Still Image Capture Board
 	8039  CXD3222 i.LINK Controller
 	8047  PS2 TOOL MRP
 	8056  Rockwell HCF 56K modem
@@ -7796,6 +7846,7 @@
 		103c 1939  QMH2672 16Gb Dual Port Fibre Channel Adapter
 		103c 8002  3830C 16G Fibre Channel Host Bus Adapter
 		1077 0241  QLE2670 16Gb Single Port Fibre Channel Adapter
+		1077 0249  QLE2672 16Gb Dual Port Fibre Channel Adapter
 	2071  ISP2714-based 16/32Gb Fibre Channel to PCIe Adapter
 		1077 0283  QLE2764 Quad Port 32Gb Fibre Channel to PCIe Adapter
 		1077 029e  QLE2694 Quad Port 16Gb Fibre Channel to PCIe Adapter
@@ -7864,6 +7915,8 @@
 		1077 0167  QME2572 Dual Port FC8 HBA Mezzanine
 		1590 00fc  StoreFabric 84Q 8Gb Quad Port Fibre Channel Host Bus Adapter
 	2971  ISP2684
+	2981  32G SFP28 EP2744 Apatter
+		1bd4 00b0  32G SFP28 EP2744 Apatter
 	3022  ISP4022-based Ethernet NIC
 	3032  ISP4032-based Ethernet IPv6 NIC
 	4010  ISP4010-based iSCSI TOE HBA
@@ -9404,13 +9457,16 @@
 	8664  PEX 8664 64-lane, 16-Port PCI Express Gen 2 (5.0 GT/s) Switch
 	8680  PEX 8680 80-lane, 20-Port PCI Express Gen 2 (5.0 GT/s) Multi-Root Switch
 	8696  PEX 8696 96-lane, 24-Port PCI Express Gen 2 (5.0 GT/s) Multi-Root Switch
+	8714  PEX 8714 12-Lane, 5-Port PCI Express Gen 3 (8 GT/s) Switch
 	8717  PEX 8717 16-lane, 8-Port PCI Express Gen 3 (8.0 GT/s) Switch with DMA
 	8718  PEX 8718 16-Lane, 5-Port PCI Express Gen 3 (8.0 GT/s) Switch
+	8723  PEX 8723 24-Lane, 6-Port PCI Express Gen 3 (8 GT/s) Switch
 	8724  PEX 8724 24-Lane, 6-Port PCI Express Gen 3 (8 GT/s) Switch, 19 x 19mm FCBGA
 		4c52 9234  LRNV9324 2-port Built-in 8643 NVMe Exchange Adapter
 		4c52 9524  LRNV9524 2-port M.2 NVMe SSD Exchange Adapter
 	8725  PEX 8725 24-Lane, 10-Port PCI Express Gen 3 (8.0 GT/s) Multi-Root Switch with DMA
 	8732  PEX 8732 32-lane, 8-Port PCI Express Gen 3 (8.0 GT/s) Switch
+	8733  PEX 8733 32-Lane, 19-Port PCI Express Gen 3 (8 GT/s) Switch
 	8734  PEX 8734 32-lane, 8-Port PCI Express Gen 3 (8.0GT/s) Switch
 	8747  PEX 8747 48-Lane, 5-Port PCI Express Gen 3 (8.0 GT/s) Switch
 		4c52 9347  LRNV9347L 2-port Built-in 8643 NVMe Switching Adapter
@@ -9418,6 +9474,9 @@
 	8748  PEX 8748 48-Lane, 12-Port PCI Express Gen 3 (8 GT/s) Switch, 27 x 27mm FCBGA
 	8749  PEX 8749 48-Lane, 18-Port PCI Express Gen 3 (8.0 GT/s) Multi-Root Switch with DMA
 		4c52 9349  LRNV9349 8-port SFF-8643 NVMe SSD Exchange Adapter
+	8764  PEX 8764 64-Lane, 16-Port PCI Express Gen 3 (8 GT/s) Switch
+	8780  PEX 8780 80-Lane, 20-Port PCI Express Gen 3 (8 GT/s) Switch
+	8796  PEX8796 96-Lane, 24-Port PCIe Gen 3 (8.0 GT/s) Switch
 	87a0  PEX PCI Express Switch NT0 Port Link Interface
 	87a1  PEX PCI Express Switch NT1 Port Link Interface
 	87b0  PEX PCI Express Switch NT0 Port Virtual Interface
@@ -9576,11 +9635,15 @@
 		1517 000f  ECDR-GC314-PMC Receiver
 		1885 0700  Tsunami FPGA PMC with Altera Stratix S40
 		1885 0701  Tsunami FPGA PMC with Altera Stratix S30
+	9712  PEX9712 12-Lane, 5-Port PCIe Gen 3 (8.0 GT/s) ExpressFabric Switch
 	9733  PEX 9733 33-lane, 9-port PCI Express Gen 3 (8.0 GT/s) Switch
 		1d49 0001  ThinkSystem 1610-4P NVMe Switch Adapter
 		1d49 0002  ThinkSystem 810-4P NVMe Switch Adapter
 	9749  PEX 9749 49-lane, 13-port PCI Express Gen 3 (8.0 GT/s) Switch
 		1d49 0004  ThinkSystem 1610-8P NVMe Switch Adapter
+	9765  PEX9765 65-Lane, 17-Port PCIe Gen 3 (8.0 GT/s) ExpressFabric Switch
+	9781  PEX9781 81-Lane, 21-Port PCIe Gen 3 (8.0 GT/s) ExpressFabric Switch
+	9797  PEX9781 97-Lane, 25-Port PCIe Gen 3 (8.0 GT/s) ExpressFabric Switch
 	a100  Blackmagic Design DeckLink
 	bb04  B&B 3PCIOSD1A Isolated PCI Serial
 	c001  CronyxOmega-PCI (8-port RS232)
@@ -11982,6 +12045,8 @@
 	0fa0  GK11x [GK11x_FPGA]
 	0fa5  GK11x
 	0fa7  GK11x [Tegra on x86 (PEATRANS)]
+	0fae  Tegra X1 PCIe x4 Root Complex
+	0faf  Tegra X1 PCIe x1 Root Complex
 	0fb0  GM200 High Definition Audio
 	0fb8  GP108 High Definition Audio Controller
 	0fb9  GP107GL High Definition Audio Controller
@@ -12178,6 +12243,8 @@
 	10c3  GT218 [GeForce 8400 GS Rev. 3]
 	10c5  GT218 [GeForce 405]
 	10d8  GT218 [NVS 300]
+	10e5  Parker PCIe x4 Root Complex
+	10e6  Parker PCIe x1 Root Complex
 	10ef  GP102 HDMI Audio Controller
 	10f0  GP104 High Definition Audio Controller
 	10f1  GP106 High Definition Audio Controller
@@ -12860,7 +12927,7 @@
 	1aed  TU116 USB Type-C UCSI Controller
 	1aef  GA102 High Definition Audio Controller
 	1af1  GA100 [A100 NVSwitch]
-	1b00  GP102 [TITAN X]
+	1b00  GP102 [TITAN X Pascal]
 	1b01  GP102 [GeForce GTX 1080 Ti 10GB]
 	1b02  GP102 [TITAN Xp]
 	1b04  GP102
@@ -13184,11 +13251,16 @@
 	228e  GA106 High Definition Audio Controller
 	2291  GA107 High Definition Audio Controller
 	2296  Tegra PCIe Endpoint Virtual Network
+	229a  Orin PCIe x8 Root Complex
+	229c  Orin PCIe x4/x8 Endpoint/Root Complex
+	229e  Orin PCIe x1 Root Complex
 	22a3  GH100 [H100 NVSwitch]
 	22ba  AD102 High Definition Audio Controller
 	22bc  AD104 High Definition Audio Controller
 	22bd  AD106M High Definition Audio Controller
 	22be  AD107 High Definition Audio Controller
+	22d8  THOR Processor PCI Express Root Port
+	22e6  THOR Processor PCI Express x16 Controller
 	2302  GH100
 	230e  GH100 [H20 NVL16]
 	2313  GH100 [H100 CNX]
@@ -13376,31 +13448,53 @@
 	28f8  AD107GLM [RTX 2000 Ada Generation Embedded GPU]
 	2900  GB100 [Reserved Dev ID A]
 	2901  GB100 [B200]
-	2920  GB100 [TS4]
+	2920  GB100 [TS4 / B100]
+	2924  GB100
+	2925  GB100
+	293d  GB100
 	2940  GB100 [Reserved Dev ID B]
 	2941  GB100 [HGX GB200]
+	297e  GB100
 	2980  GB102 [Reserved Dev ID A]
 	29bc  GB102 [B100]
 	29c0  GB102 [Reserved Dev ID B]
+	29f1  GB102
+	2b00  TA1090SA [THOR]
 	2b85  GB202 [GeForce RTX 5090]
 	2b87  GB202 [GeForce RTX 5090 D]
+	2bb1  GB202GL [RTX PRO 6000 Blackwell Workstation Edition]
+	2bb3  GB202GL [RTX PRO 5000 Blackwell]
+	2bb4  GB202GL [RTX PRO 6000 Blackwell Max-Q Workstation Edition]
+	2bb5  GB202GL [RTX PRO 6000 Blackwell Server Edition]
 	2c02  GB203 [GeForce RTX 5080]
 	2c05  GB203 [GeForce RTX 5070 Ti]
 	2c18  GB203M / GN22 [GeForce RTX 5090 Max-Q / Mobile]
 	2c19  GB203M / GN22 [GeForce RTX 5080 Max-Q / Mobile]
 	2c2c  GB6-256(N22W-ES-A1)
+	2c31  GB203GL [RTX PRO 4500 Blackwell]
+	2c34  GB203GL [RTX PRO 4000 Blackwell]
+	2c38  GB203GLM [RTX PRO 5000 Blackwell Generation Laptop GPU]
+	2c39  GB203GLM [RTX PRO 4000 Blackwell Generation Laptop GPU]
 	2c58  GB203M / GN22-X11 [GeForce RTX 5090 Max-Q / Mobile]
 	2c59  GB203M / GN22-X9 [GeForce RTX 5080 Max-Q / Mobile]
-	2d18  AD108M [GeForce RTX 5070 Max-Q / Mobile]
-	2d19  AD108M [GeForce RTX 5060 Max-Q / Mobile]
+	2d04  GB206 [GeForce RTX 5060 Ti]
+	2d05  GB206 [GeForce RTX 5060]
+	2d18  GB206M [GeForce RTX 5070 Max-Q / Mobile]
+	2d19  GB206M [GeForce RTX 5060 Max-Q / Mobile]
 	2d2c  GB6-128 (N22Y-ES-A1)
-	2d58  AD108M [GeForce RTX 5070 Max-Q / Mobile]
-	2d59  AD108M [GeForce RTX 5060 Max-Q / Mobile]
-	2d98  AD108M [GeForce RTX 5050 Max-Q / Mobile]
-	2dd8  AD108M [GeForce RTX 5050 Max-Q / Mobile]
-	2f04  GN22 [GeForce RTX 5070]
-	2f18  AD108M [GeForce RTX 5070 Ti Max-Q / Mobile]
-	2f58  AD108M [GeForce RTX 5070 Ti Max-Q / Mobile]
+	2d39  GB206GLM [RTX PRO 2000 Blackwell Generation Laptop GPU]
+	2d58  GB206M [GeForce RTX 5070 Max-Q / Mobile]
+	2d59  GB206M [GeForce RTX 5060 Max-Q / Mobile]
+	2d83  GB207 [GeForce RTX 5050]
+	2d98  GB207M [GeForce RTX 5050 Max-Q / Mobile]
+	2db8  GB207GLM [RTX PRO 1000 Blackwell Generation Laptop GPU]
+	2db9  GB207GLM [RTX PRO 500 Blackwell Generation Laptop GPU]
+	2dd8  GB207M [GeForce RTX 5050 Max-Q / Mobile]
+	2e2a  GB20B
+	2f04  GB205 [GeForce RTX 5070]
+	2f18  GB205M [GeForce RTX 5070 Ti Mobile]
+	2f38  GB205GLM [RTX PRO 3000 Blackwell Generation Laptop GPU]
+	2f58  GB205M [GeForce RTX 5070 Ti Mobile]
 	31c0  GB110
 	3340  GB120
 10df  Emulex Corporation
@@ -13554,6 +13648,7 @@
 	0860  CA91C860 [QSpan]
 	0862  CA91C862A [QSpan-II]
 	8111  Tsi381 PCIe to PCI Bridge
+	8113  89HPEB383 PCIe-to-PCI Bridge
 	8260  CA91L8200B [Dual PCI PowerSpan II]
 	8261  CA91L8260B [Single PCI PowerSpan II]
 	a108  Tsi109 Host Bridge for Dual PowerPC
@@ -13623,6 +13718,7 @@
 	5227  RTS5227 PCI Express Card Reader
 		17aa 220e  ThinkPad T440p
 		17aa 2214  ThinkPad X240
+	5228  RTS5288 PCIe SD UHS-I Card Reader controller
 	5229  RTS5229 PCI Express Card Reader
 		1025 0813  Aspire R7-571
 		103c 194e  ProBook 455 G1 Notebook
@@ -13646,7 +13742,8 @@
 		1028 0c06  Precision 3580
 		17aa 224f  ThinkPad X1 Carbon 5th Gen
 	5260  RTS5260 PCI Express Card Reader
-	5261  RTS5261 PCI Express Card Reader
+	5261  RTS5261 PCIe SD Express Card Reader controller
+	5264  RTS5264 PCIe SD UHS-II & SD Express Card Reader controller
 	5286  RTS5286 PCI Express Card Reader
 	5287  RTL8411B PCI Express Card Reader
 		1025 1094  Acer Aspire E5-575G
@@ -13658,6 +13755,7 @@
 	5763  RTS5763DL NVMe SSD Controller (DRAM-less)
 	5765  RTS5765DL NVMe SSD Controller (DRAM-less)
 	5770  RTS5770DL NVMe SSD Controller (DRAM-less)
+	5771  RTS5771 NVMe SSD Controller (DRAM-less)
 	5772  RTS5772DL NVMe SSD Controller (DRAM-less)
 	8029  RTL-8029(AS)
 		10b8 2011  EZ-Card (SMC1208)
@@ -13856,6 +13954,7 @@
 		103c 831b  Realtek RTL8822BE 802.11ac 2x2 Wi-Fi + Bluetooth 4.2 Combo Adapter (MU-MIMO supported)
 		17aa 5124  ThinkPad E595
 		17aa b023  ThinkPad E595
+	b851  RTL8851BE PCIe 802.11ax Wireless Network Controller
 	b852  RTL8852BE PCIe 802.11ax Wireless Network Controller
 	b85b  RTL8852BE PCIe 802.11ax Wireless Network Controller [1T1R]
 	c821  RTL8821CE 802.11ac PCIe Wireless Network Adapter
@@ -14078,6 +14177,8 @@
 	000b  EMU20k2 [Sound Blaster X-Fi Titanium Series]
 		1102 0041  SB0880 [SoundBlaster X-Fi Titanium PCI-e]
 		1102 0062  SB1270 [SoundBlaster X-Fi Titanium HD]
+	0010  CA0132 Sound Core3D [Sound Blaster AE-7]
+		1102 0081  Sound Blaster AE-7
 	0012  CA0132 Sound Core3D [Sound Blaster Recon3D / Z-Series / Sound BlasterX AE-5 Plus]
 		1102 0010  SB1570 SB Audigy Fx
 		1102 0191  CA0132 Sound Core3D - CA0113 [ Sound BlasterX AE-5 Plus]
@@ -14252,7 +14353,7 @@
 	0585  VT82C585VP [Apollo VP1/VPX]
 	0586  VT82C586/A/B PCI-to-ISA [Apollo VP]
 		1106 0000  MVP3 ISA Bridge
-	0591  VT8237A SATA 2-Port Controller
+	0591  VT8237A Integrated SATA RAID Controller
 	0595  VT82C595 [Apollo VP2]
 	0596  VT82C596 ISA [Mobile South]
 		1106 0000  VT82C596/A/B PCI to ISA Bridge
@@ -14610,6 +14711,7 @@
 	3372  VT8237S PCI to ISA Bridge
 	337a  VT8237A PCI to PCI Bridge
 	337b  VT8237A Host Bridge
+	3401  VT6325 Firewire Controller
 	3402  VT8261 PCI to ISA Bridge
 	3403  VT6315 Series Firewire Controller
 		1043 8374  M5A88-V EVO
@@ -14622,7 +14724,11 @@
 	3456  VX11 Standard Host Bridge
 	345b  VX11 Miscellaneous Bus
 	3483  VL805/806 xHCI USB 3.0 Controller
+	365a  VT3365 Card Reader Host Controller
+	365b  VT3365 SDIO Host Controller
 	3a01  VX11 Graphics [Chrome 645/640]
+	401a  VT6325 Card Reader Host Controller
+	401b  VT6325 SDIO PCI-E Host Controller
 	4149  VIA VT6420 (ATA133) Controller
 	4204  K8M800 Host Bridge
 	4208  PT890 Host Bridge
@@ -14657,17 +14763,18 @@
 	5324  CX700M2/VX700/VX800/820-Series Serial ATA & EIDE-Controller
 	5327  P4M890 I/O APIC Interrupt Controller
 	5336  K8M890CE I/O APIC Interrupt Controller
+	5337  VT8237A Integrated SATA Controller
 	5340  PT900 I/O APIC Interrupt Controller
 	5351  VT3351 I/O APIC Interrupt Controller
 	5353  VX800/VX820 APIC and Central Traffic Control
 	5364  CN896/VN896/P4M900 I/O APIC Interrupt Controller
-	5372  VT8237/8251 Serial ATA Controller
+	5372  VT8237S SATA Controller
 	5409  VX855/VX875 APIC and Central Traffic Control
 	5410  VX900 Series APIC and Central Traffic Control
 	5419  VN1000 I/O APIC Interrupt Controller
 	6100  VT85C100A [Rhine II]
 	6122  VN1000 Graphics [Chrome 520 IGP]
-	6287  SATA RAID Controller
+	6287  VT8251 AHCI SATA Controller
 	6290  K8M890CE Host Bridge
 	6327  P4M890 Security Device
 	6353  VX800/VX820 Scratch Registers
@@ -14699,6 +14806,7 @@
 	7351  VT3351 Host Bridge
 	7353  VX800/VX820 North-South Module Interface Control
 	7364  CN896/VN896/P4M900 Host Bridge
+	7372  VT8237S SATA RAID Controller
 	7409  VX855/VX875 North-South Module Interface Control
 	7410  VX900 Series North-South Module Interface Control
 		19da a179  ZBOX nano VD01
@@ -14730,8 +14838,10 @@
 	9000  VT8261 IDE Controller [StorX IDE Controller - 9000]
 	9001  VX900 Series Serial-ATA Controller
 	9040  VT8261 SATA Controller [StorX RAID Controller - 9040]
+	9041  VX900/VX11 SATA Controller [StorX RAID Controller - 9041]
 	9082  Standard AHCI 1.0 SATA Controller
-	9140  HDMI Audio Device
+	9140  VX11 Graphics [Chrome 645/640] HDMI Audio Device
+	9170  VX900 Graphics [Chrome9 HD] HDMI Audio Device
 	9201  USB3.0 Controller
 	9380  Ncore Coprocessor for Centaur CNS
 	9530  VX800/820/900/VT8261 Series Secure Digital Memory Card Controller
@@ -15943,6 +16053,7 @@
 	0115  XG4 NVMe SSD Controller
 	0116  XG5 NVMe SSD Controller
 		1179 0001  XG5 NVMe SSD Controller
+	0119  XD5 NVMe SSD Controller
 	011a  XG6 NVMe SSD Controller
 	0404  DVD Decoder card
 	0406  Tecra Video Capture device
@@ -16144,7 +16255,7 @@
 		103c 30cc  Pavilion dv6700
 		103c 30cf  Pavilion dv9668eg Laptop
 		17aa 20c5  ThinkPad R61
-		17aa 20c7  ThinkPad R61
+		17aa 20c7  ThinkPad R61/T400
 	0841  R5C841 CardBus/SD/SDIO/MMC/MS/MSPro/xD/IEEE1394
 	0843  R5C843 MMC Host Controller
 		1025 0121  Aspire 5920G
@@ -16592,6 +16703,8 @@
 11bc  Network Peripherals Inc
 	0001  NP-PCI
 11bd  Pinnacle Systems Inc.
+	0015  FireWire Controller
+	0023  Studio 700
 	002e  PCTV 40i
 	0040  Royal TS Function 1
 		11bd 0044  PCTV 2000i Dual DVB-T Pro PCI Tuner 1
@@ -16893,6 +17006,10 @@
 11f7  Scientific Atlanta
 # née PMC-Sierra Inc.
 11f8  Microchip Technology
+	4036  PM40036 Switchtec PFX 36xG4 Fanout PCIe Switch
+	4052  PM40052 Switchtec PFX 52xG4 Fanout PCIe Switch
+	4084  PM40084 Switchtec PFX 84xG4 Fanout PCIe Switch
+	4128  PM41028 Switchtec PSX 28xG4 Programmable PCIe Switch
 	5000  PM50100 Switchtec PFX 100xG5 Fanout PCIe Switch
 	5028  PM50028 Switchtec PFX 28xG5 Fanout PCIe Switch
 	5036  PM50036 Switchtec PFX 36xG5 Fanout PCIe Switch
@@ -17220,6 +17337,8 @@
 1233  Bus-Tech, Inc.
 # nee Risq Modular Systems, Inc.
 1235  SMART Modular Technologies
+	c241  CXA-4F1W
+		1028 2382  4-DIMM Add In Card
 1236  Sigma Designs Corporation
 	0000  RealMagic64/GX
 	6401  REALmagic 64/GX (SD 6425)
@@ -17476,6 +17595,7 @@
 	2261  SM2261XT x2 NVMe SSD Controller (DRAM-less)
 	2262  SM2262/SM2262EN SSD Controller
 	2263  SM2263EN/SM2263XT (DRAM-less) NVMe SSD Controllers
+	2268  SM2268XT (DRAM-less) NVMe SSD Controller
 	2269  SM2269XT (DRAM-less) NVMe SSD Controller
 	8366  SM8366 NVMe SSD Controller [MonTitan]
 1270  Olympus Optical Co., Ltd.
@@ -18454,6 +18574,7 @@
 	5416  2550 NVMe SSD (DRAM-less)
 	5425  2500 NVMe SSD (DRAM-less)
 	5427  2650 NVMe SSD (DRAM-less)
+	5428  4600 NVMe SSD
 	5429  2600 NVMe SSD (DRAM-less)
 	6001  2100AI NVMe SSD [Nitro]
 1345  Arescom Inc
@@ -18528,6 +18649,8 @@
 	0b22  UP-200 Powered 2 port RS-232 card
 	0b23  UP-200 Powered 2 port RS-232 card
 	0ba1  UC-101 1 + 1 port RS-232 card
+	0ba2  UC-101 1 + 1 port RS-232 card
+	0ba3  UC-101 1 + 1 port RS-232 card
 	0bc1  UC-203 1 + 1 port RS-232 + LPT card
 	0bc2  UC-203 1 + 1 port RS-232 + LPT card
 	0be1  UC-146 LPT card
@@ -18539,6 +18662,8 @@
 	0c22  UP-880 Powered 2 port RS-232 card
 	0c23  UP-880 Powered 2 port RS-232 card
 	0c41  UC-368 4 port RS-422/485 Opto Isolated card
+	0c42  UC-368 4 port RS-422/485 Opto Isolated card
+	0c43  UC-368 4 port RS-422/485 Opto Isolated card
 	0ca1  UC-253 2 port RS-232 card
 	0d21  UC-260 4 port RS-232 card
 	0d41  UC-836 4 port RS-232 card
@@ -18578,6 +18703,10 @@
 	401d  PX-475 1 port RS-232 + LPT card (Serial port)
 	401e  PX-803 Powered 1 + 1 port RS-232 card
 	401f  PX-475 1 port RS-232 + LPT card (LPT port)
+	4020  XC-157 LPT ExpressCard
+	4021  XC-475 1 port RS-232 + LPT ExpressCard (Serial port)
+	4022  XC-475 1 port RS-232 + LPT ExpressCard (LPT port)
+	4026  XC-235 1 port RS-232 ExpressCard
 	4027  IX-100 1 port RS-232 card
 	4028  IX-200 2 port RS-232 card
 	4029  IX-400 4 port RS-232 card
@@ -20294,6 +20423,8 @@
 	a80d  NVMe SSD Controller PM9C1a (DRAM-less)
 	a80e  NVMe SSD Controller PM9D3a
 	a80f  BM9C1 QLC NVME SSD (DRAM-less)
+	a810  NVMe SSD 9100 PRO [PM9E1]
+	a811  BM9H1 NVME SSD (DRAM-less)
 	a820  NVMe SSD Controller 171X
 		1028 1f95  Express Flash NVMe XS1715 SSD 400GB
 		1028 1f96  Express Flash NVMe XS1715 SSD 800GB
@@ -20469,6 +20600,7 @@
 1458  Gigabyte Technology Co., Ltd
 	1002  Aourus Radeon RX6900XT Xtreme Waterforce WB 16G
 	22e8  Ellesmere [Radeon RX 480]
+	2425  Radeon RX 9070 GAMING OC 16G
 	3483  USB 3.0 Controller (VIA VL80x-based xHCI Controller)
 1459  DOOIN Electronics
 145a  Escalate Networks Inc
@@ -20657,6 +20789,7 @@
 14c3  MEDIATEK Corp.
 	0608  MT7921K (RZ608) Wi-Fi 6E 80MHz
 	0616  MT7922 802.11ax PCI Express Wireless Network Adapter
+	0717  MT7925 (RZ717) Wi-Fi 7 160MHz
 	4d75  T700 5G Modem [5G Solution 5000]
 	7603  MT7603E 802.11bgn PCI Express Wireless Network Adapter
 	7612  MT7612E 802.11acbgn PCI Express Wireless Network Adapter
@@ -22155,6 +22288,7 @@
 	9300  Universal Exhaust Gas Oxygen Sensor Simulator
 	9310  Digital Programmable Resistor
 	9320  Arria 10 FPGA Card
+	9330  Cyclone V FPGA Card
 	9350  Analog Input Card
 1543  SILICON Laboratories
 	3052  Intel 537 [Winmodem]
@@ -22417,6 +22551,15 @@
 	0290  SagittaZ
 	0292  Arcus3 Flash Recovery
 	0293  Arcus3 RMA
+	0294  Ophy 2.1 (SagittaZ)
+# Sagitta
+	0296  OPHY2.6
+# Sagitta
+	0298  OPHY3.0
+# Sagitta
+	029a  OPHY3.1
+# Sagitta
+	029c  OPHY3.5
 	02a0  Quantum-6 in Flash Recovery Mode
 	02a1  Quantum-6 RMA
 	02a2  Spectrum-7 in Flash Recovery Mode
@@ -22503,6 +22646,7 @@
 # NIC-ETH540F-3S-2P OCP3.0 2x10G Card
 		193d 1084  NIC-ETH540F-3S-2P
 		1e81 0c10  25GbE dual-port SFP28, PCIe3.0 x8 [3SC10]
+		1f3f 0c10  25GbE dual-port SFP28, PCIe3.0 x8, 3SC10
 	1016  MT27710 Family [ConnectX-4 Lx Virtual Function]
 	1017  MT27800 Family [ConnectX-5]
 		117c 00b1  FastFrame N311 Single-port 10Gb Ethernet Adapter
@@ -22529,6 +22673,7 @@
 		193d 1035  NIC-ETH641F-LP-2P SFP28 2x25GbE PCIe Network Adapter
 		1bd4 00ac  O252MCX6Lx
 		1bd4 00ae  S252MCX6Lx
+		1f3f 0c11  25GbE dual-port SFP28, PCIe4.0 x8, 3SC1125GbE dual-port SFP28, PCIe4.0 x8, 3SC11
 		1ff9 00ad  ENFM6251-SP2
 		1ff9 00af  ENPM6251-SP2
 	1020  MT28860
@@ -22688,7 +22833,7 @@
 	5014  WD PC SN540 / Green SN350 NVMe SSD 1 TB (DRAM-less)
 	5015  PC SN740 NVMe SSD (DRAM-less)
 	5016  WD PC SN740 NVMe SSD 512GB (DRAM-less)
-	5017  WD Black SN770 / PC SN740 256GB / PC SN560 (DRAM-less) NVMe SSD
+	5017  WD SN560/SN740/SN770/SN5000 NVMe SSD
 	5019  WD Green SN350 240GB (DRAM-less) / SN560E NVMe SSD
 	501a  SanDisk Ultra 3D / WD Blue SN570 NVMe SSD (DRAM-less)
 	501d  WD Blue SN550 NVMe SSD 2TB (DRAM-less)
@@ -22699,12 +22844,16 @@
 	5028  WD CH SN560 NVMe SSD
 	5030  WD Black SN850X NVMe SSD
 	5034  WD PC SN5000S M.2 2230 NVMe SSD (DRAM-less)
+	5035  WD PC SN5000S M.2 2242 NVMe SSD (DRAM-less)
 	5036  WD PC SN5000S M.2 2280 NVMe SSD (DRAM-less)
 	5041  WD Blue SN580 NVMe SSD (DRAM-less)
 	5042  WD Black SN770M NVMe SSD (DRAM-less)
+	5044  WD PC SN7100S NVMe SSD (DRAM-less)
 	5045  WD_BLACK SN7100 NVMe SSD (DRAM-less)
 	5046  SanDisk Extreme NVMe SSD (DRAM-less)
 	5049  SN8000S NVMe SSD
+	504a  WD Blue SN5000 NVMe SSD (DRAM-less)
+	5050  WD PC SN8050S / WD_BLACK SN8100 NVMe SSD
 15b8  ADDI-DATA GmbH
 	1001  APCI1516 SP controller (16 digi outputs)
 	1003  APCI1032 SP controller (32 digi inputs w/ opto coupler)
@@ -23843,6 +23992,8 @@
 	010c  SM8350 PCIe Root Complex [Snapdragon 888]
 	010e  SC8280XP PCI Express Root Port
 	0110  SM8475 PCIe Root Complex [Snapdragon 8+ Gen 1]
+	0111  SC8380XP PCIe Root Complex [Snapdragon X / X Plus / X Elite]
+	0113  SM8550/SM8650 PCIe Root Complex [Snapdragon 8 Gen 2/Gen 3]
 	0300  MDM9x35 LTE Modem [Snapdragon X7]
 	0301  MDM9x45 LTE Modem [Snapdragon X12]
 	0302  MDM9x55 LTE Modem [Snapdragon X16]
@@ -23851,6 +24002,7 @@
 	0400  Datacenter Technologies QDF2432 PCI Express Root Port
 	0401  Datacenter Technologies QDF2400 PCI Express Root Port
 	1000  QCS405 PCIe Root Complex
+	1003  IPQ6018 PCIe Root Complex
 	1101  QCA6390 Wireless Network Adapter
 	1103  QCNFA765 Wireless Network Adapter
 	1104  QCN6024/9024/9074 Wireless Network Adapter
@@ -24714,6 +24866,14 @@
 	0441  T4240 without security
 	0446  T4160 with security
 	0447  T4160 without security
+	0820  T1040 with security
+	0821  T1040 without security
+	0824  T1042 with security
+	0825  T1042 without security
+	0828  T1020 with security
+	0829  T1020 without security
+	082c  T1022 with security
+	082d  T1022 without security
 	0830  T2080 with security
 	0831  T2080 without security
 	0838  T2081 with security
@@ -24862,6 +25022,7 @@
 	8001  RapidFile
 198a  Nallatech Ltd.
 1993  Innominate Security Technologies AG
+1998  Toyou Feiji Electronics Co., Ltd.
 1999  A-Logics
 	a900  AM-7209 Video Processor
 199a  Pulse-LINK, Inc.
@@ -25017,6 +25178,8 @@
 	a126  HiSilicon SDI NVMe Storage Controller
 	a127  HiSilicon SDI Accelerator
 	a12a  HiSilicon Add-on PCI-PCI Bridge
+	a12d  HiSilicon Embedded PMU
+	a12e  HiSilicon Embedded PCIe PTT
 	a220  HNS GE Network Controller
 	a221  HNS GE/10GE/25GE Network Controller
 		19e5 0454  TM280
@@ -25104,6 +25267,12 @@
 1a3b  AzureWave
 	1112  AR9285 Wireless Network Adapter (PCI-Express)
 1a3e  Micro-Research Finland Oy
+	132c  MTCA Event Receiver 300
+	152c  CompactPCI Event Receiver 300
+	172c  PCI Express Event Receiver 300
+	192c  CompactPCI Event Receiver TG 300
+	232c  MTCA Event Master 300
+	252c  CompactPCI Event Generator 300
 1a41  Tilera Corp.
 	0001  TILE64 processor
 	0002  TILEPro processor
@@ -25325,19 +25494,83 @@
 	1005  Virtio RNG
 	1009  Virtio filesystem
 	1041  Virtio 1.0 network device
+		1af4 1100  QEMU
 	1042  Virtio 1.0 block device
+		1af4 1100  QEMU
 	1043  Virtio 1.0 console
+		1af4 1100  QEMU
 	1044  Virtio 1.0 RNG
-	1045  Virtio 1.0 memory balloon
+		1af4 1100  QEMU
+	1045  Virtio 1.0 balloon
+		1af4 1100  QEMU
+	1046  Virtio 1.0 ioMemory
+		1af4 1100  QEMU
+	1047  Virtio 1.0 remote processor messaging
+		1af4 1100  QEMU
 	1048  Virtio 1.0 SCSI
-	1049  Virtio 1.0 filesystem
+		1af4 1100  QEMU
+	1049  Virtio 9P transport
+		1af4 1100  QEMU
+	104a  Virtio 1.0 WLAN MAC
+		1af4 1100  QEMU
+	104b  Virtio 1.0 remoteproc serial link
+		1af4 1100  QEMU
+	104d  Virtio 1.0 memory balloon
+		1af4 1100  QEMU
 	1050  Virtio 1.0 GPU
+		1af4 1100  QEMU
+	1051  Virtio 1.0 clock/timer
+		1af4 1100  QEMU
 	1052  Virtio 1.0 input
+		1af4 1100  QEMU
 	1053  Virtio 1.0 socket
-	1058  virtio-mem
-	105a  Virtio file system
-	1110  Inter-VM shared memory
-		1af4 1100  QEMU Virtual Machine
+		1af4 1100  QEMU
+	1054  Virtio 1.0 crypto
+		1af4 1100  QEMU
+	1055  Virtio 1.0 signal distribution device
+		1af4 1100  QEMU
+	1056  Virtio 1.0 pstore device
+		1af4 1100  QEMU
+	1057  Virtio 1.0 IOMMU
+		1af4 1100  QEMU
+	1058  Virtio 1.0 mem
+		1af4 1100  QEMU
+	1059  Virtio 1.0 sound
+		1af4 1100  QEMU
+	105a  Virtio 1.0 file system
+		1af4 1100  QEMU
+	105b  Virtio 1.0 pmem
+		1af4 1100  QEMU
+	105c  Virtio 1.0 rpmb
+		1af4 1100  QEMU
+	105d  Virtio 1.0 mac80211-hwsim
+		1af4 1100  QEMU
+	105e  Virtio 1.0 video encoder
+		1af4 1100  QEMU
+	105f  Virtio 1.0 video decoder
+		1af4 1100  QEMU
+	1060  Virtio 1.0 SCMI
+		1af4 1100  QEMU
+	1061  Virtio 1.0 nitro secure module
+		1af4 1100  QEMU
+	1062  Virtio 1.0 I2C adapter
+		1af4 1100  QEMU
+	1063  Virtio 1.0 watchdog
+		1af4 1100  QEMU
+	1064  Virtio 1.0 can
+		1af4 1100  QEMU
+	1065  Virtio 1.0 dmabuf
+		1af4 1100  QEMU
+	1066  Virtio 1.0 parameter server
+		1af4 1100  QEMU
+	1067  Virtio 1.0 audio policy
+		1af4 1100  QEMU
+	1068  Virtio 1.0 Bluetooth
+		1af4 1100  QEMU
+	1069  Virtio 1.0 GPIO
+		1af4 1100  QEMU
+	1110  QEMU Inter-VM shared memory device
+		1af4 1100  QEMU
 1af5  Netezza Corp.
 1afa  J & W Electronics Co., Ltd.
 1b00  Montage Technology Co., Ltd.
@@ -25429,6 +25662,7 @@
 	000b  QEMU PCIe Expander bridge
 	000c  QEMU PCIe Root port
 	000d  QEMU XHCI Host Controller
+	000e  QEMU PCIe-to-PCI bridge
 	0010  QEMU NVM Express Controller
 	0011  QEMU PVPanic device
 	0013  QEMU UFS Host Controller
@@ -25477,16 +25711,20 @@
 		1028 2196  ROR-N1
 		1028 2286  BOSS-N1 DC-MHS
 		1028 2287  BOSS-N1 Modular DC-MHS
+		1028 23b0  eBOSS-N1 DC-MHS
 		1b4b 2241  Santa Cruz NVMe Host Adapter
 		1b96 4000  WD_BLACK AN1500 NVMe SSD
 		1d49 0306  ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit
 		1d49 0307  ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit
+		207d 0800  TrustRAID B310n
+		207d 0801  TrustRAID B260s
 		4c52 9541  LRNV9541 2-port M.2 NVMe Raid Adapter
 	2b42  88W8997 2.4/5 GHz Dual-Band 2x2 Wi-Fi® 5 (802.11ac) + Bluetooth® 5.3 Solution
 	2b43  NXP 88W9098 Wi-Fi 6 (ax) MAC #1
 	2b44  NXP 88W9098 Wi-Fi 6 (ax) MAC #2
 	2b45  NXP 88W9098 Bluetooth 5.3
 	9120  88SE9120 SATA 6Gb/s Controller
+	9122  88SE912x SATA 6Gb/s Controller [AHCI mode]
 	9123  88SE9123 PCIe SATA 6.0 Gb/s controller
 		dc93 600e  DC-6xxe series SATA 6G controller
 	9125  88SE9125 PCIe SATA 6.0 Gb/s controller
@@ -25495,14 +25733,19 @@
 	9130  88SE9128 PCIe SATA 6 Gb/s RAID controller with HyperDuo
 		1043 8438  P8P67 Deluxe Motherboard
 	9170  88SE9170 PCIe 2.0 x1 2-port SATA 6 Gb/s Controller
+	9171  88SE9171 PCIe 2.0 x1 1-port SATA 6 Gb/s Controller
 	9172  88SE9172 SATA 6Gb/s Controller
 	9178  88SE9170 PCIe SATA 6Gb/s Controller
-	917a  88SE9172 SATA III 6Gb/s RAID Controller
+	917a  88SE9172 SATA III 6Gb/s Controller [IDE mode]
 	9182  88SE9182 PCIe 2.0 x2 2-port SATA 6 Gb/s Controller
 	9183  88SS9183 PCIe SSD Controller
+	9186  88SE9186 6Gb/s SATA 6Gb/s Controller [AHCI mode]
+	918a  88SE9182 PCIe SATA 6 Gb/s controller [IDE mode]
 	9192  88SE9172 SATA III 6Gb/s RAID Controller
 	91a0  88SE912x SATA 6Gb/s Controller [IDE mode]
+	91a3  88SE9128 PCIe SATA 6 Gb/s controller [IDE mode]
 	91a4  88SE912x IDE Controller
+	91b0  88SE9172 SATA 6 Gb/s controller [IDE mode]
 	9215  88SE9215 PCIe 2.0 x1 4-port SATA 6 Gb/s Controller
 	9220  88SE9220 PCIe 2.0 x2 2-port SATA 6 Gb/s RAID Controller
 	9230  88SE9230 PCIe 2.0 x2 4-port SATA 6 Gb/s RAID Controller
@@ -25562,6 +25805,7 @@
 	1009  FL1009 USB 3.0 Host Controller
 	1100  FL1100 USB 3.0 Host Controller
 		16b8 6e31  Allegro Pro USB 3.0 PCIe
+	1400  USB 3.0 Host Controller
 1b74  OpenVox Communication Co. Ltd.
 	0115  D115P/D115E Single-port E1/T1 card
 	d130  D130P/D130E Single-port E1/T1 card (3rd GEN)
@@ -25723,6 +25967,9 @@
 	5021  FireCuda 520 SSD
 # 1TB
 	5026  FireCuda 540 SSD
+	5027  LaCie Rugged SSD Pro5
+	5100  PCIe Gen3 SSD
+	5101  PCIe Gen5 SSD
 1bb3  Bluecherry
 	4304  BC-04120A MPEG4 4 port video encoder / decoder
 	4309  BC-08240A MPEG4 4 port video encoder / decoder
@@ -25784,6 +26031,8 @@
 	100c  NS8510G1Uxxx, NS8610G1Uxxx NVME SSD
 	100e  NS8500G2Uxxxx, NS8600G2Uxxxx NVME SSD
 	100f  NS6500G2UXXXX,NS6600G2UXXXX NVME SSD
+	2981  32G SFP28 EP2744 Apatter
+		1bd4 00b0  32G SFP28 EP2744 Apatter
 1bee  IXXAT Automation GmbH
 	0002  CAN-IB100/PCIe
 	0003  CAN-IB200/PCIe
@@ -25848,6 +26097,8 @@
 	0023  FD722-M2
 	0024  FD722 with bypass
 	0025  FD922
+	0026  FD788
+	0027  FD940
 1c28  Lite-On IT Corp. / Plextor
 	0122  M6e PCI Express SSD [Marvell 88SS9183]
 # previously Fiberblaze
@@ -26112,6 +26363,7 @@
 		1ea0 2111  TP2511 Series E3.S NVMe Datacenter SSD(3.84TB)
 		1ea0 2200  TP2510 Series U.2 NVMe Datacenter SSD(7.68TB)
 		1ea0 2201  TP2511 Series U.2 NVMe Datacenter SSD(7.68TB)
+		1ea0 2202  TP2310 Series U.2 NVMe Datacenter SSD(7.68TB)
 		1ea0 2210  TP2510 Series E3.S NVMe Datacenter SSD(7.68TB)
 		1ea0 2211  TP2511 Series E3.S NVMe Datacenter SSD(7.68TB)
 		1ea0 2301  TP2511 Series U.2 NVMe Datacenter SSD (15.36TB)
@@ -26184,13 +26436,17 @@
 	613a  ATOM 50, LEGEND 840 NVMe SSD (DRAM-less)
 	621a  LEGEND 850 NVMe SSD (DRAM-less)
 	622a  LEGEND 960 NVMe SSD
+	623a  LEGEND 710 NVMe SSD (DRAM-less)
 	624a  LEGEND 700, XPG GAMMIX S20 NVMe SSD (DRAM-less)
 	625a  LEGEND 850 LITE NVMe SSD (DRAM-less)
 # 1TB
 	627a  LEGEND 800 NVMe SSD (DRAM-less)
 # 500GB
 	628a  LEGEND 800 NVMe SSD (DRAM-less)
+	631a  LEGEND 970 NVMe SSD
 	633a  LEGEND 900 NVMe SSD (DRAM-less)
+	634c  LEGEND 820 NVMe SSD (DRAM-less)
+	635a  XPG GAMMIX S60 NVMe SSD (DRAM-less)
 	642a  XPG GAMMIX S50 CORE NVMe SSD (DRAM-less)
 	8201  XPG SX8200 Pro PCIe Gen3x4 M.2 2280 Solid State Drive
 1cc4  Shenzhen Unionmemory Information System Ltd.
@@ -26221,15 +26477,17 @@
 	6302  AM630 PCIe 4.0 NVMe SSD 256GB
 	6303  AM630 PCIe 4.0 x4 NVMe SSD Controller
 	6304  AM630 PCIe 4.0 NVMe SSD 1024GB
-	660c  RPETJ1T24MHP2QDQ PCIe 4.0 NVMe SSD 1024GB
+	634c  LEGEND 820 NVMe SSD (DRAM-less)
+	635a  GAMMIX S60 NVMe SSD (DRAM-less)
+	660c  AH660 PCIe 4.0 NVMe SSD
 	6a01  AM620 PCIe 3.0 NVMe SSD 128GB
 	6a02  AM6A0 PCIe 4.0 NVMe SSD 256GB
 	6a03  RPETJ512MKP1QDQ PCIe 4.0 NVMe SSD 512GB (DRAM-less)
-	6a04  RPETJ1T24MKP2QDQ PCIe 4.0 NVMe SSD 1024GB (DRAM-less)
+	6a04  AM6A0 PCIe 4.0 NVMe SSD 1024GB (DRAM-less)
 	6a13  RPJYJ512MKN1QWQ PCIe 4.0 NVMe SSD 512GB (DRAM-less)
-	6a14  RPEYJ1T24MKN2QWY PCIe 4.0 NVMe SSD 1024GB (DRAM-less)
+	6a14  AM6A1 PCIe 4.0 NVMe SSD 1024GB (DRAM-less)
 	6b04  AM6B0 PCIe 4.0 NVMe SSD
-	6b13  RPJYJ512MLR1QWY PCIe 4.0 NVMe SSD 512GB (DRAM-less)
+	6b13  AM6B1 PCIe 4.0 NVMe SSD 512GB (DRAM-less)
 	6b14  RPJYJ1T24MLR1HWY PCIe 4.0 NVMe SSD 1024GB (DRAM-less)
 	8030  NVMe SSD Controller UH8X2X/UH7X2X series
 		1cc4 1122  NVMe SSD UH812a U.2 1.92TB
@@ -26280,6 +26538,7 @@
 	0002  Pro Capture AIO
 	0010  Pro Capture Endpoint
 	0014  PRO CAPTURE AIO 4K PLUS
+	0015  Pro Capture HDMI 4K +
 	0017  PRO CAPTURE AIO 4K
 	0051  Eco Capture Dual HDMI M.2
 	0052  Eco Capture HDMI 4K M.2
@@ -26301,6 +26560,56 @@
 	000c  ExaNIC V9P-3
 	0100  ExaDISK FX1
 1cf0  Akitio
+1cf2  ZTE Corp.
+	8036  DH Switch
+	8040  NEO X510 SRIOV PF Ethernet Controller
+	8041  NEO X510 SRIOV VF Ethernet Controller Virtual Function
+	8042  NX I512 VDPA VF Ethernet Controller Virtual Function
+	8044  NEO X510 MPF Ethernet Controller
+	8045  NX I512 BOND PF Ethernet Controller
+	8046  NX I512 OVS PF Ethernet Controller
+	8047  NEO X510 BOND PF Ethernet Controller
+	8048  NEO X510 OVS PF Ethernet Controller
+	8049  NX E312 SRIOV RDMA PF Ethernet Controller
+	804a  NEO X512 NOF PF Ethernet Controller
+	804b  NEO X512 SRIOV PF Ethernet Controller
+	804c  NEO X512 INITIATOR1 PF Ethernet Controller
+	804d  NEO X512 INITIATOR2 PF Ethernet Controller
+	804e  NX I512 UPF PF Ethernet Controller
+	804f  NX I512 UPF VF Ethernet Controller Virtual Function
+	8060  NX E312 SRIOV RDMA VF Ethernet Controller Virtual Function
+	8061  NX E310 SRIOV PF Ethernet Controller
+	8062  NX E310 SRIOV VF Ethernet Controller Virtual Function
+	8063  NX I510 BOND PF Ethernet Controller
+	8064  NX I510 OVS PF Ethernet Controller
+	8065  NX I510 VDPA VF Ethernet Controller Virtual Function
+	8066  NX I511 SRIOV PF Ethernet Controller
+	8067  NX I511 OVS PF Ethernet Controller
+	8068  NX I511 VDPA VF Ethernet Controller Virtual Function
+	806b  NEO X512 RDMA PF Ethernet Controller
+	806c  NEO X512 RDMA VF Ethernet Controller Virtual Function
+	806d  NX I512 RDMA PF Ethernet Controller
+	806e  NX I512 RDMA VF Ethernet Controller Virtual Function
+	806f  NX I512 UPF BOND PF Ethernet Controller
+	807d  NX E312S SRIOV PF Ethernet Controller
+	807e  NX E316 SRIOV PF Ethernet Controller
+	807f  NX E316 SRIOV VF Ethernet Controller Virtual Function
+	8080  NX E311 SRIOV PF Ethernet Controller
+	8081  NX E311 SRIOV VF Ethernet Controller Virtual Function
+	8082  NX I511 SRIOV PF Ethernet Controller
+	8083  NX I511 SRIOV VF Ethernet Controller Virtual Function
+	8084  NX E310 RDMA PF Ethernet Controller
+	8085  NX E310 RDMA VF Ethernet Controller Virtual Function
+	8086  NX I510 SRIOV SEC PF Ethernet Controller
+	8087  NX I510 SRIOV SEC VF Ethernet Controller Virtual Function
+	8088  NX E312S SRIOV VF Ethernet Controller Virtual Function
+	8089  NEO X512 SRIOV PF Ethernet Controller
+	808a  NEO X512 SRIOV PF Ethernet Controller
+	80a0  NX E312 PF Ethernet Controller
+	80a1  NX E312 VF Ethernet Controller Virtual Function
+	80a2  NX E312S_D SRIOV PF Ethernet Controller
+	80a3  NX E312S_D SRIOV VF Ethernet Controller Virtual Function
+	80a4  NX I512 OFFLOAD PF Ethernet Controller
 1cf7  Subspace Dynamics
 1cfa  Corsair Memory, Inc
 1cfd  Mangstor
@@ -26612,11 +26921,13 @@
 		1d78 7202  Aliflash V2 U.2 15mm 1.92TB NVMe SSD
 		1d78 7204  Aliflash V2 U.2 15mm 3.84TB NVMe SSD
 		1d78 7208  Aliflash V2 U.2 15mm 7.68TB NVMe SSD
+	1516  DERA D8436/D8456 NVMe SSD
 1d79  Transcend Information, Inc.
 	2262  NVMe PCIe SSD 220S/MTE662T2
 	2263  NVMe PCIe SSD 110S/112S/120S/MTE300S/MTE400S/MTE652T2 (DRAM-less)
 	2264  NVMe PCIe SSD 250H
 	2267  NVMe PCIe SSD 220S/240S/MTE710T
+	2269  NVMe PCIe SSD 410S (DRAM-less)
 	5766  NVMe PCIe SSD 110Q (DRAM-less)
 1d7c  Aerotech, Inc.
 # Fiber-optic HyperWire motion control bus from Aerotech.
@@ -26685,6 +26996,7 @@
 	5216  FORESEE XP1000 / Lexar Professional CFexpress Type B Gold series, NM620 PCIe NVME SSD (DRAM-less)
 	5220  FORESEE XP2100 NVMe SSD (DRAM-less)
 	5236  Lexar NM800 PRO NVME SSD
+	5772  Lexar NQ700 NVME SSD (DRAM-less)
 # nee Facebook, Inc.
 1d9b  Meta Platforms, Inc.
 	0010  Networking DOM Engine
@@ -26785,9 +27097,18 @@
 		1dbe 5007  Dongting-N3 DC SSD U.2 12800GB
 		1dbe 5008  Dongting-N3 DC SSD U.2 15360GB
 		1dbe 5009  Dongting-N3 DC SSD U.2 25600GB
-		1dbe 5010  Dongting-N3 DC SSD U.2 30720GB
+		1dbe 5080  Dongting-N3 DC SSD U.2 30720GB
 		1dbe 5118  Dongting-N3Q DC QLC SSD U.2 15360GB
 		1dbe 5190  Dongting-N3Q DC QLC SSD U.2 30720GB
+		1dbe 5192  Dongting-N3Q DC QLC SSD U.2 61440GB
+		1dbe 5803  Dongting-N3 DC SSD E3.S 3200GB
+		1dbe 5804  Dongting-N3 DC SSD E3.S 3840GB
+		1dbe 5805  Dongting-N3 DC SSD E3.S 6400GB
+		1dbe 5806  Dongting-N3 DC SSD E3.S 7680GB
+		1dbe 5807  Dongting-N3 DC SSD E3.S 12800GB
+		1dbe 5808  Dongting-N3 DC SSD E3.S 15360GB
+		1dbe 5809  Dongting-N3 DC SSD E3.S 25600GB
+		1dbe 5880  Dongting-N3 DC SSD E3.S 30720GB
 		1dbe 6116  Dongting-Z3Q DC ZNS SSD U.2 7680GB
 	5669  NVMe SSD Controller IG5669 [Tacoma]
 1dbf  Guizhou Huaxintong Semiconductor Technology Co., Ltd
@@ -26812,6 +27133,7 @@
 	4131  A1x NVMe SSD Series
 	4432  D2x NVMe SSD Series
 	5200  N5200 NVMe SSD
+1dd5  Manli Technology Group Limited
 1dd8  AMD Pensando Systems
 	0002  DSC2 Elba Upstream Port
 		1dd8 100e  Distributed Services Card
@@ -27047,6 +27369,10 @@
 		1dd8 500e  DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R5
 		1dd8 500f  DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 DPU R4-T
 		1dd8 5200  DSC3-2Q400 100/200/400G 2-port DDR5 128G eMMC G3 Services Card
+	100f  Register/Memory Resource Device
+		1dd8 5201  POLLARA-1Q400 100/200/400G 1-port Card
+	1012  TAWK IPC Device
+		1dd8 5201  POLLARA-1Q400 100/200/400G 1-port Card
 1ddd  Thorlabs
 1de0  Groq
 	0000  TSP [GroqChip]
@@ -27066,7 +27392,6 @@
 	2000  NoLoad Hardware Development Kit
 	3000  eBPF-based PCIe Accelerator
 1ded  Alibaba (China) Co., Ltd.
-# A RDMA (iWarp) device provided by Alibaba Cloud used in ECS environment
 	107f  Elastic RDMA Adapter
 	5007  Elastic RDMA Adapter
 	8000  M1 Root Port
@@ -27075,8 +27400,11 @@
 	8003  RCEC PF
 	8004  RCEC VF
 1dee  Biwin Storage Technology Co., Ltd.
+	1202  HP EX900 Plus NVMe SSD (DRAM-less)
+	1602  HP FX700 NVMe SSD (DRAM-less)
 	2262  HP EX950 NVMe SSD
 	2263  HP EX900 NVMe SSD (DRAM-less)
+	2500  XCG 2500 Enterprise Gen 4 SSD
 	4121  PCIe 4.0 SP406/416 NVMe SSD
 		1dee 0000  NVMe SSD SP416 800G 2.5" U.2
 		1dee 0001  NVMe SSD SP416 1.6T 2.5" U.2
@@ -27087,6 +27415,14 @@
 		1dee 0012  NVMe SSD SP406 3.84T 2.5" U.2
 		1dee 0013  NVMe SSD SP406 7.68T 2.5" U.2
 	5161  BIWIN NVMe SSD SP506/SP516
+		1dee 0001  NVMe SSD SP516 1.6T 2.5" U.2
+		1dee 0002  NVMe SSD SP516 3.2T 2.5" U.2
+		1dee 0003  NVMe SSD SP516 6.4T 2.5" U.2
+		1dee 0004  NVMe SSD SP516 12.8T 2.5" U.2
+		1dee 0011  NVMe SSD SP506 1.92T 2.5" U.2
+		1dee 0012  NVMe SSD SP506 3.84T 2.5" U.2
+		1dee 0013  NVMe SSD SP506 7.68T 2.5" U.2
+		1dee 0014  NVMe SSD SP506 15.36T 2.5" U.2
 	5216  KingSpec NX series NVMe SSD (DRAM-less)
 	7700  BIWIN NVMe SSD SP50Y/SP51Y
 1def  Ampere Computing, LLC
@@ -27227,6 +27563,26 @@
 		1028 2193  NVMe CD7 E3.S 1.92TB
 		1028 2194  NVMe CD7 E3.S 3.84TB
 		1028 2195  NVMe CD7 E3.S 7.68TB
+	0013  VMe SSD Controller CM7
+		1028 222d  Ent NVMe CM7 FIPS U.2 RI 30.72TB
+		1028 222e  Ent NVMe CM7 FIPS U.2 RI 15.36TB
+		1028 222f  Ent NVMe CM7 FIPS U.2 RI 7.68TB
+		1028 2230  Ent NVMe CM7 FIPS U.2 RI 3.84TB
+		1028 2231  Ent NVMe CM7 FIPS U.2 RI 1.92TB
+		1028 2232  Ent NVMe CM7 U.2 RI 30.72TB
+		1028 2233  Ent NVMe CM7 U.2 RI 15.36TB
+		1028 2234  Ent NVMe CM7 U.2 RI 7.68TB
+		1028 2235  Ent NVMe CM7 U.2 RI 3.84TB
+		1028 2236  Ent NVMe CM7 U.2 RI 1.92TB
+		1028 2237  Ent NVMe CM7 FIPS U.2 MU 12.8TB
+		1028 2238  Ent NVMe CM7 FIPS U.2 MU 6.4TB
+		1028 2239  Ent NVMe CM7 FIPS U.2 MU 3.2TB
+		1028 223a  Ent NVMe CM7 FIPS U.2 MU 1.6TB
+		1028 223b  Ent NVMe CM7 U.2 MU 12.8TB
+		1028 223c  Ent NVMe CM7 U.2 MU 6.4TB
+		1028 223d  Ent NVMe CM7 U.2 MU 3.2TB
+		1028 223e  Ent NVMe CM7 U.2 MU 1.6TB
+		1028 228c  Ent NVMe CM7 U.2 MU 6.4TB
 	0014  NVMe SSD Controller CM7 EDSFF
 		1028 223f  Ent NVMe CM7 FIPS E3.S RI 15.36TB
 		1028 2240  Ent NVMe CM7 FIPS E3.S RI 7.68TB
@@ -27245,6 +27601,7 @@
 		1028 22ba  Ent NVMe CM7 FIPS E3.S MU 12.8TB
 	0018  Exceria Pro NVMe SSD
 	001a  NVMe SSD Controller BG6 (DRAM-less)
+	001b  NVMe SSD Controller EG6 (DRAM-less)
 	001f  NVMe SSD Controller CD8
 		1028 2223  DC NVMe CD8 U.2 SED 15.36TB
 		1028 2224  DC NVMe CD8 U.2 SED 7.68TB
@@ -27286,6 +27643,12 @@
 		1028 22c8  DC NVMe CD8P E3.S MU 6.4TB
 		1028 22c9  DC NVMe CD8P E3.S MU 3.2TB
 		1028 22ca  DC NVMe CD8P E3.S MU 1.6TB
+	002e  NVMe SSD Controller XD8
+	002f  NVMe SSD Controller BG7 (DRAM-less)
+	0030  NVMe SSD Controller EG7
+	0031  PCIe 5.0 NVMe SSD Controller XG10
+	0032  PCIe 4.0 NVMe SSD Controller XG10d
+	0033  Exceria Plus G4 NVMe SSD (DRAM-less)
 1e17  Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
 1e18  Beijing GuangRunTong Technology Development Co.,Ltd
 1e24  Squirrels Research Labs
@@ -27327,6 +27690,8 @@
 	c033  S60G [Enflame]
 # FHFL PCIe card, dual slot, 3rd generation from Enflame, 48GB device memory
 	c035  S60 [Enflame]
+	c041  L300 [Enflame]
+	c042  L600 [Enflame]
 # nee Thinci, Inc
 1e38  Blaize, Inc
 	0102  Xplorer X1600
@@ -27451,6 +27816,13 @@
 		1e3b 008a  Enterprise NVMe SSD HHHL 0.8TB (H3900)
 		1e3b 008b  Enterprise NVMe SSD HHHL 1.6TB (H3900)
 		1e3b 0091  Enterprise NVMe SSD HHHL 0.75TB (H3900)
+	1321  AdgeStor NVMe SSD
+		1e3b 4000  AdgeStor NVMe SSD M.2 0.48TB
+		1e3b 4001  AdgeStor NVMe SSD M.2 0.96TB
+		1e3b 4002  AdgeStor NVMe SSD M.2 1.92TB
+		1e3b 4100  AdgeStor NVMe SSD M.2 0.48TB
+		1e3b 4101  AdgeStor NVMe SSD M.2 0.96TB
+		1e3b 4102  AdgeStor NVMe SSD M.2 1.92TB
 	1333  Haishen5 NVMe SSD
 		1e3b 001a  Enterprise NVMe SSD E3.S 1T 3.84TB (H5100)
 		1e3b 001b  Enterprise NVMe SSD E3.S 1T 7.68TB (H5100)
@@ -27513,6 +27885,7 @@
 	0021  ZHITAI TiPro5000 NVMe SSD
 	0041  ZHITAI TiPro7000
 	0071  ZHITAI TiPlus7100
+	0081  ZHITAI Ti600 NVMe SSD
 # YMTC
 	1001  PC005 NVMe SSD
 	1011  PC210 M.2 2280 NVMe SSD
@@ -27521,6 +27894,7 @@
 	1033  PC300 M.2 2242 NVMe SSD (DRAM-less)
 	1071  PC411 M.2 2280 NVMe SSD (DRAM-less)
 	1073  PC411 M.2 2242 NVMe SSD (DRAM-less)
+	1081  PC41Q M.2 2280 NVMe SSD (DRAM-less)
 1e4b  MAXIO Technology (Hangzhou) Ltd.
 	1001  NVMe SSD Controller MAP1001
 	1002  NVMe SSD Controller MAP1002 (DRAM-less)
@@ -27554,6 +27928,7 @@
 	7010  AI controller A7010
 1e60  Hailo Technologies Ltd.
 	2864  Hailo-8 AI Processor
+	45c4  Hailo-10H AI Processor
 1e67  Untether AI
 	0002  runAI200 AI Inference Accelerator
 	0004  speedAI240 AI Inference Accelerator
@@ -27567,7 +27942,8 @@
 1e7c  Brainchip Inc
 	bca1  AKD1000 Neural Network Coprocessor [Akida]
 1e7e  Pliops
-	9034  Pliops Extreme Data Processor [XDP1.0]
+	0200  XDP [Extreme Data Processor PRO 1.0]
+	9034  XDP [Extreme Data Processor FLEX 1.0]
 1e7f  Jiangsu Huacun Elec. Tech. Co., Ltd.
 	6002  MMY MMSP350 PCIe 3 NVMe SSD (DRAM-less)
 	6003  MMY HC512GP3KH2T PCIe 3 NVMe SSD (DRAM-less)
@@ -27602,6 +27978,12 @@
 	1005  PLEXTOR M10P(GN) NVMe SSD M.2
 	1007  CL4-8D512 NVMe SSD M.2 (DRAM-less)
 	1008  CL5-8D512 NVMe SSD M.2 (DRAM-less)
+	100c  CL6 Series NVMe SSD M.2 (DRAM-less)
+	1010  CX3 Series NVMe SSD
+		1e95 0000  M.2 2280 480 GB
+		1e95 0001  M.2 2280 960 GB
+		1e95 0002  M.2 2280 1,920 GB
+		1e95 0003  M.2 2280 3,840 GB
 	3500  CA5-8D256 NVMe SSD M.2
 	35f1  PLEXTOR M9PGN Plus NVMe SSD M.2
 	9100  CL1-3D256-Q11 NVMe SSD M.2
@@ -27612,6 +27994,8 @@
 	2a18  Video Transcode Controller
 	2a20  Cloud Intelligent Inference and Training Controller
 	2a22  Cloud Intelligent Inference Controller
+	2a24  Cloud Intelligent Inference Controller
+	2a26  Cloud Intelligent Inference Controller
 	2a30  Cloud Video Transcode Controller
 1ea7  Intelliprop, Inc
 	223a  Typhon+ PCIe to Gen-Z Bridge
@@ -27639,30 +28023,59 @@
 	0100  SV100
 		1ec6 0010  VA1V
 		1ec6 0011  VA1A
-		1ec6 0012  VA1
+		1ec6 0012  VA1-16G
 		1ec6 0013  VA1E
-		1ec6 0020  VA10V
-		1ec6 0021  VA10A
-		1ec6 0022  VA10
+		1ec6 0014  VA1L
+		1ec6 0015  VA1-32G
+		1ec6 0020  VA10-32G
+		1ec6 0021  VA12-32G
+		1ec6 0022  VA16
+		1ec6 0023  VA10-64G
+		1ec6 0024  VA10L
+		1ec6 0025  VA12-64G
+		1ec6 0026  VA12-128G
 		1ec6 0030  VE1P
 		1ec6 0031  VE1S
 		1ec6 0032  VE1V
 		1ec6 0033  VE1M
 		1ec6 0034  VE1E
-		1ec6 0040  VV1U
+		1ec6 0035  VE1C
+		1ec6 0036  VE1MT
+		1ec6 003a  VR1S-8G
+		1ec6 003b  VR1S-16G
+		1ec6 003c  VR1M-8G
+		1ec6 003d  VR1M-16G
+		1ec6 003e  VR1MT-8G
+		1ec6 003f  VR1MT-16G
+		1ec6 0040  VA1M
 		1ec6 0041  VA1U
+		1ec6 0050  VAM
 	0200  SG100
 		1ec6 0060  VG1200
 		1ec6 0061  VG1600
 		1ec6 0062  VG1800
-		1ec6 0063  VG1000
+		1ec6 0063  VG1000-32G
+		1ec6 0064  VG600
+		1ec6 0065  VG800
+		1ec6 0066  VG1000-64G
+		1ec6 0067  VG1000-24G
+		1ec6 0068  VG1000c-24G
+		1ec6 0069  VG1000c-32G
+		1ec6 006a  VG1000c-64G
+		1ec6 006b  VG1000c-16G
+		1ec6 006c  VG1000c-48G
+		1ec6 006d  VG600c
+		1ec6 006e  VG800c
 	020f  SG100 vGPU
+	0300  SR100
 # nee Innosilicon Co Ltd
 1ec8  Beijing Fantasy Technology Co., Ltd.
 	8800  Fantasy I
 		1ec8 12a2  Fantasy I Device
 	8810  Fantasy I
 		1ec8 12a2  Fantasy I Device
+	8900  GR308
+	8902  GR3 Audio
 	9800  Fantasy II
 		1ec8 12a2  Fantasy II Device
 	9802  Fantasy II
@@ -27671,6 +28084,7 @@
 		1ec8 12a2  Fantasy II Device
 	9810  Fantasy II-M
 		1ec8 12a2  Fantasy II Device
+	9a00  GR316
 1ec9  Wingtech Group(HongKong)Limited
 1eca  Lightmatter
 	0000  Envise-B
@@ -27754,6 +28168,18 @@
 		1ee4 0425  NVMe SSD U.2 1.6TB (P8118Z3)
 		1ee4 0426  NVMe SSD U.2 3.2TB (P8118Z3)
 		1ee4 0427  NVMe SSD U.2 6.4TB (P8118Z3)
+		1ee4 0515  NVMe SSD U.2 1.92TB (P8118Z4)
+		1ee4 0516  NVMe SSD U.2 3.84TB (P8118Z4)
+		1ee4 0517  NVMe SSD U.2 7.68TB (P8118Z4)
+		1ee4 0525  NVMe SSD U.2 1.6TB (P8118Z4)
+		1ee4 0526  NVMe SSD U.2 3.2TB (P8118Z4)
+		1ee4 0527  NVMe SSD U.2 6.4TB (P8118Z4)
+		1ee4 0615  NVMe SSD U.2 1.92TB (P8128Z3)
+		1ee4 0616  NVMe SSD U.2 3.84TB (P8128Z3)
+		1ee4 0617  NVMe SSD U.2 7.68TB (P8128Z3)
+		1ee4 0625  NVMe SSD U.2 1.6TB (P8128Z3)
+		1ee4 0626  NVMe SSD U.2 3.2TB (P8128Z3)
+		1ee4 0627  NVMe SSD U.2 6.4TB (P8128Z3)
 		1ee4 3013  NVMe SSD AIC 480GB (P8118E)
 		1ee4 3014  NVMe SSD AIC 960GB (P8118E)
 		1ee4 3015  NVMe SSD AIC 1.92TB (P8118E)
@@ -27778,6 +28204,30 @@
 		1ee4 3225  NVMe SSD AIC 1.6TB (P8118X)
 		1ee4 3226  NVMe SSD AIC 3.2TB (P8118X)
 		1ee4 3227  NVMe SSD AIC 6.4TB (P8118X)
+		1ee4 3315  NVMe SSD AIC 1.92TB (P8118E4)
+		1ee4 3316  NVMe SSD AIC 3.84TB (P8118E4)
+		1ee4 3317  NVMe SSD AIC 7.68TB (P8118E4)
+		1ee4 3325  NVMe SSD AIC 1.6TB (P8118E4)
+		1ee4 3326  NVMe SSD AIC 3.2TB (P8118E4)
+		1ee4 3327  NVMe SSD AIC 6.4TB (P8118E4)
+		1ee4 3415  NVMe SSD AIC 1.92TB (P8118Z3)
+		1ee4 3416  NVMe SSD AIC 3.84TB (P8118Z3)
+		1ee4 3417  NVMe SSD AIC 7.68TB (P8118Z3)
+		1ee4 3425  NVMe SSD AIC 1.6TB (P8118Z3)
+		1ee4 3426  NVMe SSD AIC 3.2TB (P8118Z3)
+		1ee4 3427  NVMe SSD AIC 6.4TB (P8118Z3)
+		1ee4 3515  NVMe SSD AIC 1.92TB (P8118Z4)
+		1ee4 3516  NVMe SSD AIC 3.84TB (P8118Z4)
+		1ee4 3517  NVMe SSD AIC 7.68TB (P8118Z4)
+		1ee4 3525  NVMe SSD AIC 1.6TB (P8118Z4)
+		1ee4 3526  NVMe SSD AIC 3.2TB (P8118Z4)
+		1ee4 3527  NVMe SSD AIC 6.4TB (P8118Z4)
+		1ee4 3615  NVMe SSD AIC 1.92TB (P8128Z3)
+		1ee4 3616  NVMe SSD AIC 3.84TB (P8128Z3)
+		1ee4 3617  NVMe SSD AIC 7.68TB (P8128Z3)
+		1ee4 3625  NVMe SSD AIC 1.6TB (P8128Z3)
+		1ee4 3626  NVMe SSD AIC 3.2TB (P8128Z3)
+		1ee4 3627  NVMe SSD AIC 6.4TB (P8128Z3)
 		1ee4 abcd  NVMe SSD U.2
 	1181  PETA8118 NVMe E1S Series
 		1ee4 2015  NVMe SSD E1.S 1.92TB (P8118E)
@@ -27798,6 +28248,30 @@
 		1ee4 2225  NVMe SSD E1.S 1.6TB (P8118X)
 		1ee4 2226  NVMe SSD E1.S 3.2TB (P8118X)
 		1ee4 2227  NVMe SSD E1.S 6.4TB (P8118X)
+		1ee4 2315  NVMe SSD E1.S 1.92TB (P8118E4)
+		1ee4 2316  NVMe SSD E1.S 3.84TB (P8118E4)
+		1ee4 2317  NVMe SSD E1.S 7.68TB (P8118E4)
+		1ee4 2325  NVMe SSD E1.S 1.6TB (P8118E4)
+		1ee4 2326  NVMe SSD E1.S 3.2TB (P8118E4)
+		1ee4 2327  NVMe SSD E1.S 6.4TB (P8118E4)
+		1ee4 2415  NVMe SSD E1.S 1.92TB (P8118Z3)
+		1ee4 2416  NVMe SSD E1.S 3.84TB (P8118Z3)
+		1ee4 2417  NVMe SSD E1.S 7.68TB (P8118Z3)
+		1ee4 2425  NVMe SSD E1.S 1.6TB (P8118Z3)
+		1ee4 2426  NVMe SSD E1.S 3.2TB (P8118Z3)
+		1ee4 2427  NVMe SSD E1.S 6.4TB (P8118Z3)
+		1ee4 2515  NVMe SSD E1.S 1.92TB (P8118Z4)
+		1ee4 2516  NVMe SSD E1.S 3.84TB (P8118Z4)
+		1ee4 2517  NVMe SSD E1.S 7.68TB (P8118Z4)
+		1ee4 2525  NVMe SSD E1.S 1.6TB (P8118Z4)
+		1ee4 2526  NVMe SSD E1.S 3.2TB (P8118Z4)
+		1ee4 2527  NVMe SSD E1.S 6.4TB (P8118Z4)
+		1ee4 2615  NVMe SSD E1.S 1.92TB (P8128Z3)
+		1ee4 2616  NVMe SSD E1.S 3.84TB (P8128Z3)
+		1ee4 2617  NVMe SSD E1.S 7.68TB (P8128Z3)
+		1ee4 2625  NVMe SSD E1.S 1.6TB (P8128Z3)
+		1ee4 2626  NVMe SSD E1.S 3.2TB (P8128Z3)
+		1ee4 2627  NVMe SSD E1.S 6.4TB (P8128Z3)
 	1182  PETA8118 NVMe M2 Series
 		1ee4 1013  NVMe SSD M.2 480GB (P8118E)
 		1ee4 1014  NVMe SSD M.2 960GB (P8118E)
@@ -27823,6 +28297,46 @@
 		1ee4 1224  NVMe SSD M.2 800GB (P8118X)
 		1ee4 1225  NVMe SSD M.2 1.6TB (P8118X)
 		1ee4 1226  NVMe SSD M.2 3.2TB (P8118X)
+		1ee4 1313  NVMe SSD M.2 480GB (P8118E4)
+		1ee4 1314  NVMe SSD M.2 960GB (P8118E4)
+		1ee4 1315  NVMe SSD M.2 1.92TB (P8118E4)
+		1ee4 1316  NVMe SSD M.2 3.84TB (P8118E4)
+		1ee4 1317  NVMe SSD M.2 7.68TB (P8118E4)
+		1ee4 1323  NVMe SSD M.2 400GB (P8118E4)
+		1ee4 1324  NVMe SSD M.2 800GB (P8118E4)
+		1ee4 1325  NVMe SSD M.2 1.6TB (P8118E4)
+		1ee4 1326  NVMe SSD M.2 3.2TB (P8118E4)
+		1ee4 1327  NVMe SSD M.2 6.4TB (P8118E4)
+		1ee4 1413  NVMe SSD M.2 480GB (P8118Z3)
+		1ee4 1414  NVMe SSD M.2 960GB (P8118Z3)
+		1ee4 1415  NVMe SSD M.2 1.92TB (P8118Z3)
+		1ee4 1416  NVMe SSD M.2 3.84TB (P8118Z3)
+		1ee4 1417  NVMe SSD M.2 7.68TB (P8118Z3)
+		1ee4 1423  NVMe SSD M.2 400GB(P8118Z3)
+		1ee4 1424  NVMe SSD M.2 800GB (P8118Z3)
+		1ee4 1425  NVMe SSD M.2 1.6TB (P8118Z3)
+		1ee4 1426  NVMe SSD M.2 3.2TB (P8118Z3)
+		1ee4 1427  NVMe SSD M.2 6.4TB (P8118Z3)
+		1ee4 1513  NVMe SSD M.2 480GB (P8118Z4)
+		1ee4 1514  NVMe SSD M.2 960GB (P8118Z4)
+		1ee4 1515  NVMe SSD M.2 1.92TB (P8118Z4)
+		1ee4 1516  NVMe SSD M.2 3.84TB (P8118Z4)
+		1ee4 1517  NVMe SSD M.2 7.68TB (P8118Z4)
+		1ee4 1523  NVMe SSD M.2 400GB (P8118Z4)
+		1ee4 1524  NVMe SSD M.2 800GB (P8118Z4)
+		1ee4 1525  NVMe SSD M.2 1.6TB (P8118Z4)
+		1ee4 1526  NVMe SSD M.2 3.2TB (P8118Z4)
+		1ee4 1527  NVMe SSD M.2 6.4TB (P8118Z4)
+		1ee4 1613  NVMe SSD M.2 480GB (P8128Z3)
+		1ee4 1614  NVMe SSD M.2 960GB (P8128Z3)
+		1ee4 1615  NVMe SSD M.2 1.92TB (P8128Z3)
+		1ee4 1616  NVMe SSD M.2 3.84TB (P8128Z3)
+		1ee4 1617  NVMe SSD M.2 7.68TB (P8128Z3)
+		1ee4 1623  NVMe SSD M.2 400GB (P8128Z3)
+		1ee4 1624  NVMe SSD M.2 800GB (P8128Z3)
+		1ee4 1625  NVMe SSD M.2 1.6TB (P8128Z3)
+		1ee4 1626  NVMe SSD M.2 3.2TB (P8128Z3)
+		1ee4 1627  NVMe SSD M.2 6.4TB (P8128Z3)
 1ee9  SUSE LLC
 1eec  Viscore Technologies Ltd
 	0102  VSE250231S Dual-port 10Gb/25Gb Ethernet PCIe
@@ -27873,6 +28387,8 @@
 	1111  RBLN-CA11 (VF)
 	1120  RBLN-CA12 (PF)
 	1121  RBLN-CA12 (VF)
+	1210  RBLN-CA21 (PF)
+	1211  RBLN-CA21 (VF)
 	1220  RBLN-CA22 (PF)
 	1221  RBLN-CA22 (VF)
 	1250  RBLN-CA25 (PF)
@@ -27916,15 +28432,15 @@
 	3408  M18110 Lx Family OCP
 	3409  M18110 Family BASE-T OCP
 	340a  M18110 Lx Family BASE-T OCP
-	340b  M18120 Family
-	340c  M18120 Lx Family
-	340d  M18120 Family BASE-T
-	340e  M18120 Lx Family BASE-T
-	340f  M18120 Family OCP
-	3410  M18120 Lx Family OCP
-	3411  M18120 Family BASE-T OCP
-	3412  M18120 Lx Family BASE-T OCP
-	3413  M18100 Family Virtual Function
+	340b  M18000 Family
+	340c  M18000 Lx Family
+	340d  M18000 Family BASE-T
+	340e  M18000 Lx Family BASE-T
+	340f  M18000 Family OCP
+	3410  M18000 Lx Family OCP
+	3411  M18000 Family BASE-T OCP
+	3412  M18000 Lx Family BASE-T OCP
+	3413  M18000 Family Virtual Function
 	9088  D1055AS PCI Express Switch Downstream Port
 1f16  XConn Technologies
 # XConn XC50256 CXL2.0/PCIe5.0 switch
@@ -28004,21 +28520,115 @@
 1f44  VVDN Technologies Private Limited
 1f47  YUSUR Technology Co., Ltd.
 	1001  FLEXFLOW-2200T Ethernet Controller
-		1f47 0001  FLEXFLOW-2200T Ethernet 10G 2P
-		1f47 0002  FLEXFLOW-2200T Ethernet 25G 2P
-		1f47 0003  FLEXFLOW-2200T Ethernet 40G 2P
-		1f47 0004  FLEXFLOW-2200T Ethernet 100G 1P
-		1f47 0005  FLEXFLOW-2200T Ethernet 100G 2P
-		1f47 0006  FLEXFLOW-2200T Ethernet 10G 2P
-		1f47 0007  FLEXFLOW-2200T Ethernet 25G 2P
-		1f47 0008  FLEXFLOW-2200T Ethernet 40G 2P
-		1f47 0009  FLEXFLOW-2200T Ethernet 100G 1P
-		1f47 000a  FLEXFLOW-2200T Ethernet 100G 2P
-	1003  FLEXFLOW-2200T Ethernet Controller MGMT Function
+		1f47 0001  Ethernet 10G 2P FLEXFLOW-2200T
+		1f47 0002  Ethernet 25G 2P FLEXFLOW-2200T
+		1f47 0003  Ethernet 40G 2P FLEXFLOW-2200T
+		1f47 0004  Ethernet 100G 1P FLEXFLOW-2200T
+		1f47 0005  Ethernet 100G 2P FLEXFLOW-2200T
+		1f47 0006  Ethernet 10G 2P FLEXFLOW-2200T
+		1f47 0007  Ethernet 25G 2P FLEXFLOW-2200T
+		1f47 0008  Ethernet 40G 2P FLEXFLOW-2200T
+		1f47 0009  Ethernet 100G 1P FLEXFLOW-2200T
+		1f47 000a  Ethernet 100G 2P FLEXFLOW-2200T
+	1002  FLEXFLOW-2200T Ethernet Controller [Virtual Function]
+	1003  FLEXFLOW-2200T Ethernet Controller [MGMT Function]
+	1004  FLEXFLOW-2200T DATA Offload Engine
+	1005  CONFLUX-2200P NVMe Controller
+	1011  FLEXFLOW-2200T Ethernet Controller
+		1f47 0001  Ethernet 10G 2P FLEXFLOW-2200T
+		1f47 0002  Ethernet 25G 2P FLEXFLOW-2200T
+		1f47 0003  Ethernet 40G 2P FLEXFLOW-2200T
+		1f47 0004  Ethernet 100G 1P FLEXFLOW-2200T
+		1f47 0005  Ethernet 100G 2P FLEXFLOW-2200T
+		1f47 0006  Ethernet 10G 2P FLEXFLOW-2200T
+		1f47 0007  Ethernet 25G 2P FLEXFLOW-2200T
+		1f47 0008  Ethernet 40G 2P FLEXFLOW-2200T
+		1f47 0009  Ethernet 100G 1P FLEXFLOW-2200T
+		1f47 000a  Ethernet 100G 2P FLEXFLOW-2200T
+# RDMA-PF
+	1203  FLEXFLOW-2200T RoCEv2 Network Controller
 # Network Accelerating Card
 	2018  DPU Card
 # Network Accelerating Card
 	2020  DPU
+	3101  FLEXFLOW-2100R Ethernet Controller
+		1f47 0001  Ethernet 10G 2P FLEXFLOW-2100R
+		1f47 0002  Ethernet 25G 2P FLEXFLOW-2100R
+		1f47 0003  Ethernet 50G 2P FLEXFLOW-2100R
+		1f47 0004  Ethernet 100G 2P FLEXFLOW-2100R
+		1f47 0005  Ethernet 10G 2P FLEXFLOW-2100R
+		1f47 0006  Ethernet 25G 2P FLEXFLOW-2100R
+		1f47 0007  Ethernet 50G 2P FLEXFLOW-2100R
+		1f47 0008  Ethernet 100G 2P FLEXFLOW-2100R
+	3201  FLEXFLOW-2200R Ethernet Controller
+		1f47 0001  Ethernet 10G 2P FLEXFLOW-2200R
+		1f47 0002  Ethernet 25G 2P FLEXFLOW-2200R
+		1f47 0003  Ethernet 50G 2P FLEXFLOW-2200R
+		1f47 0004  Ethernet 100G 2P FLEXFLOW-2200R
+		1f47 0005  Ethernet 10G 2P FLEXFLOW-2200R
+		1f47 0006  Ethernet 25G 2P FLEXFLOW-2200R
+		1f47 0007  Ethernet 50G 2P FLEXFLOW-2200R
+		1f47 0008  Ethernet 100G 2P FLEXFLOW-2200R
+	3211  FLEXFLOW-2200R Ethernet Controller
+		1f47 0001  Ethernet 10G 2P FLEXFLOW-2200R
+		1f47 0002  Ethernet 25G 2P FLEXFLOW-2200R
+		1f47 0003  Ethernet 50G 2P FLEXFLOW-2200R
+		1f47 0004  Ethernet 100G 2P FLEXFLOW-2200R
+		1f47 0005  Ethernet 10G 2P FLEXFLOW-2200R
+		1f47 0006  Ethernet 25G 2P FLEXFLOW-2200R
+		1f47 0007  Ethernet 50G 2P FLEXFLOW-2200R
+		1f47 0008  Ethernet 100G 2P FLEXFLOW-2200R
+	4001  CONFLUX-2200E Ethernet Controller
+		1f47 0001  Ethernet 25G 2P CONFLUX-2200E
+		1f47 0002  Ethernet 40G 2P CONFLUX-2200E
+		1f47 0003  Ethernet 100G 1P CONFLUX-2200E
+		1f47 0004  Ethernet 100G 2P CONFLUX-2200E
+		1f47 0005  Ethernet 25G 2P CONFLUX-2200E
+		1f47 0006  Ethernet 40G 2P CONFLUX-2200E
+		1f47 0007  Ethernet 100G 1P CONFLUX-2200E
+		1f47 0008  Ethernet 100G 2P CONFLUX-2200E
+	4002  CONFLUX-2200E Ethernet Controller [Virtual Function]
+	4003  CONFLUX-2200E Ethernet Controller [MGMT Function]
+	4004  CONFLUX-2200E DATA Offload Engine
+	4203  CONFLUX-2200E RoCEv2 Network Controller
+	5001  CONFLUX-2200P Ethernet Controller
+		1f47 0001  Ethernet 25G 2P CONFLUX-2200P
+		1f47 0003  Ethernet 100G 2P CONFLUX-2200P
+		1f47 0004  Ethernet 25G 2P CONFLUX-2200P
+		1f47 0006  Ethernet 100G 2P CONFLUX-2200P
+		1f47 0007  Ethernet 25G 2P CONFLUX-2200P
+		1f47 0009  Ethernet 100G 2P CONFLUX-2200P
+		1f47 000a  Ethernet 25G 2P CONFLUX-2200P
+		1f47 000c  Ethernet 100G 2P CONFLUX-2200P
+	5002  CONFLUX-2200P Ethernet Controller [Virtual Function]
+	5003  CONFLUX-2200P NVMe Controller
+		1f47 0001  Ethernet 25G 2P CONFLUX-2200P
+		1f47 0003  Ethernet 100G 2P CONFLUX-2200P
+		1f47 0004  Ethernet 25G 2P CONFLUX-2200P
+		1f47 0006  Ethernet 100G 2P CONFLUX-2200P
+		1f47 0007  Ethernet 25G 2P CONFLUX-2200P
+		1f47 0009  Ethernet 100G 2P CONFLUX-2200P
+		1f47 000a  Ethernet 25G 2P CONFLUX-2200P
+		1f47 000c  Ethernet 100G 2P CONFLUX-2200P
+	5004  CONFLUX-2200P NVMe Controller [Virtual Function]
+	5005  CONFLUX-2200P Ethernet Controller [MGMT Function]
+		1f47 0001  CONFLUX-2200P Ethernet Controller [MGMT Function]
+		1f47 0002  CONFLUX-2200P Ethernet Controller [MGMT Function] DPU
+	5006  CONFLUX-2200P Ethernet Controller [YDMI Function]
+		1f47 0001  CONFLUX-2200P Ethernet Controller [YDMI Function]
+		1f47 0002  CONFLUX-2200P Ethernet Controller [YDMI Function] DPU
+	5007  CONFLUX-2200P DATA OFFLOAD ENGINE
+	5011  CONFLUX-2200P Ethernet Controller
+		1f47 0004  Ethernet 25G 2P CONFLUX-2200P
+		1f47 0006  Ethernet 100G 2P CONFLUX-2200P
+		1f47 000a  Ethernet 25G 2P CONFLUX-2200P
+		1f47 000c  Ethernet 100G 2P CONFLUX-2200P
+	5015  CONFLUX-2200P Ethernet Controller [MGMT Function]
+		1f47 0001  CONFLUX-2200P Ethernet Controller [MGMT Function]
+		1f47 0002  CONFLUX-2200P Ethernet Controller [MGMT Function] DPU
+	5016  CONFLUX-2200P Ethernet Controller [YDMI Function]
+		1f47 0001  CONFLUX-2200P Ethernet Controller [YDMI Function]
+		1f47 0002  CONFLUX-2200P Ethernet Controller [YDMI Function] DPU
 1f4b  Axera Semiconductor Co., Ltd
 1f52  MangoBoost Inc.
 	1008  Mango GPUBoost - RDMA
@@ -28037,7 +28647,11 @@
 	1059  metaFusion DPU SoC Network Interface
 	1111  YSA-100 RDMA Ethernet Network Controller
 		1bd4 00b2  O1E2YYSA100
+		1bd4 00b9  O2E1YYSA100
 		1ff9 00b1  ENFY1102-QP2
+		1ff9 00b8  ENFY1202-QP1
+		1ff9 00ba  ENFY1251-SP4
+		1ff9 00bb  ENFY1251-SP4 (Roce)
 	1112  metaScale SmartNIC Virtual Function
 	1151  metaVisor DPU Physical Function
 	1152  metaVisor DPU Virtual Function
@@ -28048,7 +28662,15 @@
 	0100  Default ID for Titanium FPGA PCIe Interface (AXI)
 1f82  d-Matrix
 	0011  Corsair [DMX 1000 Series]
+	00f1  Jetstream [DMX F1 Transparent NIC]
+1f90  Quside Technologies
+	7024  QRNG PCIe Device
+	7025  QRNG PCIe Device
 1f99  Shenzhen Techwinsemi Technology Co., Ltd.
+	1202  TWSC TE3420 series
+	1608  PCIe Gen4 x4 M.2 2280
+	1f88  TE3420 PCIe Gen3 x4 M.2 2280
+	3420  PCIe Gen3 x4 M.2 2280
 1f9d  Axelera AI
 	1100  Metis AIPU (rev 02)
 	11aa  Metis AIPU (rev 01)
@@ -28170,10 +28792,14 @@
 	2030  EIC7700 Root Complex
 1fe4  HippStor Technology
 	1600  HP600 Series NVMe SSD
+		1fe4 0001  Enterprise NVMe SSD U.2 15.36TB (HP600)
+		1fe4 0003  Enterprise NVMe SSD U.2 12.80TB (HP630)
+		1fe4 0011  Enterprise NVMe SSD U.2 30.72TB (HP620)
+		1fe4 0013  Enterprise NVMe SSD U.2 61.44TB (HP620)
 		1fe4 0075  Enterprise NVMe SSD U.2 3.84TB(HP610)
 		1fe4 0076  Enterprise NVMe SSD U.2 7.68TB(HP610)
-		1fe4 0077  Enterprise NVMe SSD U.2 6.40TB(HP630)
 		1fe4 0078  Enterprise NVMe SSD U.2 3.20TB(HP630)
+		1fe4 0079  Enterprise NVMe SSD U.2 6.40TB (HP630)
 1fe9  MemryX
 	0100  MX3
 # Linkdata Technology (Tianjin) Co., LTD
@@ -28219,11 +28845,16 @@
 		2036 0863  NF1618 Family NX863 (2*100GE)
 		2036 0864  NF1618 Family NX864 (1*200GE)
 	1619  NF1618 Family Virtual Function
+203b  XTX Markets Technologies Ltd.
 2046  GXMICRO Technology (Shanghai) Co., Ltd.
 2048  Beijing SpaceControl Technology Co.Ltd
+2058  Lime Microsystems Ltd.
 205c  Zhejiang VMing Semiconductor Co., Ltd.
+	1514  EP9410 U.2 1.92TB NVME SSD
 	1515  EP9410 U.2 3.84TB NVME SSD
-	1516  EP9410 U.2 7.68TB NVME SSD
+	1534  EP9430 U.2 1.6TB NVME SSD
+	1535  EP9430 U.2 3.2TB NVME SSD
+	1536  EP9430 U.2 6.4TB NVME SSD
 2061  Unis Flash Memory
 	4000  E4000 controller
 	4100  E4100 controller
@@ -28276,13 +28907,32 @@
 	5402  KCP54(02) 2280 PCIe G4 x4 TLC
 	5403  KCP54(03) 2280 PCIe G4 x4 TLC
 	5404  KCP54(04) 2280 PCIe G4 x4 TLC
+2099  Rolling Wireless S.a.r.l.
 209b  BitIntelligence Technology
 	1000  TCU Family - TCU-1
+	1001  TCU Family - TCU-1 Virtual Function
 209f  Mobilint, Inc.
 20a7  EEVengers Inc.
+20a8  Rayson HI-TECH(SZ) Co., Ltd.
 20a9  LDA Technologies Ltd.
 	1008  NEOTAPX FPGA Accelerator Card
 	1104  NEOTAPX FPGA Timing Synchronization Card
+20ba  Hangzhou Hikstorage Technology Co., Ltd.
+	1202  NAND memory controller
+		20ba 1202  NVMe SSD V2000 (DRAM-less)
+20bb  Quantum Machines
+	0111  OPNIC
+20bc  Xinsheng Technology Co., Ltd.
+	1001  Smart Network Adapter
+		20bc 1082  Ethernet Network Adapter XS-N1082-2X for 10GbE SFP+ Dual-port
+		20bc 2083  Ethernet Network Adapter XS-N2083-2X for 25GbE SFP28 SFP+ Dual-port ROCEv2
+		20bc 2084  Ethernet Network Adapter XS-N2084-2X for 25GbE SFP28 SFP+ Dual-port ROCEv2
+		20bc 4084  Ethernet Network Adapter XS-N4084-2X for 100GbE QSFP28/56 Dual-port
+	2001  Solid State Storage
+20d0  Telin Semiconductor (Wuhan) Co., Ltd.
+	2001  PACIFIC-S1 NVMe SSD
+20d2  Awide Labs LTD.
+	0200  XRaid [Extreme Performance Compression RAID Accelerator]
 20f4  TRENDnet
 2116  ZyDAS Technology Corp.
 21b4  Hunan Goke Microelectronics Co., Ltd
@@ -28323,7 +28973,7 @@
 	501c  NV2 NVMe SSD [E19T] (DRAM-less)
 	501d  NV2 NVMe SSD [TC2200] (DRAM-less)
 	501e  OM3PGP4 NVMe SSD (DRAM-less)
-	501f  FURY Renegade NVMe SSD + Heatsink [E18]
+	501f  FURY Renegade NVMe SSD [E18] (Heatsink)
 	5021  OM8SEP4 Design-In PCIe 4 NVMe SSD (QLC) (DRAM-less)
 	5022  OM8PGP4 Design-In PCIe 4 NVMe SSD (QLC) (DRAM-less)
 	5023  NV2 NVMe SSD [SM2269XT] (DRAM-less)
@@ -28333,7 +28983,10 @@
 	5027  NV3 NVMe SSD [E27T] (DRAM-less)
 	5028  NV3 NVMe SSD [SM2268XT2] (DRAM-less)
 	502a  FURY Renegade G5 NVMe SSD [SM2508]
+	502b  NV3 NVMe SSD [E29T] (DRAM-less)
 	502c  DC3000ME NVMe SSD [SC5]
+	502d  OM8TAP4 PCIe 4 NVMe SSD (QLC) (DRAM-less)
+	5030  NV3 2230 NVMe SSD [SM2268XT2] (DRAM-less)
 270b  Xantel Corporation
 270f  Chaintech Computer Co. Ltd
 2711  AVID Technology Inc.
@@ -28390,6 +29043,14 @@
 3475  Arista Networks, Inc.
 34ba  Ice Lake-LP PCI Express Root Port #3
 3513  ARCOM Control Systems Ltd
+3633  DeepCool
+	0001  AK400 DIGITAL CPU Air Cooler
+	0002  AK620 DIGITAL CPU Air Cooler
+	0003  AK500 DIGITAL CPU Air Cooler
+	0004  AK500S DIGITAL CPU Air Cooler
+	0005  CH560 DIGITAL PC Case
+	0006  LS Series (LS520 / LS720 SE DIGITAL) CPU Liquid Cooler
+	0007  MORPHEUS PC Case
 369a  HighSecLabs, Ltd.
 37d9  ITD Firm ltd.
 	1138  SCHD-PH-8 Phase detector
@@ -28449,6 +29110,7 @@
 	1004  Permedia
 	3d04  Permedia
 	ffff  Glint VGA
+3e08  Sinead Tech Co., Ltd
 4005  Avance Logic Inc.
 	0300  ALS300 PCI Audio Device
 	0308  ALS300+ PCI Audio Device
@@ -28490,6 +29152,8 @@
 4143  Digital Equipment Corp
 4144  Alpha Data
 	0044  ADM-XRCIIPro
+4149  AIMOTIVE Kft.
+	d011  HIL camera injector board
 4150  ONA Electroerosion
 	0001  PCI32TLITE FILSTRUP1 PCI to VME Bridge Controller
 	0006  PCI32TLITE UART 16550 Opencores
@@ -29046,6 +29710,7 @@
 	3d06  Arise-GT-10C0t
 	3d07  Arise2030
 	3d08  Arise2020
+	3d0e  Arise10D0
 	3d40  GLF HDMI/DP Audio
 	3d41  GLF HDMI/DP Audio
 	3d43  GLF HDMI/DP Audio
@@ -29894,11 +30559,14 @@
 		8086 0001  Ethernet Controller X710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking
 	0d00  Crystal Well DRAM Controller
 	0d01  Crystal Well PCI Express x16 Controller
+	0d03  Crystal Well Dynamic Platform and Thermal Framework Processor Participant
 	0d04  Crystal Well DRAM Controller
 	0d05  Crystal Well PCI Express x8 Controller
 	0d09  Crystal Well PCI Express x4 Controller
 	0d0c  Crystal Well HD Audio Controller
+	0d12  Crystal Well Integrated Graphics Controller
 	0d16  Crystal Well Integrated Graphics Controller
+	0d22  Crystal Well Integrated Iris Pro Graphics 5200
 	0d26  Crystal Well Integrated Graphics Controller
 	0d36  Crystal Well Integrated Graphics Controller
 	0d4c  Ethernet Connection (11) I219-LM
@@ -30658,6 +31326,9 @@
 		8086 4532  Desktop Board D815EEA2/D815EFV
 		8086 4541  D815EEA Motherboard
 		8086 4557  D815EGEW Mainboard
+	1133  Thunderbolt 4 Bridge [Maple Ridge 2C 2020]
+	1134  Thunderbolt 4 NHI [Maple Ridge 2C 2020]
+	1135  Thunderbolt 4 USB Controller [Maple Ridge 2C 2020]
 	1136  Thunderbolt 4 Bridge [Maple Ridge 4C 2020]
 	1137  Thunderbolt 4 NHI [Maple Ridge 4C 2020]
 	1138  Thunderbolt 4 USB Controller [Maple Ridge 4C 2020]
@@ -30891,6 +31562,9 @@
 		8086 0001  Ethernet Network Adapter E830-XXV-2 for OCP 3.0
 		8086 0003  Ethernet Network Adapter E830-XXV-2
 		8086 0004  Ethernet Network Adapter E830-XXV-4 for OCP 3.0
+		8086 0005  Ethernet Network Adapter E830-XXV-8F for OCP 3.0
+		8086 0006  Ethernet Network Adapter E830-XXV-8F
+		8086 0007  Ethernet Network Adapter E830-XXV-4F
 	12d4  Ethernet Controller E830-CC for SFP-DD
 	12d5  Ethernet Controller E830-C for backplane
 	12d8  Ethernet Controller E830-C for QSFP
@@ -31130,6 +31804,7 @@
 		1059 0190  RD20057 M.2 Dual 1GbE-T1 15m
 	1539  I211 Gigabit Network Connection
 	153a  Ethernet Connection I217-LM
+		1028 0617  Precision T5810
 		103c 1909  ZBook 15
 		103c 1998  EliteDesk 800 G1
 		17aa 220e  ThinkPad T440p
@@ -32501,6 +33176,7 @@
 		1734 1055  Amilo M1420
 		17aa 2013  ThinkPad R60e
 		17aa 20ae  ThinkPad T61/R61
+		17aa 20f4  ThinkPad T400
 		17c0 10d2  Medion Akoya E7214 Notebook PC [MD98410]
 		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
 		8086 544b  Desktop Board D425KT
@@ -34277,7 +34953,9 @@
 		17aa 20a6  ThinkPad T61/R61
 		17c0 4083  Medion WIM 2210 Notebook PC [MD96850]
 		e4bf cc47  CCG-RUMBA
+	2880  Ice Lake DDRIO Registers
 	28c0  Volume Management Device NVMe RAID Controller
+		1d49 011a  Intel VROC (VMD NVMe RAID) for ThinkSystem V4 PL
 	2912  82801IH (ICH9DH) LPC Interface Controller
 	2914  82801IO (ICH9DO) LPC Interface Controller
 		1028 0211  Optiplex 755
@@ -34506,18 +35184,22 @@
 		103c 2a6f  Asus IPIBL-LB Motherboard
 		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
 		1462 7345  MS-7345 Motherboard: Intel 82801I/IR [ICH9/ICH9R]
+		17aa 20f3  ThinkPad T400
 		8086 2940  Optiplex 755
 	2942  82801I (ICH9 Family) PCI Express Port 2
 		1028 020d  Inspiron 530
+		17aa 20f3  ThinkPad T400
 	2944  82801I (ICH9 Family) PCI Express Port 3
 		1028 020d  Inspiron 530
 		103c 2a6f  Asus IPIBL-LB Motherboard
 	2946  82801I (ICH9 Family) PCI Express Port 4
 		1028 020d  Inspiron 530
+		17aa 20f3  ThinkPad T400
 	2948  82801I (ICH9 Family) PCI Express Port 5
 		1028 020d  Inspiron 530
 		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
 		1462 7345  MS-7345 Motherboard: Intel 82801I/IR [ICH9/ICH9R]
+		17aa 20f3  ThinkPad T400
 	294a  82801I (ICH9 Family) PCI Express Port 6
 		1028 020d  Inspiron 530
 		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
@@ -34683,9 +35365,11 @@
 		e4bf cc4d  CCM-BOOGIE
 	2a42  Mobile 4 Series Chipset Integrated Graphics Controller
 		1028 02aa  Dell Inspiron 1545
+		17aa 20e4  ThinkPad T400
 		17aa 2112  ThinkPad T400
 		e4bf cc4d  CCM-BOOGIE
 	2a43  Mobile 4 Series Chipset Integrated Graphics Controller
+		17aa 20e4  ThinkPad T400
 		17aa 2112  ThinkPad T400
 		e4bf cc4d  CCM-BOOGIE
 	2a44  Mobile 4 Series Chipset MEI Controller
@@ -34693,6 +35377,7 @@
 	2a45  Mobile 4 Series Chipset MEI Controller
 	2a46  Mobile 4 Series Chipset PT IDER Controller
 	2a47  Mobile 4 Series Chipset AMT SOL Redirection
+		17aa 20ec  ThinkPad T400
 	2a50  Cantiga MEI Controller
 	2a51  Cantiga MEI Controller
 	2a52  Cantiga PT IDER Controller
@@ -35266,7 +35951,33 @@
 	3438  7500/5520/5500/X58 I/O Hub Throttle Registers
 	3440  Ice Lake UPI Misc
 	3441  Ice Lake UPI Link/Phy0
+	3442  Ice Lake UPI Phy0 Registers
+	3445  Ice Lake UPI Mesh Stop Registers
+	3446  Ice Lake UPI PMON0 Registers
+	3447  Ice Lake UPI PMON1 Registers
+	3448  Ice Lake PCU Registers
+	344a  Ice Lake Integrated Memory Controller
+	344b  Ice Lake PCU Registers
+	344c  Ice Lake CHA Registers
+	344d  Ice Lake CHA Registers
+	344f  Ice Lake CHA Registers
+	3450  Ice Lake Ubox Registers
+	3451  Ice Lake Ubox Registers
+	3452  Ice Lake Ubox Registers
+	3455  Ice Lake Ubox Registers
 	3456  Ice Lake NorthPeak
+	3457  Ice Lake CHA Registers
+	3458  Ice Lake PCU Registers
+	3459  Ice Lake PCU Registers
+	345a  Ice Lake PCU Registers
+	345b  Ice Lake PCU Registers
+	345c  Ice Lake PCU Registers
+	345d  Ice Lake PCU Registers
+	345e  Ice Lake PCU Registers
+	347a  Ice Lake PCI Express Root Port A
+	347b  Ice Lake PCI Express Root Port B
+	347c  Ice Lake PCI Express Root Port C
+	347d  Ice Lake PCI Express Root Port D
 	347e  Ice Lake Xeon Non-Transparent Bridge
 	3482  Ice Lake-LP LPC Controller
 	34a3  Ice Lake-LP SMBus Controller
@@ -35497,7 +36208,12 @@
 	372b  Xeon C5500/C3500 Core
 	372c  Xeon C5500/C3500 Reserved
 	373f  Xeon C5500/C3500 IOxAPIC
-	37c8  C62x Chipset QuickAssist Technology
+	37c0  C62x chipset series PCIe x16/x8 Upstream Port
+	37c2  C62x chipset series PCIe Virtual Switch Port 0
+	37c3  C62x chipset series PCIe Virtual Switch Port 1
+	37c4  C62x chipset series PCIe Virtual Switch Port 2
+	37c5  C62x chipset series PCIe Virtual Switch Port 3
+	37c8  C62x Chipset series QuickAssist Technology Physical Function 0~2
 		8086 0001  QuickAssist Adapter 8960
 		8086 0002  QuickAssist Adapter 8970
 	37c9  C62x Chipset QuickAssist Technology Virtual Function
@@ -35866,6 +36582,8 @@
 	3c2e  Xeon E5/Core i7 DMA
 	3c2f  Xeon E5/Core i7 DMA
 	3c40  Xeon E5/Core i7 IIO Switch and IRP Performance Monitor
+	3c41  Sandy Bridge QPI Port 0 Performance Monitor
+	3c42  Sandy Bridge QPI Port 1 Performance Monitor
 	3c43  Xeon E5/Core i7 Ring to PCI Express Performance Monitor
 	3c44  Xeon E5/Core i7 Ring to QuickPath Interconnect Link 0 Performance Monitor
 	3c45  Xeon E5/Core i7 Ring to QuickPath Interconnect Link 1 Performance Monitor
@@ -35874,9 +36592,11 @@
 	3c80  Xeon E5/Core i7 QPI Link 0
 	3c83  Xeon E5/Core i7 QPI Link Reut 0
 	3c84  Xeon E5/Core i7 QPI Link Reut 0
+	3c86  Sandy Bridge QPI Port 0 DFX Link
 	3c90  Xeon E5/Core i7 QPI Link 1
 	3c93  Xeon E5/Core i7 QPI Link Reut 1
 	3c94  Xeon E5/Core i7 QPI Link Reut 1
+	3c96  Sandy Bridge QPI Port 1 DFX Link
 	3ca0  Xeon E5/Core i7 Processor Home Agent
 	3ca8  Xeon E5/Core i7 Integrated Memory Controller Registers
 	3caa  Xeon E5/Core i7 Integrated Memory Controller Target Address Decoder 0
@@ -35916,6 +36636,7 @@
 	3e18  8th Gen Core 4-core Workstation Processor Host Bridge/DRAM Registers [Coffee Lake S]
 	3e1f  8th Gen Core 4-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S]
 		1458 5000  Z370 AORUS Gaming K3-CF
+	3e20  i9 Core / Xeon E 2200M Coffee Lake Host Bridge / DRAM Registers
 	3e30  8th/9th Gen Core 8-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S]
 	3e33  8th/9th Gen Core Processor Host Bridge/DRAM Registers [Coffee Lake]
 	3e34  Coffee Lake HOST and DRAM Controller
@@ -35944,7 +36665,7 @@
 	3ec2  8th Gen Core Processor Host Bridge/DRAM Registers
 		1028 0869  Vostro 3470
 		1043 8694  PRIME H310M-D
-	3ec4  8th Gen Core Processor Host Bridge/DRAM Registers
+	3ec4  8th/9th Gen Core Processor Host Bridge / DRAM Registers
 	3ec6  8th Gen Core Processor Host Bridge/DRAM Registers
 	3eca  8th Gen Core Processor Host Bridge/DRAM Registers
 	3ed0  8th Gen Core Processor Host Bridge/DRAM Registers
@@ -36396,9 +37117,16 @@
 		8086 0001  EtherExpress PRO/100 Server Ethernet Adapter
 	530d  80310 (IOP) IO Processor
 	5481  Alder Lake-N PCH eSPI Controller
+# https://edc.intel.com/content/www/us/en/design/products/platforms/processor-and-core-i3-n-series-datasheet-volume-1-of-2/002/pch-device-and-revision-ids/
+	54a0  Alder Lake-N P2SB Bridge
+	54a1  Alder Lake-N Power Management Controller (PMC)
 	54a3  Alder Lake-N SMBus
 	54a4  Alder Lake-N SPI (flash) Controller
+	54a6  Alder Lake-N Intel Trace Hub
 	54a8  Alder Lake-N Serial IO UART Host Controller
+	54a9  Alder Lake-N UART Controller
+	54aa  Alder Lake-N Generic SPI (GSPI) Controller #0
+	54ab  Alder Lake-N Generic SPI (GSPI) Controller #1
 	54b0  Alder Lake-N PCI Express Root Port #9
 	54b1  Alder Lake-N PCI Express Root Port #10
 	54b2  Alder Lake-N PCI Express Root Port #11
@@ -36408,13 +37136,34 @@
 	54ba  Alder Lake-N PCI Express Root Port #3
 	54bb  Alder Lake-N PCI Express Root Port #4
 	54be  Alder Lake-N PCI Express Root Port #7
+	54c4  Alder Lake-N eMMC Controller
+	54c5  Alder Lake-N I2C Controller #4
+	54c6  Alder Lake-N I2C Controller #5
+	54c7  Alder Lake-N UART Controller #2
 	54c8  Alder Lake-N PCH High Definition Audio Controller
+	54d0  Alder Lake-N Touch Host Controller #0 (THC #0)
+	54d1  Alder Lake-N Touch Host Controller #1 (THC #1)
 	54d3  Alder Lake-N SATA AHCI Controller
+	54da  Alder Lake-N UART Controller #3
 	54e0  Alder Lake-N PCH HECI Controller
-	54ed  Alder Lake-N PCH USB 3.2 xHCI Host Controller
+	54e1  Alder Lake-N PCH HECI Controller
+	54e4  Alder Lake-N PCH HECI Controller
+	54e5  Alder Lake-N PCH HECI Controller
+	54e8  Alder Lake-N PCH I2C Controller
+	54e9  Alder Lake-N PCH I2C Controller
+	54ea  Alder Lake-N PCH I2C Controller
+	54eb  Alder Lake-N PCH I2C Controller
+	54ed  Alder Lake-N PCH USB 3.2 Gen 2x1 (10 Gb/s) xHCI Host Controller
+	54ee  Alder Lake-N USB 3.2 Gen 1x1 (5 Gb/s) Device Controller (xDCI)
 	54ef  Alder Lake-N PCH Shared SRAM
-	54f0  CNVi: Wi-Fi
+	54f0  Alder Lake-N PCH CNVi WiFi
 		8086 0244  Wi-Fi 6 AX101NGW
+	54f1  Alder Lake-N PCH CNVi WiFi
+	54f2  Alder Lake-N PCH CNVi WiFi
+	54f3  Alder Lake-N PCH CNVi WiFi
+	54fb  Alder Lake-N Generic SPI (GSPI) Controller #2
+	54fc  Alder Lake-N Integrated Sensor Hub
+	54ff  Alder Lake-N UFS Controller
 	5502  Ethernet Controller (2) I225-LMvP
 		103c 87b9  Thunderbolt Dock G4 PCIe NIC
 		17aa 2303  ThinkPad Universal Thunderbolt 4 Dock PCIe NIC
@@ -36451,21 +37200,21 @@
 	56c0  ATS-M [Data Center GPU Flex 170]
 	56c1  ATS-M [Data Center GPU Flex 140]
 	56c2  ATS-M [Data Center GPU Flex 170V]
-	5780  Thunderbolt 80/120G Bridge [Barlow Ridge Host 80G 2023]
-	5781  Thunderbolt 80/120G NHI [Barlow Ridge Host 80G 2023]
-	5782  Thunderbolt 80/120G USB Controller [Barlow Ridge Host 80G 2023]
-	5783  Thunderbolt Bridge [Barlow Ridge Host 40G 2023]
-	5784  Thunderbolt NHI [Barlow Ridge Host 40G 2023]
-	5785  Thunderbolt USB Controller [Barlow Ridge Host 40G 2023]
-	5786  Thunderbolt 80/120G Bridge [Barlow Ridge Hub 80G 2023]
-	5787  Thunderbolt 80/120G USB Controller [Barlow Ridge Hub 80G 2023]
+	5780  JHL9580 Thunderbolt 5 80/120G Bridge [Barlow Ridge Host 80G 2023]
+	5781  JHL9580 Thunderbolt 5 80/120G NHI [Barlow Ridge Host 80G 2023]
+	5782  JHL9580 Thunderbolt 5 80/120G USB Controller [Barlow Ridge Host 80G 2023]
+	5783  JHL9540 Thunderbolt 4 Bridge [Barlow Ridge Host 40G 2023]
+	5784  JHL9540 Thunderbolt 4 NHI [Barlow Ridge Host 40G 2023]
+	5785  JHL9540 Thunderbolt 4 USB Controller [Barlow Ridge Host 40G 2023]
+	5786  JHL9480 Thunderbolt 5 80/120G Bridge [Barlow Ridge Hub 80G 2023]
+	5787  JHL9480 Thunderbolt 5 80/120G USB Controller [Barlow Ridge Hub 80G 2023]
 	5795  Granite Rapids Chipset LPC Controller
 	579c  Ethernet Connection E825-C for backplane
 	579d  Ethernet Connection E825-C for QSFP
 	579e  Ethernet Connection E825-C for SFP
 	579f  Ethernet Connection E825-C 10GbE
-	57a4  Thunderbolt Bridge [Barlow Ridge Hub 40G 2023]
-	57a5  Thunderbolt USB Controller [Barlow Ridge Hub 40G 2023]
+	57a4  JHL9440 Thunderbolt 4 Bridge [Barlow Ridge Hub 40G 2023]
+	57a5  JHL9440 Thunderbolt 4 USB Controller [Barlow Ridge Hub 40G 2023]
 	57ad  E610 Virtual Function
 	57ae  Ethernet Controller E610 Backplane
 	57af  Ethernet Controller E610 SFP
@@ -36559,8 +37308,11 @@
 	5ae8  Celeron N3350/Pentium N4200/Atom E3900 Series Low Pin Count Interface
 	5aee  Celeron N3350/Pentium N4200/Atom E3900 Series HSUART Controller #4
 	5af0  Celeron N3350/Pentium N4200/Atom E3900 Series Host Bridge
+	641d  Lunar Lake-M Dynamic Tuning Technology
 	6420  Lunar Lake [Intel Graphics]
 	643e  Lunar Lake NPU
+	645d  Lunar Lake IPU
+	647d  Lunar Lake-M Crashlog and Telemetry
 	64a0  Lunar Lake [Intel Arc Graphics 130V / 140V]
 	64b0  Lunar Lake [Intel Graphics]
 	65c0  5100 Chipset Memory Controller Hub
@@ -36920,6 +37672,7 @@
 	7af8  Alder Lake-S Integrated Sensor Hub
 	7afc  Alder Lake-S PCH Serial IO I2C Controller #4
 	7afd  Alder Lake-S PCH Serial IO I2C Controller #5
+	7d01  Meteor Lake-H 6p+8e cores Host Bridge/DRAM Controller
 	7d03  Meteor Lake-P Dynamic Tuning Technology
 	7d0b  Volume Management Device NVMe RAID Controller Intel Corporation
 	7d0d  Meteor Lake-P Platform Monitoring Technology
@@ -36935,6 +37688,7 @@
 	7dd1  Arrow Lake-P [Intel Graphics]
 	7dd5  Meteor Lake-P [Intel Graphics]
 	7e01  Meteor Lake-P LPC/eSPI Controller
+	7e02  Meteor Lake-H eSPI Controller
 	7e22  Meteor Lake-P SMBus Controller
 	7e23  Meteor Lake-P SPI Controller
 	7e24  Meteor Lake-P Trace Hub
@@ -36943,12 +37697,14 @@
 	7e27  Meteor Lake-P Serial IO SPI Controller #0
 	7e28  Meteor Lake-P HD Audio Controller
 	7e30  Meteor Lake-P Serial IO SPI Controller #1
+	7e3f  Meteor Lake-H/U PCIe Root Port #8
 	7e40  Meteor Lake PCH CNVi WiFi
 		8086 0094  Wi-Fi 6E AX211 160MHz
 # Refer from Intel Meteor Lake EDS (doc#640228) under its "Device IDs" section.
 	7e45  Meteor Lake-P Integrated Sensor Hub
 	7e46  Meteor Lake-P Serial IO SPI Controller #2
 	7e4c  Meteor Lake-P Gaussian & Neural-Network Accelerator
+	7e4d  Meteor Lake-H/U PCIe Root Port #9
 	7e50  Meteor Lake-P Serial IO I2C Controller #4
 	7e51  Meteor Lake-P Serial IO I2C Controller #5
 	7e52  Meteor Lake-P Serial IO UART Controller #2
@@ -36960,6 +37716,7 @@
 	7e7b  Meteor Lake-P Serial IO I2C Controller #3
 	7e7d  Meteor Lake-P USB 3.2 Gen 2x1 xHCI Host Controller
 	7e7e  Meteor Lake-P USB Device Controller
+	7e7f  Meteor Lake-H/U Shared SRAM
 	7ec0  Meteor Lake-P Thunderbolt 4 USB Controller
 	7ec2  Meteor Lake-P Thunderbolt 4 NHI #0
 	7ec3  Meteor Lake-P Thunderbolt 4 NHI #1
@@ -36967,6 +37724,8 @@
 	7ec5  Meteor Lake-P Thunderbolt 4 PCI Express Root Port #1
 	7ec6  Meteor Lake-P Thunderbolt 4 PCI Express Root Port #2
 	7ec7  Meteor Lake-P Thunderbolt 4 PCI Express Root Port #3
+	7eca  Meteor Lake-H/U PCIe Root Port #10
+	7ecc  Meteor Lake-H PCIe Root Port #12
 	7f70  Arrow Lake-S PCH CNVi WiFi
 		8086 0094  WiFi 6E AX211 160MHz
 	8002  Trusted Execution Technology Registers
@@ -37235,8 +37994,10 @@
 	8d08  C610/X99 series chipset 2-port SATA Controller [IDE mode]
 	8d0e  C610/X99 series chipset SATA Controller [RAID mode]
 	8d10  C610/X99 series chipset PCI Express Root Port #1
+		1028 0617  Precision T5810
 	8d11  C610/X99 series chipset PCI Express Root Port #1
 	8d12  C610/X99 series chipset PCI Express Root Port #2
+		1028 0617  Precision T5810
 	8d13  C610/X99 series chipset PCI Express Root Port #2
 	8d14  C610/X99 series chipset PCI Express Root Port #3
 	8d15  C610/X99 series chipset PCI Express Root Port #3
@@ -37251,24 +38012,30 @@
 	8d1e  C610/X99 series chipset PCI Express Root Port #8
 	8d1f  C610/X99 series chipset PCI Express Root Port #8
 	8d20  C610/X99 series chipset HD Audio Controller
+		1028 0617  Precision T5810
 	8d21  C610/X99 series chipset HD Audio Controller
 	8d22  C610/X99 series chipset SMBus Controller
+		1028 0617  Precision T5810
 		15d9 0821  X10DRW-i
 		15d9 0832  X10SRL-F
 	8d24  C610/X99 series chipset Thermal Subsystem
 		15d9 0821  X10DRW-i
 	8d26  C610/X99 series chipset USB Enhanced Host Controller #1
+		1028 0617  Precision T5810
 		15d9 0821  X10DRW-i
 		15d9 0832  X10SRL-F
 	8d2d  C610/X99 series chipset USB Enhanced Host Controller #2
+		1028 0617  Precision T5810
 		15d9 0821  X10DRW-i
 		15d9 0832  X10SRL-F
 	8d31  C610/X99 series chipset USB xHCI Host Controller
+		1028 0617  Precision T5810
 		15d9 0821  X10DRW-i
 		15d9 0832  X10SRL-F
 	8d33  C610/X99 series chipset LAN Controller
 	8d34  C610/X99 series chipset NAND Controller
 	8d3a  C610/X99 series chipset MEI Controller #1
+		1028 0617  Precision T5810
 		15d9 0821  X10DRW-i
 		15d9 0832  X10SRL-F
 	8d3b  C610/X99 series chipset MEI Controller #2
@@ -37281,6 +38048,7 @@
 	8d42  C610/X99 series chipset LPC Controller
 	8d43  C610/X99 series chipset LPC Controller
 	8d44  C610/X99 series chipset LPC Controller
+		1028 0617  Precision T5810
 		15d9 0821  X10DRW-i
 		15d9 0832  X10SRL-F
 	8d45  C610/X99 series chipset LPC Controller
@@ -37296,12 +38064,14 @@
 	8d4f  C610/X99 series chipset LPC Controller
 	8d60  C610/X99 series chipset sSATA Controller [IDE mode]
 	8d62  C610/X99 series chipset sSATA Controller [AHCI mode]
+		1028 0617  Precision T5810
 		15d9 0821  X10DRW-i
 	8d64  C610/X99 series chipset sSATA Controller [RAID mode]
 	8d66  C610/X99 series chipset sSATA Controller [RAID mode]
 	8d68  C610/X99 series chipset sSATA Controller [IDE mode]
 	8d6e  C610/X99 series chipset sSATA Controller [RAID mode]
 	8d7c  C610/X99 series chipset SPSR
+		1028 0617  Precision T5810
 		15d9 0821  X10DRW-i
 		15d9 0832  X10SRL-F
 	8d7d  C610/X99 series chipset MS SMBus 0
@@ -37889,6 +38659,7 @@
 	a1ea  C620 Series Chipset Family PCI Express Root Port #20
 	a1ec  C620 Series Chipset Family MROM 0
 	a1ed  C620 Series Chipset Family MROM 1
+	a1f0  C62x HD Audio Controller
 	a1f8  Lewisburg IE: HECI #1
 	a1f9  Lewisburg IE: HECI #2
 	a1fa  Lewisburg IE: IDE-r
@@ -37896,12 +38667,33 @@
 	a1fc  Lewisburg IE: HECI #3
 	a202  Lewisburg SATA Controller [AHCI mode]
 	a206  Lewisburg SATA Controller [RAID mode]
+	a210  Lewisburg PCI Express Root Port
+	a211  Lewisburg PCI Express Root Port
+	a212  Lewisburg PCI Express Root Port
+	a213  Lewisburg PCI Express Root Port
+	a214  Lewisburg PCI Express Root Port
+	a215  Lewisburg PCI Express Root Port
+	a216  Lewisburg PCI Express Root Port
+	a217  Lewisburg PCI Express Root Port
+	a218  Lewisburg PCI Express Root Port
+	a219  Lewisburg PCI Express Root Port
+	a21a  Lewisburg PCI Express Root Port
+	a21b  Lewisburg PCI Express Root Port
+	a21c  Lewisburg PCI Express Root Port
+	a21d  Lewisburg PCI Express Root Port
+	a21e  Lewisburg PCI Express Root Port
+	a21f  Lewisburg PCI Express Root Port
+	a221  Lewisburg Power Management Controller
 	a223  Lewisburg SMBus
 	a224  Lewisburg SPI Controller
 	a242  Lewisburg LPC or eSPI Controller
 	a243  Lewisburg LPC or eSPI Controller
 	a252  Lewisburg SSATA Controller [AHCI mode]
 	a256  Lewisburg SSATA Controller [RAID mode]
+	a267  Lewisburg PCI Express Root Port
+	a268  Lewisburg PCI Express Root Port
+	a269  Lewisburg PCI Express Root Port
+	a26a  Lewisburg PCI Express Root Port
 	a282  200 Series PCH SATA controller [AHCI mode]
 		1462 7a72  H270 PC MATE
 	a286  200 Series PCH SATA controller [RAID mode]
@@ -37975,11 +38767,14 @@
 		1028 0869  Vostro 3470
 	a305  Z390 Chipset LPC/eSPI Controller
 	a306  Q370 Chipset LPC/eSPI Controller
-	a308  300 Series Chipset Family LPC Controller
-	a309  Cannon Point-LP LPC Controller
+	a307  Q360 Chipset LPC/eSPI Controller
+	a308  B360 Chipset LPC/eSPI Controller
+	a309  C246 Chipset LPC/eSPI Controller
+	a30a  C242 Chipset LPC/eSPI Controller
 	a30c  QM370 Chipset LPC/eSPI Controller
-	a30d  HM470 Chipset LPC/eSPI Controller
-	a30e  Cannon Lake LPC Controller
+	a30d  HM370 Chipset LPC/eSPI Controller
+	a30e  CM246 Chipset LPC/eSPI Controller
+	a313  Cannon Lake LPC/eSPI Controller
 	a323  Cannon Lake PCH SMBus Controller
 		1028 0869  Vostro 3470
 	a324  Cannon Lake PCH SPI Controller
@@ -38110,14 +38905,21 @@
 	a840  BE201 320MHz
 	a845  Lunar Lake-M Integrated Sensor Hub
 	a847  Lunar Lake-M UFS Controller
+	a848  Lunar Lake-M Touch Host Controller #0 ID1
+	a849  Lunar Lake-M Touch Host Controller #0 ID2
+	a84a  Lunar Lake-M Touch Host Controller #1 ID1
+	a84b  Lunar Lake-M Touch Host Controller #1 ID2
 	a84e  Lunar Lake-M Thunderbolt 4 PCI Express Root Port #0
 	a84f  Lunar Lake-M Thunderbolt 4 PCI Express Root Port #1
 	a860  Lunar Lake-M Thunderbolt 4 PCI Express Root Port #2
+	a870  Lunar Lake-M CSME HECI #1
+	a873  Lunar Lake-M Keyboard and Text (KT) Redirection
 	a878  Lunar Lake-M Serial IO I2C Controller #0
 	a879  Lunar Lake-M Serial IO I2C Controller #1
 	a87a  Lunar Lake-M Serial IO I2C Controller #2
 	a87b  Lunar Lake-M Serial IO I2C Controller #3
 	a87d  Lunar Lake-M USB 3.2 Gen 2x1 xHCI Host Controller
+	a87f  Lunar Lake-M Shared SRAM
 	abc0  Omni-Path Fabric Switch Silicon 100 Series
 	ad0b  Volume Management Device NVMe RAID Controller Intel Corporation
 	ad1d  Arrow Lake NPU
@@ -38126,6 +38928,10 @@
 	b081  Panther Lake [Intel Graphics]
 	b082  Panther Lake [Intel Graphics]
 	b083  Panther Lake [Intel Graphics]
+	b084  Panther Lake [Intel Graphics]
+	b085  Panther Lake [Intel Graphics]
+	b086  Panther Lake [Intel Graphics]
+	b087  Panther Lake [Intel Graphics]
 	b08f  Panther Lake [Intel Graphics]
 	b090  Panther Lake [Intel Graphics]
 	b0a0  Panther Lake [Intel Graphics]
@@ -38172,9 +38978,14 @@
 	e20c  Battlemage G21 [Arc B570]
 	e20d  Battlemage G21 [Intel Graphics]
 	e210  Battlemage G21 [Intel Graphics]
+	e211  Battlemage G21 [Intel Graphics]
 	e212  Battlemage G21 [Intel Graphics]
 	e215  Battlemage G21 [Intel Graphics]
 	e216  Battlemage G21 [Intel Graphics]
+	e220  Battlemage G31 [Intel Graphics]
+	e221  Battlemage G31 [Intel Graphics]
+	e222  Battlemage G31 [Intel Graphics]
+	e223  Battlemage G31 [Intel Graphics]
 	f1a5  SSD 600P Series
 		8086 390a  SSDPEKKW256G7 256GB
 	f1a6  SSD DC P4101/Pro 7600p/760p/E 6100p Series
@@ -38183,6 +38994,8 @@
 	f1a8  SSD 660P Series
 	f1aa  SSD 670p Series [Keystone Harbor]
 	faf0  SSD 665p Series [Neptune Harbor Refresh]
+	fd80  Wildcat Lake [Intel Graphics]
+	fd81  Wildcat Lake [Intel Graphics]
 8088  Beijing Wangxun Technology Co., Ltd.
 	0100  WX1860AL-W Gigabit Ethernet Controller
 	0101  WX1860A2 Gigabit Ethernet Controller
@@ -38323,8 +39136,8 @@
 		4c52 3043  LRES3043PT Dual-port 1Gb Ethernet Server Adapter for OCP
 8866  T-Square Design Inc.
 8888  Silicon Magic
-# 4 port HDMI capture card
-	8504  AVMatrix VC42
+	8504  AVMatrix VC42 4-port HDMI Capture
+	8581  AVMatrix VC12 4K HDMI Capture
 8912  TRX
 # 8c4a is not Winbond but there is a board misprogrammed
 8c4a  Winbond
@@ -38892,6 +39705,7 @@
 	0001  SG2010 PCI over Starfabric Bridge
 	0002  SG2010 PCI to Starfabric Gateway
 	0003  SG1010 Starfabric Switch and PCI Bridge
+9999  MetaX Integrated Circuits (Shanghai) Co., Ltd.
 9a11  Tiger Lake-H Gaussian & Neural Accelerator
 9d32  Beijing Starblaze Technology Co. Ltd.
 	0000  STAR1000 PCIe NVMe SSD Controller
@@ -38905,6 +39719,7 @@
 	1501  STAR1500C NVMe SSD
 	1502  STAR1500E NVMe SSD
 	1504  STAR1500L NVMe SSD
+	1505  STAR1500K NVMe SSD
 # NVMe Gen5 Controller 16ch
 	1516  STAR1516 PCIe NVMe SSD Controller
 	2000  STAR2000 NVMe Controller
@@ -39016,6 +39831,7 @@ c0a9  Micron/Crucial Technology
 	5421  P3 Plus NVMe PCIe SSD (DRAM-less)
 	5426  P310 NVMe PCIe SSD (DRAM-less)
 	542b  T705 NVMe PCIe SSD
+	560b  E100 NVMe PCIe SSD (DRAM-less)
 c0de  Motorola
 c0fe  Motion Engineering, Inc.
 ca01  I-TEK OptoElectronics Co., LTD.
@@ -39104,6 +39920,8 @@ d20c  Chengdu BeiZhongWangXin Technology
 		d20c e421  N6S Series 2-port 40GbE Network Adapter
 		d20c ea21  N6S Series 2-port 100GbE Network Adapter
 d405  LeapIO
+	8200  LeapHBA
+	8201  LeapRAID
 d4d4  Dy4 Systems Inc
 	0601  PCI Mezzanine Card
 d531  I+ME ACTIA GmbH
@@ -39272,11 +40090,13 @@ edd8  ARK Logic Inc
 	a099  2000PV [Stingray]
 	a0a1  2000MT
 	a0a9  2000MI
+efab  Enfabrica
 # Found on M2N68-AM Motherboard
 f043  ASUSTeK Computer Inc. (Wrong ID)
 f05b  Foxconn International, Inc. (Wrong ID)
 f111  Framework Computer Inc.
 f117  Cerio
+	00ff  Test Device
 	1000  Emulated PCIe Switch
 	1010  Placeholder Device
 	1020  Pseudo-Device
@@ -39490,6 +40310,7 @@ C 08  Generic system peripheral
 	04  PCI Hot-plug controller
 	05  SD Host controller
 	06  IOMMU
+	07  Root Complex Event Collector
 	80  System peripheral
 	99  Timing Card
 # PTP Grandmaster Source Clock
diff -pruN 257.7-1/hwdb.d/usb.ids 257.9-0ubuntu2/hwdb.d/usb.ids
--- 257.7-1/hwdb.d/usb.ids	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/hwdb.d/usb.ids	2025-09-03 18:35:40.000000000 +0000
@@ -9,8 +9,8 @@
 #	The latest version can be obtained from
 #		http://www.linux-usb.org/usb.ids
 #
-# Version: 2025.04.01
-# Date:    2025-04-01 20:34:02
+# Version: 2025.07.26
+# Date:    2025-07-26 20:34:01
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -59,6 +59,8 @@
 	0112  Card Reader
 017c  MLK
 	145f  Trust Deskset
+019c  mek
+	0042  mek_42
 0200  TP-Link
 	0201  MA180 UMTS Modem
 0204  Chipsbank Microelectronics Co., Ltd
@@ -69,6 +71,9 @@
 0231  Sonuus Limited
 02ad  HUMAX Co., Ltd.
 	138c  PVR Mass Storage
+0300  Ajazz
+	1010  Akp153E Desktop Controller
+	1020  AKP153R Desktop Controller
 0303  Mini Automation Controller
 0324  OCZ Technology Inc
 	bc06  OCZ ATV USB 2.0 Flash Drive
@@ -95,7 +100,7 @@
 	0015  ATAPI Enclosure
 	2123  SiPix StyleCam Deluxe
 	8004  Aox 99001
-03e9  Thesys Microelectronics
+03e9  Melexis (formerly Thesys Microelectronics)
 03ea  Data Broadcasting Corp.
 03eb  Atmel Corp.
 	0902  4-Port Hub
@@ -257,6 +262,8 @@
 	0423  HS-COMBO Cardreader
 	042a  LaserJet M1132 MFP
 	0441  Prime [NW280AA, G8X92AA]
+	046b  Dock G5
+	0483  Engage Go 10 Tablet
 	0504  DeskJet 885c
 	0505  ScanJet 2100c
 	0507  DVD+RW
@@ -266,6 +273,7 @@
 	0517  LaserJet 1000
 	051d  Bluetooth Interface
 	052a  LaserJet M1212nf MFP
+	0583  Engage Go 10 Tablet
 	0601  ScanJet 6300c
 	0604  DeskJet 840c
 	0605  ScanJet 2200c
@@ -275,6 +283,7 @@
 	0624  Bluetooth Dongle
 	0641  X1200 Optical Mouse
 	0653  DeskJet 3700 series
+	0683  Engage Go 10 Tablet
 	0701  ScanJet 5300c/5370c
 	0704  DeskJet 825c
 	0705  ScanJet 4400c
@@ -325,6 +334,7 @@
 	1102  PhotoSmart 240 series
 	1104  DeskJet 959c
 	1105  ScanJet 5470c/5490c
+	110c  Pocket Media Drive
 	1111  OfficeJet v60
 	1116  Jornada 568 Pocket PC
 	1117  LaserJet 1300n
@@ -1013,6 +1023,7 @@
 	3000  Optical dual-touch panel
 	3001  Optical Touch Screen
 	3008  Optical Touch Screen
+	4033  HD Webcam
 	a060  HD Webcam
 0409  NEC Corp.
 	0011  PC98 Series Layout Keyboard Mouse
@@ -1029,6 +1040,7 @@
 	004e  SuperScript 1400 Series
 	004f  Wireless Keyboard with One-touch start buttons
 	0050  7-port hub
+	0056  uPD720133 IDE bridge
 	0058  HighSpeed Hub
 	0059  HighSpeed Hub
 	005a  HighSpeed Hub
@@ -1486,6 +1498,7 @@
 	4095  Live! Cam Sync HD [VF0770]
 	4097  Live! Cam Chat HD [VF0700/VF0790]
 	4099  Creative VF0800 [RealSense Camera SR300]
+	40a3  Live! Cam V3 2K [VF-0900]
 	4100  Nomad Jukebox 2
 	4101  Nomad Jukebox 3
 	4102  NOMAD MuVo^2
@@ -1959,6 +1972,7 @@
 	010d  3500-4500 series
 	010f  6500 series
 	0142  X3650 (Printer, Scanner, Copier)
+	01bd  S800 Series Scanner
 	01fa  S310 series
 	020e  RICOH Aficio SP 4410SF
 	4303  Xerox WorkCentre Pro 412
@@ -1982,6 +1996,7 @@
 	9a10  34UC88-B
 	9a11  34UC88-B
 	9a39  27UP850 - WK.AEUDCSN - External Monitor 4K
+	9a57  UltraGear Monitor
 	9c01  LGE Sync
 043f  RadiSys Corp.
 0440  Eizo Nanao Corp.
@@ -2007,6 +2022,7 @@
 044d  Siemens Nixdorf AG
 044e  Alps Electric Co., Ltd
 	1104  Japanese Keyboard
+	1218  Electric Touchpad
 	2002  MD-5500 Printer
 	2014  Bluetooth Device
 	3001  UGTZ4 Bluetooth
@@ -2737,6 +2753,8 @@
 	0180  Strait 3.0
 	01a4  MC 2.1 Mouse
 	01a6  MX BOARD 2.0S FL RGB DE Keyboard
+	0201  Smart Board 1150
+	0202  Smart Terminal 1150
 	b090  Keyboard
 	b091  Mouse
 	c099  Stream Keyboard TKL
@@ -2851,6 +2869,7 @@
 	08dd  QuickCam for Notebooks
 	08e0  QuickCam Express
 	08e1  Labtec Webcam
+	08e4  C505e HD Webcam
 	08e5  C920 PRO HD Webcam
 	08f0  QuickCam Messenger
 	08f1  QuickCam Express
@@ -3002,6 +3021,7 @@
 	c08e  G MX518 Gaming Mouse (MU0053)
 	c092  G102/G203 LIGHTSYNC Gaming Mouse
 	c093  M500s Optical Mouse
+	c09d  G102 LIGHTSYNC Gaming Mouse
 	c101  UltraX Media Remote
 	c110  Harmony 785/880/885 Remote
 	c111  Harmony 525 Remote
@@ -3060,6 +3080,7 @@
 	c24d  G710 Gaming Keyboard
 	c24e  G500s Laser Gaming Mouse
 	c24f  G29 Driving Force Racing Wheel [PS3]
+	c251  GamePanel for Dell XPS M1730
 	c260  G29 Driving Force Racing Wheel [PS4]
 	c262  G920 Driving Force Racing Wheel
 	c281  WingMan Force
@@ -3073,6 +3094,7 @@
 	c295  Momo Force Steering Wheel
 	c298  Driving Force Pro
 	c299  G25 Racing Wheel
+	c29a  Driving Force GT
 	c29b  G27 Racing Wheel
 	c29c  Speed Force Wireless Wheel for Wii
 	c2a0  Wingman Force Feedback Mouse
@@ -3110,6 +3132,7 @@
 	c335  G910 Orion Spectrum Mechanical Keyboard
 	c336  G213 Prodigy Gaming Keyboard
 	c33a  G413 Gaming Keyboard
+	c33e  G915 Mechanical Keyboard
 	c33f  G815 Mechanical Keyboard
 	c401  TrackMan Marble Wheel
 	c402  Marble Mouse (2-button)
@@ -3359,6 +3382,7 @@
 047c  Dell Computer Corp.
 	ffff  UPS Tower 500W LV
 047d  Kensington
+	00f2  VeriMark Desktop
 	1001  Mouse*in*a*Box
 	1002  Expert Mouse Pro
 	1003  Orbit TrackBall
@@ -3558,6 +3582,7 @@
 0485  Nokia Monitors
 0486  ASUS Computers, Inc.
 	0185  EeePC T91MT HID Touch Panel
+	573c  Xreal Light Microcontroller
 0487  Stewart Connector
 0488  Cirque Corp.
 0489  Foxconn / Hon Hai
@@ -3663,6 +3688,7 @@
 	1033  DGX-505
 	1037  PSR-E403
 	103c  MOTIF-RACK ES
+	1045  MM6
 	1054  S90XS Keyboard/Music Synthesizer
 	160f  P-105
 	1613  Clavinova CLP535
@@ -3892,9 +3918,11 @@
 	106d  S750 Printer
 	106e  S820D
 	1070  S530D
+	1071  Sony MPR-501
 	1072  I850 Printer
 	1073  I550 Printer
 	1074  S330 Printer
+	1075  Sony MPR-505
 	1076  i70
 	1077  i950
 	107a  S830D
@@ -4053,6 +4081,7 @@
 	178a  PIXMA MG3600 Series
 	178d  PIXMA MG6853
 	180b  PIXMA MG3000 series
+	183b  PIXMA MG3110 Series
 	1856  PIXMA TS6250
 	1900  CanoScan LiDE 90
 	1901  CanoScan 8800F
@@ -4060,6 +4089,7 @@
 	1905  CanoScan LiDE 200
 	1906  CanoScan 5600F
 	1907  CanoScan LiDE 700F
+	1908  CanoScan 9000F
 	1909  CanoScan LiDE 110
 	190a  CanoScan LiDE 210
 	190d  CanoScan 9000F Mark II
@@ -4621,6 +4651,7 @@
 	0434  D610
 	0436  D810
 	043f  D5600
+	0455  Z50II
 	0f03  PD-10 Wireless Printer Adapter
 	4000  Coolscan LS 40 ED
 	4001  LS 50 ED/Coolscan V ED
@@ -4907,11 +4938,19 @@
 	0891  Stylus Office BX535WD
 	0892  Stylus Office BX935FWD
 	0893  EP-774A
+	08d1  L220/L360 Series
 	0e03  Thermal Receipt Printer [TM-T20]
+	0e31  Thermal Receipt Printer [TM-L100]
 	1114  XP-440 [Expression Home Small-in-One Printer]
 	1115  ES-0133 [Expression Home XP-342]
 	1129  ET-4750 [WorkForce ET-4750 EcoTank All-in-One]
 	1168  Workforce WF-7820/7840 Series
+	1186  ET-2820 Series [ET-2820 EcoTank All-in-One]
+	118a  ET-2810/L3250 Series [EcoTank ET-2810/L3250]
+	118b  ET-2850/L4260 Series [EcoTank ET-2850/L4260]
+	11b0  XP-4200 Series [Expression Home XP-4200]
+	11b9  ET-2830/L3550 Series [EcoTank ET-2830/L3550]
+	11c8  ET-2860/L3270 Series [EcoTank ET-2860/L3270]
 04b9  Rainbow Technologies, Inc.
 	0300  SafeNet USB SuperPro/UltraPro
 	1000  iKey 1000 Token
@@ -4996,6 +5035,9 @@
 	1303  i3 Micro Module
 	1304  i3 Module
 	1305  i3 Multi Sensing Module
+	1400  Javelin Module Recovery
+	1401  Javelin Module
+	1500  Gas sensor demo board
 04c1  U.S. Robotics (3Com)
 	0020  56K Voice Pro
 	0022  56K Voice Pro
@@ -5034,7 +5076,9 @@
 	11f3  fi-6130Z
 	125a  PalmSecure Sensor Device - MP
 	132e  fi-7160
+	1526  PalmSecure-F Pro
 	159f  ScanSnap iX1500
+	15ff  Fi-8170 Document Scanner [Ricoh fi-8170: High Performance Desktop Scanner - PFU]
 	200f  Sigma DP2 (Mass Storage)
 	2010  Sigma DP2 (PictBridge)
 	201d  SATA 3.0 6Gbit/s Adaptor [GROOVY]
@@ -5067,6 +5111,7 @@
 	300f  Atheros AR3012 Bluetooth
 	3014  Qualcomm Atheros Bluetooth
 	3015  Qualcomm Atheros QCA9377 Bluetooth
+	3802  MediaTek Bluetooth MT7921
 	7022  HP HD Webcam
 	7025  HP HD Webcam
 	7046  TOSHIBA Web Camera - HD
@@ -15333,6 +15378,12 @@
 0e23  Liou Yuane Enterprise Co., Ltd
 0e25  VinChip Systems, Inc.
 0e26  J-Phone East Co., Ltd
+0e2c  Materialise Motion NV
+	0012  footscan pressure plate (0.5m)
+	0013  footscan pressure plate (1.0m)
+	0018  footscan 2D interface box
+	0020  footscan pressure plate (1.5m)
+	002d  footscan heavy duty pressure plate (1.0m)
 0e2e  Brady Worldwide, Inc.
 	000b  BMP 51
 	000c  BMP 61
diff -pruN 257.7-1/man/bootctl.xml 257.9-0ubuntu2/man/bootctl.xml
--- 257.7-1/man/bootctl.xml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/bootctl.xml	2025-09-03 18:35:40.000000000 +0000
@@ -264,7 +264,7 @@
 
     <variablelist>
       <varlistentry>
-        <term><option>kernel-identify</option> <replaceable>kernel</replaceable></term>
+        <term><option>kernel-identify</option> <replaceable>KERNEL-IMAGE</replaceable></term>
 
         <listitem><para>Takes a kernel image as argument. Checks what kind of kernel the image is. Returns
         one of <literal>uki</literal>, <literal>addon</literal>, <literal>pe</literal>, and
@@ -275,7 +275,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>kernel-inspect</option> <replaceable>kernel</replaceable></term>
+        <term><option>kernel-inspect</option> <replaceable>KERNEL-IMAGE</replaceable></term>
 
         <listitem><para>Takes a kernel image as argument. Prints details about the image.</para>
 
diff -pruN 257.7-1/man/html.in 257.9-0ubuntu2/man/html.in
--- 257.7-1/man/html.in	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/html.in	2025-09-03 18:35:40.000000000 +0000
@@ -1,5 +1,6 @@
 #!/bin/sh
 # SPDX-License-Identifier: LGPL-2.1-or-later
+
 set -e
 
 if [ -z "$1" ]; then
@@ -8,21 +9,21 @@ if [ -z "$1" ]; then
 fi
 
 # make sure the rules have been regenerated (in case update-man-rules was just run)
-ninja -C "@BUILD_ROOT@" version.h
+ninja -C @BUILD_ROOT@ version.h
 
 target="man/$1.html"
-ninja -C "@BUILD_ROOT@" "$target"
+ninja -C @BUILD_ROOT@ "$target"
 
-fullname="@BUILD_ROOT@/$target"
+fullname=@BUILD_ROOT@/"$target"
 if [ -f "$fullname" ]; then
     redirect="$(readlink "$fullname" || :)"
 else
     redirect=""
 fi
 if [ -n "$redirect" ]; then
-    ninja -C "@BUILD_ROOT@" "man/$redirect"
+    ninja -C @BUILD_ROOT@ "man/$redirect"
 
-    fullname="@BUILD_ROOT@/man/$redirect"
+    fullname=@BUILD_ROOT@"/man/$redirect"
 fi
 
 set -x
diff -pruN 257.7-1/man/importctl.xml 257.9-0ubuntu2/man/importctl.xml
--- 257.7-1/man/importctl.xml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/importctl.xml	2025-09-03 18:35:40.000000000 +0000
@@ -335,7 +335,7 @@
         <term><option>--machine=</option></term>
 
         <listitem><para>Connect to
-        <citerefentry><refentrytitle>systemd-import.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+        <citerefentry><refentrytitle>systemd-importd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
         running in a local container, to perform the specified operation within the container.</para>
 
         <xi:include href="version-info.xml" xpointer="v256"/></listitem>
diff -pruN 257.7-1/man/libsystemd.xml 257.9-0ubuntu2/man/libsystemd.xml
--- 257.7-1/man/libsystemd.xml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/libsystemd.xml	2025-09-03 18:35:40.000000000 +0000
@@ -62,7 +62,8 @@
     <citerefentry><refentrytitle>sd-id128</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
     <citerefentry><refentrytitle>sd-journal</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
     <citerefentry><refentrytitle>sd-json</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-    <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+    <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+    <citerefentry><refentrytitle>sd-path</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
     and
     <citerefentry><refentrytitle>sd-varlink</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     for information about different parts of the library interface.</para>
diff -pruN 257.7-1/man/loader.conf.xml 257.9-0ubuntu2/man/loader.conf.xml
--- 257.7-1/man/loader.conf.xml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/loader.conf.xml	2025-09-03 18:35:40.000000000 +0000
@@ -21,47 +21,50 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename><replaceable>ESP</replaceable>/loader/loader.conf</filename>,
-    <filename><replaceable>ESP</replaceable>/loader/entries/*.conf</filename>
-    <filename><replaceable>XBOOTLDR</replaceable>/loader/entries/*.conf</filename>
-    </para>
+    <para><filename><replaceable>ESP</replaceable>/loader/loader.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
     <title>Description</title>
 
     <para>
-    <citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry> will
-    read <filename><replaceable>ESP</replaceable>/loader/loader.conf</filename>, and any files with the
-    <literal>.conf</literal> extension under
-    <filename><replaceable>ESP</replaceable>/loader/entries/</filename> on the EFI system partition (ESP),
-    and <filename><replaceable>XBOOTLDR</replaceable>/loader/entries/</filename> on the extended boot loader
-    partition (XBOOTLDR) as defined by <ulink url="https://uapi-group.org/specifications/specs/boot_loader_specification">Boot Loader
-    Specification</ulink>.
+    <citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry> reads
+    <filename><replaceable>ESP</replaceable>/loader/loader.conf</filename>. This file configures whether the
+    menu is shown and for how long, the font, audible beep, types of menu entries to show, the default
+    choice, and some aspects of Secure Boot enrollment and firmware handling. See the list of available
+    options below.</para>
+
+    <para>The file uses UTF-8 encoding and consists of series of lines separated by "line feed" (i.e. ASCII
+    code 10). Lines that are empty or start with the comment sign (<literal>#</literal>) are ignored. Other
+    lines consist of an option name, followed by whitespace, and the option value.
     </para>
 
-    <para>Each of these configuration files must consist of series of newline (i.e. ASCII code 10) separated
-    lines, each consisting of an option name, followed by whitespace, and the option
-    value. <literal>#</literal> may be used to start a comment line. Empty and comment lines are ignored. The
-    files use UTF-8 encoding.</para>
-
     <para>Boolean arguments may be written as
-    <literal>yes</literal>/<literal>y</literal>/<literal>true</literal>/<literal>t</literal>/<literal>on</literal>/<literal>1</literal> or
+    <literal>yes</literal>/<literal>y</literal>/<literal>true</literal>/<literal>t</literal>/<literal>on</literal>/<literal>1</literal>
+    or
     <literal>no</literal>/<literal>n</literal>/<literal>false</literal>/<literal>f</literal>/<literal>off</literal>/<literal>0</literal>.
     </para>
+
+    <para>Note: <command>systemd-boot</command> will also read boot loader entry files,
+    type #1 (<filename><replaceable>ESP</replaceable>/loader/entries/*.conf</filename> and
+    <filename><replaceable>XBOOTLDR</replaceable>/loader/entries/*.conf</filename>)
+    and type #2 (<filename><replaceable>ESP</replaceable>/EFI/Linux/*.uki</filename>
+    and <filename><replaceable>XBOOTLDR</replaceable>/EFI/Linux/*.uki</filename>).
+    Those files are described by the
+    <ulink url="https://uapi-group.org/specifications/specs/boot_loader_specification">Boot Loader
+    Specification</ulink>.</para>
+
+    <para>Note: the behaviour of <command>systemd-boot</command> is also influenced by EFI variables. Some of
+    the settings specified in this file can be overridden by those, for example the default boot menu entry
+    or the menu timeouts. See
+    <citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry> for
+    details.</para>
   </refsect1>
 
   <refsect1>
     <title>Options</title>
 
-    <para>The configuration options supported by
-    <filename><replaceable>ESP</replaceable>/loader/entries/*.conf</filename> and
-    <filename><replaceable>XBOOTLDR</replaceable>/loader/entries/*.conf</filename> files are defined as part
-    of the <ulink url="https://uapi-group.org/specifications/specs/boot_loader_specification">Boot Loader
-    Specification</ulink>.</para>
-
-    <para>The following configuration are supported by the <filename>loader.conf</filename> configuration
-    file:</para>
+    <para>The following configuration are supported in <filename>loader.conf</filename>:</para>
 
     <variablelist>
       <varlistentry>
@@ -252,10 +255,31 @@
       </varlistentry>
 
       <varlistentry>
+        <term>auto-reboot</term>
+
+        <listitem><para>A boolean controlling the presence of the <literal>Reboot The System</literal>
+        entry (disabled by default). Even if this is disabled, the system may still be rebooted by pressing
+        <keycombo><keycap>Shift</keycap><keycap>b</keycap></keycombo>.</para>
+
+        <xi:include href="version-info.xml" xpointer="v255"/></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>auto-poweroff</term>
+
+        <listitem><para>A boolean controlling the presence of the <literal>Power Off The System</literal>
+        entry (disabled by default). Even if this is disabled, the system may still be powered off by
+        pressing <keycombo><keycap>Shift</keycap><keycap>o</keycap></keycombo>.</para>
+
+        <xi:include href="version-info.xml" xpointer="v255"/></listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term>beep</term>
 
-        <listitem><para>Takes a boolean argument. If timeout enabled beep every second, otherwise beep n times when n-th entry in boot menu is selected (default disabled).
-        Currently, only x86 is supported, where it uses the PC speaker.</para>
+        <listitem><para>Takes a boolean argument. If timeout enabled beep every second, otherwise beep n
+        times when n-th entry in boot menu is selected (default disabled). Currently, only x86 is supported,
+        where it uses the PC speaker.</para>
 
         <xi:include href="version-info.xml" xpointer="v251"/></listitem>
       </varlistentry>
@@ -379,8 +403,8 @@ sbvarsign --attr "${attr}" --key KEK.key
         <listitem><para>Caveat: This feature is experimental, and is likely to be changed (or removed in its
         current form) in a future version of systemd.</para>
 
-        <para>Work around BitLocker requiring a recovery key when the boot loader was
-        updated (disabled by default).</para>
+        <para>Work around BitLocker requiring a recovery key when the boot loader was updated (disabled by
+        default).</para>
 
         <para>Try to detect BitLocker encrypted drives along with an active TPM. If both are found and
         Windows Boot Manager is selected in the boot menu, set the <literal>BootNext</literal> EFI variable
diff -pruN 257.7-1/man/man.in 257.9-0ubuntu2/man/man.in
--- 257.7-1/man/man.in	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/man.in	2025-09-03 18:35:40.000000000 +0000
@@ -9,22 +9,22 @@ if [ -z "$1" ]; then
 fi
 
 # make sure the rules have been regenerated (in case update-man-rules was just run)
-ninja -C "@BUILD_ROOT@" version.h
+ninja -C @BUILD_ROOT@ version.h
 
 page="$(echo "$1" | sed 's/\./\\./')"
-target=$(ninja -C "@BUILD_ROOT@" -t query man/man | grep -E -m1 "man/$page\.[0-9]$" | awk '{print $2}')
+target=$(ninja -C @BUILD_ROOT@ -t query man/man | grep -E -m1 "man/$page\.[0-9]$" | awk '{print $2}')
 if [ -z "$target" ]; then
     echo "Cannot find page $1"
     exit 1
 fi
-ninja -C "@BUILD_ROOT@" "$target"
+ninja -C @BUILD_ROOT@ "$target"
 
-fullname="@BUILD_ROOT@/$target"
+fullname=@BUILD_ROOT@/"$target"
 redirect="$(sed -n -r '1 s|^\.so man[0-9]/(.*)|\1|p' "$fullname")"
 if [ -n "$redirect" ]; then
-    ninja -C "@BUILD_ROOT@" "man/$redirect"
+    ninja -C @BUILD_ROOT@ "man/$redirect"
 
-    fullname="@BUILD_ROOT@/man/$redirect"
+    fullname=@BUILD_ROOT@"/man/$redirect"
 fi
 
 exec man "$fullname"
diff -pruN 257.7-1/man/meson.build 257.9-0ubuntu2/man/meson.build
--- 257.7-1/man/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -29,7 +29,6 @@ custom_html_xsl = files('custom-html.xsl
 xslt_cmd = [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags
 
 custom_entities_ent = custom_target(
-        'custom-entities.ent',
         input : 'custom-entities.ent.in',
         output : 'custom-entities.ent',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'])
@@ -76,7 +75,6 @@ foreach tuple : manpages
 
                 if xsltproc.found()
                         p1 = custom_target(
-                                man,
                                 input : xml,
                                 output : [man] + manaliases,
                                 command : xslt_cmd + [custom_man_xsl, '@INPUT@'],
@@ -88,7 +86,6 @@ foreach tuple : manpages
                         p2 = []
                         foreach htmlalias : htmlaliases
                                 link = custom_target(
-                                        htmlalias,
                                         output : htmlalias,
                                         command : [ln, '-fs', html, '@OUTPUT@'])
                                 if want_html
@@ -99,7 +96,6 @@ foreach tuple : manpages
                         endforeach
 
                         p3 = custom_target(
-                                html,
                                 input : xml,
                                 output : html,
                                 command : xslt_cmd + [custom_html_xsl, '@INPUT@'],
@@ -121,7 +117,6 @@ if not have_lxml
 endif
 
 systemd_directives_xml = custom_target(
-        'systemd.directives.xml',
         input : ['directives-template.xml', source_xml_files],
         output : 'systemd.directives.xml',
         depends : man_page_depends,
@@ -129,7 +124,6 @@ systemd_directives_xml = custom_target(
 
 nonindex_xml_files = source_xml_files + [systemd_directives_xml]
 systemd_index_xml = custom_target(
-        'systemd.index.xml',
         input : nonindex_xml_files,
         output : 'systemd.index.xml',
         command : [make_man_index_py, '@OUTPUT@'] + nonindex_xml_files)
@@ -146,7 +140,6 @@ foreach tuple : xsltproc.found() ? [['sy
         mandirn = get_option('mandir') / ('man' + section)
 
         p1 = custom_target(
-                man,
                 input : xml,
                 output : man,
                 command : xslt_cmd + [custom_man_xsl, '@INPUT@'],
@@ -158,7 +151,6 @@ foreach tuple : xsltproc.found() ? [['sy
         if html == 'systemd.index.html'
                 htmlalias = 'index.html'
                 link = custom_target(
-                        htmlalias,
                         input : p2,
                         output : htmlalias,
                         command : [ln, '-fs', html, '@OUTPUT@'])
@@ -170,7 +162,6 @@ foreach tuple : xsltproc.found() ? [['sy
         endif
 
         p3 = custom_target(
-                html,
                 input : xml,
                 output : html,
                 command : xslt_cmd + [custom_html_xsl, '@INPUT@'],
@@ -183,13 +174,11 @@ endforeach
 # Cannot use run_target because those targets are used in depends
 # Also see https://github.com/mesonbuild/meson/issues/368.
 man = custom_target(
-        'man',
         output : 'man',
         depends : man_pages,
         command : [echo])
 
 html = custom_target(
-        'html',
         output : 'html',
         depends : html_pages,
         command : [echo])
diff -pruN 257.7-1/man/org.freedesktop.systemd1.xml 257.9-0ubuntu2/man/org.freedesktop.systemd1.xml
--- 257.7-1/man/org.freedesktop.systemd1.xml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/org.freedesktop.systemd1.xml	2025-09-03 18:35:40.000000000 +0000
@@ -2552,9 +2552,9 @@ node /org/freedesktop/systemd1/unit/avah
 
       <para><varname>SubState</varname> encodes states of the same state machine that
       <varname>ActiveState</varname> covers, but knows more fine-grained states that are
-      unit-type-specific. Where <varname>ActiveState</varname> only covers six high-level states,
+      unit-type-specific. Where <varname>ActiveState</varname> only covers eight high-level states,
       <varname>SubState</varname> covers possibly many more low-level unit-type-specific states that are
-      mapped to the six high-level states. Note that multiple low-level states might map to the same
+      mapped to the eight high-level states. Note that multiple low-level states might map to the same
       high-level state, but not vice versa. Not all high-level states have low-level counterparts on all unit
       types. At this point the low-level states are not documented here, and are more likely to be extended
       later on than the common high-level states explained above.</para>
diff -pruN 257.7-1/man/org.freedesktop.timedate1.xml 257.9-0ubuntu2/man/org.freedesktop.timedate1.xml
--- 257.7-1/man/org.freedesktop.timedate1.xml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/org.freedesktop.timedate1.xml	2025-09-03 18:35:40.000000000 +0000
@@ -196,8 +196,8 @@ $ gdbus introspect --system \
     <title>See Also</title>
     <para><simplelist type="inline">
       <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-timedate.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>timedatectl.service</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-timedated.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>timedatectl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><ulink url="https://lists.freedesktop.org/archives/systemd-devel/2011-May/002526.html">More information on how the system clock and RTC interact</ulink></member>
     </simplelist></para>
   </refsect1>
diff -pruN 257.7-1/man/org.freedesktop.timesync1.xml 257.9-0ubuntu2/man/org.freedesktop.timesync1.xml
--- 257.7-1/man/org.freedesktop.timesync1.xml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/org.freedesktop.timesync1.xml	2025-09-03 18:35:40.000000000 +0000
@@ -157,7 +157,7 @@ $ gdbus introspect --system \
     <title>See Also</title>
     <para><simplelist type="inline">
       <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-timesync.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-timesyncd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
     </simplelist></para>
   </refsect1>
 </refentry>
diff -pruN 257.7-1/man/os-release.xml 257.9-0ubuntu2/man/os-release.xml
--- 257.7-1/man/os-release.xml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/os-release.xml	2025-09-03 18:35:40.000000000 +0000
@@ -108,8 +108,9 @@
       follows the syntax and rules as described in the <ulink
       url="https://systemd.io/PORTABLE_SERVICES">Portable Services</ulink> page. The purpose of this
       file is to identify the extension and to allow the operating system to verify that the extension image
-      matches the base OS. This is typically implemented by checking that the <varname>ID=</varname> options
-      match, and either <varname>SYSEXT_LEVEL=</varname> exists and matches too, or if it is not present,
+      matches the base OS. This is typically implemented by checking that the extension <varname>ID=</varname>
+      option either matches the host <varname>ID=</varname> option or is included the host <varname>ID_LIKE=</varname>
+      option, and either <varname>SYSEXT_LEVEL=</varname> exists and matches too, or if it is not present,
       <varname>VERSION_ID=</varname> exists and matches. This ensures ABI/API compatibility between the
       layers and prevents merging of an incompatible image in an overlay.</para>
 
@@ -639,7 +640,7 @@
       set.</para>
 
       <para>Operating system vendors may extend the file format and introduce new fields. It is highly
-      recommended to prefix new fields with an OS specific name in order to avoid name clashes. Applications
+      recommended to prefix new fields with an OS-specific name in order to avoid name clashes. Applications
       reading this file must ignore unknown fields.</para>
 
       <para>Example: <literal>DEBIAN_BTS="debbugs://bugs.debian.org/"</literal>.</para>
diff -pruN 257.7-1/man/repart.d.xml 257.9-0ubuntu2/man/repart.d.xml
--- 257.7-1/man/repart.d.xml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/repart.d.xml	2025-09-03 18:35:40.000000000 +0000
@@ -593,7 +593,7 @@
         <citerefentry project="url"><refentrytitle url="https://btrfs.readthedocs.io/en/latest/btrfs.html">btrfs</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
 
         <para>Note that this option is only supported in combination with <option>--offline=yes</option>
-        since <filename>btrfs-progs</filename> 6.11 or newer.</para>
+        since <filename>btrfs-progs</filename> 6.12 or newer.</para>
 
         <xi:include href="version-info.xml" xpointer="v255"/></listitem>
       </varlistentry>
@@ -610,7 +610,7 @@
         </para>
 
         <para>Note that this option is only supported in combination with <option>--offline=yes</option>
-        since <filename>btrfs-progs</filename> 6.11 or newer.</para>
+        since <filename>btrfs-progs</filename> 6.12 or newer.</para>
 
         <xi:include href="version-info.xml" xpointer="v256"/></listitem>
       </varlistentry>
diff -pruN 257.7-1/man/rules/meson.build 257.9-0ubuntu2/man/rules/meson.build
--- 257.7-1/man/rules/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/rules/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -155,6 +155,7 @@ manpages = [
  ['sd-journal', '3', [], ''],
  ['sd-json', '3', [], ''],
  ['sd-login', '3', [], 'HAVE_PAM'],
+ ['sd-path', '3', [], ''],
  ['sd-varlink', '3', [], ''],
  ['sd_booted', '3', [], ''],
  ['sd_bus_add_match',
diff -pruN 257.7-1/man/sd-path.xml 257.9-0ubuntu2/man/sd-path.xml
--- 257.7-1/man/sd-path.xml	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/man/sd-path.xml	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,59 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
+
+<refentry id="sd-path"
+  xmlns:xi="http://www.w3.org/2001/XInclude">
+
+  <refentryinfo>
+    <title>sd-path</title>
+    <productname>systemd</productname>
+  </refentryinfo>
+
+  <refmeta>
+    <refentrytitle>sd-path</refentrytitle>
+    <manvolnum>3</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>sd-path</refname>
+    <refpurpose>APIs to query file system paths</refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcsynopsisinfo>#include &lt;systemd/sd-path.h&gt;</funcsynopsisinfo>
+    </funcsynopsis>
+
+    <cmdsynopsis>
+      <command>pkg-config --cflags --libs libsystemd</command>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title>Description</title>
+
+    <para><filename>sd-path.h</filename> is part of
+    <citerefentry><refentrytitle>libsystemd</refentrytitle><manvolnum>3</manvolnum></citerefentry> and
+    provides APIs to query file system paths. This functionality is similar to the command-line
+    functionality provided by
+    <citerefentry><refentrytitle>systemd-path</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
+    </para>
+
+    <para>See
+    <citerefentry><refentrytitle>sd_path_lookup</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+    for information about the functions available.</para>
+  </refsect1>
+
+  <xi:include href="libsystemd-pkgconfig.xml" />
+
+  <refsect1>
+    <title>See Also</title>
+    <para><simplelist type="inline">
+      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-path</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <member><citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+    </simplelist></para>
+  </refsect1>
+</refentry>
diff -pruN 257.7-1/man/sd_id128_to_string.xml 257.9-0ubuntu2/man/sd_id128_to_string.xml
--- 257.7-1/man/sd_id128_to_string.xml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/sd_id128_to_string.xml	2025-09-03 18:35:40.000000000 +0000
@@ -44,7 +44,7 @@
       </funcprototype>
 
       <funcprototype>
-        <funcdef>char *<function>sd_id128_uuid_string</function></funcdef>
+        <funcdef>char *<function>sd_id128_to_uuid_string</function></funcdef>
         <paramdef>sd_id128_t <parameter>id</parameter>, char <parameter>s</parameter>[static SD_ID128_UUID_STRING_MAX]</paramdef>
       </funcprototype>
 
@@ -113,7 +113,7 @@
     <title>History</title>
     <para><function>sd_id128_to_string()</function> and
     <function>sd_id128_from_string()</function> were added in version 187.</para>
-    <para><function>sd_id128_uuid_string()</function> was added in version 251.</para>
+    <para><function>sd_id128_to_uuid_string()</function> was added in version 251.</para>
   </refsect1>
 
   <refsect1>
diff -pruN 257.7-1/man/systemd-boot.xml 257.9-0ubuntu2/man/systemd-boot.xml
--- 257.7-1/man/systemd-boot.xml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/systemd-boot.xml	2025-09-03 18:35:40.000000000 +0000
@@ -149,6 +149,8 @@
         <term><keycap>d</keycap></term>
         <listitem><para>Make selected entry the default</para>
 
+        <para>An EFI variable is set to allow this setting to persist.</para>
+
         <xi:include href="version-info.xml" xpointer="v239"/></listitem>
       </varlistentry>
 
@@ -164,6 +166,8 @@
         <term><keycap>t</keycap></term>
         <listitem><para>Increase the timeout before default entry is booted</para>
 
+        <para>An EFI variable is set to allow this setting to persist.</para>
+
         <xi:include href="version-info.xml" xpointer="v239"/></listitem>
       </varlistentry>
 
@@ -172,6 +176,8 @@
         <term><keycap>T</keycap></term>
         <listitem><para>Decrease the timeout</para>
 
+        <para>An EFI variable is set to allow this setting to persist.</para>
+
         <xi:include href="version-info.xml" xpointer="v239"/></listitem>
       </varlistentry>
 
@@ -179,6 +185,8 @@
         <term><keycap>r</keycap></term>
         <listitem><para>Change screen resolution, skipping any unsupported modes.</para>
 
+        <para>An EFI variable is set to allow this setting to persist.</para>
+
         <xi:include href="version-info.xml" xpointer="v250"/></listitem>
       </varlistentry>
 
@@ -186,6 +194,8 @@
         <term><keycap>R</keycap></term>
         <listitem><para>Reset screen resolution to firmware or configuration file default.</para>
 
+        <para>An EFI variable is set to allow this setting to persist.</para>
+
         <xi:include href="version-info.xml" xpointer="v250"/></listitem>
       </varlistentry>
 
@@ -280,15 +290,15 @@
     </variablelist>
 
     <para>The boot menu is shown when a non-zero menu timeout has been configured. If the menu timeout has
-    been set to zero, it is sufficient to press any key — before the boot loader initializes — to bring up
-    the boot menu, except for the keys listed immediately above as they directly boot into the selected boot
-    menu item. Note that depending on the firmware implementation the time window where key presses are
-    accepted before the boot loader initializes might be short. If the window is missed, reboot and try
-    again, possibly pressing a suitable key (e.g. the space bar) continuously; on most systems it should be
-    possible to hit the time window after a few attempts. To avoid this problem, consider setting a non-zero
-    timeout, thus showing the boot menu unconditionally. Some desktop environments might offer an option to
-    directly boot into the boot menu, to avoid the problem altogether. Alternatively, use the command line
-    <command>systemctl reboot --boot-loader-menu=0</command> from the shell.</para>
+    been set to zero, hold down a key (<keycap>space</keycap> is recommended) before the boot loader
+    initializes to bring up the boot menu. Note that depending on the firmware implementation the time window
+    where key presses are accepted before the boot loader initializes might be short. If the window is
+    missed, reboot and try again, possibly repeatedly pressing a suitable key; on most systems it should be
+    possible to hit the time window after a few attempts. Keys other than the space bar may be used, except
+    for the keys listed above. If showing the menu on demand doesn't work well, consider setting a non-zero
+    timeout to show the boot menu unconditionally. Some desktop environments might offer an option to boot
+    directly into the boot menu, which also avoids the problem altogether. Alternatively, use the command
+    line <command>systemctl reboot --boot-loader-menu=</command> with a non-zero value from the shell.</para>
 
     <para>In the editor, most keys simply insert themselves, but the following keys
     may be used to perform additional actions:</para>
@@ -389,16 +399,16 @@
   <refsect1>
     <title>EFI Variables</title>
 
-    <para>The following EFI variables are defined, set and read by <command>systemd-boot</command>, under the
-    vendor UUID <literal>4a67b082-0a4c-41cf-b6c7-440b29bb8c4f</literal>, for communication between the boot
-    loader and the OS:</para>
+    <para>The following EFI variables are defined, and may be set or read by <command>systemd-boot</command>
+    for communication between the boot loader and the OS. The vendor UUID
+    <literal>4a67b082-0a4c-41cf-b6c7-440b29bb8c4f</literal> is used in all cases.</para>
 
     <variablelist class='efi-variables'>
       <varlistentry>
         <term><varname>LoaderBootCountPath</varname></term>
-        <listitem><para>If boot counting is enabled, contains the path to the file in whose name the boot counters are
-        encoded. Set by the boot
-        loader. <citerefentry><refentrytitle>systemd-bless-boot.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+        <listitem><para>If boot counting is enabled, contains the path to the file in whose name the boot
+        counters are encoded. Set by the boot loader.
+        <citerefentry><refentrytitle>systemd-bless-boot.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
         uses this information to mark a boot as successful as determined by the successful activation of the
         <filename>boot-complete.target</filename> target unit.</para>
 
@@ -454,13 +464,13 @@
         <term><varname>LoaderEntryDefault</varname></term>
         <term><varname>LoaderEntryOneShot</varname></term>
 
-        <listitem><para>The identifier of the default boot loader entry. Set primarily by the OS and read by the boot
+        <listitem><para>The identifier of the default boot loader entry. Can be set in the OS and the boot
         loader. <varname>LoaderEntryOneShot</varname> sets the default entry for the next boot only, while
-        <varname>LoaderEntryDefault</varname> sets it persistently for all future
-        boots. <citerefentry><refentrytitle>bootctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
-        <option>set-default</option> and <option>set-oneshot</option> commands make use of these variables. The boot
-        loader modifies <varname>LoaderEntryDefault</varname> on request, when the <keycap>d</keycap> key is used, see
-        above.</para>
+        <varname>LoaderEntryDefault</varname> sets it persistently for all future boots.
+        <citerefentry><refentrytitle>bootctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
+        <option>set-default</option> and <option>set-oneshot</option> commands make use of these variables.
+        The boot loader modifies <varname>LoaderEntryDefault</varname> on request, when the
+        <keycap>d</keycap> key is used, see above.</para>
 
         <xi:include href="version-info.xml" xpointer="v240"/></listitem>
       </varlistentry>
diff -pruN 257.7-1/man/systemd-dissect.xml 257.9-0ubuntu2/man/systemd-dissect.xml
--- 257.7-1/man/systemd-dissect.xml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/systemd-dissect.xml	2025-09-03 18:35:40.000000000 +0000
@@ -315,8 +315,8 @@
         specified output archive file name, e.g. any path suffixed with <literal>.tar.xz</literal> will
         result in an xz compressed UNIX tarball (if the path is omitted an uncompressed UNIX tarball is
         created). See
-        <citerefentry><refentrytitle>libarchive</refentrytitle><manvolnum>3</manvolnum></citerefentry> for a
-        list of supported archive formats and compression schemes.</para>
+        <citerefentry project='die-net'><refentrytitle>libarchive</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+        for a list of supported archive formats and compression schemes.</para>
 
         <xi:include href="version-info.xml" xpointer="v256"/></listitem>
       </varlistentry>
diff -pruN 257.7-1/man/systemd-vmspawn.xml 257.9-0ubuntu2/man/systemd-vmspawn.xml
--- 257.7-1/man/systemd-vmspawn.xml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/systemd-vmspawn.xml	2025-09-03 18:35:40.000000000 +0000
@@ -332,7 +332,7 @@
 
           <listitem><para>Controls user namespacing under <option>--directory=</option>.
           If enabled,
-          <citerefentry><refentrytitle>virtiofsd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+          <citerefentry project='url'><refentrytitle url='https://manpages.debian.org/unstable/qemu-system-common/virtiofsd.1.en.html'>virtiofsd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
           is instructed to map user and group ids (UIDs and GIDs).
           This involves mapping the private UIDs/GIDs used in the virtual machine (starting with the virtual machine's
           root user 0 and up) to a range of UIDs/GIDs on the host that are not used for other purposes (usually in the
diff -pruN 257.7-1/man/systemd.link.xml 257.9-0ubuntu2/man/systemd.link.xml
--- 257.7-1/man/systemd.link.xml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/systemd.link.xml	2025-09-03 18:35:40.000000000 +0000
@@ -413,7 +413,7 @@
         <term><varname>UnsetProperty=</varname></term>
         <listitem>
           <para>Unset specified udev properties. This takes space separated list of
-          property names. Example: <programlisting>ImportProperty=HOGE BAR</programlisting>
+          property names. Example: <programlisting>UnsetProperty=HOGE BAR</programlisting>
           This option supports simple specifier expansion, see the Specifiers section below.
           This option can be specified multiple times. If an empty string is assigned, then the all previous
           assignments are cleared.</para>
diff -pruN 257.7-1/man/systemd.service.xml 257.9-0ubuntu2/man/systemd.service.xml
--- 257.7-1/man/systemd.service.xml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/systemd.service.xml	2025-09-03 18:35:40.000000000 +0000
@@ -357,15 +357,17 @@
       <varlistentry>
         <term><varname>PIDFile=</varname></term>
 
-        <listitem><para>Takes a path referring to the PID file of the service. Usage of this option is recommended for
-        services where <varname>Type=</varname> is set to <option>forking</option>. The path specified typically points
-        to a file below <filename>/run/</filename>. If a relative path is specified it is hence prefixed with
-        <filename>/run/</filename>. The service manager will read the PID of the main process of the service from this
-        file after start-up of the service. The service manager will not write to the file configured here, although it
-        will remove the file after the service has shut down if it still exists. The PID file does not need to be owned
-        by a privileged user, but if it is owned by an unprivileged user additional safety restrictions are enforced:
-        the file may not be a symlink to a file owned by a different user (neither directly nor indirectly), and the
-        PID file must refer to a process already belonging to the service.</para>
+        <listitem><para>Takes a path referring to the PID file of the service. Usage of this option is
+        recommended for services where <varname>Type=</varname> is set to <option>forking</option>. The path
+        specified typically points to a file below <filename>/run/</filename>. If a relative path is
+        specified for system service, then it is hence prefixed with <filename>/run/</filename>, and prefixed
+        with <filename>$XDG_RUNTIME_DIR</filename> if specified in a user service. The service manager will
+        read the PID of the main process of the service from this file after start-up of the service. The
+        service manager will not write to the file configured here, although it will remove the file after
+        the service has shut down if it still exists. The PID file does not need to be owned by a privileged
+        user, but if it is owned by an unprivileged user additional safety restrictions are enforced: the
+        file may not be a symlink to a file owned by a different user (neither directly nor indirectly), and
+        the PID file must refer to a process already belonging to the service.</para>
 
         <para>Note that PID files should be avoided in modern projects. Use <option>Type=notify</option>,
         <option>Type=notify-reload</option> or <option>Type=simple</option> where possible, which does not
@@ -1686,7 +1688,7 @@ WantedBy=multi-user.target</programlisti
       just starts one process in the background:</para>
 
       <programlisting>[Unit]
-Description=Some simple daemon
+Description=My Simple Daemon
 
 [Service]
 Type=forking
@@ -1712,7 +1714,7 @@ WantedBy=multi-user.target</programlisti
       The following example shows a typical DBus service:</para>
 
       <programlisting>[Unit]
-Description=Simple DBus service
+Description=Simple DBus Service
 
 [Service]
 Type=dbus
@@ -1751,7 +1753,7 @@ SystemdService=simple-dbus-service.servi
       daemon would look like this:</para>
 
       <programlisting>[Unit]
-Description=Simple notifying service
+Description=Simple Notifying Service
 
 [Service]
 Type=notify-reload
diff -pruN 257.7-1/man/systemd.special.xml 257.9-0ubuntu2/man/systemd.special.xml
--- 257.7-1/man/systemd.special.xml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/systemd.special.xml	2025-09-03 18:35:40.000000000 +0000
@@ -54,7 +54,7 @@
     <filename>kexec.target</filename>,
     <filename>local-fs-pre.target</filename>,
     <filename>local-fs.target</filename>,
-    <filename>machines.target</filename>
+    <filename>machines.target</filename>,
     <filename>multi-user.target</filename>,
     <filename>network-online.target</filename>,
     <filename>network-pre.target</filename>,
diff -pruN 257.7-1/man/systemd.time.xml 257.9-0ubuntu2/man/systemd.time.xml
--- 257.7-1/man/systemd.time.xml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/man/systemd.time.xml	2025-09-03 18:35:40.000000000 +0000
@@ -247,7 +247,7 @@ tomorrow Pacific/Auckland → Thu 2012-1
     decimal places.</para>
 
     <para>Either time or date specification may be omitted, in which
-    case *-*-* and 00:00:00 is implied, respectively. If the
+    case 00:00:00 and *-*-* is implied, respectively. If the
     seconds component is not specified, <literal>:00</literal> is
     assumed.</para>
 
diff -pruN 257.7-1/meson.build 257.9-0ubuntu2/meson.build
--- 257.7-1/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -1814,9 +1814,21 @@ if conf.get('BPF_FRAMEWORK') == 1
         #
         # C.f. https://mesonbuild.com/Reference-tables.html#cpu-families
         # and src/basic/missing_syscall_def.h.
+
+        # Start with older ABI. When define is missing, we're likely targeting that.
+        ppc64_elf_version = '1'
+
+        if host_machine.cpu_family() == 'ppc64'
+                # cc doesn't have to be bpf_compiler, but they should be targeting the same ABI
+                call_elf_value = cc.get_define('_CALL_ELF')
+                if call_elf_value != ''
+                        ppc64_elf_version = call_elf_value
+                endif
+        endif
+
         cpu_arch_defines = {
                 'ppc'         : ['-D__powerpc__', '-D__TARGET_ARCH_powerpc'],
-                'ppc64'       : ['-D__powerpc64__', '-D__TARGET_ARCH_powerpc', '-D_CALL_ELF=2'],
+                'ppc64'       : ['-D__powerpc64__', '-D__TARGET_ARCH_powerpc', '-D_CALL_ELF=' + ppc64_elf_version],
                 'riscv32'     : ['-D__riscv', '-D__riscv_xlen=32', '-D__TARGET_ARCH_riscv'],
                 'riscv64'     : ['-D__riscv', '-D__riscv_xlen=64', '-D__TARGET_ARCH_riscv'],
                 'x86'         : ['-D__i386__', '-D__TARGET_ARCH_x86'],
@@ -1863,11 +1875,21 @@ if conf.get('BPF_FRAMEWORK') == 1
                 target_triplet_cmd = run_command('gcc', '-print-multiarch', check: false)
         endif
         if target_triplet_cmd.returncode() == 0
+                sysroot = meson.get_external_property('sys_root', '/')
                 target_triplet = target_triplet_cmd.stdout().strip()
-                bpf_o_unstripped_cmd += [
-                        '-isystem',
-                        '/usr/include/@0@'.format(target_triplet)
-                ]
+                target_include_dir = sysroot / 'usr' / 'include'
+                target_triple_include_dir = target_include_dir / target_triplet
+                isystem_dir = ''
+                if fs.is_dir(target_triple_include_dir)
+                        isystem_dir = target_triple_include_dir
+                elif fs.is_dir(target_include_dir)
+                        isystem_dir = target_include_dir
+                endif
+                if isystem_dir != ''
+                        bpf_o_unstripped_cmd += [
+                                '-isystem', isystem_dir
+                        ]
+                endif
         endif
 
         bpf_o_unstripped_cmd += [
@@ -2004,7 +2026,6 @@ if use_provided_vmlinux_h
         message('Using provided @0@'.format(provided_vmlinux_h_path))
 elif use_generated_vmlinux_h
         vmlinux_h_dependency = custom_target(
-                'vmlinux.h',
                 output: 'vmlinux.h',
                 command : [ bpftool, 'btf', 'dump', 'file', '/sys/kernel/btf/vmlinux', 'format', 'c' ],
                 capture : true)
@@ -2017,6 +2038,8 @@ endif
 
 conf.set10('HAVE_VMLINUX_H', use_provided_vmlinux_h or use_generated_vmlinux_h)
 
+conf.set10('ENABLE_SYSCTL_BPF', conf.get('HAVE_VMLINUX_H') == 1 and libbpf.version().version_compare('>= 0.7'))
+
 #####################################################################
 
 check_version_history_py = find_program('tools/check-version-history.py')
@@ -2227,12 +2250,12 @@ endif
 #####################################################################
 
 runtest_env = custom_target(
-        'systemd-runtest.env',
         output : 'systemd-runtest.env',
-        command : [sh, '-c',
-                   '{ echo SYSTEMD_TEST_DATA=@0@; echo SYSTEMD_CATALOG_DIR=@1@; } >@OUTPUT@'.format(
-                           meson.project_source_root() / 'test',
-                           meson.project_build_root() / 'catalog')],
+        command : ['printf',
+                   'SYSTEMD_TEST_DATA=%q\nSYSTEMD_CATALOG_DIR=%q\n',
+                   meson.project_source_root() / 'test',
+                   meson.project_build_root() / 'catalog'],
+        capture: true,
         depends : catalogs,
         build_by_default : true)
 
@@ -2697,7 +2720,6 @@ foreach executable : ['systemd-measure',
 endforeach
 
 ukify = custom_target(
-        'ukify',
         input : 'src/ukify/ukify.py',
         output : 'ukify',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
@@ -2848,7 +2870,6 @@ if git.found()
                 all_files = files(all_files.stdout().split())
 
                 custom_target(
-                        'tags',
                         output : 'tags',
                         command : [env, 'etags', '-o', '@0@/TAGS'.format(meson.project_source_root())] + all_files)
                 run_target(
@@ -2914,12 +2935,12 @@ if not meson.is_cross_build()
 endif
 
 meson_extract_unit_files = find_program('tools/meson-extract-unit-files.py')
-custom_target('installed-unit-files.txt',
-              output : 'installed-unit-files.txt',
-              capture : true,
-              install : want_tests != 'no' and install_tests,
-              install_dir : testdata_dir,
-              command : [meson_extract_unit_files, meson.project_build_root()])
+custom_target(
+        output : 'installed-unit-files.txt',
+        capture : true,
+        install : want_tests != 'no' and install_tests,
+        install_dir : testdata_dir,
+        command : [meson_extract_unit_files, meson.project_build_root()])
 
 #####################################################################
 
diff -pruN 257.7-1/meson.version 257.9-0ubuntu2/meson.version
--- 257.7-1/meson.version	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/meson.version	2025-09-03 18:35:40.000000000 +0000
@@ -1 +1 @@
-257.7
+257.9
diff -pruN 257.7-1/mkosi/mkosi.conf 257.9-0ubuntu2/mkosi/mkosi.conf
--- 257.7-1/mkosi/mkosi.conf	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf	2025-09-03 18:35:40.000000000 +0000
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Config]
-MinimumVersion=commit:5e739ef1ed02a4f3b6ae64e50a8ee186cbcb21c2
+MinimumVersion=commit:d45142e329550abc9c6fc63c1f1f86e5286d3d67
 Dependencies=
         exitrd
         initrd
@@ -38,6 +38,8 @@ Incremental=yes
 
 [Validation]
 SignExpectedPcr=yes
+SecureBoot=yes
+SecureBootAutoEnroll=yes
 
 [Content]
 ExtraTrees=
diff -pruN 257.7-1/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf 257.9-0ubuntu2/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf
--- 257.7-1/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf	2025-09-03 18:35:40.000000000 +0000
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-[Match]
-Distribution=arch
-
 [Build]
 Environment=
         GIT_URL=https://gitlab.archlinux.org/archlinux/packaging/packages/systemd.git
diff -pruN 257.7-1/mkosi/mkosi.conf.d/centos/mkosi.conf 257.9-0ubuntu2/mkosi/mkosi.conf.d/centos/mkosi.conf
--- 257.7-1/mkosi/mkosi.conf.d/centos/mkosi.conf	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf.d/centos/mkosi.conf	2025-09-03 18:35:40.000000000 +0000
@@ -5,6 +5,7 @@ Distribution=centos
 
 [Distribution]
 Release=10
+Repositories=epel
 
 [Build]
 Environment=
diff -pruN 257.7-1/mkosi/mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf 257.9-0ubuntu2/mkosi/mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf
--- 257.7-1/mkosi/mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Release=9
-
-[Distribution]
-Repositories=
-        epel
-        epel-next
diff -pruN 257.7-1/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf 257.9-0ubuntu2/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf
--- 257.7-1/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Repositories=epel
-
-[Content]
-Packages=
-        dfuzzer
-        dhcp-server
-        erofs-utils
-        knot
-        qrencode
-        sbsigntools
diff -pruN 257.7-1/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf 257.9-0ubuntu2/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf
--- 257.7-1/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf	2025-09-03 18:35:40.000000000 +0000
@@ -8,7 +8,6 @@ Distribution=|fedora
 PrepareScripts=systemd.prepare
 VolatilePackages=
         systemd
-        systemd-boot
         systemd-container
         systemd-devel
         systemd-journal-remote
@@ -28,6 +27,8 @@ Packages=
         cryptsetup
         device-mapper-event
         device-mapper-multipath
+        dfuzzer
+        erofs-utils
         git-core
         glibc-langpack-de
         glibc-langpack-en
@@ -39,6 +40,7 @@ Packages=
         iputils
         iscsi-initiator-utils
         kernel-core
+        knot
         libcap-ng-utils
         man-db
         nmap-ncat
@@ -51,6 +53,9 @@ Packages=
         polkit
         procps-ng
         python3-pexpect
+        # needed to upgrade and downgrade systemd-ukify in tests
+        python3-zstd
+        qrencode
         quota
         rpm
         softhsm
diff -pruN 257.7-1/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/efi.conf 257.9-0ubuntu2/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/efi.conf
--- 257.7-1/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/efi.conf	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/efi.conf	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Architecture=uefi
+
+[Content]
+Packages=
+        sbsigntools
+
+VolatilePackages=
+        systemd-boot
diff -pruN 257.7-1/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf 257.9-0ubuntu2/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf
--- 257.7-1/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf	2025-09-03 18:35:40.000000000 +0000
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-[Match]
-Distribution=|centos
-Distribution=|fedora
-
 [Build]
 Environment=
         GIT_URL=https://src.fedoraproject.org/rpms/systemd.git
diff -pruN 257.7-1/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/debug.conf 257.9-0ubuntu2/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/debug.conf
--- 257.7-1/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/debug.conf	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/debug.conf	2025-09-03 18:35:40.000000000 +0000
@@ -13,7 +13,6 @@ VolatilePackages=
         libsystemd-shared-dbgsym
         libsystemd0-dbgsym
         libudev1-dbgsym
-        systemd-boot-dbgsym
         systemd-container-dbgsym
         systemd-coredump-dbgsym
         systemd-cryptsetup-dbgsym
diff -pruN 257.7-1/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi-debug.conf 257.9-0ubuntu2/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi-debug.conf
--- 257.7-1/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi-debug.conf	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi-debug.conf	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Environment=WITH_DEBUG=1
+
+[Match]
+Architecture=uefi
+
+[Content]
+VolatilePackages=
+        systemd-boot-dbgsym
diff -pruN 257.7-1/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf 257.9-0ubuntu2/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf
--- 257.7-1/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf	2025-09-03 18:35:40.000000000 +0000
@@ -2,13 +2,7 @@
 # sbsigntool exists only on UEFI architectures
 
 [Match]
-Architecture=|x86
-Architecture=|x86-64
-Architecture=|arm
-Architecture=|arm64
-Architecture=|riscv32
-Architecture=|riscv64
-Architecture=|loongarch64
+Architecture=uefi
 
 [Content]
 Packages=
diff -pruN 257.7-1/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf 257.9-0ubuntu2/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf
--- 257.7-1/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf	2025-09-03 18:35:40.000000000 +0000
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-[Match]
-Distribution=|debian
-Distribution=|ubuntu
-
 [Build]
 Environment=
         GIT_URL=https://salsa.debian.org/systemd-team/systemd.git
diff -pruN 257.7-1/mkosi/mkosi.conf.d/fedora/mkosi.conf 257.9-0ubuntu2/mkosi/mkosi.conf.d/fedora/mkosi.conf
--- 257.7-1/mkosi/mkosi.conf.d/fedora/mkosi.conf	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf.d/fedora/mkosi.conf	2025-09-03 18:35:40.000000000 +0000
@@ -10,16 +10,11 @@ Release=rawhide
 Packages=
         btrfs-progs
         compsize
-        dfuzzer
         dhcp-server
         dnf5
-        erofs-utils
         f2fs-tools
         # Required for systemd-networkd-tests.py (netdevsim and sch_xxx modules)
         kernel-modules-extra
         kernel-modules-internal
-        knot
-        qrencode
         rpmautospec
-        sbsigntools
         scsi-target-utils
diff -pruN 257.7-1/mkosi/mkosi.conf.d/fedora/mkosi.conf.d/rawhide-42.conf 257.9-0ubuntu2/mkosi/mkosi.conf.d/fedora/mkosi.conf.d/rawhide-42.conf
--- 257.7-1/mkosi/mkosi.conf.d/fedora/mkosi.conf.d/rawhide-42.conf	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf.d/fedora/mkosi.conf.d/rawhide-42.conf	2025-09-03 18:35:40.000000000 +0000
@@ -4,6 +4,7 @@
 Release=|rawhide
 Release=|42
 Release=|43
+Release=|44
 
 [Content]
 Packages=util-linux-script
diff -pruN 257.7-1/mkosi/mkosi.conf.d/opensuse/mkosi.conf 257.9-0ubuntu2/mkosi/mkosi.conf.d/opensuse/mkosi.conf
--- 257.7-1/mkosi/mkosi.conf.d/opensuse/mkosi.conf	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf.d/opensuse/mkosi.conf	2025-09-03 18:35:40.000000000 +0000
@@ -16,7 +16,6 @@ VolatilePackages=
         libsystemd0
         libudev1
         systemd
-        systemd-boot
         systemd-container
         systemd-devel
         systemd-doc
@@ -49,6 +48,7 @@ Packages=
         group(wheel)
         gzip
         hostname
+        iproute2
         iputils
         kernel-default
         kmod
@@ -69,7 +69,6 @@ Packages=
         qrencode
         quota
         rsync
-        sbsigntools
         sed
         shadow
         softhsm
diff -pruN 257.7-1/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf 257.9-0ubuntu2/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf
--- 257.7-1/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf	2025-09-03 18:35:40.000000000 +0000
@@ -7,7 +7,6 @@ Environment=WITH_DEBUG=1
 VolatilePackages=
         libsystemd0-debuginfo
         libudev1-debuginfo
-        systemd-boot-debuginfo
         systemd-container-debuginfo
         systemd-debuginfo
         systemd-debugsource
diff -pruN 257.7-1/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf 257.9-0ubuntu2/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf
--- 257.7-1/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Environment=WITH_DEBUG=1
+
+[Match]
+Architecture=uefi
+
+[Content]
+VolatilePackages=
+        systemd-boot-debuginfo
diff -pruN 257.7-1/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf 257.9-0ubuntu2/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf
--- 257.7-1/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Architecture=uefi
+
+[Content]
+VolatilePackages=
+        systemd-boot
+
+Packages=
+        sbsigntools
diff -pruN 257.7-1/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf 257.9-0ubuntu2/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf
--- 257.7-1/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf	2025-09-03 18:35:40.000000000 +0000
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-[Match]
-Distribution=opensuse
-
 [Build]
 Environment=
         GIT_URL=https://github.com/bmwiedemann/openSUSE
diff -pruN 257.7-1/mkosi/mkosi.extra.common/usr/lib/systemd/system-preset/00-mkosi.preset 257.9-0ubuntu2/mkosi/mkosi.extra.common/usr/lib/systemd/system-preset/00-mkosi.preset
--- 257.7-1/mkosi/mkosi.extra.common/usr/lib/systemd/system-preset/00-mkosi.preset	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.extra.common/usr/lib/systemd/system-preset/00-mkosi.preset	2025-09-03 18:35:40.000000000 +0000
@@ -29,8 +29,8 @@ disable dnf-makecache.*
 # We have journald to receive audit data so let's make sure we're not running auditd as well
 disable auditd.service
 
-# systemd-timesyncd is not enabled by default in the default systemd preset so enable it here instead.
-enable systemd-timesyncd.service
+# systemd-timesyncd causes quite a bit of debug log noise so let's disable it by default.
+disable systemd-timesyncd.service
 
 # Enabled by default on OpenSUSE and not conditioned out in containers, so let's disable these here instead.
 disable iscsi.service
diff -pruN 257.7-1/mkosi/mkosi.finalize 257.9-0ubuntu2/mkosi/mkosi.finalize
--- 257.7-1/mkosi/mkosi.finalize	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.finalize	2025-09-03 18:35:40.000000000 +0000
@@ -3,3 +3,16 @@
 set -e
 
 touch -r "$BUILDROOT/usr" "$BUILDROOT/etc/.updated" "$BUILDROOT/var/.updated"
+
+if [ -n "$EFI_ARCHITECTURE" ]; then
+    mkdir -p "$BUILDROOT/boot/loader/addons"
+    ukify build \
+        --stub "$BUILDROOT/usr/lib/systemd/boot/efi/addon${EFI_ARCHITECTURE}.efi.stub" \
+        --cmdline="addonfoobar" \
+        --output "$BUILDROOT/boot/loader/addons/test.addon.efi" \
+        --secureboot-certificate "$SRCDIR/mkosi/mkosi.crt" \
+        --secureboot-private-key "$SRCDIR/mkosi/mkosi.key"
+fi
+
+# Used to sign artifacts verified by kernel platform keyring
+cp "$SRCDIR/mkosi/mkosi.crt" "$SRCDIR/mkosi/mkosi.key" "$BUILDROOT/usr/share/"
diff -pruN 257.7-1/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/epel-packages.conf 257.9-0ubuntu2/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/epel-packages.conf
--- 257.7-1/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/epel-packages.conf	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/epel-packages.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Repositories=epel
-
-[Content]
-Packages=
-        erofs-utils
-        rpmautospec-rpm-macros
diff -pruN 257.7-1/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/erofs-utils.conf 257.9-0ubuntu2/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/erofs-utils.conf
--- 257.7-1/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/erofs-utils.conf	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/erofs-utils.conf	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[TriggerMatch]
+Repositories=epel
+Release=9
+
+[TriggerMatch]
+Release=10
+
+[Content]
+Packages=erofs-utils
diff -pruN 257.7-1/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/rpmautospec-rpm-macros.conf 257.9-0ubuntu2/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/rpmautospec-rpm-macros.conf
--- 257.7-1/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/rpmautospec-rpm-macros.conf	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/rpmautospec-rpm-macros.conf	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Repositories=epel
+Release=9
+
+[Content]
+Packages=rpmautospec-rpm-macros
diff -pruN 257.7-1/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf 257.9-0ubuntu2/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf
--- 257.7-1/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf	2025-09-03 18:35:40.000000000 +0000
@@ -13,5 +13,5 @@ Packages=
         clangd
         erofs-utils
         git-core
-        libclang-rt-dev
+        ?exact-name(libclang-rt-dev)
         dpkg-dev
diff -pruN 257.7-1/mkosi/mkosi.images/minimal-0/mkosi.postinst 257.9-0ubuntu2/mkosi/mkosi.images/minimal-0/mkosi.postinst
--- 257.7-1/mkosi/mkosi.images/minimal-0/mkosi.postinst	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.images/minimal-0/mkosi.postinst	2025-09-03 18:35:40.000000000 +0000
@@ -8,4 +8,7 @@ cat >>"$BUILDROOT/usr/lib/os-release" <<
 MARKER=1
 PORTABLE_PREFIXES=app0 minimal minimal-app0
 EOF
+if [ ! -L "$BUILDROOT/etc/os-release" ]; then
+    cp "$BUILDROOT/usr/lib/os-release" "$BUILDROOT/etc/os-release"
+fi
 cp "$BUILDROOT/usr/lib/systemd/system/minimal-app0.service" "$BUILDROOT/usr/lib/systemd/system/minimal-app0-foo.service"
diff -pruN 257.7-1/mkosi/mkosi.images/minimal-1/mkosi.postinst 257.9-0ubuntu2/mkosi/mkosi.images/minimal-1/mkosi.postinst
--- 257.7-1/mkosi/mkosi.images/minimal-1/mkosi.postinst	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.images/minimal-1/mkosi.postinst	2025-09-03 18:35:40.000000000 +0000
@@ -8,4 +8,7 @@ cat >>"$BUILDROOT/usr/lib/os-release" <<
 MARKER=2
 PORTABLE_PREFIXES=app0 minimal minimal-app0
 EOF
+if [ ! -L "$BUILDROOT/etc/os-release" ]; then
+    cp "$BUILDROOT/usr/lib/os-release" "$BUILDROOT/etc/os-release"
+fi
 cp "$BUILDROOT/usr/lib/systemd/system/minimal-app0.service" "$BUILDROOT/usr/lib/systemd/system/minimal-app0-bar.service"
diff -pruN 257.7-1/mkosi/mkosi.sync 257.9-0ubuntu2/mkosi/mkosi.sync
--- 257.7-1/mkosi/mkosi.sync	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/mkosi/mkosi.sync	2025-09-03 18:35:40.000000000 +0000
@@ -23,14 +23,9 @@ if [[ -d "pkg/$PKG_SUBDIR/.git" ]]; then
     fi
 
     # If work is being done on the packaging rules in a separate branch, don't touch the checkout.
-    if ! git -C "pkg/$PKG_SUBDIR" merge-base --is-ancestor HEAD "origin/$GIT_BRANCH"; then
-        EXIT_STATUS=$?
-        if [[ $EXIT_STATUS -eq 1 ]]; then
-            echo "Currently checked out pkg/$PKG_SUBDIR commit is not an ancestor of origin/$GIT_BRANCH, not checking out commit $GIT_COMMIT" >&2
-            exit 0
-        else
-            exit $EXIT_STATUS
-        fi
+    if [[ -z "$(git -C "pkg/$PKG_SUBDIR" branch --remotes --list "origin/*" --contains HEAD)" ]]; then
+        echo "Currently checked out pkg/$PKG_SUBDIR commit is not part of any origin branch, not checking out commit $GIT_COMMIT" >&2
+        exit 0
     fi
 fi
 
diff -pruN 257.7-1/ruff.toml 257.9-0ubuntu2/ruff.toml
--- 257.7-1/ruff.toml	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/ruff.toml	2025-09-03 18:35:40.000000000 +0000
@@ -1,6 +1,11 @@
-target-version = "py39"
+target-version = "py37"
 line-length = 109
 lint.select = ["E", "F", "I", "UP"]
 
 [format]
 quote-style = "single"
+
+[per-file-target-version]
+"src/ukify/*.py" = "py39"
+"test/**/integration-test-wrapper.py" = "py39"
+"test/test-udev.py" = "py39"
diff -pruN 257.7-1/rules.d/meson.build 257.9-0ubuntu2/rules.d/meson.build
--- 257.7-1/rules.d/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/rules.d/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -70,7 +70,6 @@ foreach tuple : rules_in
         want = tuple.length() == 1 or tuple[1]
 
         rule = custom_target(
-                tuple[0],
                 input : tuple[0] + '.in',
                 output: tuple[0],
                 command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/shell-completion/bash/meson.build 257.9-0ubuntu2/shell-completion/bash/meson.build
--- 257.7-1/shell-completion/bash/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/shell-completion/bash/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -11,7 +11,6 @@ if bashcompletiondir == ''
 endif
 
 custom_target(
-        'systemctl',
         input : 'systemctl.in',
         output : 'systemctl',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/shell-completion/zsh/meson.build 257.9-0ubuntu2/shell-completion/zsh/meson.build
--- 257.7-1/shell-completion/zsh/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/shell-completion/zsh/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -6,7 +6,6 @@ if zshcompletiondir == ''
 endif
 
 custom_target(
-        '_systemctl',
         input : '_systemctl.in',
         output : '_systemctl',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/src/analyze/analyze-architectures.c 257.9-0ubuntu2/src/analyze/analyze-architectures.c
--- 257.7-1/src/analyze/analyze-architectures.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/analyze/analyze-architectures.c	2025-09-03 18:35:40.000000000 +0000
@@ -82,7 +82,7 @@ int verb_architectures(int argc, char *a
 
         r = table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, arg_legend);
         if (r < 0)
-                return log_error_errno(r, "Failed to output table: %m");
+                return r;
 
         return EXIT_SUCCESS;
 }
diff -pruN 257.7-1/src/analyze/analyze-capability.c 257.9-0ubuntu2/src/analyze/analyze-capability.c
--- 257.7-1/src/analyze/analyze-capability.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/analyze/analyze-capability.c	2025-09-03 18:35:40.000000000 +0000
@@ -81,7 +81,7 @@ int verb_capabilities(int argc, char *ar
 
         r = table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, arg_legend);
         if (r < 0)
-                return log_error_errno(r, "Failed to output table: %m");
+                return r;
 
         return EXIT_SUCCESS;
 }
diff -pruN 257.7-1/src/analyze/analyze-exit-status.c 257.9-0ubuntu2/src/analyze/analyze-exit-status.c
--- 257.7-1/src/analyze/analyze-exit-status.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/analyze/analyze-exit-status.c	2025-09-03 18:35:40.000000000 +0000
@@ -48,7 +48,7 @@ int verb_exit_status(int argc, char *arg
 
         r = table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, arg_legend);
         if (r < 0)
-                return log_error_errno(r, "Failed to output table: %m");
+                return r;
 
         return EXIT_SUCCESS;
 }
diff -pruN 257.7-1/src/analyze/analyze-pcrs.c 257.9-0ubuntu2/src/analyze/analyze-pcrs.c
--- 257.7-1/src/analyze/analyze-pcrs.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/analyze/analyze-pcrs.c	2025-09-03 18:35:40.000000000 +0000
@@ -138,7 +138,7 @@ int verb_pcrs(int argc, char *argv[], vo
 
         r = table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, /* show_header= */true);
         if (r < 0)
-                return log_error_errno(r, "Failed to output table: %m");
+                return r;
 
         return EXIT_SUCCESS;
 }
diff -pruN 257.7-1/src/analyze/analyze-security.c 257.9-0ubuntu2/src/analyze/analyze-security.c
--- 257.7-1/src/analyze/analyze-security.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/analyze/analyze-security.c	2025-09-03 18:35:40.000000000 +0000
@@ -1880,7 +1880,7 @@ static int assess(const SecurityInfo *in
 
                 r = table_print_with_pager(details_table, json_format_flags, pager_flags, /* show_header= */true);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to output table: %m");
+                        return r;
         }
 
         exposure = DIV_ROUND_UP(badness_sum * 100U, weight_sum);
@@ -2891,7 +2891,7 @@ static int analyze_security(sd_bus *bus,
 
                 r = table_print_with_pager(overview_table, json_format_flags, pager_flags, /* show_header= */true);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to output table: %m");
+                        return r;
         }
         return ret;
 }
diff -pruN 257.7-1/src/basic/cgroup-util.c 257.9-0ubuntu2/src/basic/cgroup-util.c
--- 257.7-1/src/basic/cgroup-util.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/cgroup-util.c	2025-09-03 18:35:40.000000000 +0000
@@ -99,6 +99,9 @@ int cg_read_pid(FILE *f, pid_t *ret, CGr
         assert(f);
         assert(ret);
 
+        /* NB: The kernel returns ENODEV if we tried to read from cgroup.procs of a cgroup that has been
+         * removed already. Callers should handle that! */
+
         for (;;) {
                 errno = 0;
                 if (fscanf(f, "%lu", &ul) != 1) {
@@ -334,6 +337,13 @@ static int cg_kill_items(
                         _cleanup_(pidref_done) PidRef pidref = PIDREF_NULL;
 
                         r = cg_read_pidref(f, &pidref, flags);
+                        if (r == -ENODEV) {
+                                /* reading from cgroup.pids will result in ENODEV if the cgroup is
+                                 * concurrently removed. Just leave in that case, because a removed cgroup
+                                 * contains no processes anymore. */
+                                done = true;
+                                break;
+                        }
                         if (r < 0)
                                 return RET_GATHER(ret, log_debug_errno(r, "Failed to read pidref from cgroup '%s': %m", path));
                         if (r == 0)
diff -pruN 257.7-1/src/basic/compress.c 257.9-0ubuntu2/src/basic/compress.c
--- 257.7-1/src/basic/compress.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/compress.c	2025-09-03 18:35:40.000000000 +0000
@@ -348,15 +348,14 @@ int decompress_blob_xz(
                 size_t used;
 
                 ret = sym_lzma_code(&s, LZMA_FINISH);
-
                 if (ret == LZMA_STREAM_END)
                         break;
-                else if (ret != LZMA_OK)
+                if (ret != LZMA_OK)
                         return -ENOMEM;
 
                 if (dst_max > 0 && (space - s.avail_out) >= dst_max)
                         break;
-                else if (dst_max > 0 && space == dst_max)
+                if (dst_max > 0 && space == dst_max)
                         return -ENOBUFS;
 
                 used = space - s.avail_out;
@@ -483,20 +482,22 @@ int decompress_blob(
                 size_t* dst_size,
                 size_t dst_max) {
 
-        if (compression == COMPRESSION_XZ)
+        switch (compression) {
+        case COMPRESSION_XZ:
                 return decompress_blob_xz(
                                 src, src_size,
                                 dst, dst_size, dst_max);
-        else if (compression == COMPRESSION_LZ4)
+        case COMPRESSION_LZ4:
                 return decompress_blob_lz4(
                                 src, src_size,
                                 dst, dst_size, dst_max);
-        else if (compression == COMPRESSION_ZSTD)
+        case COMPRESSION_ZSTD:
                 return decompress_blob_zstd(
                                 src, src_size,
                                 dst, dst_size, dst_max);
-        else
+        default:
                 return -EPROTONOSUPPORT;
+        }
 }
 
 int decompress_startswith_xz(
@@ -707,27 +708,30 @@ int decompress_startswith(
                 size_t prefix_len,
                 uint8_t extra) {
 
-        if (compression == COMPRESSION_XZ)
+        switch (compression) {
+
+        case COMPRESSION_XZ:
                 return decompress_startswith_xz(
                                 src, src_size,
                                 buffer,
                                 prefix, prefix_len,
                                 extra);
 
-        else if (compression == COMPRESSION_LZ4)
+        case COMPRESSION_LZ4:
                 return decompress_startswith_lz4(
                                 src, src_size,
                                 buffer,
                                 prefix, prefix_len,
                                 extra);
-        else if (compression == COMPRESSION_ZSTD)
+        case COMPRESSION_ZSTD:
                 return decompress_startswith_zstd(
                                 src, src_size,
                                 buffer,
                                 prefix, prefix_len,
                                 extra);
-        else
+        default:
                 return -EBADMSG;
+        }
 }
 
 int compress_stream_xz(int fdf, int fdt, uint64_t max_bytes, uint64_t *ret_uncompressed_size) {
@@ -1291,10 +1295,10 @@ int decompress_stream(const char *filena
 
         if (endswith(filename, ".lz4"))
                 return decompress_stream_lz4(fdf, fdt, max_bytes);
-        else if (endswith(filename, ".xz"))
+        if (endswith(filename, ".xz"))
                 return decompress_stream_xz(fdf, fdt, max_bytes);
-        else if (endswith(filename, ".zst"))
+        if (endswith(filename, ".zst"))
                 return decompress_stream_zstd(fdf, fdt, max_bytes);
-        else
-                return -EPROTONOSUPPORT;
+
+        return -EPROTONOSUPPORT;
 }
diff -pruN 257.7-1/src/basic/linux/batman_adv.h 257.9-0ubuntu2/src/basic/linux/batman_adv.h
--- 257.7-1/src/basic/linux/batman_adv.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/batman_adv.h	2025-09-03 18:35:40.000000000 +0000
@@ -342,7 +342,7 @@ enum batadv_nl_attrs {
 	BATADV_ATTR_MCAST_FLAGS_PRIV,
 
 	/**
-	 * @BATADV_ATTR_VLANID: VLAN id on top of soft interface
+	 * @BATADV_ATTR_VLANID: VLAN id on top of mesh interface
 	 */
 	BATADV_ATTR_VLANID,
 
@@ -380,7 +380,7 @@ enum batadv_nl_attrs {
 	/**
 	 * @BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED: whether the bridge loop
 	 *  avoidance feature is enabled. This feature detects and avoids loops
-	 *  between the mesh and devices bridged with the soft interface
+	 *  between the mesh and devices bridged with the mesh interface
 	 */
 	BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED,
 
@@ -509,7 +509,7 @@ enum batadv_nl_commands {
 	BATADV_CMD_UNSPEC,
 
 	/**
-	 * @BATADV_CMD_GET_MESH: Get attributes from softif/mesh
+	 * @BATADV_CMD_GET_MESH: Get attributes from mesh(if)
 	 */
 	BATADV_CMD_GET_MESH,
 
@@ -535,7 +535,7 @@ enum batadv_nl_commands {
 
 	/**
 	 * @BATADV_CMD_GET_HARDIF: Get attributes from a hardif of the
-	 *  current softif
+	 *  current mesh(if)
 	 */
 	BATADV_CMD_GET_HARDIF,
 
@@ -591,25 +591,25 @@ enum batadv_nl_commands {
 	BATADV_CMD_GET_MCAST_FLAGS,
 
 	/**
-	 * @BATADV_CMD_SET_MESH: Set attributes for softif/mesh
+	 * @BATADV_CMD_SET_MESH: Set attributes for mesh(if)
 	 */
 	BATADV_CMD_SET_MESH,
 
 	/**
 	 * @BATADV_CMD_SET_HARDIF: Set attributes for hardif of the
-	 *  current softif
+	 *  current mesh(if)
 	 */
 	BATADV_CMD_SET_HARDIF,
 
 	/**
 	 * @BATADV_CMD_GET_VLAN: Get attributes from a VLAN of the
-	 *  current softif
+	 *  current mesh(if)
 	 */
 	BATADV_CMD_GET_VLAN,
 
 	/**
 	 * @BATADV_CMD_SET_VLAN: Set attributes for VLAN of the
-	 *  current softif
+	 *  current mesh(if)
 	 */
 	BATADV_CMD_SET_VLAN,
 
@@ -691,7 +691,7 @@ enum batadv_ifla_attrs {
 	 */
 	IFLA_BATADV_ALGO_NAME,
 
-	/* add attributes above here, update the policy in soft-interface.c */
+	/* add attributes above here, update the policy in mesh-interface.c */
 
 	/**
 	 * @__IFLA_BATADV_MAX: internal use
diff -pruN 257.7-1/src/basic/linux/bpf.h 257.9-0ubuntu2/src/basic/linux/bpf.h
--- 257.7-1/src/basic/linux/bpf.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/bpf.h	2025-09-03 18:35:40.000000000 +0000
@@ -51,6 +51,9 @@
 #define BPF_XCHG	(0xe0 | BPF_FETCH)	/* atomic exchange */
 #define BPF_CMPXCHG	(0xf0 | BPF_FETCH)	/* atomic compare-and-write */
 
+#define BPF_LOAD_ACQ	0x100	/* load-acquire */
+#define BPF_STORE_REL	0x110	/* store-release */
+
 enum bpf_cond_pseudo_jmp {
 	BPF_MAY_GOTO = 0,
 };
@@ -447,6 +450,7 @@ union bpf_iter_link_info {
  *		* **struct bpf_map_info**
  *		* **struct bpf_btf_info**
  *		* **struct bpf_link_info**
+ *		* **struct bpf_token_info**
  *
  *	Return
  *		Returns zero on success. On error, -1 is returned and *errno*
@@ -903,6 +907,17 @@ union bpf_iter_link_info {
  *		A new file descriptor (a nonnegative integer), or -1 if an
  *		error occurred (in which case, *errno* is set appropriately).
  *
+ * BPF_PROG_STREAM_READ_BY_FD
+ *	Description
+ *		Read data of a program's BPF stream. The program is identified
+ *		by *prog_fd*, and the stream is identified by the *stream_id*.
+ *		The data is copied to a buffer pointed to by *stream_buf*, and
+ *		filled less than or equal to *stream_buf_len* bytes.
+ *
+ *	Return
+ *		Number of bytes read from the stream on success, or -1 if an
+ *		error occurred (in which case, *errno* is set appropriately).
+ *
  * NOTES
  *	eBPF objects (maps and programs) can be shared between processes.
  *
@@ -958,6 +973,7 @@ enum bpf_cmd {
 	BPF_LINK_DETACH,
 	BPF_PROG_BIND_MAP,
 	BPF_TOKEN_CREATE,
+	BPF_PROG_STREAM_READ_BY_FD,
 	__MAX_BPF_CMD,
 };
 
@@ -1207,6 +1223,7 @@ enum bpf_perf_event_type {
 #define BPF_F_BEFORE		(1U << 3)
 #define BPF_F_AFTER		(1U << 4)
 #define BPF_F_ID		(1U << 5)
+#define BPF_F_PREORDER		(1U << 6)
 #define BPF_F_LINK		BPF_F_LINK /* 1 << 13 */
 
 /* If BPF_F_STRICT_ALIGNMENT is used in BPF_PROG_LOAD command, the
@@ -1459,6 +1476,11 @@ struct bpf_stack_build_id {
 
 #define BPF_OBJ_NAME_LEN 16U
 
+enum {
+	BPF_STREAM_STDOUT = 1,
+	BPF_STREAM_STDERR = 2,
+};
+
 union bpf_attr {
 	struct { /* anonymous struct used by BPF_MAP_CREATE command */
 		__u32	map_type;	/* one of enum bpf_map_type */
@@ -1502,7 +1524,7 @@ union bpf_attr {
 		__s32	map_token_fd;
 	};
 
-	struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */
+	struct { /* anonymous struct used by BPF_MAP_*_ELEM and BPF_MAP_FREEZE commands */
 		__u32		map_fd;
 		__aligned_u64	key;
 		union {
@@ -1648,6 +1670,7 @@ union bpf_attr {
 		};
 		__u32		next_id;
 		__u32		open_flags;
+		__s32		fd_by_id_token_fd;
 	};
 
 	struct { /* anonymous struct used by BPF_OBJ_GET_INFO_BY_FD */
@@ -1789,6 +1812,13 @@ union bpf_attr {
 				};
 				__u64		expected_revision;
 			} netkit;
+			struct {
+				union {
+					__u32	relative_fd;
+					__u32	relative_id;
+				};
+				__u64		expected_revision;
+			} cgroup;
 		};
 	} link_create;
 
@@ -1837,6 +1867,13 @@ union bpf_attr {
 		__u32		bpffs_fd;
 	} token_create;
 
+	struct {
+		__aligned_u64	stream_buf;
+		__u32		stream_buf_len;
+		__u32		stream_id;
+		__u32		prog_fd;
+	} prog_stream_read;
+
 } __attribute__((aligned(8)));
 
 /* The description below is an attempt at providing documentation to eBPF
@@ -1990,11 +2027,15 @@ union bpf_attr {
  * long bpf_skb_store_bytes(struct sk_buff *skb, u32 offset, const void *from, u32 len, u64 flags)
  * 	Description
  * 		Store *len* bytes from address *from* into the packet
- * 		associated to *skb*, at *offset*. *flags* are a combination of
- * 		**BPF_F_RECOMPUTE_CSUM** (automatically recompute the
- * 		checksum for the packet after storing the bytes) and
- * 		**BPF_F_INVALIDATE_HASH** (set *skb*\ **->hash**, *skb*\
- * 		**->swhash** and *skb*\ **->l4hash** to 0).
+ * 		associated to *skb*, at *offset*. The *flags* are a combination
+ * 		of the following values:
+ *
+ * 		**BPF_F_RECOMPUTE_CSUM**
+ * 			Automatically update *skb*\ **->csum** after storing the
+ * 			bytes.
+ * 		**BPF_F_INVALIDATE_HASH**
+ * 			Set *skb*\ **->hash**, *skb*\ **->swhash** and *skb*\
+ * 			**->l4hash** to 0.
  *
  * 		A call to this helper is susceptible to change the underlying
  * 		packet buffer. Therefore, at load time, all checks on pointers
@@ -2046,7 +2087,8 @@ union bpf_attr {
  * 		untouched (unless **BPF_F_MARK_ENFORCE** is added as well), and
  * 		for updates resulting in a null checksum the value is set to
  * 		**CSUM_MANGLED_0** instead. Flag **BPF_F_PSEUDO_HDR** indicates
- * 		the checksum is to be computed against a pseudo-header.
+ * 		that the modified header field is part of the pseudo-header.
+ * 		Flag **BPF_F_IPV6** should be set for IPv6 packets.
  *
  * 		This helper works in combination with **bpf_csum_diff**\ (),
  * 		which does not update the checksum in-place, but offers more
@@ -2393,7 +2435,7 @@ union bpf_attr {
  * 		into it. An example is available in file
  * 		*samples/bpf/trace_output_user.c* in the Linux kernel source
  * 		tree (the eBPF program counterpart is in
- * 		*samples/bpf/trace_output_kern.c*).
+ *		*samples/bpf/trace_output.bpf.c*).
  *
  * 		**bpf_perf_event_output**\ () achieves better performance
  * 		than **bpf_trace_printk**\ () for sharing data with user
@@ -4963,6 +5005,9 @@ union bpf_attr {
  * 		the netns switch takes place from ingress to ingress without
  * 		going through the CPU's backlog queue.
  *
+ * 		*skb*\ **->mark** and *skb*\ **->tstamp** are not cleared during
+ * 		the netns switch.
+ *
  * 		The *flags* argument is reserved and must be 0. The helper is
  * 		currently only supported for tc BPF program types at the
  * 		ingress hook and for veth and netkit target device types. The
@@ -6019,7 +6064,10 @@ union bpf_attr {
 	FN(user_ringbuf_drain, 209, ##ctx)		\
 	FN(cgrp_storage_get, 210, ##ctx)		\
 	FN(cgrp_storage_delete, 211, ##ctx)		\
-	/* */
+	/* This helper list is effectively frozen. If you are trying to	\
+	 * add a new helper, you should add a kfunc instead which has	\
+	 * less stability guarantees. See Documentation/bpf/kfuncs.rst	\
+	 */
 
 /* backwards-compatibility macros for users of __BPF_FUNC_MAPPER that don't
  * know or care about integer value that is now passed as second argument
@@ -6057,6 +6105,7 @@ enum {
 	BPF_F_PSEUDO_HDR		= (1ULL << 4),
 	BPF_F_MARK_MANGLED_0		= (1ULL << 5),
 	BPF_F_MARK_ENFORCE		= (1ULL << 6),
+	BPF_F_IPV6			= (1ULL << 7),
 };
 
 /* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
@@ -6636,11 +6685,15 @@ struct bpf_link_info {
 		struct {
 			__aligned_u64 tp_name; /* in/out: tp_name buffer ptr */
 			__u32 tp_name_len;     /* in/out: tp_name buffer len */
+			__u32 :32;
+			__u64 cookie;
 		} raw_tracepoint;
 		struct {
 			__u32 attach_type;
 			__u32 target_obj_id; /* prog_id for PROG_EXT, otherwise btf object id */
 			__u32 target_btf_id; /* BTF type id inside the object */
+			__u32 :32;
+			__u64 cookie;
 		} tracing;
 		struct {
 			__u64 cgroup_id;
@@ -6712,6 +6765,7 @@ struct bpf_link_info {
 					__u32 name_len;
 					__u32 offset; /* offset from file_name */
 					__u64 cookie;
+					__u64 ref_ctr_offset;
 				} uprobe; /* BPF_PERF_EVENT_UPROBE, BPF_PERF_EVENT_URETPROBE */
 				struct {
 					__aligned_u64 func_name; /* in/out */
@@ -6750,6 +6804,13 @@ struct bpf_link_info {
 	};
 } __attribute__((aligned(8)));
 
+struct bpf_token_info {
+	__u64 allowed_cmds;
+	__u64 allowed_maps;
+	__u64 allowed_progs;
+	__u64 allowed_attachs;
+} __attribute__((aligned(8)));
+
 /* User bpf_sock_addr struct to access socket fields and sockaddr struct passed
  * by user and intended to be used by socket (e.g. to bind to, depends on
  * attach type).
@@ -6913,6 +6974,12 @@ enum {
 	BPF_SOCK_OPS_ALL_CB_FLAGS       = 0x7F,
 };
 
+enum {
+	SK_BPF_CB_TX_TIMESTAMPING	= 1<<0,
+	SK_BPF_CB_MASK			= (SK_BPF_CB_TX_TIMESTAMPING - 1) |
+					   SK_BPF_CB_TX_TIMESTAMPING
+};
+
 /* List of known BPF sock_ops operators.
  * New entries can only be added at the end
  */
@@ -7025,6 +7092,29 @@ enum {
 					 * by the kernel or the
 					 * earlier bpf-progs.
 					 */
+	BPF_SOCK_OPS_TSTAMP_SCHED_CB,	/* Called when skb is passing
+					 * through dev layer when
+					 * SK_BPF_CB_TX_TIMESTAMPING
+					 * feature is on.
+					 */
+	BPF_SOCK_OPS_TSTAMP_SND_SW_CB,	/* Called when skb is about to send
+					 * to the nic when SK_BPF_CB_TX_TIMESTAMPING
+					 * feature is on.
+					 */
+	BPF_SOCK_OPS_TSTAMP_SND_HW_CB,	/* Called in hardware phase when
+					 * SK_BPF_CB_TX_TIMESTAMPING feature
+					 * is on.
+					 */
+	BPF_SOCK_OPS_TSTAMP_ACK_CB,	/* Called when all the skbs in the
+					 * same sendmsg call are acked
+					 * when SK_BPF_CB_TX_TIMESTAMPING
+					 * feature is on.
+					 */
+	BPF_SOCK_OPS_TSTAMP_SENDMSG_CB,	/* Called when every sendmsg syscall
+					 * is triggered. It's used to correlate
+					 * sendmsg timestamp with corresponding
+					 * tskey.
+					 */
 };
 
 /* List of TCP states. There is a build check in net/ipv4/tcp.c to detect
@@ -7091,6 +7181,7 @@ enum {
 	TCP_BPF_SYN_IP		= 1006, /* Copy the IP[46] and TCP header */
 	TCP_BPF_SYN_MAC         = 1007, /* Copy the MAC, IP[46], and TCP header */
 	TCP_BPF_SOCK_OPS_CB_FLAGS = 1008, /* Get or Set TCP sock ops flags */
+	SK_BPF_CB_FLAGS		= 1009, /* Get or set sock ops flags in socket */
 };
 
 enum {
diff -pruN 257.7-1/src/basic/linux/btrfs.h 257.9-0ubuntu2/src/basic/linux/btrfs.h
--- 257.7-1/src/basic/linux/btrfs.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/btrfs.h	2025-09-03 18:35:40.000000000 +0000
@@ -615,7 +615,12 @@ struct btrfs_ioctl_clone_range_args {
  */
 #define BTRFS_DEFRAG_RANGE_COMPRESS 1
 #define BTRFS_DEFRAG_RANGE_START_IO 2
+#define BTRFS_DEFRAG_RANGE_COMPRESS_LEVEL 4
+/* Request no compression on the range (uncompress if necessary). */
+#define BTRFS_DEFRAG_RANGE_NOCOMPRESS	8
 #define BTRFS_DEFRAG_RANGE_FLAGS_SUPP	(BTRFS_DEFRAG_RANGE_COMPRESS |		\
+					 BTRFS_DEFRAG_RANGE_COMPRESS_LEVEL |	\
+					 BTRFS_DEFRAG_RANGE_NOCOMPRESS |	\
 					 BTRFS_DEFRAG_RANGE_START_IO)
 
 struct btrfs_ioctl_defrag_range_args {
@@ -640,10 +645,18 @@ struct btrfs_ioctl_defrag_range_args {
 
 	/*
 	 * which compression method to use if turning on compression
-	 * for this defrag operation.  If unspecified, zlib will
-	 * be used
+	 * for this defrag operation. If unspecified, zlib will be
+	 * used. If compression level is also being specified, set the
+	 * BTRFS_DEFRAG_RANGE_COMPRESS_LEVEL flag and fill the compress
+	 * member structure instead of the compress_type field.
 	 */
-	__u32 compress_type;
+	union {
+		__u32 compress_type;
+		struct {
+			__u8 type;
+			__s8 level;
+		} compress;
+	};
 
 	/* spare for later */
 	__u32 unused[4];
diff -pruN 257.7-1/src/basic/linux/const.h 257.9-0ubuntu2/src/basic/linux/const.h
--- 257.7-1/src/basic/linux/const.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/const.h	2025-09-03 18:35:40.000000000 +0000
@@ -33,7 +33,7 @@
  * Missing __asm__ support
  *
  * __BIT128() would not work in the __asm__ code, as it shifts an
- * 'unsigned __init128' data type as direct representation of
+ * 'unsigned __int128' data type as direct representation of
  * 128 bit constants is not supported in the gcc compiler, as
  * they get silently truncated.
  *
diff -pruN 257.7-1/src/basic/linux/dm-ioctl.h 257.9-0ubuntu2/src/basic/linux/dm-ioctl.h
--- 257.7-1/src/basic/linux/dm-ioctl.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/dm-ioctl.h	2025-09-03 18:35:40.000000000 +0000
@@ -258,10 +258,12 @@ enum {
 	DM_DEV_SET_GEOMETRY_CMD,
 	DM_DEV_ARM_POLL_CMD,
 	DM_GET_TARGET_VERSION_CMD,
+	DM_MPATH_PROBE_PATHS_CMD,
 };
 
 #define DM_IOCTL 0xfd
 
+/* Control device ioctls */
 #define DM_VERSION       _IOWR(DM_IOCTL, DM_VERSION_CMD, struct dm_ioctl)
 #define DM_REMOVE_ALL    _IOWR(DM_IOCTL, DM_REMOVE_ALL_CMD, struct dm_ioctl)
 #define DM_LIST_DEVICES  _IOWR(DM_IOCTL, DM_LIST_DEVICES_CMD, struct dm_ioctl)
@@ -285,10 +287,13 @@ enum {
 #define DM_TARGET_MSG	 _IOWR(DM_IOCTL, DM_TARGET_MSG_CMD, struct dm_ioctl)
 #define DM_DEV_SET_GEOMETRY	_IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
 
+/* Block device ioctls */
+#define DM_MPATH_PROBE_PATHS _IO(DM_IOCTL, DM_MPATH_PROBE_PATHS_CMD)
+
 #define DM_VERSION_MAJOR	4
 #define DM_VERSION_MINOR	27
 #define DM_VERSION_PATCHLEVEL	0
-#define DM_VERSION_EXTRA	"-ioctl (2025-01-17)"
+#define DM_VERSION_EXTRA	"-ioctl (2025-04-28)"
 
 /* Status bits */
 #define DM_READONLY_FLAG	(1 << 0) /* In/Out */
diff -pruN 257.7-1/src/basic/linux/ethtool.h 257.9-0ubuntu2/src/basic/linux/ethtool.h
--- 257.7-1/src/basic/linux/ethtool.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/ethtool.h	2025-09-03 18:35:40.000000000 +0000
@@ -680,6 +680,7 @@ enum ethtool_link_ext_substate_module {
  * @ETH_SS_STATS_ETH_CTRL: names of IEEE 802.3 MAC Control statistics
  * @ETH_SS_STATS_RMON: names of RMON statistics
  * @ETH_SS_STATS_PHY: names of PHY(dev) statistics
+ * @ETH_SS_TS_FLAGS: hardware timestamping flags
  *
  * @ETH_SS_COUNT: number of defined string sets
  */
@@ -706,6 +707,7 @@ enum ethtool_stringset {
 	ETH_SS_STATS_ETH_CTRL,
 	ETH_SS_STATS_RMON,
 	ETH_SS_STATS_PHY,
+	ETH_SS_TS_FLAGS,
 
 	/* add new constants above here */
 	ETH_SS_COUNT
@@ -2055,6 +2057,24 @@ enum ethtool_link_mode_bit_indices {
 	ETHTOOL_LINK_MODE_10baseT1S_Half_BIT		 = 100,
 	ETHTOOL_LINK_MODE_10baseT1S_P2MP_Half_BIT	 = 101,
 	ETHTOOL_LINK_MODE_10baseT1BRR_Full_BIT		 = 102,
+	ETHTOOL_LINK_MODE_200000baseCR_Full_BIT		 = 103,
+	ETHTOOL_LINK_MODE_200000baseKR_Full_BIT		 = 104,
+	ETHTOOL_LINK_MODE_200000baseDR_Full_BIT		 = 105,
+	ETHTOOL_LINK_MODE_200000baseDR_2_Full_BIT	 = 106,
+	ETHTOOL_LINK_MODE_200000baseSR_Full_BIT		 = 107,
+	ETHTOOL_LINK_MODE_200000baseVR_Full_BIT		 = 108,
+	ETHTOOL_LINK_MODE_400000baseCR2_Full_BIT	 = 109,
+	ETHTOOL_LINK_MODE_400000baseKR2_Full_BIT	 = 110,
+	ETHTOOL_LINK_MODE_400000baseDR2_Full_BIT	 = 111,
+	ETHTOOL_LINK_MODE_400000baseDR2_2_Full_BIT	 = 112,
+	ETHTOOL_LINK_MODE_400000baseSR2_Full_BIT	 = 113,
+	ETHTOOL_LINK_MODE_400000baseVR2_Full_BIT	 = 114,
+	ETHTOOL_LINK_MODE_800000baseCR4_Full_BIT	 = 115,
+	ETHTOOL_LINK_MODE_800000baseKR4_Full_BIT	 = 116,
+	ETHTOOL_LINK_MODE_800000baseDR4_Full_BIT	 = 117,
+	ETHTOOL_LINK_MODE_800000baseDR4_2_Full_BIT	 = 118,
+	ETHTOOL_LINK_MODE_800000baseSR4_Full_BIT	 = 119,
+	ETHTOOL_LINK_MODE_800000baseVR4_Full_BIT	 = 120,
 
 	/* must be last entry */
 	__ETHTOOL_LINK_MODE_MASK_NBITS
@@ -2267,73 +2287,81 @@ static __inline__ int ethtool_validate_d
  * be exploited to reduce the RSS queue spread.
  */
 #define	RXH_XFRM_SYM_XOR	(1 << 0)
+/* Similar to SYM_XOR, except that one copy of the XOR'ed fields is replaced by
+ * an OR of the same fields
+ */
+#define	RXH_XFRM_SYM_OR_XOR	(1 << 1)
 #define	RXH_XFRM_NO_CHANGE	0xff
 
-/* L2-L4 network traffic flow types */
-#define	TCP_V4_FLOW	0x01	/* hash or spec (tcp_ip4_spec) */
-#define	UDP_V4_FLOW	0x02	/* hash or spec (udp_ip4_spec) */
-#define	SCTP_V4_FLOW	0x03	/* hash or spec (sctp_ip4_spec) */
-#define	AH_ESP_V4_FLOW	0x04	/* hash only */
-#define	TCP_V6_FLOW	0x05	/* hash or spec (tcp_ip6_spec; nfc only) */
-#define	UDP_V6_FLOW	0x06	/* hash or spec (udp_ip6_spec; nfc only) */
-#define	SCTP_V6_FLOW	0x07	/* hash or spec (sctp_ip6_spec; nfc only) */
-#define	AH_ESP_V6_FLOW	0x08	/* hash only */
-#define	AH_V4_FLOW	0x09	/* hash or spec (ah_ip4_spec) */
-#define	ESP_V4_FLOW	0x0a	/* hash or spec (esp_ip4_spec) */
-#define	AH_V6_FLOW	0x0b	/* hash or spec (ah_ip6_spec; nfc only) */
-#define	ESP_V6_FLOW	0x0c	/* hash or spec (esp_ip6_spec; nfc only) */
-#define	IPV4_USER_FLOW	0x0d	/* spec only (usr_ip4_spec) */
-#define	IP_USER_FLOW	IPV4_USER_FLOW
-#define	IPV6_USER_FLOW	0x0e	/* spec only (usr_ip6_spec; nfc only) */
-#define	IPV4_FLOW	0x10	/* hash only */
-#define	IPV6_FLOW	0x11	/* hash only */
-#define	ETHER_FLOW	0x12	/* spec only (ether_spec) */
-
-/* Used for GTP-U IPv4 and IPv6.
- * The format of GTP packets only includes
- * elements such as TEID and GTP version.
- * It is primarily intended for data communication of the UE.
- */
-#define GTPU_V4_FLOW 0x13	/* hash only */
-#define GTPU_V6_FLOW 0x14	/* hash only */
-
-/* Use for GTP-C IPv4 and v6.
- * The format of these GTP packets does not include TEID.
- * Primarily expected to be used for communication
- * to create sessions for UE data communication,
- * commonly referred to as CSR (Create Session Request).
- */
-#define GTPC_V4_FLOW 0x15	/* hash only */
-#define GTPC_V6_FLOW 0x16	/* hash only */
-
-/* Use for GTP-C IPv4 and v6.
- * Unlike GTPC_V4_FLOW, the format of these GTP packets includes TEID.
- * After session creation, it becomes this packet.
- * This is mainly used for requests to realize UE handover.
- */
-#define GTPC_TEID_V4_FLOW 0x17	/* hash only */
-#define GTPC_TEID_V6_FLOW 0x18	/* hash only */
-
-/* Use for GTP-U and extended headers for the PSC (PDU Session Container).
- * The format of these GTP packets includes TEID and QFI.
- * In 5G communication using UPF (User Plane Function),
- * data communication with this extended header is performed.
- */
-#define GTPU_EH_V4_FLOW 0x19	/* hash only */
-#define GTPU_EH_V6_FLOW 0x1a	/* hash only */
-
-/* Use for GTP-U IPv4 and v6 PSC (PDU Session Container) extended headers.
- * This differs from GTPU_EH_V(4|6)_FLOW in that it is distinguished by
- * UL/DL included in the PSC.
- * There are differences in the data included based on Downlink/Uplink,
- * and can be used to distinguish packets.
- * The functions described so far are useful when you want to
- * handle communication from the mobile network in UPF, PGW, etc.
- */
-#define GTPU_UL_V4_FLOW 0x1b	/* hash only */
-#define GTPU_UL_V6_FLOW 0x1c	/* hash only */
-#define GTPU_DL_V4_FLOW 0x1d	/* hash only */
-#define GTPU_DL_V6_FLOW 0x1e	/* hash only */
+enum {
+	/* L2-L4 network traffic flow types */
+	TCP_V4_FLOW	= 0x01,	/* hash or spec (tcp_ip4_spec) */
+	UDP_V4_FLOW	= 0x02,	/* hash or spec (udp_ip4_spec) */
+	SCTP_V4_FLOW	= 0x03,	/* hash or spec (sctp_ip4_spec) */
+	AH_ESP_V4_FLOW	= 0x04,	/* hash only */
+	TCP_V6_FLOW	= 0x05,	/* hash or spec (tcp_ip6_spec; nfc only) */
+	UDP_V6_FLOW	= 0x06,	/* hash or spec (udp_ip6_spec; nfc only) */
+	SCTP_V6_FLOW	= 0x07,	/* hash or spec (sctp_ip6_spec; nfc only) */
+	AH_ESP_V6_FLOW	= 0x08,	/* hash only */
+	AH_V4_FLOW	= 0x09,	/* hash or spec (ah_ip4_spec) */
+	ESP_V4_FLOW	= 0x0a,	/* hash or spec (esp_ip4_spec) */
+	AH_V6_FLOW	= 0x0b,	/* hash or spec (ah_ip6_spec; nfc only) */
+	ESP_V6_FLOW	= 0x0c,	/* hash or spec (esp_ip6_spec; nfc only) */
+	IPV4_USER_FLOW	= 0x0d,	/* spec only (usr_ip4_spec) */
+	IP_USER_FLOW	= IPV4_USER_FLOW,
+	IPV6_USER_FLOW	= 0x0e, /* spec only (usr_ip6_spec; nfc only) */
+	IPV4_FLOW	= 0x10, /* hash only */
+	IPV6_FLOW	= 0x11, /* hash only */
+	ETHER_FLOW	= 0x12, /* hash or spec (ether_spec) */
+
+	/* Used for GTP-U IPv4 and IPv6.
+	 * The format of GTP packets only includes
+	 * elements such as TEID and GTP version.
+	 * It is primarily intended for data communication of the UE.
+	 */
+	GTPU_V4_FLOW	= 0x13,	/* hash only */
+	GTPU_V6_FLOW	= 0x14,	/* hash only */
+
+	/* Use for GTP-C IPv4 and v6.
+	 * The format of these GTP packets does not include TEID.
+	 * Primarily expected to be used for communication
+	 * to create sessions for UE data communication,
+	 * commonly referred to as CSR (Create Session Request).
+	 */
+	GTPC_V4_FLOW	= 0x15,	/* hash only */
+	GTPC_V6_FLOW	= 0x16,	/* hash only */
+
+	/* Use for GTP-C IPv4 and v6.
+	 * Unlike GTPC_V4_FLOW, the format of these GTP packets includes TEID.
+	 * After session creation, it becomes this packet.
+	 * This is mainly used for requests to realize UE handover.
+	 */
+	GTPC_TEID_V4_FLOW	= 0x17,	/* hash only */
+	GTPC_TEID_V6_FLOW	= 0x18,	/* hash only */
+
+	/* Use for GTP-U and extended headers for the PSC (PDU Session Container).
+	 * The format of these GTP packets includes TEID and QFI.
+	 * In 5G communication using UPF (User Plane Function),
+	 * data communication with this extended header is performed.
+	 */
+	GTPU_EH_V4_FLOW	= 0x19,	/* hash only */
+	GTPU_EH_V6_FLOW	= 0x1a,	/* hash only */
+
+	/* Use for GTP-U IPv4 and v6 PSC (PDU Session Container) extended headers.
+	 * This differs from GTPU_EH_V(4|6)_FLOW in that it is distinguished by
+	 * UL/DL included in the PSC.
+	 * There are differences in the data included based on Downlink/Uplink,
+	 * and can be used to distinguish packets.
+	 * The functions described so far are useful when you want to
+	 * handle communication from the mobile network in UPF, PGW, etc.
+	 */
+	GTPU_UL_V4_FLOW	= 0x1b,	/* hash only */
+	GTPU_UL_V6_FLOW	= 0x1c,	/* hash only */
+	GTPU_DL_V4_FLOW	= 0x1d,	/* hash only */
+	GTPU_DL_V6_FLOW	= 0x1e,	/* hash only */
+
+	__FLOW_TYPE_COUNT,
+};
 
 /* Flag to enable additional fields in struct ethtool_rx_flow_spec */
 #define	FLOW_EXT	0x80000000
@@ -2341,7 +2369,7 @@ static __inline__ int ethtool_validate_d
 /* Flag to enable RSS spreading of traffic matching rule (nfc only) */
 #define	FLOW_RSS	0x20000000
 
-/* L3-L4 network traffic flow hash options */
+/* L2-L4 network traffic flow hash options */
 #define	RXH_L2DA	(1 << 1)
 #define	RXH_VLAN	(1 << 2)
 #define	RXH_L3_PROTO	(1 << 3)
diff -pruN 257.7-1/src/basic/linux/fib_rules.h 257.9-0ubuntu2/src/basic/linux/fib_rules.h
--- 257.7-1/src/basic/linux/fib_rules.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/fib_rules.h	2025-09-03 18:35:40.000000000 +0000
@@ -70,6 +70,9 @@ enum {
 	FRA_DSCP,	/* dscp */
 	FRA_FLOWLABEL,	/* flowlabel */
 	FRA_FLOWLABEL_MASK,	/* flowlabel mask */
+	FRA_SPORT_MASK,	/* sport mask */
+	FRA_DPORT_MASK,	/* dport mask */
+	FRA_DSCP_MASK,	/* dscp mask */
 	__FRA_MAX
 };
 
diff -pruN 257.7-1/src/basic/linux/if_bridge.h 257.9-0ubuntu2/src/basic/linux/if_bridge.h
--- 257.7-1/src/basic/linux/if_bridge.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/if_bridge.h	2025-09-03 18:35:40.000000000 +0000
@@ -699,10 +699,11 @@ struct br_mdb_entry {
 #define MDB_TEMPORARY 0
 #define MDB_PERMANENT 1
 	__u8 state;
-#define MDB_FLAGS_OFFLOAD	(1 << 0)
-#define MDB_FLAGS_FAST_LEAVE	(1 << 1)
-#define MDB_FLAGS_STAR_EXCL	(1 << 2)
-#define MDB_FLAGS_BLOCKED	(1 << 3)
+#define MDB_FLAGS_OFFLOAD		(1 << 0)
+#define MDB_FLAGS_FAST_LEAVE		(1 << 1)
+#define MDB_FLAGS_STAR_EXCL		(1 << 2)
+#define MDB_FLAGS_BLOCKED		(1 << 3)
+#define MDB_FLAGS_OFFLOAD_FAILED	(1 << 4)
 	__u8 flags;
 	__u16 vid;
 	struct {
@@ -830,6 +831,7 @@ enum br_boolopt_id {
 	BR_BOOLOPT_NO_LL_LEARN,
 	BR_BOOLOPT_MCAST_VLAN_SNOOPING,
 	BR_BOOLOPT_MST_ENABLE,
+	BR_BOOLOPT_MDB_OFFLOAD_FAIL_NOTIFICATION,
 	BR_BOOLOPT_MAX
 };
 
diff -pruN 257.7-1/src/basic/linux/if_link.h 257.9-0ubuntu2/src/basic/linux/if_link.h
--- 257.7-1/src/basic/linux/if_link.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/if_link.h	2025-09-03 18:35:40.000000000 +0000
@@ -378,6 +378,7 @@ enum {
 	IFLA_GRO_IPV4_MAX_SIZE,
 	IFLA_DPLL_PIN,
 	IFLA_MAX_PACING_OFFLOAD_HORIZON,
+	IFLA_NETNS_IMMUTABLE,
 	__IFLA_MAX
 };
 
@@ -1395,6 +1396,7 @@ enum {
 	IFLA_VXLAN_LOCALBYPASS,
 	IFLA_VXLAN_LABEL_POLICY, /* IPv6 flow label policy; ifla_vxlan_label_policy */
 	IFLA_VXLAN_RESERVED_BITS,
+	IFLA_VXLAN_MC_ROUTE,
 	__IFLA_VXLAN_MAX
 };
 #define IFLA_VXLAN_MAX	(__IFLA_VXLAN_MAX - 1)
@@ -1436,6 +1438,7 @@ enum {
 	IFLA_GENEVE_TTL_INHERIT,
 	IFLA_GENEVE_DF,
 	IFLA_GENEVE_INNER_PROTO_INHERIT,
+	IFLA_GENEVE_PORT_RANGE,
 	__IFLA_GENEVE_MAX
 };
 #define IFLA_GENEVE_MAX	(__IFLA_GENEVE_MAX - 1)
@@ -1448,6 +1451,11 @@ enum ifla_geneve_df {
 	GENEVE_DF_MAX = __GENEVE_DF_END - 1,
 };
 
+struct ifla_geneve_port_range {
+	__be16 low;
+	__be16 high;
+};
+
 /* Bareudp section  */
 enum {
 	IFLA_BAREUDP_UNSPEC,
@@ -1525,6 +1533,7 @@ enum {
 	IFLA_BOND_MISSED_MAX,
 	IFLA_BOND_NS_IP6_TARGET,
 	IFLA_BOND_COUPLED_CONTROL,
+	IFLA_BOND_BROADCAST_NEIGH,
 	__IFLA_BOND_MAX,
 };
 
@@ -1977,4 +1986,19 @@ enum {
 
 #define IFLA_DSA_MAX	(__IFLA_DSA_MAX - 1)
 
+/* OVPN section */
+
+enum ovpn_mode {
+	OVPN_MODE_P2P,
+	OVPN_MODE_MP,
+};
+
+enum {
+	IFLA_OVPN_UNSPEC,
+	IFLA_OVPN_MODE,
+	__IFLA_OVPN_MAX,
+};
+
+#define IFLA_OVPN_MAX	(__IFLA_OVPN_MAX - 1)
+
 #endif /* _LINUX_IF_LINK_H */
diff -pruN 257.7-1/src/basic/linux/if_tun.h 257.9-0ubuntu2/src/basic/linux/if_tun.h
--- 257.7-1/src/basic/linux/if_tun.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/if_tun.h	2025-09-03 18:35:40.000000000 +0000
@@ -93,6 +93,15 @@
 #define TUN_F_USO4	0x20	/* I can handle USO for IPv4 packets */
 #define TUN_F_USO6	0x40	/* I can handle USO for IPv6 packets */
 
+/* I can handle TSO/USO for UDP tunneled packets */
+#define TUN_F_UDP_TUNNEL_GSO		0x080
+
+/*
+ * I can handle TSO/USO for UDP tunneled packets requiring csum offload for
+ * the outer header
+ */
+#define TUN_F_UDP_TUNNEL_GSO_CSUM	0x100
+
 /* Protocol info prepended to the packets (when IFF_NO_PI is not set) */
 #define TUN_PKT_STRIP	0x0001
 struct tun_pi {
diff -pruN 257.7-1/src/basic/linux/in6.h 257.9-0ubuntu2/src/basic/linux/in6.h
--- 257.7-1/src/basic/linux/in6.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/in6.h	2025-09-03 18:35:40.000000000 +0000
@@ -152,7 +152,6 @@ struct in6_flowlabel_req {
 /*
  *	IPV6 socket options
  */
-#if __UAPI_DEF_IPV6_OPTIONS
 #define IPV6_ADDRFORM		1
 #define IPV6_2292PKTINFO	2
 #define IPV6_2292HOPOPTS	3
@@ -169,8 +168,10 @@ struct in6_flowlabel_req {
 #define IPV6_MULTICAST_IF	17
 #define IPV6_MULTICAST_HOPS	18
 #define IPV6_MULTICAST_LOOP	19
+#if __UAPI_DEF_IPV6_OPTIONS
 #define IPV6_ADD_MEMBERSHIP	20
 #define IPV6_DROP_MEMBERSHIP	21
+#endif
 #define IPV6_ROUTER_ALERT	22
 #define IPV6_MTU_DISCOVER	23
 #define IPV6_MTU		24
@@ -203,7 +204,6 @@ struct in6_flowlabel_req {
 #define IPV6_IPSEC_POLICY	34
 #define IPV6_XFRM_POLICY	35
 #define IPV6_HDRINCL		36
-#endif
 
 /*
  * Multicast:
diff -pruN 257.7-1/src/basic/linux/input-event-codes.h 257.9-0ubuntu2/src/basic/linux/input-event-codes.h
--- 257.7-1/src/basic/linux/input-event-codes.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/input-event-codes.h	2025-09-03 18:35:40.000000000 +0000
@@ -601,6 +601,11 @@
 #define BTN_DPAD_LEFT		0x222
 #define BTN_DPAD_RIGHT		0x223
 
+#define BTN_GRIPL		0x224
+#define BTN_GRIPR		0x225
+#define BTN_GRIPL2		0x226
+#define BTN_GRIPR2		0x227
+
 #define KEY_ALS_TOGGLE		0x230	/* Ambient light sensor */
 #define KEY_ROTATE_LOCK_TOGGLE	0x231	/* Display rotation lock */
 #define KEY_REFRESH_RATE_TOGGLE	0x232	/* Display refresh rate toggle */
@@ -765,6 +770,9 @@
 #define KEY_KBD_LCD_MENU4		0x2bb
 #define KEY_KBD_LCD_MENU5		0x2bc
 
+/* Performance Boost key (Alienware)/G-Mode key (Dell) */
+#define KEY_PERFORMANCE			0x2bd
+
 #define BTN_TRIGGER_HAPPY		0x2c0
 #define BTN_TRIGGER_HAPPY1		0x2c0
 #define BTN_TRIGGER_HAPPY2		0x2c1
@@ -925,7 +933,8 @@
 #define SW_MUTE_DEVICE		0x0e  /* set = device disabled */
 #define SW_PEN_INSERTED		0x0f  /* set = pen inserted */
 #define SW_MACHINE_COVER	0x10  /* set = cover closed */
-#define SW_MAX			0x10
+#define SW_USB_INSERT		0x11  /* set = USB audio device connected */
+#define SW_MAX			0x11
 #define SW_CNT			(SW_MAX+1)
 
 /*
diff -pruN 257.7-1/src/basic/linux/input.h 257.9-0ubuntu2/src/basic/linux/input.h
--- 257.7-1/src/basic/linux/input.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/input.h	2025-09-03 18:35:40.000000000 +0000
@@ -273,6 +273,7 @@ struct input_mask {
 #define BUS_CEC			0x1E
 #define BUS_INTEL_ISHTP		0x1F
 #define BUS_AMD_SFH		0x20
+#define BUS_SDW			0x21
 
 /*
  * MT_TOOL types
diff -pruN 257.7-1/src/basic/linux/ipv6.h 257.9-0ubuntu2/src/basic/linux/ipv6.h
--- 257.7-1/src/basic/linux/ipv6.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/ipv6.h	2025-09-03 18:35:40.000000000 +0000
@@ -199,6 +199,7 @@ enum {
 	DEVCONF_NDISC_EVICT_NOCARRIER,
 	DEVCONF_ACCEPT_UNTRACKED_NA,
 	DEVCONF_ACCEPT_RA_MIN_LFT,
+	DEVCONF_FORCE_FORWARDING,
 	DEVCONF_MAX
 };
 
diff -pruN 257.7-1/src/basic/linux/neighbour.h 257.9-0ubuntu2/src/basic/linux/neighbour.h
--- 257.7-1/src/basic/linux/neighbour.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/neighbour.h	2025-09-03 18:35:40.000000000 +0000
@@ -54,6 +54,7 @@ enum {
 /* Extended flags under NDA_FLAGS_EXT: */
 #define NTF_EXT_MANAGED		(1 << 0)
 #define NTF_EXT_LOCKED		(1 << 1)
+#define NTF_EXT_EXT_VALIDATED	(1 << 2)
 
 /*
  *	Neighbor Cache Entry States.
@@ -92,6 +93,10 @@ enum {
  * bridge in response to a host trying to communicate via a locked bridge port
  * with MAB enabled. Their purpose is to notify user space that a host requires
  * authentication.
+ *
+ * NTF_EXT_EXT_VALIDATED flagged neighbor entries were externally validated by
+ * a user space control plane. The kernel will not remove or invalidate them,
+ * but it can probe them and notify user space when they become reachable.
  */
 
 struct nda_cacheinfo {
diff -pruN 257.7-1/src/basic/linux/netfilter/nf_tables.h 257.9-0ubuntu2/src/basic/linux/netfilter/nf_tables.h
--- 257.7-1/src/basic/linux/netfilter/nf_tables.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/netfilter/nf_tables.h	2025-09-03 18:35:40.000000000 +0000
@@ -394,6 +394,8 @@ enum nft_set_field_attributes {
  * @NFTA_SET_HANDLE: set handle (NLA_U64)
  * @NFTA_SET_EXPR: set expression (NLA_NESTED: nft_expr_attributes)
  * @NFTA_SET_EXPRESSIONS: list of expressions (NLA_NESTED: nft_list_attributes)
+ * @NFTA_SET_TYPE: set backend type (NLA_STRING)
+ * @NFTA_SET_COUNT: number of set elements (NLA_U32)
  */
 enum nft_set_attributes {
 	NFTA_SET_UNSPEC,
@@ -415,6 +417,8 @@ enum nft_set_attributes {
 	NFTA_SET_HANDLE,
 	NFTA_SET_EXPR,
 	NFTA_SET_EXPRESSIONS,
+	NFTA_SET_TYPE,
+	NFTA_SET_COUNT,
 	__NFTA_SET_MAX
 };
 #define NFTA_SET_MAX		(__NFTA_SET_MAX - 1)
@@ -1837,6 +1841,10 @@ enum nft_xfrm_keys {
  * @NFTA_TRACE_MARK: nfmark (NLA_U32)
  * @NFTA_TRACE_NFPROTO: nf protocol processed (NLA_U32)
  * @NFTA_TRACE_POLICY: policy that decided fate of packet (NLA_U32)
+ * @NFTA_TRACE_CT_ID: conntrack id (NLA_U32)
+ * @NFTA_TRACE_CT_DIRECTION: packets direction (NLA_U8)
+ * @NFTA_TRACE_CT_STATUS: conntrack status (NLA_U32)
+ * @NFTA_TRACE_CT_STATE: packet state (new, established, ...) (NLA_U32)
  */
 enum nft_trace_attributes {
 	NFTA_TRACE_UNSPEC,
@@ -1857,6 +1865,10 @@ enum nft_trace_attributes {
 	NFTA_TRACE_NFPROTO,
 	NFTA_TRACE_POLICY,
 	NFTA_TRACE_PAD,
+	NFTA_TRACE_CT_ID,
+	NFTA_TRACE_CT_DIRECTION,
+	NFTA_TRACE_CT_STATUS,
+	NFTA_TRACE_CT_STATE,
 	__NFTA_TRACE_MAX
 };
 #define NFTA_TRACE_MAX (__NFTA_TRACE_MAX - 1)
diff -pruN 257.7-1/src/basic/linux/nl80211.h 257.9-0ubuntu2/src/basic/linux/nl80211.h
--- 257.7-1/src/basic/linux/nl80211.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/nl80211.h	2025-09-03 18:35:40.000000000 +0000
@@ -11,7 +11,7 @@
  * Copyright 2008 Jouni Malinen <jouni.malinen@atheros.com>
  * Copyright 2008 Colin McCabe <colin@cozybit.com>
  * Copyright 2015-2017	Intel Deutschland GmbH
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -1330,7 +1330,15 @@
  *      TID to Link mapping for downlink/uplink traffic.
  *
  * @NL80211_CMD_ASSOC_MLO_RECONF: For a non-AP MLD station, request to
- *      add/remove links to/from the association.
+ *      add/remove links to/from the association. To indicate link
+ *      reconfiguration request results from the driver, this command is also
+ *      used as an event to notify userspace about the added links information.
+ *      For notifying the removed links information, the existing
+ *      %NL80211_CMD_LINKS_REMOVED command is used. This command is also used to
+ *      notify userspace about newly added links for the current connection in
+ *      case of AP-initiated link recommendation requests, received via
+ *      a BTM (BSS Transition Management) request or a link reconfig notify
+ *      frame, where the driver handles the link recommendation offload.
  *
  * @NL80211_CMD_EPCS_CFG: EPCS configuration for a station. Used by userland to
  *	control EPCS configuration. Used to notify userland on the current state
@@ -2881,9 +2889,9 @@ enum nl80211_commands {
  * @NL80211_ATTR_VIF_RADIO_MASK: Bitmask of allowed radios (u32).
  *	A value of 0 means all radios.
  *
- * @NL80211_ATTR_SUPPORTED_SELECTORS: supported selectors, array of
- *	supported selectors as defined by IEEE 802.11 7.3.2.2 but without the
- *	length restriction (at most %NL80211_MAX_SUPP_SELECTORS).
+ * @NL80211_ATTR_SUPPORTED_SELECTORS: supported BSS Membership Selectors, array
+ *	of supported selectors as defined by IEEE Std 802.11-2020 9.4.2.3 but
+ *	without the length restriction (at most %NL80211_MAX_SUPP_SELECTORS).
  *	This can be used to provide a list of selectors that are implemented
  *	by the supplicant. If not given, support for SAE_H2E is assumed.
  *
@@ -2893,6 +2901,33 @@ enum nl80211_commands {
  * @NL80211_ATTR_EPCS: Flag attribute indicating that EPCS is enabled for a
  *	station interface.
  *
+ * @NL80211_ATTR_ASSOC_MLD_EXT_CAPA_OPS: Extended MLD capabilities and
+ *	operations that userspace implements to use during association/ML
+ *	link reconfig, currently only "BTM MLD Recommendation For Multiple
+ *	APs Support". Drivers may set additional flags that they support
+ *	in the kernel or device.
+ *
+ * @NL80211_ATTR_WIPHY_RADIO_INDEX: (int) Integer attribute denoting the index
+ *	of the radio in interest. Internally a value of -1 is used to
+ *	indicate that the radio id is not given in user-space. This means
+ *	that all the attributes are applicable to all the radios. If there is
+ *	a radio index provided in user-space, the attributes will be
+ *	applicable to that specific radio only. If the radio id is greater
+ *	thank the number of radios, error denoting invalid value is returned.
+ *
+ * @NL80211_ATTR_S1G_LONG_BEACON_PERIOD: (u8) Integer attribute that represents
+ *	the number of beacon intervals between each long beacon transmission
+ *	for an S1G BSS with short beaconing enabled. This is a required
+ *	attribute for initialising an S1G short beaconing BSS. When updating
+ *	the short beacon data, this is not required. It has a minimum value of
+ *	2 (i.e 2 beacon intervals).
+ *
+ * @NL80211_ATTR_S1G_SHORT_BEACON: Nested attribute containing the short beacon
+ *	head and tail used to set or update the short beacon templates. When
+ *	bringing up a new interface, %NL80211_ATTR_S1G_LONG_BEACON_PERIOD is
+ *	required alongside this attribute. Refer to
+ *	@enum nl80211_s1g_short_beacon_attrs for the attribute definitions.
+ *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -3448,6 +3483,13 @@ enum nl80211_attrs {
 	NL80211_ATTR_MLO_RECONF_REM_LINKS,
 	NL80211_ATTR_EPCS,
 
+	NL80211_ATTR_ASSOC_MLD_EXT_CAPA_OPS,
+
+	NL80211_ATTR_WIPHY_RADIO_INDEX,
+
+	NL80211_ATTR_S1G_LONG_BEACON_PERIOD,
+	NL80211_ATTR_S1G_SHORT_BEACON,
+
 	/* add attributes here, update the policy in nl80211.c */
 
 	__NL80211_ATTR_AFTER_LAST,
@@ -4327,6 +4369,8 @@ enum nl80211_wmm_rule {
  *	otherwise completely disabled.
  * @NL80211_FREQUENCY_ATTR_ALLOW_6GHZ_VLP_AP: This channel can be used for a
  *	very low power (VLP) AP, despite being NO_IR.
+ * @NL80211_FREQUENCY_ATTR_ALLOW_20MHZ_ACTIVITY: This channel can be active in
+ *	20 MHz bandwidth, despite being NO_IR.
  * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
  *	currently defined
  * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
@@ -4371,6 +4415,7 @@ enum nl80211_frequency_attr {
 	NL80211_FREQUENCY_ATTR_NO_6GHZ_AFC_CLIENT,
 	NL80211_FREQUENCY_ATTR_CAN_MONITOR,
 	NL80211_FREQUENCY_ATTR_ALLOW_6GHZ_VLP_AP,
+	NL80211_FREQUENCY_ATTR_ALLOW_20MHZ_ACTIVITY,
 
 	/* keep last */
 	__NL80211_FREQUENCY_ATTR_AFTER_LAST,
@@ -4582,31 +4627,34 @@ enum nl80211_sched_scan_match_attr {
  * @NL80211_RRF_NO_6GHZ_AFC_CLIENT: Client connection to AFC AP not allowed
  * @NL80211_RRF_ALLOW_6GHZ_VLP_AP: Very low power (VLP) AP can be permitted
  *	despite NO_IR configuration.
+ * @NL80211_RRF_ALLOW_20MHZ_ACTIVITY: Allow activity in 20 MHz bandwidth,
+ *	despite NO_IR configuration.
  */
 enum nl80211_reg_rule_flags {
-	NL80211_RRF_NO_OFDM		= 1<<0,
-	NL80211_RRF_NO_CCK		= 1<<1,
-	NL80211_RRF_NO_INDOOR		= 1<<2,
-	NL80211_RRF_NO_OUTDOOR		= 1<<3,
-	NL80211_RRF_DFS			= 1<<4,
-	NL80211_RRF_PTP_ONLY		= 1<<5,
-	NL80211_RRF_PTMP_ONLY		= 1<<6,
-	NL80211_RRF_NO_IR		= 1<<7,
-	__NL80211_RRF_NO_IBSS		= 1<<8,
-	NL80211_RRF_AUTO_BW		= 1<<11,
-	NL80211_RRF_IR_CONCURRENT	= 1<<12,
-	NL80211_RRF_NO_HT40MINUS	= 1<<13,
-	NL80211_RRF_NO_HT40PLUS		= 1<<14,
-	NL80211_RRF_NO_80MHZ		= 1<<15,
-	NL80211_RRF_NO_160MHZ		= 1<<16,
-	NL80211_RRF_NO_HE		= 1<<17,
-	NL80211_RRF_NO_320MHZ		= 1<<18,
-	NL80211_RRF_NO_EHT		= 1<<19,
-	NL80211_RRF_PSD			= 1<<20,
-	NL80211_RRF_DFS_CONCURRENT	= 1<<21,
-	NL80211_RRF_NO_6GHZ_VLP_CLIENT	= 1<<22,
-	NL80211_RRF_NO_6GHZ_AFC_CLIENT	= 1<<23,
-	NL80211_RRF_ALLOW_6GHZ_VLP_AP	= 1<<24,
+	NL80211_RRF_NO_OFDM                 = 1 << 0,
+	NL80211_RRF_NO_CCK                  = 1 << 1,
+	NL80211_RRF_NO_INDOOR               = 1 << 2,
+	NL80211_RRF_NO_OUTDOOR              = 1 << 3,
+	NL80211_RRF_DFS                     = 1 << 4,
+	NL80211_RRF_PTP_ONLY                = 1 << 5,
+	NL80211_RRF_PTMP_ONLY               = 1 << 6,
+	NL80211_RRF_NO_IR                   = 1 << 7,
+	__NL80211_RRF_NO_IBSS               = 1 << 8,
+	NL80211_RRF_AUTO_BW                 = 1 << 11,
+	NL80211_RRF_IR_CONCURRENT           = 1 << 12,
+	NL80211_RRF_NO_HT40MINUS            = 1 << 13,
+	NL80211_RRF_NO_HT40PLUS             = 1 << 14,
+	NL80211_RRF_NO_80MHZ                = 1 << 15,
+	NL80211_RRF_NO_160MHZ               = 1 << 16,
+	NL80211_RRF_NO_HE                   = 1 << 17,
+	NL80211_RRF_NO_320MHZ               = 1 << 18,
+	NL80211_RRF_NO_EHT                  = 1 << 19,
+	NL80211_RRF_PSD                     = 1 << 20,
+	NL80211_RRF_DFS_CONCURRENT          = 1 << 21,
+	NL80211_RRF_NO_6GHZ_VLP_CLIENT      = 1 << 22,
+	NL80211_RRF_NO_6GHZ_AFC_CLIENT      = 1 << 23,
+	NL80211_RRF_ALLOW_6GHZ_VLP_AP       = 1 << 24,
+	NL80211_RRF_ALLOW_20MHZ_ACTIVITY    = 1 << 25,
 };
 
 #define NL80211_RRF_PASSIVE_SCAN	NL80211_RRF_NO_IR
@@ -4727,8 +4775,8 @@ enum nl80211_survey_info {
  * @NL80211_MNTR_FLAG_PLCPFAIL: pass frames with bad PLCP
  * @NL80211_MNTR_FLAG_CONTROL: pass control frames
  * @NL80211_MNTR_FLAG_OTHER_BSS: disable BSSID filtering
- * @NL80211_MNTR_FLAG_COOK_FRAMES: report frames after processing.
- *	overrides all other flags.
+ * @NL80211_MNTR_FLAG_COOK_FRAMES: deprecated
+ *	will unconditionally be refused
  * @NL80211_MNTR_FLAG_ACTIVE: use the configured MAC address
  *	and ACK incoming unicast packets.
  * @NL80211_MNTR_FLAG_SKIP_TX: do not pass local tx packets
@@ -8022,6 +8070,11 @@ enum nl80211_sar_specs_attrs {
  *	Setting this flag is permitted only if the driver advertises EMA support
  *	by setting wiphy->ema_max_profile_periodicity to non-zero.
  *
+ * @NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID: Link ID of the transmitted profile.
+ *	This parameter is mandatory when NL80211_ATTR_MBSSID_CONFIG attributes
+ *	are sent for a non-transmitted profile and if the transmitted profile
+ *	is part of an MLD. For all other cases this parameter is unnecessary.
+ *
  * @__NL80211_MBSSID_CONFIG_ATTR_LAST: Internal
  * @NL80211_MBSSID_CONFIG_ATTR_MAX: highest attribute
  */
@@ -8033,6 +8086,7 @@ enum nl80211_mbssid_config_attributes {
 	NL80211_MBSSID_CONFIG_ATTR_INDEX,
 	NL80211_MBSSID_CONFIG_ATTR_TX_IFINDEX,
 	NL80211_MBSSID_CONFIG_ATTR_EMA,
+	NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID,
 
 	/* keep last */
 	__NL80211_MBSSID_CONFIG_ATTR_LAST,
@@ -8068,6 +8122,7 @@ enum nl80211_ap_settings_flags {
  *	and contains attributes defined in &enum nl80211_if_combination_attrs.
  * @NL80211_WIPHY_RADIO_ATTR_ANTENNA_MASK: bitmask (u32) of antennas
  *	connected to this radio.
+ * @NL80211_WIPHY_RADIO_ATTR_RTS_THRESHOLD: RTS threshold (u32) of this radio.
  *
  * @__NL80211_WIPHY_RADIO_ATTR_LAST: Internal
  * @NL80211_WIPHY_RADIO_ATTR_MAX: Highest attribute
@@ -8079,6 +8134,7 @@ enum nl80211_wiphy_radio_attrs {
 	NL80211_WIPHY_RADIO_ATTR_FREQ_RANGE,
 	NL80211_WIPHY_RADIO_ATTR_INTERFACE_COMBINATION,
 	NL80211_WIPHY_RADIO_ATTR_ANTENNA_MASK,
+	NL80211_WIPHY_RADIO_ATTR_RTS_THRESHOLD,
 
 	/* keep last */
 	__NL80211_WIPHY_RADIO_ATTR_LAST,
@@ -8108,4 +8164,27 @@ enum nl80211_wiphy_radio_freq_range {
 	NL80211_WIPHY_RADIO_FREQ_ATTR_MAX = __NL80211_WIPHY_RADIO_FREQ_ATTR_LAST - 1,
 };
 
+/**
+ * enum nl80211_s1g_short_beacon_attrs - S1G short beacon data
+ *
+ * @__NL80211_S1G_SHORT_BEACON_ATTR_INVALID: Invalid
+ *
+ * @NL80211_S1G_SHORT_BEACON_ATTR_HEAD: Short beacon head (binary).
+ * @NL80211_S1G_SHORT_BEACON_ATTR_TAIL: Short beacon tail (binary).
+ *
+ * @__NL80211_S1G_SHORT_BEACON_ATTR_LAST: Internal
+ * @NL80211_S1G_SHORT_BEACON_ATTR_MAX: Highest attribute
+ */
+enum nl80211_s1g_short_beacon_attrs {
+	__NL80211_S1G_SHORT_BEACON_ATTR_INVALID,
+
+	NL80211_S1G_SHORT_BEACON_ATTR_HEAD,
+	NL80211_S1G_SHORT_BEACON_ATTR_TAIL,
+
+	/* keep last */
+	__NL80211_S1G_SHORT_BEACON_ATTR_LAST,
+	NL80211_S1G_SHORT_BEACON_ATTR_MAX =
+		__NL80211_S1G_SHORT_BEACON_ATTR_LAST - 1
+};
+
 #endif /* __LINUX_NL80211_H */
diff -pruN 257.7-1/src/basic/linux/pkt_sched.h 257.9-0ubuntu2/src/basic/linux/pkt_sched.h
--- 257.7-1/src/basic/linux/pkt_sched.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/pkt_sched.h	2025-09-03 18:35:40.000000000 +0000
@@ -1182,6 +1182,7 @@ enum {
 	TCA_TAPRIO_ATTR_SCHED_SINGLE_ENTRY, /* single entry */
 	TCA_TAPRIO_ATTR_SCHED_CLOCKID, /* s32 */
 	TCA_TAPRIO_PAD,
+	TCA_TAPRIO_ATTR_PAD = TCA_TAPRIO_PAD,
 	TCA_TAPRIO_ATTR_ADMIN_SCHED, /* The admin sched, only used in dump */
 	TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME, /* s64 */
 	TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME_EXTENSION, /* s64 */
@@ -1210,4 +1211,72 @@ enum {
 
 #define TCA_ETS_MAX (__TCA_ETS_MAX - 1)
 
+/* DUALPI2 */
+enum tc_dualpi2_drop_overload {
+	TC_DUALPI2_DROP_OVERLOAD_OVERFLOW = 0,
+	TC_DUALPI2_DROP_OVERLOAD_DROP = 1,
+	__TCA_DUALPI2_DROP_OVERLOAD_MAX,
+};
+#define TCA_DUALPI2_DROP_OVERLOAD_MAX (__TCA_DUALPI2_DROP_OVERLOAD_MAX - 1)
+
+enum tc_dualpi2_drop_early {
+	TC_DUALPI2_DROP_EARLY_DROP_DEQUEUE = 0,
+	TC_DUALPI2_DROP_EARLY_DROP_ENQUEUE = 1,
+	__TCA_DUALPI2_DROP_EARLY_MAX,
+};
+#define TCA_DUALPI2_DROP_EARLY_MAX (__TCA_DUALPI2_DROP_EARLY_MAX - 1)
+
+enum tc_dualpi2_ecn_mask {
+	TC_DUALPI2_ECN_MASK_L4S_ECT = 1,
+	TC_DUALPI2_ECN_MASK_CLA_ECT = 2,
+	TC_DUALPI2_ECN_MASK_ANY_ECT = 3,
+	__TCA_DUALPI2_ECN_MASK_MAX,
+};
+#define TCA_DUALPI2_ECN_MASK_MAX (__TCA_DUALPI2_ECN_MASK_MAX - 1)
+
+enum tc_dualpi2_split_gso {
+	TC_DUALPI2_SPLIT_GSO_NO_SPLIT_GSO = 0,
+	TC_DUALPI2_SPLIT_GSO_SPLIT_GSO = 1,
+	__TCA_DUALPI2_SPLIT_GSO_MAX,
+};
+#define TCA_DUALPI2_SPLIT_GSO_MAX (__TCA_DUALPI2_SPLIT_GSO_MAX - 1)
+
+enum {
+	TCA_DUALPI2_UNSPEC,
+	TCA_DUALPI2_LIMIT,		/* Packets */
+	TCA_DUALPI2_MEMORY_LIMIT,	/* Bytes */
+	TCA_DUALPI2_TARGET,		/* us */
+	TCA_DUALPI2_TUPDATE,		/* us */
+	TCA_DUALPI2_ALPHA,		/* Hz scaled up by 256 */
+	TCA_DUALPI2_BETA,		/* Hz scaled up by 256 */
+	TCA_DUALPI2_STEP_THRESH_PKTS,	/* Step threshold in packets */
+	TCA_DUALPI2_STEP_THRESH_US,	/* Step threshold in microseconds */
+	TCA_DUALPI2_MIN_QLEN_STEP,	/* Minimum qlen to apply STEP_THRESH */
+	TCA_DUALPI2_COUPLING,		/* Coupling factor between queues */
+	TCA_DUALPI2_DROP_OVERLOAD,	/* Whether to drop on overload */
+	TCA_DUALPI2_DROP_EARLY,		/* Whether to drop on enqueue */
+	TCA_DUALPI2_C_PROTECTION,	/* Percentage */
+	TCA_DUALPI2_ECN_MASK,		/* L4S queue classification mask */
+	TCA_DUALPI2_SPLIT_GSO,		/* Split GSO packets at enqueue */
+	TCA_DUALPI2_PAD,
+	__TCA_DUALPI2_MAX
+};
+
+#define TCA_DUALPI2_MAX   (__TCA_DUALPI2_MAX - 1)
+
+struct tc_dualpi2_xstats {
+	__u32 prob;		/* current probability */
+	__u32 delay_c;		/* current delay in C queue */
+	__u32 delay_l;		/* current delay in L queue */
+	__u32 packets_in_c;	/* number of packets enqueued in C queue */
+	__u32 packets_in_l;	/* number of packets enqueued in L queue */
+	__u32 maxq;		/* maximum queue size */
+	__u32 ecn_mark;		/* packets marked with ecn*/
+	__u32 step_marks;	/* ECN marks due to the step AQM */
+	__s32 credit;		/* current c_protection credit */
+	__u32 memory_used;	/* Memory used by both queues */
+	__u32 max_memory_used;	/* Maximum used memory */
+	__u32 memory_limit;	/* Memory limit of both queues */
+};
+
 #endif
diff -pruN 257.7-1/src/basic/linux/rtnetlink.h 257.9-0ubuntu2/src/basic/linux/rtnetlink.h
--- 257.7-1/src/basic/linux/rtnetlink.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/rtnetlink.h	2025-09-03 18:35:40.000000000 +0000
@@ -307,6 +307,7 @@ enum {
 #define RTPROT_MROUTED		17	/* Multicast daemon */
 #define RTPROT_KEEPALIVED	18	/* Keepalived daemon */
 #define RTPROT_BABEL		42	/* Babel daemon */
+#define RTPROT_OVN		84	/* OVN daemon */
 #define RTPROT_OPENR		99	/* Open Routing (Open/R) Routes */
 #define RTPROT_BGP		186	/* BGP Routes */
 #define RTPROT_ISIS		187	/* ISIS Routes */
diff -pruN 257.7-1/src/basic/linux/stddef.h 257.9-0ubuntu2/src/basic/linux/stddef.h
--- 257.7-1/src/basic/linux/stddef.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/stddef.h	2025-09-03 18:35:40.000000000 +0000
@@ -70,4 +70,6 @@
 #define __counted_by_be(m)
 #endif
 
+#define __kernel_nonstring
+
 #endif /* _LINUX_STDDEF_H */
diff -pruN 257.7-1/src/basic/linux/vm_sockets.h 257.9-0ubuntu2/src/basic/linux/vm_sockets.h
--- 257.7-1/src/basic/linux/vm_sockets.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/vm_sockets.h	2025-09-03 18:35:40.000000000 +0000
@@ -17,6 +17,8 @@
 #ifndef _VM_SOCKETS_H
 #define _VM_SOCKETS_H
 
+#include <sys/socket.h>        /* for struct sockaddr and sa_family_t */
+
 #include <linux/socket.h>
 #include <linux/types.h>
 
diff -pruN 257.7-1/src/basic/linux/wireguard.h 257.9-0ubuntu2/src/basic/linux/wireguard.h
--- 257.7-1/src/basic/linux/wireguard.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/linux/wireguard.h	2025-09-03 18:35:40.000000000 +0000
@@ -101,6 +101,10 @@
  *                    WGALLOWEDIP_A_FAMILY: NLA_U16
  *                    WGALLOWEDIP_A_IPADDR: struct in_addr or struct in6_addr
  *                    WGALLOWEDIP_A_CIDR_MASK: NLA_U8
+ *                    WGALLOWEDIP_A_FLAGS: NLA_U32, WGALLOWEDIP_F_REMOVE_ME if
+ *                                         the specified IP should be removed;
+ *                                         otherwise, this IP will be added if
+ *                                         it is not already present.
  *                0: NLA_NESTED
  *                    ...
  *                0: NLA_NESTED
@@ -184,11 +188,16 @@ enum wgpeer_attribute {
 };
 #define WGPEER_A_MAX (__WGPEER_A_LAST - 1)
 
+enum wgallowedip_flag {
+	WGALLOWEDIP_F_REMOVE_ME = 1U << 0,
+	__WGALLOWEDIP_F_ALL = WGALLOWEDIP_F_REMOVE_ME
+};
 enum wgallowedip_attribute {
 	WGALLOWEDIP_A_UNSPEC,
 	WGALLOWEDIP_A_FAMILY,
 	WGALLOWEDIP_A_IPADDR,
 	WGALLOWEDIP_A_CIDR_MASK,
+	WGALLOWEDIP_A_FLAGS,
 	__WGALLOWEDIP_A_LAST
 };
 #define WGALLOWEDIP_A_MAX (__WGALLOWEDIP_A_LAST - 1)
diff -pruN 257.7-1/src/basic/meson.build 257.9-0ubuntu2/src/basic/meson.build
--- 257.7-1/src/basic/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -121,28 +121,24 @@ basic_sources += missing_syscall_def_h
 
 generate_af_list = find_program('generate-af-list.sh')
 af_list_txt = custom_target(
-        'af-list.txt',
         output : 'af-list.txt',
         command : [generate_af_list, cpp, config_h, missing_socket_h],
         capture : true)
 
 generate_arphrd_list = find_program('generate-arphrd-list.sh')
 arphrd_list_txt = custom_target(
-        'arphrd-list.txt',
         output : 'arphrd-list.txt',
         command : [generate_arphrd_list, cpp, files('linux/if_arp.h'), config_h],
         capture : true)
 
 generate_cap_list = find_program('generate-cap-list.sh')
 cap_list_txt = custom_target(
-        'cap-list.txt',
         output : 'cap-list.txt',
         command : [generate_cap_list, cpp, config_h, missing_capability_h],
         capture : true)
 
 generate_errno_list = find_program('generate-errno-list.sh')
 errno_list_txt = custom_target(
-        'errno-list.txt',
         output : 'errno-list.txt',
         command : [generate_errno_list, cpp],
         capture : true)
@@ -155,7 +151,6 @@ foreach item : [['af',     af_list_txt,
 
         fname = '@0@-from-name.gperf'.format(item[0])
         gperf_file = custom_target(
-                fname,
                 input : item[1],
                 output : fname,
                 command : [generate_gperfs, item[2], item[3], '@INPUT@'],
@@ -163,7 +158,6 @@ foreach item : [['af',     af_list_txt,
 
         fname = '@0@-from-name.h'.format(item[0])
         target1 = custom_target(
-                fname,
                 input : gperf_file,
                 output : fname,
                 command : [gperf,
@@ -177,7 +171,6 @@ foreach item : [['af',     af_list_txt,
         fname = '@0@-to-name.h'.format(item[0])
         awkscript = '@0@-to-name.awk'.format(item[0])
         target2 = custom_target(
-                fname,
                 input : [awkscript, item[1]],
                 output : fname,
                 command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
@@ -207,6 +200,7 @@ arch_list = [
         'powerpc64',
         'riscv32',
         'riscv64',
+        'sh',
         's390',
         's390x',
         'sparc',
@@ -246,7 +240,6 @@ if r.returncode() != 0
 endif
 
 filesystems_gperf_h = custom_target(
-        'filesystems-gperf.h',
         input : 'filesystems-gperf.gperf',
         output : 'filesystems-gperf.h',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
@@ -254,7 +247,6 @@ filesystems_gperf_h = custom_target(
 generate_filesystem_list = find_program('generate-filesystem-list.py')
 fname = 'filesystem-list.h'
 filesystem_list_h = custom_target(
-        fname,
         input : 'filesystems-gperf.gperf',
         output : fname,
         command : [generate_filesystem_list,
@@ -264,7 +256,6 @@ filesystem_list_h = custom_target(
 generate_filesystem_switch_case_h = find_program('generate-filesystem-switch-case.py')
 fname = 'filesystem-switch-case.h'
 filesystem_switch_case_h = custom_target(
-        fname,
         input : 'filesystems-gperf.gperf',
         output : 'filesystem-switch-case.h',
         command : [generate_filesystem_switch_case_h,
diff -pruN 257.7-1/src/basic/missing_syscall_def.h 257.9-0ubuntu2/src/basic/missing_syscall_def.h
--- 257.7-1/src/basic/missing_syscall_def.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/missing_syscall_def.h	2025-09-03 18:35:40.000000000 +0000
@@ -32,6 +32,7 @@
 #      error "Unknown RISC-V ABI"
 #    endif
 #  elif defined(__s390__)
+#  elif defined(__sh__)
 #  elif defined(__sparc__)
 #  elif defined(__x86_64__)
 #    if defined(__ILP32__)
@@ -83,6 +84,8 @@
 #    endif
 #  elif defined(__s390__)
 #    define systemd_NR_bpf 351
+#  elif defined(__sh__)
+#    define systemd_NR_bpf 375
 #  elif defined(__sparc__)
 #    define systemd_NR_bpf 349
 #  elif defined(__x86_64__)
@@ -151,6 +154,8 @@ assert_cc(__NR_bpf == systemd_NR_bpf);
 #    endif
 #  elif defined(__s390__)
 #    define systemd_NR_close_range 436
+#  elif defined(__sh__)
+#    define systemd_NR_close_range 436
 #  elif defined(__sparc__)
 #    define systemd_NR_close_range 436
 #  elif defined(__x86_64__)
@@ -219,6 +224,8 @@ assert_cc(__NR_close_range == systemd_NR
 #    endif
 #  elif defined(__s390__)
 #    define systemd_NR_copy_file_range 375
+#  elif defined(__sh__)
+#    define systemd_NR_copy_file_range 380
 #  elif defined(__sparc__)
 #    define systemd_NR_copy_file_range 357
 #  elif defined(__x86_64__)
@@ -287,6 +294,8 @@ assert_cc(__NR_copy_file_range == system
 #    endif
 #  elif defined(__s390__)
 #    define systemd_NR_fchmodat2 452
+#  elif defined(__sh__)
+#    define systemd_NR_fchmodat2 452
 #  elif defined(__sparc__)
 #    define systemd_NR_fchmodat2 452
 #  elif defined(__x86_64__)
@@ -355,6 +364,8 @@ assert_cc(__NR_fchmodat2 == systemd_NR_f
 #    endif
 #  elif defined(__s390__)
 #    define systemd_NR_getrandom 349
+#  elif defined(__sh__)
+#    define systemd_NR_getrandom 373
 #  elif defined(__sparc__)
 #    define systemd_NR_getrandom 347
 #  elif defined(__x86_64__)
@@ -423,6 +434,8 @@ assert_cc(__NR_getrandom == systemd_NR_g
 #    endif
 #  elif defined(__s390__)
 #    define systemd_NR_memfd_create 350
+#  elif defined(__sh__)
+#    define systemd_NR_memfd_create 374
 #  elif defined(__sparc__)
 #    define systemd_NR_memfd_create 348
 #  elif defined(__x86_64__)
@@ -491,6 +504,8 @@ assert_cc(__NR_memfd_create == systemd_N
 #    endif
 #  elif defined(__s390__)
 #    define systemd_NR_mount_setattr 442
+#  elif defined(__sh__)
+#    define systemd_NR_mount_setattr 442
 #  elif defined(__sparc__)
 #    define systemd_NR_mount_setattr 442
 #  elif defined(__x86_64__)
@@ -559,6 +574,8 @@ assert_cc(__NR_mount_setattr == systemd_
 #    endif
 #  elif defined(__s390__)
 #    define systemd_NR_move_mount 429
+#  elif defined(__sh__)
+#    define systemd_NR_move_mount 429
 #  elif defined(__sparc__)
 #    define systemd_NR_move_mount 429
 #  elif defined(__x86_64__)
@@ -627,6 +644,8 @@ assert_cc(__NR_move_mount == systemd_NR_
 #    endif
 #  elif defined(__s390__)
 #    define systemd_NR_name_to_handle_at 335
+#  elif defined(__sh__)
+#    define systemd_NR_name_to_handle_at 359
 #  elif defined(__sparc__)
 #    define systemd_NR_name_to_handle_at 332
 #  elif defined(__x86_64__)
@@ -695,6 +714,8 @@ assert_cc(__NR_name_to_handle_at == syst
 #    endif
 #  elif defined(__s390__)
 #    define systemd_NR_open_tree 428
+#  elif defined(__sh__)
+#    define systemd_NR_open_tree 428
 #  elif defined(__sparc__)
 #    define systemd_NR_open_tree 428
 #  elif defined(__x86_64__)
@@ -763,6 +784,8 @@ assert_cc(__NR_open_tree == systemd_NR_o
 #    endif
 #  elif defined(__s390__)
 #    define systemd_NR_openat2 437
+#  elif defined(__sh__)
+#    define systemd_NR_openat2 437
 #  elif defined(__sparc__)
 #    define systemd_NR_openat2 437
 #  elif defined(__x86_64__)
@@ -831,6 +854,8 @@ assert_cc(__NR_openat2 == systemd_NR_ope
 #    endif
 #  elif defined(__s390__)
 #    define systemd_NR_pidfd_open 434
+#  elif defined(__sh__)
+#    define systemd_NR_pidfd_open 434
 #  elif defined(__sparc__)
 #    define systemd_NR_pidfd_open 434
 #  elif defined(__x86_64__)
@@ -899,6 +924,8 @@ assert_cc(__NR_pidfd_open == systemd_NR_
 #    endif
 #  elif defined(__s390__)
 #    define systemd_NR_pidfd_send_signal 424
+#  elif defined(__sh__)
+#    define systemd_NR_pidfd_send_signal 424
 #  elif defined(__sparc__)
 #    define systemd_NR_pidfd_send_signal 424
 #  elif defined(__x86_64__)
@@ -967,6 +994,8 @@ assert_cc(__NR_pidfd_send_signal == syst
 #    endif
 #  elif defined(__s390__)
 #    define systemd_NR_pkey_mprotect 384
+#  elif defined(__sh__)
+#    define systemd_NR_pkey_mprotect 384
 #  elif defined(__sparc__)
 #    define systemd_NR_pkey_mprotect 362
 #  elif defined(__x86_64__)
@@ -1035,6 +1064,8 @@ assert_cc(__NR_pkey_mprotect == systemd_
 #    endif
 #  elif defined(__s390__)
 #    define systemd_NR_renameat2 347
+#  elif defined(__sh__)
+#    define systemd_NR_renameat2 371
 #  elif defined(__sparc__)
 #    define systemd_NR_renameat2 345
 #  elif defined(__x86_64__)
@@ -1103,6 +1134,8 @@ assert_cc(__NR_renameat2 == systemd_NR_r
 #    endif
 #  elif defined(__s390__)
 #    define systemd_NR_setns 339
+#  elif defined(__sh__)
+#    define systemd_NR_setns 364
 #  elif defined(__sparc__)
 #    define systemd_NR_setns 337
 #  elif defined(__x86_64__)
@@ -1171,6 +1204,8 @@ assert_cc(__NR_setns == systemd_NR_setns
 #    endif
 #  elif defined(__s390__)
 #    define systemd_NR_statx 379
+#  elif defined(__sh__)
+#    define systemd_NR_statx 383
 #  elif defined(__sparc__)
 #    define systemd_NR_statx 360
 #  elif defined(__x86_64__)
diff -pruN 257.7-1/src/basic/missing_syscalls.py 257.9-0ubuntu2/src/basic/missing_syscalls.py
--- 257.7-1/src/basic/missing_syscalls.py	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/missing_syscalls.py	2025-09-03 18:35:40.000000000 +0000
@@ -88,6 +88,8 @@ DEF_TEMPLATE_B = '''\
 #    endif
 #  elif defined(__s390__)
 #    define systemd_NR_{syscall} {nr_s390}
+#  elif defined(__sh__)
+#    define systemd_NR_{syscall} {nr_sh}
 #  elif defined(__sparc__)
 #    define systemd_NR_{syscall} {nr_sparc}
 #  elif defined(__x86_64__)
diff -pruN 257.7-1/src/basic/socket-util.h 257.9-0ubuntu2/src/basic/socket-util.h
--- 257.7-1/src/basic/socket-util.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/socket-util.h	2025-09-03 18:35:40.000000000 +0000
@@ -321,27 +321,14 @@ static inline int getsockopt_int(int fd,
 int socket_bind_to_ifname(int fd, const char *ifname);
 int socket_bind_to_ifindex(int fd, int ifindex);
 
-/* Define a 64-bit version of timeval/timespec in any case, even on 32-bit userspace. */
-struct timeval_large {
-        uint64_t tvl_sec, tvl_usec;
-};
-struct timespec_large {
-        uint64_t tvl_sec, tvl_nsec;
-};
 
 /* glibc duplicates timespec/timeval on certain 32-bit arches, once in 32-bit and once in 64-bit.
  * See __convert_scm_timestamps() in glibc source code. Hence, we need additional buffer space for them
  * to prevent truncating control msg (recvmsg() MSG_CTRUNC). */
 #define CMSG_SPACE_TIMEVAL                                              \
-        ((sizeof(struct timeval) == sizeof(struct timeval_large)) ?     \
-         CMSG_SPACE(sizeof(struct timeval)) :                           \
-         CMSG_SPACE(sizeof(struct timeval)) +                           \
-         CMSG_SPACE(sizeof(struct timeval_large)))
+        (CMSG_SPACE(sizeof(struct timeval)) + CMSG_SPACE(2 * sizeof(uint64_t)))
 #define CMSG_SPACE_TIMESPEC                                             \
-        ((sizeof(struct timespec) == sizeof(struct timespec_large)) ?   \
-         CMSG_SPACE(sizeof(struct timespec)) :                          \
-         CMSG_SPACE(sizeof(struct timespec)) +                          \
-         CMSG_SPACE(sizeof(struct timespec_large)))
+        (CMSG_SPACE(sizeof(struct timespec)) + CMSG_SPACE(2 * sizeof(uint64_t)))
 
 ssize_t recvmsg_safe(int sockfd, struct msghdr *msg, int flags);
 
diff -pruN 257.7-1/src/basic/syscall-list.txt 257.9-0ubuntu2/src/basic/syscall-list.txt
--- 257.7-1/src/basic/syscall-list.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscall-list.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl
 fcntl64
 fdatasync
 fgetxattr
+file_getattr
+file_setattr
 finit_module
 flistxattr
 flock
diff -pruN 257.7-1/src/basic/syscalls-alpha.txt 257.9-0ubuntu2/src/basic/syscalls-alpha.txt
--- 257.7-1/src/basic/syscalls-alpha.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-alpha.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl	92
 fcntl64
 fdatasync	447
 fgetxattr	387
+file_getattr	578
+file_setattr	579
 finit_module	507
 flistxattr	390
 flock	131
diff -pruN 257.7-1/src/basic/syscalls-arc.txt 257.9-0ubuntu2/src/basic/syscalls-arc.txt
--- 257.7-1/src/basic/syscalls-arc.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-arc.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl
 fcntl64	25
 fdatasync	83
 fgetxattr	10
+file_getattr	468
+file_setattr	469
 finit_module	273
 flistxattr	13
 flock	32
diff -pruN 257.7-1/src/basic/syscalls-arm.txt 257.9-0ubuntu2/src/basic/syscalls-arm.txt
--- 257.7-1/src/basic/syscalls-arm.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-arm.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl	55
 fcntl64	221
 fdatasync	148
 fgetxattr	231
+file_getattr	468
+file_setattr	469
 finit_module	379
 flistxattr	234
 flock	143
diff -pruN 257.7-1/src/basic/syscalls-arm64.txt 257.9-0ubuntu2/src/basic/syscalls-arm64.txt
--- 257.7-1/src/basic/syscalls-arm64.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-arm64.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl	25
 fcntl64
 fdatasync	83
 fgetxattr	10
+file_getattr	468
+file_setattr	469
 finit_module	273
 flistxattr	13
 flock	32
diff -pruN 257.7-1/src/basic/syscalls-i386.txt 257.9-0ubuntu2/src/basic/syscalls-i386.txt
--- 257.7-1/src/basic/syscalls-i386.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-i386.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl	55
 fcntl64	221
 fdatasync	148
 fgetxattr	231
+file_getattr	468
+file_setattr	469
 finit_module	350
 flistxattr	234
 flock	143
diff -pruN 257.7-1/src/basic/syscalls-loongarch64.txt 257.9-0ubuntu2/src/basic/syscalls-loongarch64.txt
--- 257.7-1/src/basic/syscalls-loongarch64.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-loongarch64.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl	25
 fcntl64
 fdatasync	83
 fgetxattr	10
+file_getattr	468
+file_setattr	469
 finit_module	273
 flistxattr	13
 flock	32
diff -pruN 257.7-1/src/basic/syscalls-m68k.txt 257.9-0ubuntu2/src/basic/syscalls-m68k.txt
--- 257.7-1/src/basic/syscalls-m68k.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-m68k.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl	55
 fcntl64	239
 fdatasync	148
 fgetxattr	228
+file_getattr	468
+file_setattr	469
 finit_module	348
 flistxattr	231
 flock	143
diff -pruN 257.7-1/src/basic/syscalls-mips64.txt 257.9-0ubuntu2/src/basic/syscalls-mips64.txt
--- 257.7-1/src/basic/syscalls-mips64.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-mips64.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl	5070
 fcntl64
 fdatasync	5073
 fgetxattr	5185
+file_getattr	5468
+file_setattr	5469
 finit_module	5307
 flistxattr	5188
 flock	5071
diff -pruN 257.7-1/src/basic/syscalls-mips64n32.txt 257.9-0ubuntu2/src/basic/syscalls-mips64n32.txt
--- 257.7-1/src/basic/syscalls-mips64n32.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-mips64n32.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl	6070
 fcntl64	6212
 fdatasync	6073
 fgetxattr	6185
+file_getattr	6468
+file_setattr	6469
 finit_module	6312
 flistxattr	6188
 flock	6071
diff -pruN 257.7-1/src/basic/syscalls-mipso32.txt 257.9-0ubuntu2/src/basic/syscalls-mipso32.txt
--- 257.7-1/src/basic/syscalls-mipso32.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-mipso32.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl	4055
 fcntl64	4220
 fdatasync	4152
 fgetxattr	4229
+file_getattr	4468
+file_setattr	4469
 finit_module	4348
 flistxattr	4232
 flock	4143
diff -pruN 257.7-1/src/basic/syscalls-parisc.txt 257.9-0ubuntu2/src/basic/syscalls-parisc.txt
--- 257.7-1/src/basic/syscalls-parisc.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-parisc.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl	55
 fcntl64	202
 fdatasync	148
 fgetxattr	243
+file_getattr	468
+file_setattr	469
 finit_module	333
 flistxattr	246
 flock	143
diff -pruN 257.7-1/src/basic/syscalls-powerpc.txt 257.9-0ubuntu2/src/basic/syscalls-powerpc.txt
--- 257.7-1/src/basic/syscalls-powerpc.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-powerpc.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl	55
 fcntl64	204
 fdatasync	148
 fgetxattr	214
+file_getattr	468
+file_setattr	469
 finit_module	353
 flistxattr	217
 flock	143
diff -pruN 257.7-1/src/basic/syscalls-powerpc64.txt 257.9-0ubuntu2/src/basic/syscalls-powerpc64.txt
--- 257.7-1/src/basic/syscalls-powerpc64.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-powerpc64.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl	55
 fcntl64
 fdatasync	148
 fgetxattr	214
+file_getattr	468
+file_setattr	469
 finit_module	353
 flistxattr	217
 flock	143
diff -pruN 257.7-1/src/basic/syscalls-riscv32.txt 257.9-0ubuntu2/src/basic/syscalls-riscv32.txt
--- 257.7-1/src/basic/syscalls-riscv32.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-riscv32.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl
 fcntl64	25
 fdatasync	83
 fgetxattr	10
+file_getattr	468
+file_setattr	469
 finit_module	273
 flistxattr	13
 flock	32
diff -pruN 257.7-1/src/basic/syscalls-riscv64.txt 257.9-0ubuntu2/src/basic/syscalls-riscv64.txt
--- 257.7-1/src/basic/syscalls-riscv64.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-riscv64.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl	25
 fcntl64
 fdatasync	83
 fgetxattr	10
+file_getattr	468
+file_setattr	469
 finit_module	273
 flistxattr	13
 flock	32
diff -pruN 257.7-1/src/basic/syscalls-s390.txt 257.9-0ubuntu2/src/basic/syscalls-s390.txt
--- 257.7-1/src/basic/syscalls-s390.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-s390.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl	55
 fcntl64	221
 fdatasync	148
 fgetxattr	229
+file_getattr	468
+file_setattr	469
 finit_module	344
 flistxattr	232
 flock	143
diff -pruN 257.7-1/src/basic/syscalls-s390x.txt 257.9-0ubuntu2/src/basic/syscalls-s390x.txt
--- 257.7-1/src/basic/syscalls-s390x.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-s390x.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl	55
 fcntl64
 fdatasync	148
 fgetxattr	229
+file_getattr	468
+file_setattr	469
 finit_module	344
 flistxattr	232
 flock	143
diff -pruN 257.7-1/src/basic/syscalls-sh.txt 257.9-0ubuntu2/src/basic/syscalls-sh.txt
--- 257.7-1/src/basic/syscalls-sh.txt	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-sh.txt	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,530 @@
+_llseek	140
+_newselect	142
+accept	344
+accept4	358
+access	33
+acct	51
+add_key	285
+adjtimex	124
+alarm	27
+arc_gettls
+arc_settls
+arc_usr_cmpxchg
+arch_prctl
+arm_fadvise64_64
+atomic_barrier
+atomic_cmpxchg_32
+bind	341
+bpf	375
+brk	45
+cachectl
+cacheflush	123
+cachestat	451
+capget	184
+capset	185
+chdir	12
+chmod	15
+chown	182
+chown32	212
+chroot	61
+clock_adjtime	361
+clock_adjtime64	405
+clock_getres	266
+clock_getres_time64	406
+clock_gettime	265
+clock_gettime64	403
+clock_nanosleep	267
+clock_nanosleep_time64	407
+clock_settime	264
+clock_settime64	404
+clone	120
+clone3
+close	6
+close_range	436
+connect	342
+copy_file_range	380
+creat	8
+delete_module	129
+dipc
+dup	41
+dup2	63
+dup3	330
+epoll_create	254
+epoll_create1	329
+epoll_ctl	255
+epoll_ctl_old
+epoll_pwait	319
+epoll_pwait2	441
+epoll_wait	256
+epoll_wait_old
+eventfd	323
+eventfd2	328
+exec_with_loader
+execv
+execve	11
+execveat	376
+exit	1
+exit_group	252
+faccessat	307
+faccessat2	439
+fadvise64	250
+fadvise64_64	272
+fallocate	324
+fanotify_init	337
+fanotify_mark	338
+fchdir	133
+fchmod	94
+fchmodat	306
+fchmodat2	452
+fchown	95
+fchown32	207
+fchownat	298
+fcntl	55
+fcntl64	221
+fdatasync	148
+fgetxattr	231
+file_getattr	468
+file_setattr	469
+finit_module	368
+flistxattr	234
+flock	143
+fork	2
+fremovexattr	237
+fsconfig	431
+fsetxattr	228
+fsmount	432
+fsopen	430
+fspick	433
+fstat	108
+fstat64	197
+fstatat64	300
+fstatfs	100
+fstatfs64	269
+fsync	118
+ftruncate	93
+ftruncate64	194
+futex	240
+futex_requeue	456
+futex_time64	422
+futex_wait	455
+futex_waitv	449
+futex_wake	454
+futimesat	299
+get_mempolicy	275
+get_robust_list	312
+get_thread_area
+getcpu	318
+getcwd	183
+getdents	141
+getdents64	220
+getdomainname
+getdtablesize
+getegid	50
+getegid32	202
+geteuid	49
+geteuid32	201
+getgid	47
+getgid32	200
+getgroups	80
+getgroups32	205
+gethostname
+getitimer	105
+getpagesize
+getpeername	346
+getpgid	132
+getpgrp	65
+getpid	20
+getppid	64
+getpriority	96
+getrandom	373
+getresgid	171
+getresgid32	211
+getresuid	165
+getresuid32	209
+getrlimit	76
+getrusage	77
+getsid	147
+getsockname	345
+getsockopt	354
+gettid	224
+gettimeofday	78
+getuid	24
+getuid32	199
+getxattr	229
+getxattrat	464
+getxgid
+getxpid
+getxuid
+init_module	128
+inotify_add_watch	291
+inotify_init	290
+inotify_init1	332
+inotify_rm_watch	292
+io_cancel	249
+io_destroy	246
+io_getevents	247
+io_pgetevents
+io_pgetevents_time64	416
+io_setup	245
+io_submit	248
+io_uring_enter	426
+io_uring_register	427
+io_uring_setup	425
+ioctl	54
+ioperm
+iopl
+ioprio_get	289
+ioprio_set	288
+ipc	117
+kcmp	367
+kern_features
+kexec_file_load
+kexec_load	283
+keyctl	287
+kill	37
+landlock_add_rule	445
+landlock_create_ruleset	444
+landlock_restrict_self	446
+lchown	16
+lchown32	198
+lgetxattr	230
+link	9
+linkat	303
+listen	343
+listmount	458
+listxattr	232
+listxattrat	465
+llistxattr	233
+llseek
+lookup_dcookie	253
+lremovexattr	236
+lseek	19
+lsetxattr	227
+lsm_get_self_attr	459
+lsm_list_modules	461
+lsm_set_self_attr	460
+lstat	107
+lstat64	196
+madvise	219
+map_shadow_stack	453
+mbind	274
+membarrier	378
+memfd_create	374
+memfd_secret
+memory_ordering
+migrate_pages	294
+mincore	218
+mkdir	39
+mkdirat	296
+mknod	14
+mknodat	297
+mlock	150
+mlock2	379
+mlockall	152
+mmap	90
+mmap2	192
+modify_ldt
+mount	21
+mount_setattr	442
+move_mount	429
+move_pages	317
+mprotect	125
+mq_getsetattr	282
+mq_notify	281
+mq_open	277
+mq_timedreceive	280
+mq_timedreceive_time64	419
+mq_timedsend	279
+mq_timedsend_time64	418
+mq_unlink	278
+mremap	163
+mseal	462
+msgctl	402
+msgget	399
+msgrcv	401
+msgsnd	400
+msync	144
+multiplexer
+munlock	151
+munlockall	153
+munmap	91
+name_to_handle_at	359
+nanosleep	162
+newfstatat
+nice	34
+old_adjtimex
+oldfstat	28
+oldlstat	84
+oldolduname
+oldstat	18
+oldumount
+olduname	109
+open	5
+open_by_handle_at	360
+open_tree	428
+open_tree_attr	467
+openat	295
+openat2	437
+or1k_atomic
+osf_fstat
+osf_fstatfs
+osf_fstatfs64
+osf_getdirentries
+osf_getdomainname
+osf_getitimer
+osf_getrusage
+osf_getsysinfo
+osf_gettimeofday
+osf_lstat
+osf_mount
+osf_proplist_syscall
+osf_select
+osf_set_program_attributes
+osf_setitimer
+osf_setsysinfo
+osf_settimeofday
+osf_shmat
+osf_sigprocmask
+osf_sigstack
+osf_stat
+osf_statfs
+osf_statfs64
+osf_swapon
+osf_syscall
+osf_sysinfo
+osf_usleep_thread
+osf_utimes
+osf_utsname
+osf_wait4
+pause	29
+pciconfig_iobase
+pciconfig_read
+pciconfig_write
+perf_event_open	336
+perfctr
+personality	136
+pidfd_getfd	438
+pidfd_open	434
+pidfd_send_signal	424
+pipe	42
+pipe2	331
+pivot_root	217
+pkey_alloc	385
+pkey_free	386
+pkey_mprotect	384
+poll	168
+ppoll	309
+ppoll_time64	414
+prctl	172
+pread64	180
+preadv	333
+preadv2	381
+prlimit64	339
+process_madvise	440
+process_mrelease	448
+process_vm_readv	365
+process_vm_writev	366
+pselect6	308
+pselect6_time64	413
+ptrace	26
+pwrite64	181
+pwritev	334
+pwritev2	382
+quotactl	131
+quotactl_fd	443
+read	3
+readahead	225
+readdir	89
+readlink	85
+readlinkat	305
+readv	145
+reboot	88
+recv	350
+recvfrom	351
+recvmmsg	357
+recvmmsg_time64	417
+recvmsg	356
+remap_file_pages	257
+removexattr	235
+removexattrat	466
+rename	38
+renameat	302
+renameat2	371
+request_key	286
+restart_syscall	0
+riscv_flush_icache
+riscv_hwprobe
+rmdir	40
+rseq	387
+rt_sigaction	174
+rt_sigpending	176
+rt_sigprocmask	175
+rt_sigqueueinfo	178
+rt_sigreturn	173
+rt_sigsuspend	179
+rt_sigtimedwait	177
+rt_sigtimedwait_time64	421
+rt_tgsigqueueinfo	335
+rtas
+s390_guarded_storage
+s390_pci_mmio_read
+s390_pci_mmio_write
+s390_runtime_instr
+s390_sthyi
+sched_get_affinity
+sched_get_priority_max	159
+sched_get_priority_min	160
+sched_getaffinity	242
+sched_getattr	369
+sched_getparam	155
+sched_getscheduler	157
+sched_rr_get_interval	161
+sched_rr_get_interval_time64	423
+sched_set_affinity
+sched_setaffinity	241
+sched_setattr	370
+sched_setparam	154
+sched_setscheduler	156
+sched_yield	158
+seccomp	372
+select
+semctl	394
+semget	393
+semop
+semtimedop
+semtimedop_time64	420
+send	348
+sendfile	187
+sendfile64	239
+sendmmsg	363
+sendmsg	355
+sendto	349
+set_mempolicy	276
+set_mempolicy_home_node	450
+set_robust_list	311
+set_thread_area
+set_tid_address	258
+setdomainname	121
+setfsgid	139
+setfsgid32	216
+setfsuid	138
+setfsuid32	215
+setgid	46
+setgid32	214
+setgroups	81
+setgroups32	206
+sethae
+sethostname	74
+setitimer	104
+setns	364
+setpgid	57
+setpgrp
+setpriority	97
+setregid	71
+setregid32	204
+setresgid	170
+setresgid32	210
+setresuid	164
+setresuid32	208
+setreuid	70
+setreuid32	203
+setrlimit	75
+setsid	66
+setsockopt	353
+settimeofday	79
+setuid	23
+setuid32	213
+setxattr	226
+setxattrat	463
+sgetmask	68
+shmat	397
+shmctl	396
+shmdt	398
+shmget	395
+shutdown	352
+sigaction	67
+sigaltstack	186
+signal	48
+signalfd	321
+signalfd4	327
+sigpending	73
+sigprocmask	126
+sigreturn	119
+sigsuspend	72
+socket	340
+socketcall	102
+socketpair	347
+splice	313
+spu_create
+spu_run
+ssetmask	69
+stat	106
+stat64	195
+statfs	99
+statfs64	268
+statmount	457
+statx	383
+stime	25
+subpage_prot
+swapcontext
+swapoff	115
+swapon	87
+switch_endian
+symlink	83
+symlinkat	304
+sync	36
+sync_file_range	314
+sync_file_range2	388
+syncfs	362
+sys_debug_setcontext
+syscall
+sysfs	135
+sysinfo	116
+syslog	103
+sysmips
+tee	315
+tgkill	270
+time	13
+timer_create	259
+timer_delete	263
+timer_getoverrun	262
+timer_gettime	261
+timer_gettime64	408
+timer_settime	260
+timer_settime64	409
+timerfd
+timerfd_create	322
+timerfd_gettime	326
+timerfd_gettime64	410
+timerfd_settime	325
+timerfd_settime64	411
+times	43
+tkill	238
+truncate	92
+truncate64	193
+ugetrlimit	191
+umask	60
+umount	22
+umount2	52
+uname	122
+unlink	10
+unlinkat	301
+unshare	310
+uretprobe
+userfaultfd	377
+ustat	62
+utime	30
+utimensat	320
+utimensat_time64	412
+utimes	271
+utrap_install
+vfork	190
+vhangup	111
+vm86
+vm86old
+vmsplice	316
+wait4	114
+waitid	284
+waitpid	7
+write	4
+writev	146
diff -pruN 257.7-1/src/basic/syscalls-sparc.txt 257.9-0ubuntu2/src/basic/syscalls-sparc.txt
--- 257.7-1/src/basic/syscalls-sparc.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-sparc.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl	92
 fcntl64	155
 fdatasync	253
 fgetxattr	177
+file_getattr	468
+file_setattr	469
 finit_module	342
 flistxattr	180
 flock	131
diff -pruN 257.7-1/src/basic/syscalls-x86_64.txt 257.9-0ubuntu2/src/basic/syscalls-x86_64.txt
--- 257.7-1/src/basic/syscalls-x86_64.txt	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/syscalls-x86_64.txt	2025-09-03 18:35:40.000000000 +0000
@@ -83,6 +83,8 @@ fcntl	72
 fcntl64
 fdatasync	75
 fgetxattr	193
+file_getattr	468
+file_setattr	469
 finit_module	313
 flistxattr	196
 flock	73
diff -pruN 257.7-1/src/basic/terminal-util.c 257.9-0ubuntu2/src/basic/terminal-util.c
--- 257.7-1/src/basic/terminal-util.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/terminal-util.c	2025-09-03 18:35:40.000000000 +0000
@@ -122,18 +122,18 @@ int read_one_char(FILE *f, char *ret, us
                 new_termios.c_cc[VMIN] = 1;
                 new_termios.c_cc[VTIME] = 0;
 
-                if (tcsetattr(fd, TCSADRAIN, &new_termios) >= 0) {
+                if (tcsetattr(fd, TCSANOW, &new_termios) >= 0) {
                         char c;
 
                         if (t != USEC_INFINITY) {
                                 if (fd_wait_for_event(fd, POLLIN, t) <= 0) {
-                                        (void) tcsetattr(fd, TCSADRAIN, &old_termios);
+                                        (void) tcsetattr(fd, TCSANOW, &old_termios);
                                         return -ETIMEDOUT;
                                 }
                         }
 
                         r = safe_fgetc(f, &c);
-                        (void) tcsetattr(fd, TCSADRAIN, &old_termios);
+                        (void) tcsetattr(fd, TCSANOW, &old_termios);
                         if (r < 0)
                                 return r;
                         if (r == 0)
@@ -1915,7 +1915,7 @@ int get_default_background_color(double
         struct termios new_termios = old_termios;
         termios_disable_echo(&new_termios);
 
-        if (tcsetattr(STDIN_FILENO, TCSADRAIN, &new_termios) < 0)
+        if (tcsetattr(STDIN_FILENO, TCSANOW, &new_termios) < 0)
                 return -errno;
 
         r = loop_write(STDOUT_FILENO, ANSI_OSC "11;?" ANSI_ST, SIZE_MAX);
@@ -1979,7 +1979,7 @@ int get_default_background_color(double
         }
 
 finish:
-        RET_GATHER(r, RET_NERRNO(tcsetattr(STDIN_FILENO, TCSADRAIN, &old_termios)));
+        RET_GATHER(r, RET_NERRNO(tcsetattr(STDIN_FILENO, TCSANOW, &old_termios)));
         return r;
 }
 
@@ -2106,7 +2106,7 @@ int terminal_get_size_by_dsr(
         struct termios new_termios = old_termios;
         termios_disable_echo(&new_termios);
 
-        if (tcsetattr(input_fd, TCSADRAIN, &new_termios) < 0)
+        if (tcsetattr(input_fd, TCSANOW, &new_termios) < 0)
                 return log_debug_errno(errno, "Failed to set new terminal settings: %m");
 
         unsigned saved_row = 0, saved_column = 0;
@@ -2209,7 +2209,7 @@ finish:
         if (saved_row > 0 && saved_column > 0)
                 RET_GATHER(r, terminal_set_cursor_position(output_fd, saved_row, saved_column));
 
-        RET_GATHER(r, RET_NERRNO(tcsetattr(input_fd, TCSADRAIN, &old_termios)));
+        RET_GATHER(r, RET_NERRNO(tcsetattr(input_fd, TCSANOW, &old_termios)));
         return r;
 }
 
diff -pruN 257.7-1/src/basic/virt.c 257.9-0ubuntu2/src/basic/virt.c
--- 257.7-1/src/basic/virt.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/basic/virt.c	2025-09-03 18:35:40.000000000 +0000
@@ -250,7 +250,7 @@ static int detect_vm_smbios(void) {
 #endif /* defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || defined(__loongarch_lp64) */
 
 static Virtualization detect_vm_dmi(void) {
-#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || defined(__loongarch_lp64)
+#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || defined(__loongarch_lp64) || defined(__riscv)
 
         int r;
         r = detect_vm_dmi_vendor();
@@ -471,8 +471,14 @@ Virtualization detect_vm(void) {
                    VIRTUALIZATION_ORACLE,
                    VIRTUALIZATION_XEN,
                    VIRTUALIZATION_AMAZON,
-                   VIRTUALIZATION_PARALLELS,
-                   VIRTUALIZATION_GOOGLE)) {
+                   /* Unable to distinguish a GCE machine from a VM to bare-metal
+                    * for non-x86 architectures due to its necessity for cpuid
+                    * detection, which functions solely on x86 platforms. Report
+                    * as a VM for other architectures. */
+#if !defined(__i386__) && !defined(__x86_64__)
+                   VIRTUALIZATION_GOOGLE,
+#endif
+                   VIRTUALIZATION_PARALLELS)) {
                 v = dmi;
                 goto finish;
         }
@@ -511,6 +517,10 @@ Virtualization detect_vm(void) {
                 hyperv = true;
         else if (v == VIRTUALIZATION_VM_OTHER)
                 other = true;
+        else if (v == VIRTUALIZATION_KVM && dmi == VIRTUALIZATION_GOOGLE)
+                /* The DMI vendor tables in /sys/class/dmi/id don't help us distinguish between GCE
+                 * virtual machines and bare-metal instances, so we need to look at hypervisor. */
+                return VIRTUALIZATION_GOOGLE;
         else if (v != VIRTUALIZATION_NONE)
                 goto finish;
 
@@ -523,7 +533,9 @@ Virtualization detect_vm(void) {
                 return dmi;
         if (dmi == VIRTUALIZATION_VM_OTHER)
                 other = true;
-        else if (dmi != VIRTUALIZATION_NONE) {
+        else if (!IN_SET(dmi, VIRTUALIZATION_NONE, VIRTUALIZATION_GOOGLE)) {
+                /* At this point if GCE has been detected in dmi, do not report as a VM. It should
+                 * be a bare-metal machine */
                 v = dmi;
                 goto finish;
         }
diff -pruN 257.7-1/src/boot/boot.c 257.9-0ubuntu2/src/boot/boot.c
--- 257.7-1/src/boot/boot.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/boot/boot.c	2025-09-03 18:35:40.000000000 +0000
@@ -1612,7 +1612,7 @@ static void config_load_defaults(Config
         if (err == EFI_SUCCESS)
                 config->timeout_sec = config->timeout_sec_efivar;
         else if (err != EFI_NOT_FOUND)
-                log_error_status(err, "Error reading LoaderConfigTimeout EFI variable: %m");
+                log_warning_status(err, "Error reading LoaderConfigTimeout EFI variable, ignoring: %m");
 
         err = efivar_get_timeout(u"LoaderConfigTimeoutOneShot", &config->timeout_sec);
         if (err == EFI_SUCCESS) {
@@ -1621,7 +1621,7 @@ static void config_load_defaults(Config
 
                 config->force_menu = true; /* force the menu when this is set */
         } else if (err != EFI_NOT_FOUND)
-                log_error_status(err, "Error reading LoaderConfigTimeoutOneShot EFI variable: %m");
+                log_warning_status(err, "Error reading LoaderConfigTimeoutOneShot EFI variable, ignoring: %m");
 
         uint64_t value;
         err = efivar_get_uint64_str16(MAKE_GUID_PTR(LOADER), u"LoaderConfigConsoleMode", &value);
diff -pruN 257.7-1/src/boot/meson.build 257.9-0ubuntu2/src/boot/meson.build
--- 257.7-1/src/boot/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/boot/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 efi_config_h_dir = meson.current_build_dir()
-efi_addon = ''
+efi_addon = []
 
 libefitest = static_library(
         'efitest',
@@ -393,7 +393,6 @@ foreach efi_elf_binary : efi_elf_binarie
         endif
 
         exe = custom_target(
-                name,
                 output : name,
                 input : efi_elf_binary,
                 install : true,
@@ -418,12 +417,12 @@ foreach efi_elf_binary : efi_elf_binarie
 
         # This is supposed to match exactly one time
         if name == 'addon@0@.efi.stub'.format(efi_arch)
-                efi_addon = exe.full_path()
+                efi_addon = [exe]
         endif
 
         test('check-alignment-@0@'.format(name),
              check_efi_alignment_py,
-             args : exe.full_path(),
+             args : exe,
              suite : 'boot')
 endforeach
 
diff -pruN 257.7-1/src/bootctl/bootctl-install.c 257.9-0ubuntu2/src/bootctl/bootctl-install.c
--- 257.7-1/src/bootctl/bootctl-install.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/bootctl/bootctl-install.c	2025-09-03 18:35:40.000000000 +0000
@@ -329,6 +329,9 @@ static int update_efi_boot_binaries(cons
         _cleanup_free_ char *p = NULL;
         int r, ret = 0;
 
+        assert(esp_path);
+        assert(source_path);
+
         r = chase_and_opendir("/EFI/BOOT", esp_path, CHASE_PREFIX_ROOT|CHASE_PROHIBIT_SYMLINKS, &p, &d);
         if (r == -ENOENT)
                 return 0;
@@ -337,7 +340,6 @@ static int update_efi_boot_binaries(cons
 
         FOREACH_DIRENT(de, d, break) {
                 _cleanup_close_ int fd = -EBADF;
-                _cleanup_free_ char *v = NULL;
 
                 if (!endswith_no_case(de->d_name, ".efi"))
                         continue;
@@ -354,19 +356,14 @@ static int update_efi_boot_binaries(cons
                 if (r == 0)
                         continue;
 
-                r = get_file_version(fd, &v);
-                if (r == -ESRCH)
-                        continue;  /* No version information */
-                if (r < 0)
-                        return r;
-                if (!startswith(v, "systemd-boot "))
-                        continue;
-
                 _cleanup_free_ char *dest_path = path_join(p, de->d_name);
                 if (!dest_path)
                         return log_oom();
 
-                RET_GATHER(ret, copy_file_with_version_check(source_path, dest_path, /* force = */ false));
+                r = copy_file_with_version_check(source_path, dest_path, /* force = */ false);
+                if (IN_SET(r, -ESTALE, -ESRCH))
+                        continue;
+                RET_GATHER(ret, r);
         }
 
         return ret;
diff -pruN 257.7-1/src/bootctl/bootctl-status.c 257.9-0ubuntu2/src/bootctl/bootctl-status.c
--- 257.7-1/src/bootctl/bootctl-status.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/bootctl/bootctl-status.c	2025-09-03 18:35:40.000000000 +0000
@@ -730,7 +730,7 @@ static int unlink_entry(const BootConfig
 
         r = boot_config_find_in(config, root, id);
         if (r < 0)
-                return r;
+                return 0; /* There is nothing to remove. */
 
         if (r == config->default_entry)
                 log_warning("%s is the default boot entry", id);
@@ -751,6 +751,8 @@ static int unlink_entry(const BootConfig
                 log_info("Would remove \"%s\"", e->path);
         else {
                 r = chase_and_unlink(e->path, root, CHASE_PROHIBIT_SYMLINKS, 0, NULL);
+                if (r == -ENOENT)
+                        return 0; /* Already removed? */
                 if (r < 0)
                         return log_error_errno(r, "Failed to remove \"%s\": %m", e->path);
 
@@ -783,7 +785,8 @@ static int list_remove_orphaned_file(
         if (arg_dry_run)
                 log_info("Would remove %s", path);
         else if (unlinkat(dir_fd, de->d_name, 0) < 0)
-                log_warning_errno(errno, "Failed to remove \"%s\", ignoring: %m", path);
+                log_full_errno(errno == ENOENT ? LOG_DEBUG : LOG_WARNING, errno,
+                               "Failed to remove \"%s\", ignoring: %m", path);
         else
                 log_info("Removed %s", path);
 
@@ -870,12 +873,9 @@ int verb_list(int argc, char *argv[], vo
                 return cleanup_orphaned_files(&config, arg_esp_path);
         } else {
                 assert(streq(argv[0], "unlink"));
-                if (arg_xbootldr_path && xbootldr_devid != esp_devid) {
+                if (arg_xbootldr_path && xbootldr_devid != esp_devid)
                         r = unlink_entry(&config, arg_xbootldr_path, argv[1]);
-                        if (r == 0 || r != -ENOENT)
-                                return r;
-                }
-                return unlink_entry(&config, arg_esp_path, argv[1]);
+                return RET_GATHER(r, unlink_entry(&config, arg_esp_path, argv[1]));
         }
 }
 
diff -pruN 257.7-1/src/bootctl/bootctl.c 257.9-0ubuntu2/src/bootctl/bootctl.c
--- 257.7-1/src/bootctl/bootctl.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/bootctl/bootctl.c	2025-09-03 18:35:40.000000000 +0000
@@ -248,8 +248,10 @@ static int help(int argc, char *argv[],
                "  random-seed          Initialize or refresh random seed in ESP and EFI\n"
                "                       variables\n"
                "\n%3$sKernel Image Commands:%4$s\n"
-               "  kernel-identify      Identify kernel image type\n"
-               "  kernel-inspect       Prints details about the kernel image\n"
+               "  kernel-identify KERNEL-IMAGE\n"
+               "                       Identify kernel image type\n"
+               "  kernel-inspect KERNEL-IMAGE\n"
+               "                       Prints details about the kernel image\n"
                "\n%3$sOptions:%4$s\n"
                "  -h --help            Show this help\n"
                "     --version         Print version\n"
diff -pruN 257.7-1/src/core/bpf/restrict_fs/meson.build 257.9-0ubuntu2/src/core/bpf/restrict_fs/meson.build
--- 257.7-1/src/core/bpf/restrict_fs/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/core/bpf/restrict_fs/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -5,19 +5,16 @@ if conf.get('BPF_FRAMEWORK') != 1
 endif
 
 restrict_fs_bpf_o_unstripped = custom_target(
-        'restrict-fs.bpf.unstripped.o',
         input : 'restrict-fs.bpf.c',
         output : 'restrict-fs.bpf.unstripped.o',
         command : bpf_o_unstripped_cmd)
 
 restrict_fs_bpf_o = custom_target(
-        'restrict-fs.bpf.o',
         input : restrict_fs_bpf_o_unstripped,
         output : 'restrict-fs.bpf.o',
         command : bpf_o_cmd)
 
 restrict_fs_skel_h = custom_target(
-        'restrict-fs.skel.h',
         input : restrict_fs_bpf_o,
         output : 'restrict-fs.skel.h',
         command : skel_h_cmd,
diff -pruN 257.7-1/src/core/bpf/restrict_ifaces/meson.build 257.9-0ubuntu2/src/core/bpf/restrict_ifaces/meson.build
--- 257.7-1/src/core/bpf/restrict_ifaces/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/core/bpf/restrict_ifaces/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -5,19 +5,16 @@ if conf.get('BPF_FRAMEWORK') != 1
 endif
 
 restrict_ifaces_bpf_o_unstripped = custom_target(
-        'restrict-ifaces.bpf.unstripped.o',
         input : 'restrict-ifaces.bpf.c',
         output : 'restrict-ifaces.bpf.unstripped.o',
         command : bpf_o_unstripped_cmd)
 
 restrict_ifaces_bpf_o = custom_target(
-        'restrict-ifaces.bpf.o',
         input : restrict_ifaces_bpf_o_unstripped,
         output : 'restrict-ifaces.bpf.o',
         command : bpf_o_cmd)
 
 restrict_ifaces_skel_h = custom_target(
-        'restrict-ifaces.skel.h',
         input : restrict_ifaces_bpf_o,
         output : 'restrict-ifaces.skel.h',
         command : skel_h_cmd,
diff -pruN 257.7-1/src/core/bpf/socket_bind/meson.build 257.9-0ubuntu2/src/core/bpf/socket_bind/meson.build
--- 257.7-1/src/core/bpf/socket_bind/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/core/bpf/socket_bind/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -5,19 +5,16 @@ if conf.get('BPF_FRAMEWORK') != 1
 endif
 
 socket_bind_bpf_o_unstripped = custom_target(
-        'socket-bind.bpf.unstripped.o',
         input : 'socket-bind.bpf.c',
         output : 'socket-bind.bpf.unstripped.o',
         command : bpf_o_unstripped_cmd)
 
 socket_bind_bpf_o = custom_target(
-        'socket-bind.bpf.o',
         input : socket_bind_bpf_o_unstripped,
         output : 'socket-bind.bpf.o',
         command : bpf_o_cmd)
 
 socket_bind_skel_h = custom_target(
-        'socket-bind.skel.h',
         input : socket_bind_bpf_o,
         output : 'socket-bind.skel.h',
         command : skel_h_cmd,
diff -pruN 257.7-1/src/core/cgroup.c 257.9-0ubuntu2/src/core/cgroup.c
--- 257.7-1/src/core/cgroup.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/core/cgroup.c	2025-09-03 18:35:40.000000000 +0000
@@ -1880,10 +1880,10 @@ void unit_modify_nft_set(Unit *u, bool a
 
                 r = nft_set_element_modify_any(u->manager->fw_ctx, add, nft_set->nfproto, nft_set->table, nft_set->set, &element, sizeof(element));
                 if (r < 0)
-                        log_warning_errno(r, "Failed to %s NFT set: family %s, table %s, set %s, cgroup %" PRIu64 ", ignoring: %m",
+                        log_warning_errno(r, "Failed to %s NFT set entry: family %s, table %s, set %s, cgroup %" PRIu64 ", ignoring: %m",
                                           add? "add" : "delete", nfproto_to_string(nft_set->nfproto), nft_set->table, nft_set->set, crt->cgroup_id);
                 else
-                        log_debug("%s NFT set: family %s, table %s, set %s, cgroup %" PRIu64,
+                        log_debug("%s NFT set entry: family %s, table %s, set %s, cgroup %" PRIu64,
                                   add? "Added" : "Deleted", nfproto_to_string(nft_set->nfproto), nft_set->table, nft_set->set, crt->cgroup_id);
         }
 }
@@ -5126,6 +5126,7 @@ static int unit_cgroup_freezer_kernel_st
 int unit_cgroup_freezer_action(Unit *u, FreezerAction action) {
         _cleanup_free_ char *path = NULL;
         FreezerState current, next, objective;
+        bool action_in_progress = false;
         int r;
 
         assert(u);
@@ -5140,14 +5141,21 @@ int unit_cgroup_freezer_action(Unit *u,
         CGroupRuntime *crt = unit_get_cgroup_runtime(u);
         if (!crt || !crt->cgroup_path)
                 /* No realized cgroup = nothing to freeze */
-                goto skip;
+                goto finish;
 
         r = unit_cgroup_freezer_kernel_state(u, &current);
         if (r < 0)
                 return r;
 
-        if (current == objective)
-                goto skip;
+        if (current == objective) {
+                if (objective == FREEZER_FROZEN)
+                        goto finish;
+
+                /* Skip thaw only if no freeze operation was in flight */
+                if (IN_SET(u->freezer_state, FREEZER_RUNNING, FREEZER_THAWING))
+                        goto finish;
+        } else
+                action_in_progress = true;
 
         if (next == freezer_state_finish(next)) {
                 /* We're directly transitioning into a finished state, which in theory means that
@@ -5179,12 +5187,13 @@ int unit_cgroup_freezer_action(Unit *u,
         if (r < 0)
                 return r;
 
-        unit_set_freezer_state(u, next);
-        return 1; /* Wait for cgroup event before replying */
+finish:
+        if (action_in_progress)
+                unit_set_freezer_state(u, next);
+        else
+                unit_set_freezer_state(u, freezer_state_finish(next));
 
-skip:
-        unit_set_freezer_state(u, freezer_state_finish(next));
-        return 0;
+        return action_in_progress;
 }
 
 int unit_get_cpuset(Unit *u, CPUSet *cpus, const char *name) {
diff -pruN 257.7-1/src/core/dbus-manager.c 257.9-0ubuntu2/src/core/dbus-manager.c
--- 257.7-1/src/core/dbus-manager.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/core/dbus-manager.c	2025-09-03 18:35:40.000000000 +0000
@@ -763,6 +763,7 @@ static int method_generic_unit_operation
                 sd_bus_message *message,
                 Manager *m,
                 sd_bus_error *error,
+                UnitType type,
                 sd_bus_message_handler_t handler,
                 GenericUnitOperationFlags flags) {
 
@@ -788,6 +789,11 @@ static int method_generic_unit_operation
         if (r < 0)
                 return r;
 
+        if (type != _UNIT_TYPE_INVALID && u->type != type)
+                return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED,
+                                         "%s operation is not supported for unit type '%s'",
+                                         sd_bus_message_get_member(message), unit_type_to_string(u->type));
+
         if (FLAGS_SET(flags, GENERIC_UNIT_VALIDATE_LOADED)) {
                 r = bus_unit_validate_load_state(u, error);
                 if (r < 0)
@@ -799,7 +805,7 @@ static int method_generic_unit_operation
 
 static int method_enqueue_unit_job(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         /* We don't bother with GENERIC_UNIT_VALIDATE_LOADED here, as the job logic validates that anyway */
-        return method_generic_unit_operation(message, userdata, error, bus_unit_method_enqueue_job, GENERIC_UNIT_LOAD);
+        return method_generic_unit_operation(message, userdata, error, _UNIT_TYPE_INVALID, bus_unit_method_enqueue_job, GENERIC_UNIT_LOAD);
 }
 
 static int method_start_unit_replace(sd_bus_message *message, void *userdata, sd_bus_error *error) {
@@ -824,57 +830,57 @@ static int method_start_unit_replace(sd_
 }
 
 static int method_kill_unit(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        /* We don't bother with GENERIC_UNIT_LOAD nor GENERIC_UNIT_VALIDATE_LOADED here, as it shouldn't
-         * matter whether a unit is loaded for killing any processes possibly in the unit's cgroup. */
-        return method_generic_unit_operation(message, userdata, error, bus_unit_method_kill, 0);
+        /* We don't bother with GENERIC_UNIT_LOAD or GENERIC_UNIT_VALIDATE_LOADED here, as it shouldn't
+         * matter whether a unit is loaded for killing any processes in the unit's cgroup. */
+        return method_generic_unit_operation(message, userdata, error, _UNIT_TYPE_INVALID, bus_unit_method_kill, /* flags = */ 0);
 }
 
 static int method_clean_unit(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         /* Load the unit if necessary, in order to load it, and insist on the unit being loaded to be
          * cleaned */
-        return method_generic_unit_operation(message, userdata, error, bus_unit_method_clean, GENERIC_UNIT_LOAD|GENERIC_UNIT_VALIDATE_LOADED);
+        return method_generic_unit_operation(message, userdata, error, _UNIT_TYPE_INVALID, bus_unit_method_clean, GENERIC_UNIT_LOAD|GENERIC_UNIT_VALIDATE_LOADED);
 }
 
 static int method_freeze_unit(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         /* Only active units can be frozen, which must be properly loaded already */
-        return method_generic_unit_operation(message, userdata, error, bus_unit_method_freeze, GENERIC_UNIT_VALIDATE_LOADED);
+        return method_generic_unit_operation(message, userdata, error, _UNIT_TYPE_INVALID, bus_unit_method_freeze, GENERIC_UNIT_VALIDATE_LOADED);
 }
 
 static int method_thaw_unit(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         /* Same as freeze above */
-        return method_generic_unit_operation(message, userdata, error, bus_unit_method_thaw, GENERIC_UNIT_VALIDATE_LOADED);
+        return method_generic_unit_operation(message, userdata, error, _UNIT_TYPE_INVALID, bus_unit_method_thaw, GENERIC_UNIT_VALIDATE_LOADED);
 }
 
 static int method_reset_failed_unit(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         /* Don't load the unit (because unloaded units can't be in failed state), and don't insist on the
          * unit to be loaded properly (since a failed unit might have its unit file disappeared) */
-        return method_generic_unit_operation(message, userdata, error, bus_unit_method_reset_failed, 0);
+        return method_generic_unit_operation(message, userdata, error, _UNIT_TYPE_INVALID, bus_unit_method_reset_failed, /* flags = */ 0);
 }
 
 static int method_set_unit_properties(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         /* Only change properties on fully loaded units, and load them in order to set properties */
-        return method_generic_unit_operation(message, userdata, error, bus_unit_method_set_properties, GENERIC_UNIT_LOAD|GENERIC_UNIT_VALIDATE_LOADED);
+        return method_generic_unit_operation(message, userdata, error, _UNIT_TYPE_INVALID, bus_unit_method_set_properties, GENERIC_UNIT_LOAD|GENERIC_UNIT_VALIDATE_LOADED);
 }
 
 static int method_bind_mount_unit(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         /* Only add mounts on fully loaded units */
-        return method_generic_unit_operation(message, userdata, error, bus_service_method_bind_mount, GENERIC_UNIT_VALIDATE_LOADED);
+        return method_generic_unit_operation(message, userdata, error, UNIT_SERVICE, bus_service_method_bind_mount, GENERIC_UNIT_VALIDATE_LOADED);
 }
 
 static int method_mount_image_unit(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         /* Only add mounts on fully loaded units */
-        return method_generic_unit_operation(message, userdata, error, bus_service_method_mount_image, GENERIC_UNIT_VALIDATE_LOADED);
+        return method_generic_unit_operation(message, userdata, error, UNIT_SERVICE, bus_service_method_mount_image, GENERIC_UNIT_VALIDATE_LOADED);
 }
 
 static int method_ref_unit(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         /* Only allow reffing of fully loaded units, and make sure reffing a unit loads it. */
-        return method_generic_unit_operation(message, userdata, error, bus_unit_method_ref, GENERIC_UNIT_LOAD|GENERIC_UNIT_VALIDATE_LOADED);
+        return method_generic_unit_operation(message, userdata, error, _UNIT_TYPE_INVALID, bus_unit_method_ref, GENERIC_UNIT_LOAD|GENERIC_UNIT_VALIDATE_LOADED);
 }
 
 static int method_unref_unit(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         /* Dropping a ref OTOH should not require the unit to still be loaded. And since a reffed unit is a
          * loaded unit there's no need to load the unit for unreffing it. */
-        return method_generic_unit_operation(message, userdata, error, bus_unit_method_unref, 0);
+        return method_generic_unit_operation(message, userdata, error, _UNIT_TYPE_INVALID, bus_unit_method_unref, /* flags = */ 0);
 }
 
 static int reply_unit_info(sd_bus_message *reply, Unit *u) {
@@ -953,14 +959,14 @@ static int method_get_unit_processes(sd_
         /* Don't load a unit actively (since it won't have any processes if it's not loaded), but don't
          * insist on the unit being loaded either (because even improperly loaded units might still have
          * processes around). */
-        return method_generic_unit_operation(message, userdata, error, bus_unit_method_get_processes, /* flags = */ 0);
+        return method_generic_unit_operation(message, userdata, error, _UNIT_TYPE_INVALID, bus_unit_method_get_processes, /* flags = */ 0);
 }
 
 static int method_attach_processes_to_unit(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         /* Don't allow attaching new processes to units that aren't loaded. Don't bother with loading a unit
          * for this purpose though, as an unloaded unit is a stopped unit, and we don't allow attaching
          * processes to stopped units anyway. */
-        return method_generic_unit_operation(message, userdata, error, bus_unit_method_attach_processes, GENERIC_UNIT_VALIDATE_LOADED);
+        return method_generic_unit_operation(message, userdata, error, _UNIT_TYPE_INVALID, bus_unit_method_attach_processes, GENERIC_UNIT_VALIDATE_LOADED);
 }
 
 static int transient_unit_from_message(
@@ -2890,7 +2896,7 @@ static int method_set_show_status(sd_bus
 }
 
 static int method_dump_unit_descriptor_store(sd_bus_message *message, void *userdata, sd_bus_error *error) {
-        return method_generic_unit_operation(message, userdata, error, bus_service_method_dump_file_descriptor_store, 0);
+        return method_generic_unit_operation(message, userdata, error, UNIT_SERVICE, bus_service_method_dump_file_descriptor_store, GENERIC_UNIT_VALIDATE_LOADED);
 }
 
 static int aux_scope_from_message(Manager *m, sd_bus_message *message, Unit **ret_scope, sd_bus_error *error) {
diff -pruN 257.7-1/src/core/dbus-unit.c 257.9-0ubuntu2/src/core/dbus-unit.c
--- 257.7-1/src/core/dbus-unit.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/core/dbus-unit.c	2025-09-03 18:35:40.000000000 +0000
@@ -1315,10 +1315,13 @@ static int append_cgroup(sd_bus_message
                 /* libvirt / qemu uses threaded mode and cgroup.procs cannot be read at the lower levels.
                  * From https://docs.kernel.org/admin-guide/cgroup-v2.html#threads, “cgroup.procs” in a
                  * threaded domain cgroup contains the PIDs of all processes in the subtree and is not
-                 * readable in the subtree proper. */
+                 * readable in the subtree proper.
+                 *
+                 * We'll see ENODEV when trying to enumerate processes and the cgroup is removed at the same
+                 * time. Handle this gracefully. */
 
                 r = cg_read_pidref(f, &pidref, /* flags = */ 0);
-                if (IN_SET(r, 0, -EOPNOTSUPP))
+                if (IN_SET(r, 0, -EOPNOTSUPP, -ENODEV))
                         break;
                 if (r < 0)
                         return r;
diff -pruN 257.7-1/src/core/exec-invoke.c 257.9-0ubuntu2/src/core/exec-invoke.c
--- 257.7-1/src/core/exec-invoke.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/core/exec-invoke.c	2025-09-03 18:35:40.000000000 +0000
@@ -3634,7 +3634,7 @@ static int setup_keyring(
                                                     "Failed to change GID back for user keyring: %m");
         }
 
-        /* Populate they keyring with the invocation ID by default, as original saved_uid. */
+        /* Populate the keyring with the invocation ID by default, as original saved_uid. */
         if (!sd_id128_is_null(p->invocation_id)) {
                 key_serial_t key;
 
diff -pruN 257.7-1/src/core/meson.build 257.9-0ubuntu2/src/core/meson.build
--- 257.7-1/src/core/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/core/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -84,20 +84,17 @@ if conf.get('BPF_FRAMEWORK') == 1
 endif
 
 load_fragment_gperf_gperf = custom_target(
-        'load-fragment-gperf.gperf',
         input : 'load-fragment-gperf.gperf.in',
         output: 'load-fragment-gperf.gperf',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'])
 
 load_fragment_gperf_c = custom_target(
-        'load-fragment-gperf.c',
         input : load_fragment_gperf_gperf,
         output : 'load-fragment-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
 
 awkscript = 'load-fragment-gperf-nulstr.awk'
 load_fragment_gperf_nulstr_c = custom_target(
-        'load-fragment-gperf-nulstr.c',
         input : [awkscript, load_fragment_gperf_gperf],
         output : 'load-fragment-gperf-nulstr.c',
         command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
@@ -230,7 +227,6 @@ foreach item : in_files
         dir = item[1]
 
         custom_target(
-                file,
                 input : file + '.in',
                 output: file,
                 command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
@@ -239,7 +235,6 @@ foreach item : in_files
 endforeach
 
 systemd_pc = custom_target(
-        'systemd.pc',
         input : 'systemd.pc.in',
         output : 'systemd.pc',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/src/core/namespace.c 257.9-0ubuntu2/src/core/namespace.c
--- 257.7-1/src/core/namespace.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/core/namespace.c	2025-09-03 18:35:40.000000000 +0000
@@ -1516,7 +1516,7 @@ static int mount_image(
                 const char *root_directory,
                 const ImagePolicy *image_policy) {
 
-        _cleanup_free_ char *host_os_release_id = NULL, *host_os_release_version_id = NULL,
+        _cleanup_free_ char *host_os_release_id = NULL, *host_os_release_id_like = NULL, *host_os_release_version_id = NULL,
                             *host_os_release_sysext_level = NULL, *host_os_release_confext_level = NULL,
                             *extension_name = NULL;
         int r;
@@ -1531,6 +1531,7 @@ static int mount_image(
                 r = parse_os_release(
                                 empty_to_root(root_directory),
                                 "ID", &host_os_release_id,
+                                "ID_LIKE", &host_os_release_id_like,
                                 "VERSION_ID", &host_os_release_version_id,
                                 image_class_info[IMAGE_SYSEXT].level_env, &host_os_release_sysext_level,
                                 image_class_info[IMAGE_CONFEXT].level_env, &host_os_release_confext_level,
@@ -1542,12 +1543,13 @@ static int mount_image(
         }
 
         r = verity_dissect_and_mount(
-                        /* src_fd= */ -1,
+                        /* src_fd= */ -EBADF,
                         mount_entry_source(m),
                         mount_entry_path(m),
                         m->image_options_const,
                         image_policy,
                         host_os_release_id,
+                        host_os_release_id_like,
                         host_os_release_version_id,
                         host_os_release_sysext_level,
                         host_os_release_confext_level,
@@ -1558,9 +1560,10 @@ static int mount_image(
                 return 0;
         if (r == -ESTALE && host_os_release_id)
                 return log_error_errno(r, // FIXME: this should not be logged ad LOG_ERR, as it will result in duplicate logging.
-                                       "Failed to mount image %s, extension-release metadata does not match the lower layer's: ID=%s%s%s%s%s%s%s",
+                                       "Failed to mount image %s, extension-release metadata does not match the lower layer's: ID=%s ID_LIKE='%s'%s%s%s%s%s%s",
                                        mount_entry_source(m),
                                        host_os_release_id,
+                                       strempty(host_os_release_id_like),
                                        host_os_release_version_id ? " VERSION_ID=" : "",
                                        strempty(host_os_release_version_id),
                                        host_os_release_sysext_level ? image_class_info[IMAGE_SYSEXT].level_env_print : "",
@@ -1735,8 +1738,9 @@ static int apply_one_mount(
                 break;
 
         case MOUNT_EXTENSION_DIRECTORY: {
-                _cleanup_free_ char *host_os_release_id = NULL, *host_os_release_version_id = NULL,
-                                *host_os_release_level = NULL, *extension_name = NULL;
+                _cleanup_free_ char *host_os_release_id = NULL, *host_os_release_id_like = NULL,
+                                *host_os_release_version_id = NULL, *host_os_release_level = NULL,
+                                *extension_name = NULL;
                 _cleanup_strv_free_ char **extension_release = NULL;
                 ImageClass class = IMAGE_SYSEXT;
 
@@ -1768,6 +1772,7 @@ static int apply_one_mount(
                 r = parse_os_release(
                                 empty_to_root(root_directory),
                                 "ID", &host_os_release_id,
+                                "ID_LIKE", &host_os_release_id_like,
                                 "VERSION_ID", &host_os_release_version_id,
                                 image_class_info[class].level_env, &host_os_release_level,
                                 NULL);
@@ -1779,6 +1784,7 @@ static int apply_one_mount(
                 r = extension_release_validate(
                                 extension_name,
                                 host_os_release_id,
+                                host_os_release_id_like,
                                 host_os_release_version_id,
                                 host_os_release_level,
                                 /* host_extension_scope = */ NULL, /* Leave empty, we need to accept both system and portable */
diff -pruN 257.7-1/src/core/service.c 257.9-0ubuntu2/src/core/service.c
--- 257.7-1/src/core/service.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/core/service.c	2025-09-03 18:35:40.000000000 +0000
@@ -408,6 +408,12 @@ static void service_extend_timeout(Servi
 static void service_reset_watchdog(Service *s) {
         assert(s);
 
+        if (freezer_state_finish(UNIT(s)->freezer_state) != FREEZER_RUNNING) {
+                log_unit_debug(UNIT(s), "Service is currently %s, skipping resetting watchdog.",
+                               freezer_state_to_string(UNIT(s)->freezer_state));
+                return;
+        }
+
         dual_timestamp_now(&s->watchdog_timestamp);
         service_start_watchdog(s);
 }
@@ -1215,11 +1221,13 @@ static int service_load_pid_file(Service
                 if (fstat(fileno(f), &st) < 0)
                         return log_unit_error_errno(UNIT(s), errno, "Failed to fstat() PID file '%s': %m", s->pid_file);
 
-                if (st.st_uid != 0)
+                if (st.st_uid != getuid())
                         return log_unit_error_errno(UNIT(s), SYNTHETIC_ERRNO(EPERM),
-                                                    "New main PID "PID_FMT" from PID file does not belong to service, and PID file is not owned by root. Refusing.", pidref.pid);
+                                                    "New main PID "PID_FMT" from PID file does not belong to service, and PID file is owned by "UID_FMT" (must be owned by "UID_FMT"). Refusing.",
+                                                    pidref.pid, st.st_uid, getuid());
 
-                log_unit_debug(UNIT(s), "New main PID "PID_FMT" does not belong to service, accepting anyway since PID file is owned by root.", pidref.pid);
+                log_unit_debug(UNIT(s), "New main PID "PID_FMT" does not belong to service, accepting anyway since PID file is owned by "UID_FMT".",
+                               pidref.pid, st.st_uid);
         }
 
         if (s->main_pid_known) {
@@ -1430,7 +1438,8 @@ static int service_coldplug(Unit *u) {
                 (void) unit_setup_exec_runtime(u);
         }
 
-        if (IN_SET(s->deserialized_state, SERVICE_START_POST, SERVICE_RUNNING, SERVICE_RELOAD, SERVICE_RELOAD_SIGNAL, SERVICE_RELOAD_NOTIFY, SERVICE_MOUNTING))
+        if (IN_SET(s->deserialized_state, SERVICE_START_POST, SERVICE_RUNNING, SERVICE_RELOAD, SERVICE_RELOAD_SIGNAL, SERVICE_RELOAD_NOTIFY, SERVICE_MOUNTING) &&
+            freezer_state_finish(u->freezer_state) == FREEZER_RUNNING)
                 service_start_watchdog(s);
 
         if (UNIT_ISSET(s->accept_socket)) {
@@ -5516,6 +5525,22 @@ int service_determine_exec_selinux_label
         return 0;
 }
 
+static int service_cgroup_freezer_action(Unit *u, FreezerAction action) {
+        Service *s = ASSERT_PTR(SERVICE(u));
+        int r;
+
+        r = unit_cgroup_freezer_action(u, action);
+        if (r <= 0)
+                return r;
+
+        if (action == FREEZER_FREEZE)
+                service_stop_watchdog(s);
+        else if (action == FREEZER_THAW)
+                service_reset_watchdog(s);
+
+        return r;
+}
+
 static const char* const service_restart_table[_SERVICE_RESTART_MAX] = {
         [SERVICE_RESTART_NO]          = "no",
         [SERVICE_RESTART_ON_SUCCESS]  = "on-success",
@@ -5653,7 +5678,7 @@ const UnitVTable service_vtable = {
         .live_mount = service_live_mount,
         .can_live_mount = service_can_live_mount,
 
-        .freezer_action = unit_cgroup_freezer_action,
+        .freezer_action = service_cgroup_freezer_action,
 
         .serialize = service_serialize,
         .deserialize_item = service_deserialize_item,
diff -pruN 257.7-1/src/core/timer.c 257.9-0ubuntu2/src/core/timer.c
--- 257.7-1/src/core/timer.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/core/timer.c	2025-09-03 18:35:40.000000000 +0000
@@ -476,7 +476,8 @@ static void timer_enter_waiting(Timer *t
                                 assert_not_reached();
                         }
 
-                        v->next_elapse = usec_add(usec_shift_clock(base, CLOCK_MONOTONIC, TIMER_MONOTONIC_CLOCK(t)), v->value);
+                        if (!time_change)
+                                v->next_elapse = usec_add(usec_shift_clock(base, CLOCK_MONOTONIC, TIMER_MONOTONIC_CLOCK(t)), v->value);
 
                         if (dual_timestamp_is_set(&t->last_trigger) &&
                             !time_change &&
diff -pruN 257.7-1/src/core/unit.c 257.9-0ubuntu2/src/core/unit.c
--- 257.7-1/src/core/unit.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/core/unit.c	2025-09-03 18:35:40.000000000 +0000
@@ -2219,17 +2219,17 @@ static void retroactively_start_dependen
         assert(u);
         assert(UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u)));
 
-        UNIT_FOREACH_DEPENDENCY(other, u, UNIT_ATOM_RETROACTIVE_START_REPLACE) /* Requires= + BindsTo= */
+        UNIT_FOREACH_DEPENDENCY_SAFE(other, u, UNIT_ATOM_RETROACTIVE_START_REPLACE) /* Requires= + BindsTo= */
                 if (!unit_has_dependency(u, UNIT_ATOM_AFTER, other) &&
                     !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
                         (void) manager_add_job(u->manager, JOB_START, other, JOB_REPLACE, /* error = */ NULL, /* ret = */ NULL);
 
-        UNIT_FOREACH_DEPENDENCY(other, u, UNIT_ATOM_RETROACTIVE_START_FAIL) /* Wants= */
+        UNIT_FOREACH_DEPENDENCY_SAFE(other, u, UNIT_ATOM_RETROACTIVE_START_FAIL) /* Wants= */
                 if (!unit_has_dependency(u, UNIT_ATOM_AFTER, other) &&
                     !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
                         (void) manager_add_job(u->manager, JOB_START, other, JOB_FAIL, /* error = */ NULL, /* ret = */ NULL);
 
-        UNIT_FOREACH_DEPENDENCY(other, u, UNIT_ATOM_RETROACTIVE_STOP_ON_START) /* Conflicts= (and inverse) */
+        UNIT_FOREACH_DEPENDENCY_SAFE(other, u, UNIT_ATOM_RETROACTIVE_STOP_ON_START) /* Conflicts= (and inverse) */
                 if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
                         (void) manager_add_job(u->manager, JOB_STOP, other, JOB_REPLACE, /* error = */ NULL, /* ret = */ NULL);
 }
@@ -2241,7 +2241,7 @@ static void retroactively_stop_dependenc
         assert(UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(u)));
 
         /* Pull down units which are bound to us recursively if enabled */
-        UNIT_FOREACH_DEPENDENCY(other, u, UNIT_ATOM_RETROACTIVE_STOP_ON_STOP) /* BoundBy= */
+        UNIT_FOREACH_DEPENDENCY_SAFE(other, u, UNIT_ATOM_RETROACTIVE_STOP_ON_STOP) /* BoundBy= */
                 if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
                         (void) manager_add_job(u->manager, JOB_STOP, other, JOB_REPLACE, /* error = */ NULL, /* ret = */ NULL);
 }
@@ -2268,7 +2268,7 @@ void unit_start_on_termination_deps(Unit
         assert(dependency_name);
 
         Unit *other;
-        UNIT_FOREACH_DEPENDENCY(other, u, atom) {
+        UNIT_FOREACH_DEPENDENCY_SAFE(other, u, atom) {
                 _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
 
                 if (n_jobs == 0)
@@ -2291,7 +2291,7 @@ void unit_trigger_notify(Unit *u) {
 
         assert(u);
 
-        UNIT_FOREACH_DEPENDENCY(other, u, UNIT_ATOM_TRIGGERED_BY)
+        UNIT_FOREACH_DEPENDENCY_SAFE(other, u, UNIT_ATOM_TRIGGERED_BY)
                 if (UNIT_VTABLE(other)->trigger_notify)
                         UNIT_VTABLE(other)->trigger_notify(other, u);
 }
@@ -4755,7 +4755,7 @@ static int operation_to_signal(
 
         case KILL_TERMINATE:
         case KILL_TERMINATE_AND_LOG:
-                *ret_noteworthy = false;
+                *ret_noteworthy = k == KILL_TERMINATE_AND_LOG;
                 return c->kill_signal;
 
         case KILL_RESTART:
@@ -5191,10 +5191,10 @@ static void unit_modify_user_nft_set(Uni
 
                 r = nft_set_element_modify_any(u->manager->fw_ctx, add, nft_set->nfproto, nft_set->table, nft_set->set, &element, sizeof(element));
                 if (r < 0)
-                        log_warning_errno(r, "Failed to %s NFT set: family %s, table %s, set %s, ID %u, ignoring: %m",
+                        log_warning_errno(r, "Failed to %s NFT set entry: family %s, table %s, set %s, ID %u, ignoring: %m",
                                           add? "add" : "delete", nfproto_to_string(nft_set->nfproto), nft_set->table, nft_set->set, element);
                 else
-                        log_debug("%s NFT set: family %s, table %s, set %s, ID %u",
+                        log_debug("%s NFT set entry: family %s, table %s, set %s, ID %u",
                                   add? "Added" : "Deleted", nfproto_to_string(nft_set->nfproto), nft_set->table, nft_set->set, element);
         }
 }
diff -pruN 257.7-1/src/cryptsetup/cryptsetup.c 257.9-0ubuntu2/src/cryptsetup/cryptsetup.c
--- 257.7-1/src/cryptsetup/cryptsetup.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/cryptsetup/cryptsetup.c	2025-09-03 18:35:40.000000000 +0000
@@ -533,7 +533,7 @@ static int parse_one_option(const char *
 #if HAVE_OPENSSL
                 _cleanup_strv_free_ char **l = NULL;
 
-                l = strv_split(optarg, ":");
+                l = strv_split(val, ":");
                 if (!l)
                         return log_oom();
 
@@ -582,7 +582,7 @@ static int parse_one_option(const char *
                         log_warning_errno(r, "Failed to parse %s, ignoring: %m", option);
 
         } else if ((val = startswith(option, "link-volume-key="))) {
-#ifdef HAVE_CRYPT_SET_KEYRING_TO_LINK
+#if HAVE_CRYPT_SET_KEYRING_TO_LINK
                 _cleanup_free_ char *keyring = NULL, *key_type = NULL, *key_description = NULL;
                 const char *sep;
 
diff -pruN 257.7-1/src/home/meson.build 257.9-0ubuntu2/src/home/meson.build
--- 257.7-1/src/home/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/home/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -42,7 +42,6 @@ systemd_homed_sources = files(
 )
 
 homed_gperf_c = custom_target(
-        'homed_gperf.c',
         input : 'homed-gperf.gperf',
         output : 'homed-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
diff -pruN 257.7-1/src/home/user-record-sign.c 257.9-0ubuntu2/src/home/user-record-sign.c
--- 257.7-1/src/home/user-record-sign.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/home/user-record-sign.c	2025-09-03 18:35:40.000000000 +0000
@@ -75,7 +75,7 @@ int user_record_sign(UserRecord *ur, EVP
                 return r;
 
         if (DEBUG_LOGGING)
-                sd_json_variant_dump(v, SD_JSON_FORMAT_PRETTY|SD_JSON_FORMAT_COLOR_AUTO, NULL, NULL);
+                sd_json_variant_dump(v, SD_JSON_FORMAT_CENSOR_SENSITIVE|SD_JSON_FORMAT_PRETTY|SD_JSON_FORMAT_COLOR_AUTO, NULL, NULL);
 
         signed_ur = user_record_new();
         if (!signed_ur)
diff -pruN 257.7-1/src/import/import-compress.c 257.9-0ubuntu2/src/import/import-compress.c
--- 257.7-1/src/import/import-compress.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/import/import-compress.c	2025-09-03 18:35:40.000000000 +0000
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "import-compress.h"
+#include "log.h"
 #include "string-table.h"
 
 void import_compress_free(ImportCompress *c) {
@@ -79,6 +80,7 @@ int import_uncompress_detect(ImportCompr
 
         c->encoding = false;
 
+        log_debug("Detected compression type: %s", import_compress_type_to_string(c->type));
         return 1;
 }
 
diff -pruN 257.7-1/src/import/importctl.c 257.9-0ubuntu2/src/import/importctl.c
--- 257.7-1/src/import/importctl.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/import/importctl.c	2025-09-03 18:35:40.000000000 +0000
@@ -848,7 +848,7 @@ static int list_transfers(int argc, char
         if (!table_isempty(t)) {
                 r = table_print_with_pager(t, arg_json_format_flags, arg_pager_flags, arg_legend);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to output table: %m");
+                        return r;
         }
 
         if (arg_legend) {
@@ -967,7 +967,7 @@ static int list_images(int argc, char *a
         if (!table_isempty(t)) {
                 r = table_print_with_pager(t, arg_json_format_flags, arg_pager_flags, arg_legend);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to output table: %m");
+                        return r;
         }
 
         if (arg_legend) {
diff -pruN 257.7-1/src/import/pull-common.c 257.9-0ubuntu2/src/import/pull-common.c
--- 257.7-1/src/import/pull-common.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/import/pull-common.c	2025-09-03 18:35:40.000000000 +0000
@@ -10,6 +10,7 @@
 #include "discover-image.h"
 #include "escape.h"
 #include "fd-util.h"
+#include "hexdecoct.h"
 #include "hostname-util.h"
 #include "io-util.h"
 #include "memory-util.h"
@@ -318,7 +319,6 @@ int pull_make_verification_jobs(
 
 static int verify_one(PullJob *checksum_job, PullJob *job) {
         _cleanup_free_ char *fn = NULL;
-        const char *line, *p;
         int r;
 
         assert(checksum_job);
@@ -351,17 +351,23 @@ static int verify_one(PullJob *checksum_
                 return log_error_errno(SYNTHETIC_ERRNO(ELOOP),
                                        "Cannot verify checksum/signature files via themselves.");
 
-        line = strjoina(job->checksum, " *", fn, "\n"); /* string for binary mode */
-        p = memmem_safe(checksum_job->payload,
-                        checksum_job->payload_size,
-                        line,
-                        strlen(line));
-        if (!p) {
-                line = strjoina(job->checksum, "  ", fn, "\n"); /* string for text mode */
+        const char *p = NULL;
+        FOREACH_STRING(separator,
+                       " *", /* separator for binary mode */
+                       "  ", /* separator for text mode */
+                       " "   /* non-standard separator used by linuxcontainers.org */) {
+                _cleanup_free_ char *line = NULL;
+
+                line = strjoin(job->checksum, separator, fn, "\n");
+                if (!line)
+                        return log_oom();
+
                 p = memmem_safe(checksum_job->payload,
                                 checksum_job->payload_size,
                                 line,
                                 strlen(line));
+                if (p)
+                        break;
         }
 
         /* Only counts if found at beginning of a line */
diff -pruN 257.7-1/src/journal/journalctl-misc.c 257.9-0ubuntu2/src/journal/journalctl-misc.c
--- 257.7-1/src/journal/journalctl-misc.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/journal/journalctl-misc.c	2025-09-03 18:35:40.000000000 +0000
@@ -146,7 +146,7 @@ static int show_log_ids(const LogId *ids
 
         r = table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, !arg_quiet);
         if (r < 0)
-                return table_log_print_error(r);
+                return r;
 
         return 0;
 }
diff -pruN 257.7-1/src/journal/journalctl-show.c 257.9-0ubuntu2/src/journal/journalctl-show.c
--- 257.7-1/src/journal/journalctl-show.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/journal/journalctl-show.c	2025-09-03 18:35:40.000000000 +0000
@@ -20,6 +20,7 @@ typedef struct Context {
         bool has_cursor;
         bool need_seek;
         bool since_seeked;
+        bool until_safe;
         bool ellipsized;
         bool previous_boot_id_valid;
         sd_id128_t previous_boot_id;
@@ -104,10 +105,15 @@ static int seek_journal(Context *c) {
                                 return log_error_errno(r, "Failed to seek to tail: %m");
                 }
 
-                if (arg_reverse)
+                if (arg_reverse) {
                         r = sd_journal_previous(j);
-                else /* arg_lines_needs_seek_end */
+                        c->until_safe = true; /* can't possibly go beyond --until= if --reverse */
+
+                } else { /* arg_lines_needs_seek_end() */
                         r = sd_journal_previous_skip(j, arg_lines);
+                        c->until_safe = r >= arg_lines; /* We have enough lines to output before --until= is hit.
+                                                           No need to check timestamp of each journal entry */
+                }
 
         } else if (arg_since_set) {
                 /* This is placed after arg_reverse and arg_lines. If --since is used without
@@ -161,11 +167,10 @@ static int show(Context *c) {
                                 break;
                 }
 
-                if (arg_until_set && !arg_reverse && (arg_lines < 0 || arg_since_set || c->has_cursor)) {
+                if (arg_until_set && !c->until_safe) {
                         /* If --lines= is set, we usually rely on the n_shown to tell us when to stop.
-                         * However, if --since= or one of the cursor argument is set too, we may end up
-                         * having less than --lines= to output. In this case let's also check if the entry
-                         * is in range. */
+                         * However, in the case where we may have less than --lines= to output let's check
+                         * whether the individual entries are in range. */
 
                         usec_t usec;
 
@@ -194,6 +199,11 @@ static int show(Context *c) {
                                         return log_error_errno(r, "Failed to seek to date: %m");
                                 c->since_seeked = true;
 
+                                /* We just jumped forward, meaning there might suddenly be less than
+                                 * --lines= to show within the --until= range, hence keep a close eye on
+                                 * timestamps from now on. */
+                                c->until_safe = false;
+
                                 c->need_seek = true;
                                 continue;
                         }
@@ -222,6 +232,12 @@ static int show(Context *c) {
                         r = sd_journal_get_data(j, "MESSAGE", &message, &len);
                         if (r < 0) {
                                 if (r == -ENOENT) {
+                                        /* We will skip some entries forward, meaning there might suddenly
+                                         * be less than --lines= to show within the --until= range, hence
+                                         * keep a close eye on timestamps from now on. */
+                                        if (!arg_reverse)
+                                                c->until_safe = false;
+
                                         c->need_seek = true;
                                         continue;
                                 }
@@ -236,6 +252,12 @@ static int show(Context *c) {
                         if (r < 0)
                                 return r;
                         if (r == 0) {
+                                /* We will skip some entries forward, meaning there might suddenly
+                                 * be less than --lines= to show within the --until= range, hence
+                                 * keep a close eye on timestamps from now on. */
+                                if (!arg_reverse)
+                                        c->until_safe = false;
+
                                 c->need_seek = true;
                                 continue;
                         }
diff -pruN 257.7-1/src/journal/journald-server.c 257.9-0ubuntu2/src/journal/journald-server.c
--- 257.7-1/src/journal/journald-server.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/journal/journald-server.c	2025-09-03 18:35:40.000000000 +0000
@@ -554,11 +554,14 @@ static int server_do_rotate(
         JournalFileFlags file_flags;
         int r;
 
+        assert(f);
         assert(s);
 
         if (!*f)
                 return -EINVAL;
 
+        log_debug("Rotating journal file %s.", (*f)->path);
+
         file_flags =
                 (s->compress.enabled ? JOURNAL_COMPRESS : 0)|
                 (seal ? JOURNAL_SEAL : 0) |
@@ -2201,6 +2204,8 @@ static int synchronize_second_half(sd_ev
          * messages are processed. */
         server_full_sync(s, /* wait = */ true);
 
+        log_debug("Client request to sync journal completed.");
+
         /* Let's get rid of the event source now, by marking it as non-floating again. It then has no ref
          * anymore and is immediately destroyed after we return from this function, i.e. from this event
          * source handler at the end. */
@@ -2266,6 +2271,7 @@ static int vl_method_rotate(sd_varlink *
 
         log_info("Received client request to rotate journal, rotating.");
         server_full_rotate(s);
+        log_debug("Client request to rotate journal completed.");
 
         return sd_varlink_reply(link, NULL);
 }
@@ -2282,6 +2288,7 @@ static int vl_method_flush_to_var(sd_var
 
         log_info("Received client request to flush runtime journal.");
         server_full_flush(s);
+        log_debug("Client request to flush runtime journal completed.");
 
         return sd_varlink_reply(link, NULL);
 }
@@ -2298,6 +2305,7 @@ static int vl_method_relinquish_var(sd_v
 
         log_info("Received client request to relinquish %s access.", s->system_storage.path);
         server_relinquish_var(s);
+        log_debug("Client request to relinquish %s access completed.", s->system_storage.path);
 
         return sd_varlink_reply(link, NULL);
 }
diff -pruN 257.7-1/src/journal/journald-syslog.c 257.9-0ubuntu2/src/journal/journald-syslog.c
--- 257.7-1/src/journal/journald-syslog.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/journal/journald-syslog.c	2025-09-03 18:35:40.000000000 +0000
@@ -374,9 +374,6 @@ void server_process_syslog_message(
         if (!client_context_test_priority(context, priority))
                 return;
 
-        if (client_context_check_keep_log(context, msg, strlen(msg)) <= 0)
-                return;
-
         syslog_ts = msg;
         syslog_ts_len = syslog_skip_timestamp(&msg);
         if (syslog_ts_len == 0)
@@ -385,6 +382,9 @@ void server_process_syslog_message(
 
         syslog_parse_identifier(&msg, &identifier, &pid);
 
+        if (client_context_check_keep_log(context, msg, strlen(msg)) <= 0)
+                return;
+
         if (s->forward_to_syslog)
                 forward_syslog_raw(s, priority, buf, raw_len, ucred, tv);
 
diff -pruN 257.7-1/src/journal/meson.build 257.9-0ubuntu2/src/journal/meson.build
--- 257.7-1/src/journal/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/journal/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -16,7 +16,6 @@ sources = files(
 )
 
 sources += custom_target(
-        'journald-gperf.c',
         input : 'journald-gperf.gperf',
         output : 'journald-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
diff -pruN 257.7-1/src/journal-remote/meson.build 257.9-0ubuntu2/src/journal-remote/meson.build
--- 257.7-1/src/journal-remote/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/journal-remote/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -97,7 +97,6 @@ in_files = [
 foreach tuple : in_files
         file = tuple[0]
         custom_target(
-                file,
                 input : file + '.in',
                 output: file,
                 command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/src/kernel-install/meson.build 257.9-0ubuntu2/src/kernel-install/meson.build
--- 257.7-1/src/kernel-install/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/kernel-install/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -12,7 +12,6 @@ executables += [
 ]
 
 ukify_install = custom_target(
-        '60-ukify.install',
         input : '60-ukify.install.in',
         output : '60-ukify.install',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
@@ -21,7 +20,6 @@ ukify_install = custom_target(
         install_dir : kernelinstalldir)
 
 loaderentry_install = custom_target(
-        '90-loaderentry.install',
         input : '90-loaderentry.install.in',
         output : '90-loaderentry.install',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
@@ -42,9 +40,11 @@ if want_kernel_install
 
         install_data('install.conf',
                      install_dir : kerneldir)
- 
-        install_data('uki.conf',
-                     install_dir : kerneldir)
+
+        if want_ukify
+                install_data('uki.conf',
+                             install_dir : kerneldir)
+        endif
 
         if install_sysconfdir
                 install_emptydir(sysconfdir / 'kernel/install.d')
diff -pruN 257.7-1/src/libsystemd/meson.build 257.9-0ubuntu2/src/libsystemd/meson.build
--- 257.7-1/src/libsystemd/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/libsystemd/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -180,7 +180,6 @@ static_libsystemd = get_option('static-l
 static_libsystemd_pic = static_libsystemd == 'true' or static_libsystemd == 'pic'
 
 libsystemd_pc = custom_target(
-        'libsystemd.pc',
         input : 'libsystemd.pc.in',
         output : 'libsystemd.pc',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/src/libsystemd/sd-event/sd-event.c 257.9-0ubuntu2/src/libsystemd/sd-event/sd-event.c
--- 257.7-1/src/libsystemd/sd-event/sd-event.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/libsystemd/sd-event/sd-event.c	2025-09-03 18:35:40.000000000 +0000
@@ -4023,9 +4023,12 @@ static int event_inotify_data_process(sd
                         }
                 }
 
-                /* Something pending now? If so, let's finish, otherwise let's read more. */
+                /* Something pending now? If so, let's finish. */
                 if (d->n_pending > 0)
                         return 1;
+
+                /* otherwise, drop the event and let's read more */
+                event_inotify_data_drop(e, d, sz);
         }
 
         return 0;
diff -pruN 257.7-1/src/libsystemd/sd-event/test-event.c 257.9-0ubuntu2/src/libsystemd/sd-event/test-event.c
--- 257.7-1/src/libsystemd/sd-event/test-event.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/libsystemd/sd-event/test-event.c	2025-09-03 18:35:40.000000000 +0000
@@ -11,6 +11,7 @@
 #include "alloc-util.h"
 #include "exec-util.h"
 #include "fd-util.h"
+#include "fileio.h"
 #include "fs-util.h"
 #include "log.h"
 #include "macro.h"
@@ -827,6 +828,40 @@ TEST(inotify_process_buffered_data) {
         assert_se(sd_event_wait(e, 0) == 0);
 }
 
+static int inotify_handler_issue_38265(sd_event_source *s, const struct inotify_event *event, void *userdata) {
+        log_debug("Inotify event: mask=0x%x name=%s", event->mask, event->name);
+        return 0;
+}
+
+TEST(inotify_issue_38265) {
+        _cleanup_(rm_rf_physical_and_freep) char *t = NULL;
+        _cleanup_(sd_event_source_unrefp) sd_event_source *a = NULL, *b = NULL;
+        _cleanup_(sd_event_unrefp) sd_event *e = NULL;
+        _cleanup_free_ char *p = NULL;
+
+        /* For issue #38265. */
+
+        ASSERT_OK(mkdtemp_malloc("/tmp/test-inotify-XXXXXX", &t));
+
+        ASSERT_OK(sd_event_default(&e));
+
+        /* Create inode data that watches IN_MODIFY */
+        ASSERT_OK(sd_event_add_inotify(e, &a, t, IN_CREATE | IN_MODIFY, inotify_handler_issue_38265, NULL));
+        ASSERT_OK(sd_event_add_inotify(e, &b, t, IN_CREATE, inotify_handler_issue_38265, NULL));
+
+        /* Then drop the event source that is interested in IN_MODIFY */
+        ASSERT_NULL(a = sd_event_source_unref(a));
+
+        /* Trigger IN_MODIFY (of course with IN_CREATE) */
+        ASSERT_NOT_NULL(p = path_join(t, "hoge"));
+        ASSERT_OK(write_string_file(p, "aaa", WRITE_STRING_FILE_CREATE));
+
+        for (unsigned i = 1; i < 5; i++) {
+                log_debug("Running event loop cycle %u to process inotify events...", i);
+                ASSERT_OK(sd_event_run(e, USEC_PER_MSEC));
+        }
+}
+
 TEST(fork) {
         _cleanup_(sd_event_unrefp) sd_event *e = NULL;
         int r;
diff -pruN 257.7-1/src/libsystemd/sd-journal/journal-file.c 257.9-0ubuntu2/src/libsystemd/sd-journal/journal-file.c
--- 257.7-1/src/libsystemd/sd-journal/journal-file.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/libsystemd/sd-journal/journal-file.c	2025-09-03 18:35:40.000000000 +0000
@@ -188,10 +188,14 @@ int journal_file_set_offline_thread_join
         if (f->offline_state == OFFLINE_JOINED)
                 return 0;
 
+        log_debug("Joining journal offlining thread for %s.", f->path);
+
         r = pthread_join(f->offline_thread, NULL);
         if (r)
                 return -r;
 
+        log_debug("Journal offlining thread for %s joined.", f->path);
+
         f->offline_state = OFFLINE_JOINED;
 
         if (mmap_cache_fd_got_sigbus(f->cache_fd))
@@ -1399,7 +1403,7 @@ static int journal_file_link_field(
         assert(offset > 0);
 
         if (o->object.type != OBJECT_FIELD)
-                return -EINVAL;
+                return -EBADMSG;
 
         m = le64toh(READ_NOW(f->header->field_hash_table_size)) / sizeof(HashItem);
         if (m <= 0)
@@ -1444,7 +1448,7 @@ static int journal_file_link_data(
         assert(offset > 0);
 
         if (o->object.type != OBJECT_DATA)
-                return -EINVAL;
+                return -EBADMSG;
 
         m = le64toh(READ_NOW(f->header->data_hash_table_size)) / sizeof(HashItem);
         if (m <= 0)
@@ -1798,17 +1802,27 @@ static int journal_file_append_field(
         return 0;
 }
 
-static int maybe_compress_payload(JournalFile *f, uint8_t *dst, const uint8_t *src, uint64_t size, size_t *rsize) {
+static int maybe_compress_payload(
+                JournalFile *f,
+                uint8_t *dst,
+                const uint8_t *src,
+                uint64_t size,
+                size_t *rsize,
+                Compression *ret_compression) {
+
         assert(f);
         assert(f->header);
+        assert(ret_compression);
 
 #if HAVE_COMPRESSION
         Compression c;
         int r;
 
         c = JOURNAL_FILE_COMPRESSION(f);
-        if (c == COMPRESSION_NONE || size < f->compress_threshold_bytes)
+        if (c == COMPRESSION_NONE || size < f->compress_threshold_bytes) {
+                *ret_compression = COMPRESSION_NONE;
                 return 0;
+        }
 
         r = compress_blob(c, src, size, dst, size - 1, rsize);
         if (r < 0)
@@ -1816,8 +1830,10 @@ static int maybe_compress_payload(Journa
 
         log_debug("Compressed data object %"PRIu64" -> %zu using %s", size, *rsize, compression_to_string(c));
 
+        *ret_compression = c;
         return 1; /* compressed */
 #else
+        *ret_compression = COMPRESSION_NONE;
         return 0;
 #endif
 }
@@ -1837,8 +1853,11 @@ static int journal_file_append_data(
 
         assert(f);
 
+        /* Return a recognizable error for data that is submitted for *writing*. Note that we leave EBADMSG
+         * for bad messages we *read*. And EINVAL is too generic an error (which might be triggered by all
+         * kinds of other places). Hence use a separate EUCLEAN here. */
         if (!data || size == 0)
-                return -EINVAL;
+                return -EUCLEAN;
 
         hash = journal_file_hash_data(f, data, size);
 
@@ -1850,7 +1869,7 @@ static int journal_file_append_data(
 
         eq = memchr(data, '=', size);
         if (!eq)
-                return -EINVAL;
+                return -EUCLEAN;
 
         osize = journal_file_data_payload_offset(f) + size;
         r = journal_file_append_object(f, OBJECT_DATA, osize, &o, &p);
@@ -1859,13 +1878,12 @@ static int journal_file_append_data(
 
         o->data.hash = htole64(hash);
 
-        r = maybe_compress_payload(f, journal_file_data_payload_field(f, o), data, size, &rsize);
+        Compression c;
+        r = maybe_compress_payload(f, journal_file_data_payload_field(f, o), data, size, &rsize, &c);
         if (r <= 0)
                 /* We don't really care failures, let's continue without compression */
                 memcpy_safe(journal_file_data_payload_field(f, o), data, size);
         else {
-                Compression c = JOURNAL_FILE_COMPRESSION(f);
-
                 assert(c >= 0 && c < _COMPRESSION_MAX && c != COMPRESSION_NONE);
 
                 o->object.size = htole64(journal_file_data_payload_offset(f) + rsize);
@@ -2212,7 +2230,7 @@ static int journal_file_link_entry_item(
 
 static int journal_file_link_entry(
                 JournalFile *f,
-                Object *o,
+                const Object *o,
                 uint64_t offset,
                 const EntryItem items[],
                 size_t n_items) {
@@ -2225,7 +2243,7 @@ static int journal_file_link_entry(
         assert(offset > 0);
 
         if (o->object.type != OBJECT_ENTRY)
-                return -EINVAL;
+                return -EBADMSG;
 
         __atomic_thread_fence(__ATOMIC_SEQ_CST);
 
@@ -2721,7 +2739,9 @@ static int bump_entry_array(
 
         if (direction == DIRECTION_DOWN) {
                 assert(o);
-                assert(o->object.type == OBJECT_ENTRY_ARRAY);
+
+                if (o->object.type != OBJECT_ENTRY_ARRAY)
+                        return -EBADMSG;
 
                 *ret = le64toh(o->entry_array.next_entry_array_offset);
         } else {
@@ -3222,9 +3242,11 @@ static int generic_array_bisect_for_data
 
         assert(f);
         assert(d);
-        assert(d->object.type == OBJECT_DATA);
         assert(test_object);
 
+        if (d->object.type != OBJECT_DATA)
+                return -EBADMSG;
+
         n = le64toh(d->data.n_entries);
         if (n <= 0)
                 return 0;
@@ -3590,9 +3612,11 @@ int journal_file_move_to_entry_for_data(
 
         assert(f);
         assert(d);
-        assert(d->object.type == OBJECT_DATA);
         assert(IN_SET(direction, DIRECTION_DOWN, DIRECTION_UP));
 
+        if (d->object.type != OBJECT_DATA)
+                return -EBADMSG;
+
         /* FIXME: fix return value assignment. */
 
         /* This returns the first (when the direction is down, otherwise the last) entry linked to the
@@ -3652,7 +3676,9 @@ int journal_file_move_to_entry_by_offset
 
         assert(f);
         assert(d);
-        assert(d->object.type == OBJECT_DATA);
+
+        if (d->object.type != OBJECT_DATA)
+                return -EBADMSG;
 
         return generic_array_bisect_for_data(
                         f,
@@ -3678,7 +3704,9 @@ int journal_file_move_to_entry_by_monoto
 
         assert(f);
         assert(d);
-        assert(d->object.type == OBJECT_DATA);
+
+        if (d->object.type != OBJECT_DATA)
+                return -EBADMSG;
 
         /* First, pin the given data object, before reading the _BOOT_ID= data object below. */
         r = journal_file_pin_object(f, d);
@@ -3744,7 +3772,9 @@ int journal_file_move_to_entry_by_seqnum
 
         assert(f);
         assert(d);
-        assert(d->object.type == OBJECT_DATA);
+
+        if (d->object.type != OBJECT_DATA)
+                return -EBADMSG;
 
         return generic_array_bisect_for_data(
                         f,
@@ -3764,7 +3794,9 @@ int journal_file_move_to_entry_by_realti
 
         assert(f);
         assert(d);
-        assert(d->object.type == OBJECT_DATA);
+
+        if (d->object.type != OBJECT_DATA)
+                return -EBADMSG;
 
         return generic_array_bisect_for_data(
                         f,
@@ -4460,10 +4492,11 @@ int journal_file_copy_entry(
                         return r;
                 assert(r > 0);
 
-                if (l == 0)
-                        return -EBADMSG;
-
                 r = journal_file_append_data(to, data, l, &u, &h);
+                if (r == -EUCLEAN) {
+                        log_debug_errno(r, "Entry item %"PRIu64" invalid, skipping over it: %m", i);
+                        continue;
+                }
                 if (r < 0)
                         return r;
 
diff -pruN 257.7-1/src/libsystemd-network/sd-dhcp6-lease.c 257.9-0ubuntu2/src/libsystemd-network/sd-dhcp6-lease.c
--- 257.7-1/src/libsystemd-network/sd-dhcp6-lease.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/libsystemd-network/sd-dhcp6-lease.c	2025-09-03 18:35:40.000000000 +0000
@@ -112,7 +112,7 @@ static void dhcp6_lease_set_lifetime(sd_
         }
 
 DEFINE_GET_TIME_FUNCTIONS(t1, lifetime_t1);
-DEFINE_GET_TIME_FUNCTIONS(t2, lifetime_t1);
+DEFINE_GET_TIME_FUNCTIONS(t2, lifetime_t2);
 DEFINE_GET_TIME_FUNCTIONS(valid_lifetime, lifetime_valid);
 
 static void dhcp6_lease_set_server_address(sd_dhcp6_lease *lease, const struct in6_addr *server_address) {
diff -pruN 257.7-1/src/libudev/meson.build 257.9-0ubuntu2/src/libudev/meson.build
--- 257.7-1/src/libudev/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/libudev/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -35,7 +35,6 @@ static_libudev = get_option('static-libu
 static_libudev_pic = static_libudev == 'true' or static_libudev == 'pic'
 
 libudev_pc = custom_target(
-        'libudev.pc',
         input : 'libudev.pc.in',
         output : 'libudev.pc',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/src/locale/localed-util.c 257.9-0ubuntu2/src/locale/localed-util.c
--- 257.7-1/src/locale/localed-util.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/locale/localed-util.c	2025-09-03 18:35:40.000000000 +0000
@@ -10,6 +10,7 @@
 #include "env-file-label.h"
 #include "env-file.h"
 #include "env-util.h"
+#include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
@@ -257,15 +258,16 @@ static int verify_keymap(const char *key
         assert(keymap);
 
         r = keymap_exists(keymap); /* This also verifies that the keymap name is kosher. */
-        if (r < 0) {
-                if (error)
-                        sd_bus_error_set_errnof(error, r, "Failed to check keymap %s: %m", keymap);
-                return log_full_errno(log_level, r, "Failed to check keymap %s: %m", keymap);
-        }
-        if (r == 0) {
+        if (r <= 0) {
+                _cleanup_free_ char *escaped = cescape(keymap);
+                if (r < 0) {
+                        if (error)
+                                sd_bus_error_set_errnof(error, r, "Failed to check keymap %s: %m", strna(escaped));
+                        return log_full_errno(log_level, r, "Failed to check keymap %s: %m", strna(escaped));
+                }
                 if (error)
-                        sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Keymap %s is not installed.", keymap);
-                return log_full_errno(log_level, SYNTHETIC_ERRNO(ENOENT), "Keymap %s is not installed.", keymap);
+                        sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Keymap %s is not installed.", strna(escaped));
+                return log_full_errno(log_level, SYNTHETIC_ERRNO(ENOENT), "Keymap %s is not installed.", strna(escaped));
         }
 
         return 0;
diff -pruN 257.7-1/src/login/logind-core.c 257.9-0ubuntu2/src/login/logind-core.c
--- 257.7-1/src/login/logind-core.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/login/logind-core.c	2025-09-03 18:35:40.000000000 +0000
@@ -359,6 +359,29 @@ int manager_process_button_device(Manage
 
 int manager_get_session_by_pidref(Manager *m, const PidRef *pid, Session **ret) {
         _cleanup_free_ char *unit = NULL;
+        Session *s = NULL;
+        int r;
+
+        assert(m);
+
+        if (!pidref_is_set(pid))
+                return -EINVAL;
+
+        r = manager_get_session_by_leader(m, pid, ret);
+        if (r != 0)
+                return r;
+
+        r = cg_pidref_get_unit(pid, &unit);
+        if (r >= 0)
+                s = hashmap_get(m->session_units, unit);
+
+        if (ret)
+                *ret = s;
+
+        return !!s;
+}
+
+int manager_get_session_by_leader(Manager *m, const PidRef *pid, Session **ret) {
         Session *s;
         int r;
 
@@ -372,10 +395,6 @@ int manager_get_session_by_pidref(Manage
                 r = pidref_verify(pid);
                 if (r < 0)
                         return r;
-        } else {
-                r = cg_pidref_get_unit(pid, &unit);
-                if (r >= 0)
-                        s = hashmap_get(m->session_units, unit);
         }
 
         if (ret)
@@ -741,7 +760,7 @@ int manager_read_utmp(Manager *m) {
                 if (!pid_is_valid(u->ut_pid))
                         continue;
 
-                t = strndup(u->ut_line, sizeof(u->ut_line));
+                t = memdup_suffix0(u->ut_line, sizeof(u->ut_line));
                 if (!t)
                         return log_oom();
 
@@ -755,7 +774,10 @@ int manager_read_utmp(Manager *m) {
                 if (isempty(t))
                         continue;
 
-                if (manager_get_session_by_pidref(m, &PIDREF_MAKE_FROM_PID(u->ut_pid), &s) <= 0)
+                if (manager_get_session_by_leader(m, &PIDREF_MAKE_FROM_PID(u->ut_pid), &s) <= 0)
+                        continue;
+
+                if (s->type != SESSION_TTY)
                         continue;
 
                 if (s->tty_validity == TTY_FROM_UTMP && !streq_ptr(s->tty, t)) {
diff -pruN 257.7-1/src/login/logind.h 257.9-0ubuntu2/src/login/logind.h
--- 257.7-1/src/login/logind.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/login/logind.h	2025-09-03 18:35:40.000000000 +0000
@@ -172,6 +172,7 @@ int manager_get_idle_hint(Manager *m, du
 
 int manager_get_user_by_pid(Manager *m, pid_t pid, User **user);
 int manager_get_session_by_pidref(Manager *m, const PidRef *pid, Session **ret);
+int manager_get_session_by_leader(Manager *m, const PidRef *pid, Session **ret);
 
 bool manager_is_lid_closed(Manager *m);
 bool manager_is_docked_or_external_displays(Manager *m);
diff -pruN 257.7-1/src/login/meson.build 257.9-0ubuntu2/src/login/meson.build
--- 257.7-1/src/login/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/login/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -5,7 +5,6 @@ systemd_logind_sources = files(
 )
 
 logind_gperf_c = custom_target(
-        'logind_gperf.c',
         input : 'logind-gperf.gperf',
         output : 'logind-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
@@ -127,7 +126,6 @@ modules += [
 enable_logind = conf.get('ENABLE_LOGIND') == 1
 
 custom_target(
-        'logind.conf',
         input : 'logind.conf.in',
         output : 'logind.conf',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
@@ -135,7 +133,6 @@ custom_target(
         install_dir : pkgconfigfiledir)
 
 custom_target(
-        'systemd-user',
         input : 'systemd-user.in',
         output : 'systemd-user',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
@@ -143,10 +140,13 @@ custom_target(
         install_dir : pamconfdir)
 
 if enable_logind
-        install_data('org.freedesktop.login1.conf',
-                     install_dir : dbuspolicydir)
-        install_data('org.freedesktop.login1.service',
-                     install_dir : dbussystemservicedir)
-        install_data('org.freedesktop.login1.policy',
-                     install_dir : polkitpolicydir)
+        install_data(
+                'org.freedesktop.login1.conf',
+                install_dir : dbuspolicydir)
+        install_data(
+                'org.freedesktop.login1.service',
+                install_dir : dbussystemservicedir)
+        install_data(
+                'org.freedesktop.login1.policy',
+                install_dir : polkitpolicydir)
 endif
diff -pruN 257.7-1/src/network/bpf/sysctl_monitor/meson.build 257.9-0ubuntu2/src/network/bpf/sysctl_monitor/meson.build
--- 257.7-1/src/network/bpf/sysctl_monitor/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/network/bpf/sysctl_monitor/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -1,24 +1,21 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-if conf.get('HAVE_VMLINUX_H') != 1
+if conf.get('ENABLE_SYSCTL_BPF') != 1
         subdir_done()
 endif
 
 sysctl_monitor_bpf_o_unstripped = custom_target(
-        'sysctl-monitor.bpf.unstripped.o',
         input : 'sysctl-monitor.bpf.c',
         output : 'sysctl-monitor.bpf.unstripped.o',
         command : bpf_o_unstripped_cmd,
         depends : vmlinux_h_dependency)
 
 sysctl_monitor_bpf_o = custom_target(
-        'sysctl-monitor.bpf.o',
         input : sysctl_monitor_bpf_o_unstripped,
         output : 'sysctl-monitor.bpf.o',
         command : bpf_o_cmd)
 
 sysctl_monitor_skel_h = custom_target(
-        'sysctl-monitor.skel.h',
         input : sysctl_monitor_bpf_o,
         output : 'sysctl-monitor.skel.h',
         command : skel_h_cmd,
diff -pruN 257.7-1/src/network/meson.build 257.9-0ubuntu2/src/network/meson.build
--- 257.7-1/src/network/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/network/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -143,24 +143,21 @@ network_generator_sources = files(
 networkd_network_gperf_gperf = files('networkd-network-gperf.gperf')
 networkd_netdev_gperf_gperf = files('netdev/netdev-gperf.gperf')
 
-if conf.get('HAVE_VMLINUX_H') == 1
+if conf.get('ENABLE_SYSCTL_BPF') == 1
         sources += sysctl_monitor_skel_h
 endif
 
 sources += custom_target(
-        'networkd-gperf.c',
         input : 'networkd-gperf.gperf',
         output : 'networkd-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
 
 sources += custom_target(
-        'networkd-network-gperf.c',
         input : networkd_network_gperf_gperf,
         output : 'networkd-network-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
 
 sources += custom_target(
-        'netdev-gperf.c',
         input : networkd_netdev_gperf_gperf,
         output : 'netdev-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
diff -pruN 257.7-1/src/network/networkctl-config-file.c 257.9-0ubuntu2/src/network/networkctl-config-file.c
--- 257.7-1/src/network/networkctl-config-file.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/network/networkctl-config-file.c	2025-09-03 18:35:40.000000000 +0000
@@ -58,7 +58,7 @@ static int get_config_files_by_name(
         _cleanup_free_ char *path = NULL;
         int r;
 
-        assert(name);
+        assert(filename_is_valid(name));
         assert(ret_path);
 
         STRV_FOREACH(i, NETWORK_DIRS) {
@@ -512,12 +512,15 @@ int verb_edit(int argc, char *argv[], vo
                         continue;
                 }
 
+                if (!filename_is_valid(*name))
+                        return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid config filename: %s", *name);
+
                 if (ENDSWITH_SET(*name, ".network", ".netdev"))
                         reload |= RELOAD_NETWORKD;
                 else if (endswith(*name, ".link"))
                         reload |= RELOAD_UDEVD;
                 else
-                        return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid network config name '%s'.", *name);
+                        return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Network config of unknown type: %s", *name);
 
                 r = get_config_files_by_name(*name, /* allow_masked = */ false, &path, &dropins);
                 if (r == -ERFKILL)
@@ -634,6 +637,9 @@ int verb_cat(int argc, char *argv[], voi
                         continue;
                 }
 
+                if (!filename_is_valid(*name) || !ENDSWITH_SET(*name, ".network", ".netdev", ".link"))
+                        return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid network config name: %s", *name);
+
                 _cleanup_strv_free_ char **dropins = NULL;
                 _cleanup_free_ char *path = NULL;
 
@@ -674,13 +680,16 @@ int verb_mask(int argc, char *argv[], vo
                 _cleanup_free_ char *config_path = NULL, *symlink_path = NULL;
                 ReloadFlags reload;
 
+                if (!filename_is_valid(*name))
+                        return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid config filename: %s", *name);
+
                 /* We update the real 'flags' at last, since the operation can be skipped. */
                 if (ENDSWITH_SET(*name, ".network", ".netdev"))
                         reload = RELOAD_NETWORKD;
                 else if (endswith(*name, ".link"))
                         reload = RELOAD_UDEVD;
                 else
-                        return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid network config name '%s'.", *name);
+                        return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Network config of unknown type: %s", *name);
 
                 r = get_config_files_by_name(*name, /* allow_masked = */ true, &config_path, /* ret_dropins = */ NULL);
                 if (r == -ENOENT)
@@ -731,12 +740,15 @@ int verb_unmask(int argc, char *argv[],
                 _cleanup_free_ char *path = NULL;
                 ReloadFlags reload;
 
+                if (!filename_is_valid(*name))
+                        return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid config filename: %s", *name);
+
                 if (ENDSWITH_SET(*name, ".network", ".netdev"))
                         reload = RELOAD_NETWORKD;
                 else if (endswith(*name, ".link"))
                         reload = RELOAD_UDEVD;
                 else
-                        return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid network config name '%s'.", *name);
+                        return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Network config of unknown type: %s", *name);
 
                 r = get_config_files_by_name(*name, /* allow_masked = */ true, &path, /* ret_dropins = */ NULL);
                 if (r == -ENOENT) {
diff -pruN 257.7-1/src/network/networkd-address.c 257.9-0ubuntu2/src/network/networkd-address.c
--- 257.7-1/src/network/networkd-address.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/network/networkd-address.c	2025-09-03 18:35:40.000000000 +0000
@@ -726,12 +726,12 @@ static void address_modify_nft_set_conte
                 }
 
                 if (r < 0)
-                        log_warning_errno(r, "Failed to %s NFT set: family %s, table %s, set %s, IP address %s, ignoring: %m",
+                        log_warning_errno(r, "Failed to %s NFT set entry: family %s, table %s, set %s, IP address %s, ignoring: %m",
                                           add ? "add" : "delete",
                                           nfproto_to_string(nft_set->nfproto), nft_set->table, nft_set->set,
                                           IN_ADDR_PREFIX_TO_STRING(address->family, &address->in_addr, address->prefixlen));
                 else
-                        log_debug("%s NFT set: family %s, table %s, set %s, IP address %s",
+                        log_debug("%s NFT set entry: family %s, table %s, set %s, IP address %s",
                                   add ? "Added" : "Deleted",
                                   nfproto_to_string(nft_set->nfproto), nft_set->table, nft_set->set,
                                   IN_ADDR_PREFIX_TO_STRING(address->family, &address->in_addr, address->prefixlen));
diff -pruN 257.7-1/src/network/networkd-bridge-vlan.c 257.9-0ubuntu2/src/network/networkd-bridge-vlan.c
--- 257.7-1/src/network/networkd-bridge-vlan.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/network/networkd-bridge-vlan.c	2025-09-03 18:35:40.000000000 +0000
@@ -246,8 +246,9 @@ int bridge_vlan_set_message(Link *link,
         if (r < 0)
                 return r;
 
-        if (link->master_ifindex <= 0) {
-                /* master needs BRIDGE_FLAGS_SELF flag */
+        if (link->master_ifindex <= 0 || streq_ptr(link->kind, "bridge")) {
+                /* If the setting is requested in a .network file for a bridge master (or a physical master)
+                 * interface, then BRIDGE_FLAGS_SELF flag needs to be set. */
                 r = sd_netlink_message_append_u16(m, IFLA_BRIDGE_FLAGS, BRIDGE_FLAGS_SELF);
                 if (r < 0)
                         return r;
diff -pruN 257.7-1/src/network/networkd-manager.c 257.9-0ubuntu2/src/network/networkd-manager.c
--- 257.7-1/src/network/networkd-manager.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/network/networkd-manager.c	2025-09-03 18:35:40.000000000 +0000
@@ -653,7 +653,7 @@ int manager_new(Manager **ret, bool test
                 .dhcp_server_persist_leases = true,
                 .serialization_fd = -EBADF,
                 .ip_forwarding = { -1, -1, },
-#if HAVE_VMLINUX_H
+#if ENABLE_SYSCTL_BPF
                 .cgroup_fd = -EBADF,
 #endif
         };
diff -pruN 257.7-1/src/network/networkd-manager.h 257.9-0ubuntu2/src/network/networkd-manager.h
--- 257.7-1/src/network/networkd-manager.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/network/networkd-manager.h	2025-09-03 18:35:40.000000000 +0000
@@ -133,7 +133,7 @@ struct Manager {
 
         /* sysctl */
         int ip_forwarding[2];
-#if HAVE_VMLINUX_H
+#if ENABLE_SYSCTL_BPF
         Hashmap *sysctl_shadow;
         sd_event_source *sysctl_event_source;
         struct ring_buffer *sysctl_buffer;
@@ -164,7 +164,7 @@ int manager_set_timezone(Manager *m, con
 int manager_reload(Manager *m, sd_bus_message *message);
 
 static inline Hashmap** manager_get_sysctl_shadow(Manager *manager) {
-#if HAVE_VMLINUX_H
+#if ENABLE_SYSCTL_BPF
         return &ASSERT_PTR(manager)->sysctl_shadow;
 #else
         return NULL;
diff -pruN 257.7-1/src/network/networkd-sysctl.c 257.9-0ubuntu2/src/network/networkd-sysctl.c
--- 257.7-1/src/network/networkd-sysctl.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/network/networkd-sysctl.c	2025-09-03 18:35:40.000000000 +0000
@@ -23,7 +23,7 @@
 #include "string-table.h"
 #include "sysctl-util.h"
 
-#if HAVE_VMLINUX_H
+#if ENABLE_SYSCTL_BPF
 
 #include "bpf-link.h"
 
diff -pruN 257.7-1/src/network/networkd-sysctl.h 257.9-0ubuntu2/src/network/networkd-sysctl.h
--- 257.7-1/src/network/networkd-sysctl.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/network/networkd-sysctl.h	2025-09-03 18:35:40.000000000 +0000
@@ -27,7 +27,7 @@ typedef enum IPReversePathFilter {
         _IP_REVERSE_PATH_FILTER_INVALID = -EINVAL,
 } IPReversePathFilter;
 
-#if HAVE_VMLINUX_H
+#if ENABLE_SYSCTL_BPF
 int sysctl_add_monitor(Manager *manager);
 void sysctl_remove_monitor(Manager *manager);
 int sysctl_clear_link_shadows(Link *link);
diff -pruN 257.7-1/src/network/test-networkd-address.c 257.9-0ubuntu2/src/network/test-networkd-address.c
--- 257.7-1/src/network/test-networkd-address.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/network/test-networkd-address.c	2025-09-03 18:35:40.000000000 +0000
@@ -7,8 +7,9 @@
 static void test_FORMAT_LIFETIME_one(usec_t lifetime, const char *expected) {
         const char *t = FORMAT_LIFETIME(lifetime);
 
-        log_debug(USEC_FMT " → \"%s\" (expected \"%s\")", lifetime, t, expected);
-        assert_se(streq(t, expected));
+        log_debug(USEC_FMT " → \"%s\" (expected \"%s\")", lifetime, t, strna(expected));
+        if (expected)
+                ASSERT_STREQ(t, expected);
 }
 
 TEST(FORMAT_LIFETIME) {
@@ -17,9 +18,11 @@ TEST(FORMAT_LIFETIME) {
         now_usec = now(CLOCK_BOOTTIME);
 
         test_FORMAT_LIFETIME_one(now_usec, "for 0");
-        test_FORMAT_LIFETIME_one(usec_add(now_usec, 2 * USEC_PER_SEC - 1), "for 1s");
-        test_FORMAT_LIFETIME_one(usec_add(now_usec, 3 * USEC_PER_WEEK + USEC_PER_SEC - 1), "for 3w");
         test_FORMAT_LIFETIME_one(USEC_INFINITY, "forever");
+
+        /* These two are necessarily racy, especially for slow test environment. */
+        test_FORMAT_LIFETIME_one(usec_add(now_usec, 2 * USEC_PER_SEC - 1), NULL);
+        test_FORMAT_LIFETIME_one(usec_add(now_usec, 3 * USEC_PER_WEEK + USEC_PER_SEC - 1), NULL);
 }
 
 DEFINE_TEST_MAIN(LOG_DEBUG);
diff -pruN 257.7-1/src/nspawn/meson.build 257.9-0ubuntu2/src/nspawn/meson.build
--- 257.7-1/src/nspawn/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/nspawn/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -17,7 +17,6 @@ libnspawn_core_sources = files(
 )
 
 nspawn_gperf_c = custom_target(
-        'nspawn-gperf.c',
         input : 'nspawn-gperf.gperf',
         output : 'nspawn-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
diff -pruN 257.7-1/src/nspawn/nspawn-seccomp.c 257.9-0ubuntu2/src/nspawn/nspawn-seccomp.c
--- 257.7-1/src/nspawn/nspawn-seccomp.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/nspawn/nspawn-seccomp.c	2025-09-03 18:35:40.000000000 +0000
@@ -111,6 +111,7 @@ static int add_syscall_filters(
                 { CAP_SYS_BOOT,       "reboot"                       },
                 { CAP_SYSLOG,         "syslog"                       },
                 { CAP_SYS_TTY_CONFIG, "vhangup"                      },
+                { CAP_BPF,            "bpf",                         },
 
                 /*
                  * The following syscalls and groups are knowingly excluded:
@@ -121,7 +122,6 @@ static int add_syscall_filters(
                  * @pkey
                  * @swap
                  *
-                 * bpf
                  * fanotify_init
                  * fanotify_mark
                  * kexec_file_load
diff -pruN 257.7-1/src/nspawn/nspawn.c 257.9-0ubuntu2/src/nspawn/nspawn.c
--- 257.7-1/src/nspawn/nspawn.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/nspawn/nspawn.c	2025-09-03 18:35:40.000000000 +0000
@@ -2659,7 +2659,7 @@ static int setup_hostname(void) {
         return 0;
 }
 
-static int setup_journal(const char *directory) {
+static int setup_journal(const char *directory, uid_t uid_shift, uid_t uid_range) {
         _cleanup_free_ char *d = NULL;
         const char *p, *q;
         sd_id128_t this_id;
@@ -2782,11 +2782,19 @@ static int setup_journal(const char *dir
         if (r < 0)
                 return log_error_errno(r, "Failed to create %s: %m", q);
 
-        r = mount_nofollow_verbose(LOG_DEBUG, p, q, NULL, MS_BIND, NULL);
-        if (r < 0)
-                return log_error_errno(r, "Failed to bind mount journal from host into guest: %m");
-
-        return 0;
+        return mount_custom(
+                        directory,
+                        &(CustomMount) {
+                                .type = CUSTOM_MOUNT_BIND,
+                                .options = (char*) (uid_is_valid(uid_shift) ? "rootidmap" : NULL),
+                                .source = (char *)p,
+                                .destination = (char *)p,
+                        },
+                        /* n = */ 1,
+                        uid_shift,
+                        uid_range,
+                        arg_selinux_apifs_context,
+                        MOUNT_NON_ROOT_ONLY);
 }
 
 static int drop_capabilities(uid_t uid) {
@@ -4292,7 +4300,7 @@ static int outer_child(
         if (r < 0)
                 return r;
 
-        r = setup_journal(directory);
+        r = setup_journal(directory, arg_uid_shift, arg_uid_range);
         if (r < 0)
                 return r;
 
diff -pruN 257.7-1/src/nsresourced/bpf/userns_restrict/meson.build 257.9-0ubuntu2/src/nsresourced/bpf/userns_restrict/meson.build
--- 257.7-1/src/nsresourced/bpf/userns_restrict/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/nsresourced/bpf/userns_restrict/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -5,20 +5,17 @@ if conf.get('HAVE_VMLINUX_H') != 1
 endif
 
 userns_restrict_bpf_o_unstripped = custom_target(
-        'userns-restrict.bpf.unstripped.o',
         input : 'userns-restrict.bpf.c',
         output : 'userns-restrict.bpf.unstripped.o',
         command : bpf_o_unstripped_cmd,
         depends : vmlinux_h_dependency)
 
 userns_restrict_bpf_o = custom_target(
-        'userns-restrict.bpf.o',
         input : userns_restrict_bpf_o_unstripped,
         output : 'userns-restrict.bpf.o',
         command : bpf_o_cmd)
 
 userns_restrict_skel_h = custom_target(
-        'userns-restrict.skel.h',
         input : userns_restrict_bpf_o,
         output : 'userns-restrict.skel.h',
         command : skel_h_cmd,
diff -pruN 257.7-1/src/oom/test-oomd-util.c 257.9-0ubuntu2/src/oom/test-oomd-util.c
--- 257.7-1/src/oom/test-oomd-util.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/oom/test-oomd-util.c	2025-09-03 18:35:40.000000000 +0000
@@ -55,6 +55,8 @@ static void test_oomd_cgroup_kill(void)
          * by the test so that pid1 doesn't delete it before we can read the xattrs. */
         cgroup = path_join(cgroup_root, "oomdkilltest");
         assert_se(cgroup);
+        /* Always start clean, in case of repeated runs and failures */
+        assert_se(cg_trim(SYSTEMD_CGROUP_CONTROLLER, cgroup, /* delete_root */ true) >= 0);
         assert_se(cg_create(SYSTEMD_CGROUP_CONTROLLER, cgroup) >= 0);
 
         /* If we don't have permissions to set xattrs we're likely in a userns or missing capabilities */
@@ -88,6 +90,8 @@ static void test_oomd_cgroup_kill(void)
                 assert_se(cg_get_xattr_malloc(cgroup, "user.oomd_kill", &v) >= 0);
                 assert_se(streq(v, i == 0 ? "2" : "4"));
         }
+
+        assert_se(cg_trim(SYSTEMD_CGROUP_CONTROLLER, cgroup, /* delete_root */ true) >= 0);
 }
 
 static void test_oomd_cgroup_context_acquire_and_insert(void) {
diff -pruN 257.7-1/src/pcrlock/pcrlock.c 257.9-0ubuntu2/src/pcrlock/pcrlock.c
--- 257.7-1/src/pcrlock/pcrlock.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/pcrlock/pcrlock.c	2025-09-03 18:35:40.000000000 +0000
@@ -2185,7 +2185,7 @@ static int show_log_table(EventLog *el,
 
         r = table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, /* show_header= */true);
         if (r < 0)
-                return log_error_errno(r, "Failed to output table: %m");
+                return r;
 
         return 0;
 }
@@ -2346,7 +2346,7 @@ static int show_pcr_table(EventLog *el,
 
         r = table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, /* show_header= */ true);
         if (r < 0)
-                return log_error_errno(r, "Failed to output table: %m");
+                return r;
 
         if (!sd_json_format_enabled(arg_json_format_flags))
                 printf("\n"
@@ -2657,7 +2657,7 @@ static int verb_list_components(int argc
         if (!table_isempty(table) || sd_json_format_enabled(arg_json_format_flags)) {
                 r = table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, /* show_header= */ true);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to output table: %m");
+                        return r;
         }
 
         if (!sd_json_format_enabled(arg_json_format_flags)) {
@@ -4473,9 +4473,18 @@ static int make_policy(bool force, Recov
         if (DEBUG_LOGGING)
                 (void) sd_json_variant_dump(new_prediction_json, SD_JSON_FORMAT_PRETTY_AUTO|SD_JSON_FORMAT_COLOR_AUTO, stderr, NULL);
 
-        _cleanup_(tpm2_pcrlock_policy_done) Tpm2PCRLockPolicy old_policy = {};
+        /* v257 and older mistakenly used --pcrlock= for the path. To keep backward compatibility, let's fallback to it when
+         * --policy= is unspecified but --pcrlock is specified. */
+        if (!arg_policy_path && arg_pcrlock_path) {
+                log_notice("Specified --pcrlock= option for make-policy command. Please use --policy= instead.");
+
+                arg_policy_path = strdup(arg_pcrlock_path);
+                if (!arg_policy_path)
+                        return log_oom();
+        }
 
-        r = tpm2_pcrlock_policy_load(arg_pcrlock_path, &old_policy);
+        _cleanup_(tpm2_pcrlock_policy_done) Tpm2PCRLockPolicy old_policy = {};
+        r = tpm2_pcrlock_policy_load(arg_policy_path, &old_policy);
         if (r < 0)
                 return r;
 
@@ -4511,15 +4520,13 @@ static int make_policy(bool force, Recov
 
         _cleanup_(tpm2_handle_freep) Tpm2Handle *srk_handle = NULL;
 
-        if (iovec_is_set(&srk_blob)) {
-                r = tpm2_deserialize(
-                                tc,
-                                srk_blob.iov_base,
-                                srk_blob.iov_len,
-                                &srk_handle);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to deserialize SRK TR: %m");
-        } else {
+        r = tpm2_deserialize(
+                        tc,
+                        &srk_blob,
+                        &srk_handle);
+        if (r < 0)
+                return log_error_errno(r, "Failed to deserialize SRK TR: %m");
+        if (r == 0) {
                 r = tpm2_get_or_create_srk(
                                 tc,
                                 /* session= */ NULL,
@@ -4586,13 +4593,11 @@ static int make_policy(bool force, Recov
         _cleanup_(tpm2_handle_freep) Tpm2Handle *nv_handle = NULL;
         TPM2_HANDLE nv_index = 0;
 
-        if (iovec_is_set(&nv_blob)) {
-                r = tpm2_deserialize(tc, nv_blob.iov_base, nv_blob.iov_len, &nv_handle);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to deserialize NV index TR: %m");
-
+        r = tpm2_deserialize(tc, &nv_blob, &nv_handle);
+        if (r < 0)
+                return log_error_errno(r, "Failed to deserialize NV index TR: %m");
+        if (r > 0)
                 nv_index = old_policy.nv_index;
-        }
 
         TPM2B_AUTH auth = {};
         CLEANUP_ERASE(auth);
@@ -4778,13 +4783,13 @@ static int make_policy(bool force, Recov
         }
 
         if (!iovec_is_set(&nv_blob)) {
-                r = tpm2_serialize(tc, nv_handle, &nv_blob.iov_base, &nv_blob.iov_len);
+                r = tpm2_serialize(tc, nv_handle, &nv_blob);
                 if (r < 0)
                         return log_error_errno(r, "Failed to serialize NV index TR: %m");
         }
 
         if (!iovec_is_set(&srk_blob)) {
-                r = tpm2_serialize(tc, srk_handle, &srk_blob.iov_base, &srk_blob.iov_len);
+                r = tpm2_serialize(tc, srk_handle, &srk_blob);
                 if (r < 0)
                         return log_error_errno(r, "Failed to serialize SRK index TR: %m");
         }
@@ -4814,12 +4819,12 @@ static int make_policy(bool force, Recov
         if (r < 0)
                 return log_error_errno(r, "Failed to format new configuration to JSON: %m");
 
-        const char *path = arg_pcrlock_path ?: (in_initrd() ? "/run/systemd/pcrlock.json" : "/var/lib/systemd/pcrlock.json");
+        const char *path = arg_policy_path ?: (in_initrd() ? "/run/systemd/pcrlock.json" : "/var/lib/systemd/pcrlock.json");
         r = write_string_file(path, text, WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC|WRITE_STRING_FILE_SYNC|WRITE_STRING_FILE_MKDIR_0755);
         if (r < 0)
                 return log_error_errno(r, "Failed to write new configuration to '%s': %m", path);
 
-        if (!arg_pcrlock_path && !in_initrd()) {
+        if (!arg_policy_path && !in_initrd()) {
                 r = remove_policy_file("/run/systemd/pcrlock.json");
                 if (r < 0)
                         return r;
@@ -4855,20 +4860,18 @@ static int undefine_policy_nv_index(
         _cleanup_(tpm2_handle_freep) Tpm2Handle *srk_handle = NULL;
         r = tpm2_deserialize(
                         tc,
-                        srk_blob->iov_base,
-                        srk_blob->iov_len,
+                        srk_blob,
                         &srk_handle);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to deserialize SRK TR: %m");
+        if (r < 0)
+                return log_error_errno(r, "Failed to deserialize SRK TR: %m");
 
         _cleanup_(tpm2_handle_freep) Tpm2Handle *nv_handle = NULL;
         r = tpm2_deserialize(
                         tc,
-                        nv_blob->iov_base,
-                        nv_blob->iov_len,
+                        nv_blob,
                         &nv_handle);
-                if (r < 0)
-                        return log_error_errno(r, "Failed to deserialize NV TR: %m");
+        if (r < 0)
+                return log_error_errno(r, "Failed to deserialize NV TR: %m");
 
         _cleanup_(tpm2_handle_freep) Tpm2Handle *encryption_session = NULL;
         r = tpm2_make_encryption_session(
diff -pruN 257.7-1/src/portable/portable.c 257.9-0ubuntu2/src/portable/portable.c
--- 257.7-1/src/portable/portable.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/portable/portable.c	2025-09-03 18:35:40.000000000 +0000
@@ -563,7 +563,7 @@ static int extract_image_and_extensions(
                 char ***ret_valid_prefixes,
                 sd_bus_error *error) {
 
-        _cleanup_free_ char *id = NULL, *version_id = NULL, *sysext_level = NULL, *confext_level = NULL;
+        _cleanup_free_ char *id = NULL, *id_like = NULL, *version_id = NULL, *sysext_level = NULL, *confext_level = NULL;
         _cleanup_(portable_metadata_unrefp) PortableMetadata *os_release = NULL;
         _cleanup_ordered_hashmap_free_ OrderedHashmap *extension_images = NULL, *extension_releases = NULL;
         _cleanup_(pick_result_done) PickResult result = PICK_RESULT_NULL;
@@ -664,6 +664,7 @@ static int extract_image_and_extensions(
 
                 r = parse_env_file_fd(os_release->fd, os_release->name,
                                      "ID", &id,
+                                     "ID_LIKE", &id_like,
                                      "VERSION_ID", &version_id,
                                      "SYSEXT_LEVEL", &sysext_level,
                                      "CONFEXT_LEVEL", &confext_level,
@@ -710,9 +711,9 @@ static int extract_image_and_extensions(
                         return r;
 
                 if (validate_extension) {
-                        r = extension_release_validate(ext->path, id, version_id, sysext_level, "portable", extension_release, IMAGE_SYSEXT);
+                        r = extension_release_validate(ext->path, id, id_like, version_id, sysext_level, "portable", extension_release, IMAGE_SYSEXT);
                         if (r < 0)
-                                r = extension_release_validate(ext->path, id, version_id, confext_level, "portable", extension_release, IMAGE_CONFEXT);
+                                r = extension_release_validate(ext->path, id, id_like, version_id, confext_level, "portable", extension_release, IMAGE_CONFEXT);
 
                         if (r == 0)
                                 return sd_bus_error_set_errnof(error, ESTALE, "Image %s extension-release metadata does not match the root's", ext->path);
diff -pruN 257.7-1/src/repart/repart.c 257.9-0ubuntu2/src/repart/repart.c
--- 257.7-1/src/repart/repart.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/repart/repart.c	2025-09-03 18:35:40.000000000 +0000
@@ -308,6 +308,19 @@ static SubvolumeFlags subvolume_flags_fr
         return flags;
 }
 
+static char* subvolume_flags_to_string(SubvolumeFlags flags) {
+        const char *l[CONST_LOG2U(_SUBVOLUME_FLAGS_MASK + 1) + 1]; /* one string per known flag at most */
+        size_t m = 0;
+
+        if (FLAGS_SET(flags, SUBVOLUME_RO))
+                l[m++] = "ro";
+
+        assert(m < ELEMENTSOF(l));
+        l[m] = NULL;
+
+        return strv_join((char**) l, ",");
+}
+
 typedef struct Subvolume {
         char *path;
         SubvolumeFlags flags;
@@ -859,7 +872,7 @@ static bool context_drop_or_foreignize_o
 }
 
 static uint64_t partition_min_size(const Context *context, const Partition *p) {
-        uint64_t sz, override_min;
+        uint64_t sz;
 
         assert(context);
         assert(p);
@@ -901,9 +914,17 @@ static uint64_t partition_min_size(const
                         sz = d;
         }
 
-        override_min = p->suppressing ? MAX(p->size_min, p->suppressing->size_min) : p->size_min;
+        uint64_t min_size = p->size_min;
+        if (p->suppressing && (min_size == UINT64_MAX || p->suppressing->size_min > min_size))
+                min_size = p->suppressing->size_min;
+
+        /* Default to 10M min size, except if the file system is read-only, in which case let's not enforce a
+         * minimum size, because even if we wanted to we couldn't take possession of the extra space
+         * allocated. */
+        if (min_size == UINT64_MAX)
+                min_size = (p->format && fstype_is_ro(p->format)) || p->verity != VERITY_OFF ? 1 : DEFAULT_MIN_SIZE;
 
-        return MAX(round_up_size(override_min != UINT64_MAX ? override_min : DEFAULT_MIN_SIZE, context->grain_size), sz);
+        return MAX(round_up_size(min_size, context->grain_size), sz);
 }
 
 static uint64_t partition_max_size(const Context *context, const Partition *p) {
@@ -2486,14 +2507,6 @@ static int partition_read_definition(Par
                                   "SizeMinBytes=/SizeMaxBytes= cannot be used with Verity=%s.",
                                   verity_mode_to_string(p->verity));
 
-        if (!ordered_hashmap_isempty(p->subvolumes) && arg_offline > 0)
-                return log_syntax(NULL, LOG_ERR, path, 1, SYNTHETIC_ERRNO(EOPNOTSUPP),
-                                  "Subvolumes= cannot be used with --offline=yes.");
-
-        if (p->default_subvolume && arg_offline > 0)
-                return log_syntax(NULL, LOG_ERR, path, 1, SYNTHETIC_ERRNO(EOPNOTSUPP),
-                                  "DefaultSubvolume= cannot be used with --offline=yes.");
-
         if (p->default_subvolume && !ordered_hashmap_contains(p->subvolumes, p->default_subvolume))
                 return log_syntax(NULL, LOG_ERR, path, 1, SYNTHETIC_ERRNO(EINVAL),
                                   "DefaultSubvolume= must be one of the paths in Subvolumes=.");
@@ -4341,7 +4354,7 @@ static int prepare_temporary_file(Contex
 
 static bool loop_device_error_is_fatal(const Partition *p, int r) {
         assert(p);
-        return arg_offline == 0 || (r != -ENOENT && !ERRNO_IS_PRIVILEGE(r)) || !ordered_hashmap_isempty(p->subvolumes) || p->default_subvolume;
+        return arg_offline == 0 || (r != -ENOENT && !ERRNO_IS_PRIVILEGE(r));
 }
 
 static int partition_target_prepare(
@@ -5901,6 +5914,38 @@ static int partition_populate_filesystem
         return 0;
 }
 
+static int append_btrfs_subvols(char ***l, OrderedHashmap *subvolumes, const char *default_subvolume) {
+        Subvolume *subvolume;
+        int r;
+
+        assert(l);
+
+        ORDERED_HASHMAP_FOREACH(subvolume, subvolumes) {
+                _cleanup_free_ char *s = NULL, *f = NULL;
+
+                s = strdup(subvolume->path);
+                if (!s)
+                        return log_oom();
+
+                f = subvolume_flags_to_string(subvolume->flags);
+                if (!f)
+                        return log_oom();
+
+                if (streq_ptr(subvolume->path, default_subvolume) &&
+                    !strextend_with_separator(&f, ",", "default"))
+                        return log_oom();
+
+                if (!isempty(f) && !strextend_with_separator(&s, ":", f))
+                        return log_oom();
+
+                r = strv_extend_many(l, "--subvol", s);
+                if (r < 0)
+                        return log_oom();
+        }
+
+        return 0;
+}
+
 static int finalize_extra_mkfs_options(const Partition *p, const char *root, char ***ret) {
         _cleanup_strv_free_ char **sv = NULL;
         int r;
@@ -5914,6 +5959,18 @@ static int finalize_extra_mkfs_options(c
                                        "Failed to determine mkfs command line options for '%s': %m",
                                        p->format);
 
+        if (partition_needs_populate(p) && root && streq(p->format, "btrfs")) {
+                r = append_btrfs_subvols(&sv, p->subvolumes, p->default_subvolume);
+                if (r < 0)
+                        return r;
+
+                if (p->suppressing) {
+                        r = append_btrfs_subvols(&sv, p->suppressing->subvolumes, NULL);
+                        if (r < 0)
+                                return r;
+                }
+        }
+
         *ret = TAKE_PTR(sv);
         return 0;
 }
diff -pruN 257.7-1/src/resolve/meson.build 257.9-0ubuntu2/src/resolve/meson.build
--- 257.7-1/src/resolve/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/resolve/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -47,7 +47,6 @@ resolvectl_sources = files(
 ############################################################
 
 dns_type_list_txt = custom_target(
-        'dns_type-list.txt',
         input : ['generate-dns_type-list.sed', 'dns-type.h'],
         output : 'dns_type-list.txt',
         command : [sed, '-n', '-r', '-f', '@INPUT0@', '@INPUT1@'],
@@ -56,14 +55,12 @@ dns_type_list_txt = custom_target(
 generate_dns_type_gperf = find_program('generate-dns_type-gperf.py')
 
 gperf_file = custom_target(
-        'dns_type-from-name.gperf',
         input : dns_type_list_txt,
         output : 'dns_type-from-name.gperf',
         command : [generate_dns_type_gperf, 'dns_type', 'DNS_TYPE_', '@INPUT@'],
         capture : true)
 
 basic_dns_sources += custom_target(
-        'dns_type-from-name.h',
         input : gperf_file,
         output : 'dns_type-from-name.h',
         command : [gperf,
@@ -75,7 +72,6 @@ basic_dns_sources += custom_target(
         capture : true)
 
 basic_dns_sources += custom_target(
-        'dns_type-to-name.h',
         input : ['dns_type-to-name.awk', dns_type_list_txt],
         output : 'dns_type-to-name.h',
         command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
@@ -89,13 +85,11 @@ libsystemd_resolve_core = static_library
         build_by_default : false)
 
 systemd_resolved_sources += custom_target(
-        'resolved_gperf.c',
         input : 'resolved-gperf.gperf',
         output : 'resolved-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
 
 systemd_resolved_sources += custom_target(
-        'resolved_dnssd_gperf.c',
         input : 'resolved-dnssd-gperf.gperf',
         output : 'resolved-dnssd-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
@@ -323,7 +317,6 @@ if conf.get('ENABLE_RESOLVE') == 1
 endif
 
 custom_target(
-        'resolved.conf',
         input : 'resolved.conf.in',
         output : 'resolved.conf',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/src/resolve/resolvectl.c 257.9-0ubuntu2/src/resolve/resolvectl.c
--- 257.7-1/src/resolve/resolvectl.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/resolve/resolvectl.c	2025-09-03 18:35:40.000000000 +0000
@@ -3107,6 +3107,8 @@ static int dump_cache_scope(sd_json_vari
                 int ifindex;
                 const char *ifname;
                 sd_json_variant *cache;
+                const char *dnssec_mode;
+                const char *dns_over_tls_mode;
         } scope_info = {
                 .family = AF_UNSPEC,
         };
@@ -3114,11 +3116,13 @@ static int dump_cache_scope(sd_json_vari
         int r, c = 0;
 
         static const sd_json_dispatch_field dispatch_table[] = {
-                { "protocol", SD_JSON_VARIANT_STRING,        sd_json_dispatch_const_string,  offsetof(struct scope_info, protocol), SD_JSON_MANDATORY },
-                { "family",   _SD_JSON_VARIANT_TYPE_INVALID, sd_json_dispatch_int,           offsetof(struct scope_info, family),   0                 },
-                { "ifindex",  _SD_JSON_VARIANT_TYPE_INVALID, json_dispatch_ifindex,          offsetof(struct scope_info, ifindex),  SD_JSON_RELAX     },
-                { "ifname",   SD_JSON_VARIANT_STRING,        sd_json_dispatch_const_string,  offsetof(struct scope_info, ifname),   0                 },
-                { "cache",    SD_JSON_VARIANT_ARRAY,         sd_json_dispatch_variant_noref, offsetof(struct scope_info, cache),    SD_JSON_MANDATORY },
+                { "protocol",     SD_JSON_VARIANT_STRING,        sd_json_dispatch_const_string,  offsetof(struct scope_info, protocol),          SD_JSON_MANDATORY },
+                { "family",       _SD_JSON_VARIANT_TYPE_INVALID, sd_json_dispatch_int,           offsetof(struct scope_info, family),            0                 },
+                { "ifindex",      _SD_JSON_VARIANT_TYPE_INVALID, json_dispatch_ifindex,          offsetof(struct scope_info, ifindex),           SD_JSON_RELAX     },
+                { "ifname",       SD_JSON_VARIANT_STRING,        sd_json_dispatch_const_string,  offsetof(struct scope_info, ifname),            0                 },
+                { "cache",        SD_JSON_VARIANT_ARRAY,         sd_json_dispatch_variant_noref, offsetof(struct scope_info, cache),             SD_JSON_MANDATORY },
+                { "dnssec",       SD_JSON_VARIANT_STRING,        sd_json_dispatch_const_string,  offsetof(struct scope_info, dnssec_mode),       0                 },
+                { "dnsOverTLS",   SD_JSON_VARIANT_STRING,        sd_json_dispatch_const_string,  offsetof(struct scope_info, dns_over_tls_mode), 0                 },
                 {},
         };
 
@@ -3136,6 +3140,13 @@ static int dump_cache_scope(sd_json_vari
         if (scope_info.ifname)
                 printf(" ifname=%s", scope_info.ifname);
 
+        if (dns_protocol_from_string(scope_info.protocol) == DNS_PROTOCOL_DNS) {
+                if (scope_info.dnssec_mode)
+                        printf(" DNSSEC=%s", scope_info.dnssec_mode);
+                if (scope_info.dns_over_tls_mode)
+                        printf(" DNSOverTLS=%s", scope_info.dns_over_tls_mode);
+        }
+
         printf("%s\n", ansi_normal());
 
         JSON_VARIANT_ARRAY_FOREACH(i, scope_info.cache) {
diff -pruN 257.7-1/src/resolve/resolved-dns-scope.c 257.9-0ubuntu2/src/resolve/resolved-dns-scope.c
--- 257.7-1/src/resolve/resolved-dns-scope.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/resolve/resolved-dns-scope.c	2025-09-03 18:35:40.000000000 +0000
@@ -1375,6 +1375,14 @@ void dns_scope_dump(DnsScope *s, FILE *f
                 fputs(af_to_name(s->family), f);
         }
 
+        if (s->protocol == DNS_PROTOCOL_DNS) {
+                fputs(" DNSSEC=", f);
+                fputs(dnssec_mode_to_string(s->dnssec_mode), f);
+
+                fputs(" DNSOverTLS=", f);
+                fputs(dns_over_tls_mode_to_string(s->dns_over_tls_mode), f);
+        }
+
         fputs("]\n", f);
 
         if (!dns_zone_is_empty(&s->zone)) {
@@ -1737,7 +1745,13 @@ int dns_scope_dump_cache_to_json(DnsScop
                         SD_JSON_BUILD_PAIR_CONDITION(scope->family != AF_UNSPEC, "family", SD_JSON_BUILD_INTEGER(scope->family)),
                         SD_JSON_BUILD_PAIR_CONDITION(!!scope->link, "ifindex", SD_JSON_BUILD_INTEGER(dns_scope_ifindex(scope))),
                         SD_JSON_BUILD_PAIR_CONDITION(!!scope->link, "ifname", SD_JSON_BUILD_STRING(dns_scope_ifname(scope))),
-                        SD_JSON_BUILD_PAIR_VARIANT("cache", cache));
+                        SD_JSON_BUILD_PAIR_VARIANT("cache", cache),
+                        SD_JSON_BUILD_PAIR_CONDITION(scope->protocol == DNS_PROTOCOL_DNS,
+                                                     "dnssec",
+                                                     SD_JSON_BUILD_STRING(dnssec_mode_to_string(scope->dnssec_mode))),
+                        SD_JSON_BUILD_PAIR_CONDITION(scope->protocol == DNS_PROTOCOL_DNS,
+                                                     "dnsOverTLS",
+                                                     SD_JSON_BUILD_STRING(dns_over_tls_mode_to_string(scope->dns_over_tls_mode))));
 }
 
 int dns_type_suitable_for_protocol(uint16_t type, DnsProtocol protocol) {
diff -pruN 257.7-1/src/resolve/resolved-manager.c 257.9-0ubuntu2/src/resolve/resolved-manager.c
--- 257.7-1/src/resolve/resolved-manager.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/resolve/resolved-manager.c	2025-09-03 18:35:40.000000000 +0000
@@ -594,6 +594,7 @@ static void manager_set_defaults(Manager
 
 static int manager_dispatch_reload_signal(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata) {
         Manager *m = ASSERT_PTR(userdata);
+        Link *l;
         int r;
 
         (void) notify_reloading();
@@ -629,6 +630,12 @@ static int manager_dispatch_reload_signa
         if (r < 0)
                 return r;
 
+        /* A link's unicast scope may also be influenced by the manager's configuration. I.e., DNSSEC= and DNSOverTLS=
+         * from the manager will be used if not explicitly configured on the link. Free the scopes here so that
+         * link_allocate_scopes() in on_network_event() re-creates them. */
+        HASHMAP_FOREACH(l, m->links)
+                l->unicast_scope = dns_scope_free(l->unicast_scope);
+
         /* The configuration has changed, so reload the per-interface configuration too in order to take
          * into account any changes (e.g.: enable/disable DNSSEC). */
         r = on_network_event(/* sd_event_source= */ NULL, -EBADF, /* revents= */ 0, m);
diff -pruN 257.7-1/src/resolve/test-dns-query.c 257.9-0ubuntu2/src/resolve/test-dns-query.c
--- 257.7-1/src/resolve/test-dns-query.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/resolve/test-dns-query.c	2025-09-03 18:35:40.000000000 +0000
@@ -701,7 +701,7 @@ TEST(dns_query_string_request_address) {
  * particular:
  *
  * - The very first thing it does is try to respond to the query by reading the system /etc/hosts file, which
- *   may be symlinked to a SystemD resource. Ideally we could test this without accessing global files.
+ *   may be symlinked to a systemd resource. Ideally we could test this without accessing global files.
  *
  * - dns_scope_get_dns_server() calls manager_get_dns_server(), which tries to read /etc/resolv.conf.
  *
diff -pruN 257.7-1/src/rpm/meson.build 257.9-0ubuntu2/src/rpm/meson.build
--- 257.7-1/src/rpm/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/rpm/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -12,10 +12,11 @@ in_files = [
 # The last two don't get installed anywhere, one of them needs to included in
 # the rpm spec file definition instead.
 
+rpm_depends = []
+
 foreach tuple : in_files
         file = tuple[0]
-        custom_target(
-                file,
+        rpm_depends += custom_target(
                 input : file + '.in',
                 output : file,
                 command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/src/run/meson.build 257.9-0ubuntu2/src/run/meson.build
--- 257.7-1/src/run/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/run/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -15,7 +15,6 @@ meson.add_install_script(sh, '-c',
                                          bindir / 'run0'))
 
 custom_target(
-        'systemd-run0',
         input : 'systemd-run0.in',
         output : 'systemd-run0',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/src/shared/ask-password-api.c 257.9-0ubuntu2/src/shared/ask-password-api.c
--- 257.7-1/src/shared/ask-password-api.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/shared/ask-password-api.c	2025-09-03 18:35:40.000000000 +0000
@@ -253,14 +253,14 @@ static int ask_password_keyring(const As
                 return -EUNATCH;
 
         r = lookup_key(req->keyring, &serial);
-        if (ERRNO_IS_NEG_NOT_SUPPORTED(r) || r == -EPERM)
+        if (ERRNO_IS_NEG_NOT_SUPPORTED(r) || IN_SET(r, -EPERM, -ENOKEY))
                 /* When retrieving, the distinction between "kernel or container manager don't support or
                  * allow this" and "no matching key known" doesn't matter. Note that we propagate EACCESS
                  * here (even if EPERM not) since that is used if the keyring is available, but we lack
                  * access to the key. */
                 return -ENOKEY;
         if (r < 0)
-                return r;
+                return log_debug_errno(r, "Failed to look up key %s in keyring: %m", req->keyring);
 
         _cleanup_strv_free_erase_ char **l = NULL;
         r = retrieve_key(serial, &l);
@@ -561,7 +561,7 @@ int ask_password_tty(
                 new_termios = old_termios;
                 termios_disable_echo(&new_termios);
 
-                r = RET_NERRNO(tcsetattr(ttyfd, TCSADRAIN, &new_termios));
+                r = RET_NERRNO(tcsetattr(ttyfd, TCSANOW, &new_termios));
                 if (r < 0)
                         goto finish;
 
@@ -758,7 +758,7 @@ skipped:
 finish:
         if (ttyfd >= 0 && reset_tty) {
                 (void) loop_write(ttyfd, "\n", 1);
-                (void) tcsetattr(ttyfd, TCSADRAIN, &old_termios);
+                (void) tcsetattr(ttyfd, TCSANOW, &old_termios);
         }
 
         return r;
diff -pruN 257.7-1/src/shared/cgroup-setup.c 257.9-0ubuntu2/src/shared/cgroup-setup.c
--- 257.7-1/src/shared/cgroup-setup.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/shared/cgroup-setup.c	2025-09-03 18:35:40.000000000 +0000
@@ -664,6 +664,8 @@ int cg_migrate(
                         if (r < 0)
                                 return RET_GATHER(ret, r);
                 }
+                if (r == -ENODEV)
+                        continue;
                 if (r < 0)
                         return RET_GATHER(ret, r);
         } while (!done);
diff -pruN 257.7-1/src/shared/cgroup-show.c 257.9-0ubuntu2/src/shared/cgroup-show.c
--- 257.7-1/src/shared/cgroup-show.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/shared/cgroup-show.c	2025-09-03 18:35:40.000000000 +0000
@@ -108,9 +108,12 @@ static int show_cgroup_one_by_path(
                 /* libvirt / qemu uses threaded mode and cgroup.procs cannot be read at the lower levels.
                  * From https://docs.kernel.org/admin-guide/cgroup-v2.html#threads,
                  * “cgroup.procs” in a threaded domain cgroup contains the PIDs of all processes in
-                 * the subtree and is not readable in the subtree proper. */
+                 * the subtree and is not readable in the subtree proper.
+                 *
+                 * ENODEV is generated when we enumerate processes from a cgroup and the cgroup is removed
+                 * concurrently. */
                 r = cg_read_pid(f, &pid, /* flags = */ 0);
-                if (IN_SET(r, 0, -EOPNOTSUPP))
+                if (IN_SET(r, 0, -EOPNOTSUPP, -ENODEV))
                         break;
                 if (r < 0)
                         return r;
diff -pruN 257.7-1/src/shared/dissect-image.c 257.9-0ubuntu2/src/shared/dissect-image.c
--- 257.7-1/src/shared/dissect-image.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/shared/dissect-image.c	2025-09-03 18:35:40.000000000 +0000
@@ -4030,6 +4030,7 @@ int verity_dissect_and_mount(
                 const MountOptions *options,
                 const ImagePolicy *image_policy,
                 const char *required_host_os_release_id,
+                const char *required_host_os_release_id_like,
                 const char *required_host_os_release_version_id,
                 const char *required_host_os_release_sysext_level,
                 const char *required_host_os_release_confext_level,
@@ -4158,6 +4159,7 @@ int verity_dissect_and_mount(
                 r = extension_release_validate(
                                 dissected_image->image_name,
                                 required_host_os_release_id,
+                                required_host_os_release_id_like,
                                 required_host_os_release_version_id,
                                 class == IMAGE_SYSEXT ? required_host_os_release_sysext_level : required_host_os_release_confext_level,
                                 required_sysext_scope,
diff -pruN 257.7-1/src/shared/dissect-image.h 257.9-0ubuntu2/src/shared/dissect-image.h
--- 257.7-1/src/shared/dissect-image.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/shared/dissect-image.h	2025-09-03 18:35:40.000000000 +0000
@@ -226,7 +226,7 @@ bool dissected_image_verity_sig_ready(co
 
 int mount_image_privately_interactively(const char *path, const ImagePolicy *image_policy, DissectImageFlags flags, char **ret_directory, int *ret_dir_fd, LoopDevice **ret_loop_device);
 
-int verity_dissect_and_mount(int src_fd, const char *src, const char *dest, const MountOptions *options, const ImagePolicy *image_policy, const char *required_host_os_release_id, const char *required_host_os_release_version_id, const char *required_host_os_release_sysext_level, const char *required_host_os_release_confext_level, const char *required_sysext_scope, VeritySettings *verity, DissectedImage **ret_image);
+int verity_dissect_and_mount(int src_fd, const char *src, const char *dest, const MountOptions *options, const ImagePolicy *image_policy, const char *required_host_os_release_id, const char *required_host_os_release_id_like, const char *required_host_os_release_version_id, const char *required_host_os_release_sysext_level, const char *required_host_os_release_confext_level, const char *required_sysext_scope, VeritySettings *verity, DissectedImage **ret_image);
 
 int dissect_fstype_ok(const char *fstype);
 
diff -pruN 257.7-1/src/shared/efi-api.c 257.9-0ubuntu2/src/shared/efi-api.c
--- 257.7-1/src/shared/efi-api.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/shared/efi-api.c	2025-09-03 18:35:40.000000000 +0000
@@ -548,9 +548,9 @@ void efi_id128_to_guid(sd_id128_t id, vo
         assert(ret_guid);
 
         EFI_GUID uuid = {
-                .Data1 = id.bytes[0] << 24 | id.bytes[1] << 16 | id.bytes[2] << 8 | id.bytes[3],
-                .Data2 = id.bytes[4] << 8 | id.bytes[5],
-                .Data3 = id.bytes[6] << 8 | id.bytes[7],
+                .Data1 = (uint32_t) id.bytes[0] << 24 | (uint32_t) id.bytes[1] << 16 | (uint32_t) id.bytes[2] << 8 | id.bytes[3],
+                .Data2 = (uint16_t) id.bytes[4] << 8 | id.bytes[5],
+                .Data3 = (uint16_t) id.bytes[6] << 8 | id.bytes[7],
         };
         memcpy(uuid.Data4, id.bytes+8, sizeof(uuid.Data4));
         memcpy(ret_guid, &uuid, sizeof(uuid));
diff -pruN 257.7-1/src/shared/extension-util.c 257.9-0ubuntu2/src/shared/extension-util.c
--- 257.7-1/src/shared/extension-util.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/shared/extension-util.c	2025-09-03 18:35:40.000000000 +0000
@@ -12,6 +12,7 @@
 int extension_release_validate(
                 const char *name,
                 const char *host_os_release_id,
+                const char *host_os_release_id_like,
                 const char *host_os_release_version_id,
                 const char *host_os_extension_release_level,
                 const char *host_extension_scope,
@@ -21,6 +22,7 @@ int extension_release_validate(
         const char *extension_release_id = NULL, *extension_release_level = NULL, *extension_architecture = NULL;
         const char *extension_level = image_class == IMAGE_CONFEXT ? "CONFEXT_LEVEL" : "SYSEXT_LEVEL";
         const char *extension_scope = image_class == IMAGE_CONFEXT ? "CONFEXT_SCOPE" : "SYSEXT_SCOPE";
+        _cleanup_strv_free_ char **id_like_l = NULL;
 
         assert(name);
         assert(!isempty(host_os_release_id));
@@ -77,9 +79,19 @@ int extension_release_validate(
                 return 1;
         }
 
-        if (!streq(host_os_release_id, extension_release_id)) {
-                log_debug("Extension '%s' is for OS '%s', but deployed on top of '%s'.",
-                          name, extension_release_id, host_os_release_id);
+        /* Match extension OS ID against host OS ID or ID_LIKE */
+        if (host_os_release_id_like) {
+                id_like_l = strv_split(host_os_release_id_like, WHITESPACE);
+                if (!id_like_l)
+                        return log_oom();
+        }
+
+        if (!streq(host_os_release_id, extension_release_id) && !strv_contains(id_like_l, extension_release_id)) {
+                log_debug("Extension '%s' is for OS '%s', but deployed on top of '%s'%s%s%s.",
+                          name, extension_release_id, host_os_release_id,
+                          host_os_release_id_like ? " (like '" : "",
+                          strempty(host_os_release_id_like),
+                          host_os_release_id_like ? "')" : "");
                 return 0;
         }
 
diff -pruN 257.7-1/src/shared/extension-util.h 257.9-0ubuntu2/src/shared/extension-util.h
--- 257.7-1/src/shared/extension-util.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/shared/extension-util.h	2025-09-03 18:35:40.000000000 +0000
@@ -9,6 +9,7 @@
 int extension_release_validate(
                 const char *name,
                 const char *host_os_release_id,
+                const char *host_os_release_id_like,
                 const char *host_os_release_version_id,
                 const char *host_os_extension_release_level,
                 const char *host_extension_scope,
diff -pruN 257.7-1/src/shared/journal-file-util.c 257.9-0ubuntu2/src/shared/journal-file-util.c
--- 257.7-1/src/shared/journal-file-util.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/shared/journal-file-util.c	2025-09-03 18:35:40.000000000 +0000
@@ -10,6 +10,8 @@
 #include "format-util.h"
 #include "journal-authenticate.h"
 #include "journal-file-util.h"
+#include "journal-internal.h"
+#include "log.h"
 #include "path-util.h"
 #include "random-util.h"
 #include "set.h"
@@ -318,12 +320,25 @@ int journal_file_set_offline(JournalFile
 
         target_state = f->archive ? STATE_ARCHIVED : STATE_OFFLINE;
 
+        log_ratelimit_full(LOG_DEBUG,
+                           JOURNAL_LOG_RATELIMIT,
+                           "Journal file %s is %s transitioning to %s.",
+                           f->path,
+                           wait ? "synchronously" : "asynchronously",
+                           f->archive ? "archived" : "offline");
+
         /* An offlining journal is implicitly online and may modify f->header->state,
          * we must also join any potentially lingering offline thread when already in
          * the desired offline state.
          */
-        if (!journal_file_is_offlining(f) && f->header->state == target_state)
+        if (!journal_file_is_offlining(f) && f->header->state == target_state) {
+                log_ratelimit_full(LOG_DEBUG,
+                                   JOURNAL_LOG_RATELIMIT,
+                                   "Journal file %s is already %s, waiting for offlining thread.",
+                                   f->path,
+                                   f->archive ? "archived" : "offline");
                 return journal_file_set_offline_thread_join(f);
+        }
 
         /* Restart an in-flight offline thread and wait if needed, or join a lingering done one. */
         restarted = journal_file_set_offline_try_restart(f);
@@ -336,6 +351,12 @@ int journal_file_set_offline(JournalFile
         if (restarted)
                 return 0;
 
+        log_ratelimit_full(LOG_DEBUG,
+                           JOURNAL_LOG_RATELIMIT,
+                           "Starting new %s offlining operation for journal file %s.",
+                           wait ? "synchronous" : "asynchronous",
+                           f->path);
+
         /* Initiate a new offline. */
         f->offline_state = OFFLINE_SYNCING;
 
diff -pruN 257.7-1/src/shared/meson.build 257.9-0ubuntu2/src/shared/meson.build
--- 257.7-1/src/shared/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/shared/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -216,7 +216,6 @@ endif
 generate_syscall_list = find_program('generate-syscall-list.py')
 fname = 'syscall-list.h'
 syscall_list_h = custom_target(
-        fname,
         input : syscall_list_txt,
         output : fname,
         command : [generate_syscall_list,
@@ -258,14 +257,12 @@ endif
 
 generate_ip_protocol_list = find_program('generate-ip-protocol-list.sh')
 ip_protocol_list_txt = custom_target(
-        'ip-protocol-list.txt',
         output : 'ip-protocol-list.txt',
         command : [generate_ip_protocol_list, cpp],
         capture : true)
 
 fname = 'ip-protocol-from-name.gperf'
 gperf_file = custom_target(
-        fname,
         input : ip_protocol_list_txt,
         output : fname,
         command : [generate_gperfs, 'ip_protocol', 'IPPROTO_', '@INPUT@'],
@@ -273,7 +270,6 @@ gperf_file = custom_target(
 
 fname = 'ip-protocol-from-name.h'
 target1 = custom_target(
-        fname,
         input : gperf_file,
         output : fname,
         command : [gperf,
@@ -287,7 +283,6 @@ target1 = custom_target(
 fname = 'ip-protocol-to-name.h'
 awkscript = 'ip-protocol-to-name.awk'
 target2 = custom_target(
-        fname,
         input : [awkscript, ip_protocol_list_txt],
         output : fname,
         command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
@@ -298,7 +293,6 @@ shared_sources += shared_generated_gperf
 
 fname = 'ethtool-link-mode.h'
 ethtool_link_mode_h = custom_target(
-        fname,
         input : ['ethtool-link-mode.py', '../basic/linux/ethtool.h'],
         output : fname,
         command : [python, '@INPUT0@', '--header', cpp, '@INPUT1@'],
@@ -307,7 +301,6 @@ shared_sources += ethtool_link_mode_h
 
 fname = 'ethtool-link-mode.xml'
 ethtool_link_mode_xml = custom_target(
-        fname,
         input : ['ethtool-link-mode.py', '../basic/linux/ethtool.h'],
         output : fname,
         command : [python, '@INPUT0@', '--xml', cpp, '@INPUT1@'],
diff -pruN 257.7-1/src/shared/mount-util.c 257.9-0ubuntu2/src/shared/mount-util.c
--- 257.7-1/src/shared/mount-util.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/shared/mount-util.c	2025-09-03 18:35:40.000000000 +0000
@@ -929,6 +929,7 @@ static int mount_in_namespace_legacy(
                                 options,
                                 image_policy,
                                 /* required_host_os_release_id= */ NULL,
+                                /* required_host_os_release_id_like= */ NULL,
                                 /* required_host_os_release_version_id= */ NULL,
                                 /* required_host_os_release_sysext_level= */ NULL,
                                 /* required_host_os_release_confext_level= */ NULL,
@@ -1140,6 +1141,7 @@ static int mount_in_namespace(
                                 options,
                                 image_policy,
                                 /* required_host_os_release_id= */ NULL,
+                                /* required_host_os_release_id_like= */ NULL,
                                 /* required_host_os_release_version_id= */ NULL,
                                 /* required_host_os_release_sysext_level= */ NULL,
                                 /* required_host_os_release_confext_level= */ NULL,
diff -pruN 257.7-1/src/shared/openssl-util.c 257.9-0ubuntu2/src/shared/openssl-util.c
--- 257.7-1/src/shared/openssl-util.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/shared/openssl-util.c	2025-09-03 18:35:40.000000000 +0000
@@ -24,7 +24,9 @@ DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(ENGINE*
 REENABLE_WARNING;
 #  endif
 
+#ifndef OPENSSL_NO_UI_CONSOLE
 DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(UI_METHOD*, UI_destroy_method, NULL);
+#endif
 
 /* For each error in the OpenSSL thread error queue, log the provided message and the OpenSSL error
  * string. If there are no errors in the OpenSSL thread queue, this logs the message with "No OpenSSL
@@ -1386,6 +1388,7 @@ static int load_key_from_engine(const ch
 #endif
 }
 
+#ifndef OPENSSL_NO_UI_CONSOLE
 static int openssl_ask_password_ui_read(UI *ui, UI_STRING *uis) {
         int r;
 
@@ -1421,6 +1424,7 @@ static int openssl_ask_password_ui_read(
                 return (UI_method_get_reader(UI_OpenSSL()))(ui, uis);
         }
 }
+#endif
 
 static int openssl_load_private_key_from_file(const char *path, EVP_PKEY **ret) {
         _cleanup_(erase_and_freep) char *rawkey = NULL;
@@ -1458,6 +1462,7 @@ static int openssl_load_private_key_from
 static int openssl_ask_password_ui_new(const AskPasswordRequest *request, OpenSSLAskPasswordUI **ret) {
         assert(ret);
 
+#ifndef OPENSSL_NO_UI_CONSOLE
         _cleanup_(UI_destroy_methodp) UI_METHOD *method = UI_create_method("systemd-ask-password");
         if (!method)
                 return log_openssl_errors("Failed to initialize openssl user interface");
@@ -1481,6 +1486,9 @@ static int openssl_ask_password_ui_new(c
 
         *ret = TAKE_PTR(ui);
         return 0;
+#else
+        return -EOPNOTSUPP;
+#endif
 }
 
 static int load_x509_certificate_from_file(const char *path, X509 **ret) {
@@ -1559,7 +1567,7 @@ static int load_x509_certificate_from_pr
 #endif
 
 OpenSSLAskPasswordUI* openssl_ask_password_ui_free(OpenSSLAskPasswordUI *ui) {
-#if HAVE_OPENSSL
+#if HAVE_OPENSSL && !defined(OPENSSL_NO_UI_CONSOLE)
         if (!ui)
                 return NULL;
 
diff -pruN 257.7-1/src/shared/openssl-util.h 257.9-0ubuntu2/src/shared/openssl-util.h
--- 257.7-1/src/shared/openssl-util.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/shared/openssl-util.h	2025-09-03 18:35:40.000000000 +0000
@@ -38,7 +38,9 @@ int parse_openssl_key_source_argument(co
 #  include <openssl/opensslv.h>
 #  include <openssl/pkcs7.h>
 #  include <openssl/ssl.h>
-#  include <openssl/ui.h>
+#  ifndef OPENSSL_NO_UI_CONSOLE
+#    include <openssl/ui.h>
+#  endif
 #  include <openssl/x509v3.h>
 #  ifndef OPENSSL_VERSION_MAJOR
 /* OPENSSL_VERSION_MAJOR macro was added in OpenSSL 3. Thus, if it doesn't exist,  we must be before OpenSSL 3. */
diff -pruN 257.7-1/src/shared/seccomp-util.c 257.9-0ubuntu2/src/shared/seccomp-util.c
--- 257.7-1/src/shared/seccomp-util.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/shared/seccomp-util.c	2025-09-03 18:35:40.000000000 +0000
@@ -486,6 +486,8 @@ const SyscallFilterSet syscall_filter_se
                 "fcntl\0"
                 "fcntl64\0"
                 "fgetxattr\0"
+                "file_getattr\0"
+                "file_setattr\0"
                 "flistxattr\0"
                 "fremovexattr\0"
                 "fsetxattr\0"
diff -pruN 257.7-1/src/shared/tpm2-util.c 257.9-0ubuntu2/src/shared/tpm2-util.c
--- 257.7-1/src/shared/tpm2-util.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/shared/tpm2-util.c	2025-09-03 18:35:40.000000000 +0000
@@ -4313,8 +4313,7 @@ static int tpm2_build_sealing_policy(
 
                 r = tpm2_deserialize(
                                 c,
-                                pcrlock_policy->nv_handle.iov_base,
-                                pcrlock_policy->nv_handle.iov_len,
+                                &pcrlock_policy->nv_handle,
                                 &nv_handle);
                 if (r < 0)
                         return r;
@@ -4729,15 +4728,13 @@ int tpm2_calculate_serialize(
 int tpm2_serialize(
                 Tpm2Context *c,
                 const Tpm2Handle *handle,
-                void **ret_serialized,
-                size_t *ret_serialized_size) {
+                struct iovec *ret) {
 
         TSS2_RC rc;
 
         assert(c);
         assert(handle);
-        assert(ret_serialized);
-        assert(ret_serialized_size);
+        assert(ret);
 
         _cleanup_(Esys_Freep) unsigned char *serialized = NULL;
         size_t size = 0;
@@ -4746,25 +4743,34 @@ int tpm2_serialize(
                 return log_debug_errno(SYNTHETIC_ERRNO(ENOTRECOVERABLE),
                                        "Failed to serialize: %s", sym_Tss2_RC_Decode(rc));
 
-        *ret_serialized = TAKE_PTR(serialized);
-        *ret_serialized_size = size;
+        /* Make a copy since we don't want the caller to understand that ESYS allocated the pointer.
+         * It would make tracking what deallocator to use for the result in which context a PITA. */
+        struct iovec v;
+        v.iov_base = memdup(serialized, size);
+        if (!v.iov_base)
+                return log_oom_debug();
+        v.iov_len = size;
 
+        *ret = v;
         return 0;
 }
 
 int tpm2_deserialize(
                 Tpm2Context *c,
-                const void *serialized,
-                size_t serialized_size,
+                const struct iovec *serialized,
                 Tpm2Handle **ret_handle) {
 
         TSS2_RC rc;
         int r;
 
         assert(c);
-        assert(serialized);
         assert(ret_handle);
 
+        if (!iovec_is_set(serialized)) {
+                *ret_handle = NULL;
+                return 0;
+        }
+
         _cleanup_(tpm2_handle_freep) Tpm2Handle *handle = NULL;
         r = tpm2_handle_new(c, &handle);
         if (r < 0)
@@ -4773,14 +4779,13 @@ int tpm2_deserialize(
         /* Since this is an existing handle in the TPM we should not implicitly flush it. */
         handle->flush = false;
 
-        rc = sym_Esys_TR_Deserialize(c->esys_context, serialized, serialized_size, &handle->esys_handle);
+        rc = sym_Esys_TR_Deserialize(c->esys_context, serialized->iov_base, serialized->iov_len, &handle->esys_handle);
         if (rc != TSS2_RC_SUCCESS)
                 return log_debug_errno(SYNTHETIC_ERRNO(ENOTRECOVERABLE),
                                        "Failed to deserialize: %s", sym_Tss2_RC_Decode(rc));
 
         *ret_handle = TAKE_PTR(handle);
-
-        return 0;
+        return 1;
 }
 
 #if HAVE_OPENSSL
@@ -5613,25 +5618,9 @@ int tpm2_seal(Tpm2Context *c,
                 log_debug("Completed TPM2 key sealing in %s.", FORMAT_TIMESPAN(now(CLOCK_MONOTONIC) - start, 1));
 
         if (ret_srk) {
-                _cleanup_(iovec_done) struct iovec srk = {};
-                _cleanup_(Esys_Freep) void *tmp = NULL;
-                size_t tmp_size;
-
-                r = tpm2_serialize(c, primary_handle, &tmp, &tmp_size);
+                r = tpm2_serialize(c, primary_handle, ret_srk);
                 if (r < 0)
                         return r;
-
-                /*
-                 * make a copy since we don't want the caller to understand that
-                 * ESYS allocated the pointer. It would make tracking what deallocator
-                 * to use for srk in which context a PITA.
-                 */
-                srk.iov_base = memdup(tmp, tmp_size);
-                if (!srk.iov_base)
-                        return log_oom_debug();
-                srk.iov_len = tmp_size;
-
-                *ret_srk = TAKE_STRUCT(srk);
         }
 
         *ret_secret = TAKE_STRUCT(secret);
@@ -5697,11 +5686,13 @@ int tpm2_unseal(Tpm2Context *c,
         }
 
         _cleanup_(tpm2_handle_freep) Tpm2Handle *primary_handle = NULL;
-        if (iovec_is_set(srk)) {
-                r = tpm2_deserialize(c, srk->iov_base, srk->iov_len, &primary_handle);
-                if (r < 0)
-                        return r;
-        } else if (primary_alg != 0) {
+        r = tpm2_deserialize(c, srk, &primary_handle);
+        if (r < 0)
+                return r;
+        if (r == 0) {
+                if (primary_alg == 0)
+                        return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), "No SRK or primary algorithm provided.");
+
                 TPM2B_PUBLIC template = {
                         .size = sizeof(TPMT_PUBLIC),
                 };
@@ -5718,9 +5709,7 @@ int tpm2_unseal(Tpm2Context *c,
                                 &primary_handle);
                 if (r < 0)
                         return r;
-        } else
-                return log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "No SRK or primary alg provided.");
+        }
 
         TPM2B_PUBLIC pubkey_tpm2b;
         _cleanup_(iovec_done) struct iovec fp = {};
diff -pruN 257.7-1/src/shared/tpm2-util.h 257.9-0ubuntu2/src/shared/tpm2-util.h
--- 257.7-1/src/shared/tpm2-util.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/shared/tpm2-util.h	2025-09-03 18:35:40.000000000 +0000
@@ -309,8 +309,8 @@ int tpm2_undefine_policy_nv_index(Tpm2Co
 int tpm2_seal_data(Tpm2Context *c, const struct iovec *data, const Tpm2Handle *primary_handle, const Tpm2Handle *encryption_session, const TPM2B_DIGEST *policy, struct iovec *ret_public, struct iovec *ret_private);
 int tpm2_unseal_data(Tpm2Context *c, const struct iovec *public, const struct iovec *private, const Tpm2Handle *primary_handle, const Tpm2Handle *policy_session, const Tpm2Handle *encryption_session, struct iovec *ret_data);
 
-int tpm2_serialize(Tpm2Context *c, const Tpm2Handle *handle, void **ret_serialized, size_t *ret_serialized_size);
-int tpm2_deserialize(Tpm2Context *c, const void *serialized, size_t serialized_size, Tpm2Handle **ret_handle);
+int tpm2_serialize(Tpm2Context *c, const Tpm2Handle *handle, struct iovec *ret);
+int tpm2_deserialize(Tpm2Context *c, const struct iovec *serialized, Tpm2Handle **ret_handle);
 
 int tpm2_load_public_key_file(const char *path, TPM2B_PUBLIC *ret);
 
diff -pruN 257.7-1/src/shared/varlink-idl-common.c 257.9-0ubuntu2/src/shared/varlink-idl-common.c
--- 257.7-1/src/shared/varlink-idl-common.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/shared/varlink-idl-common.c	2025-09-03 18:35:40.000000000 +0000
@@ -18,4 +18,4 @@ SD_VARLINK_DEFINE_STRUCT_TYPE(
                 SD_VARLINK_FIELD_COMMENT("64bit inode number of pidfd if known"),
                 SD_VARLINK_DEFINE_FIELD(pidfdId, SD_VARLINK_INT, SD_VARLINK_NULLABLE),
                 SD_VARLINK_FIELD_COMMENT("Boot ID of the system the inode number belongs to"),
-                SD_VARLINK_DEFINE_FIELD(bootId, SD_VARLINK_INT, SD_VARLINK_NULLABLE));
+                SD_VARLINK_DEFINE_FIELD(bootId, SD_VARLINK_STRING, SD_VARLINK_NULLABLE));
diff -pruN 257.7-1/src/shared/varlink-io.systemd.Resolve.Monitor.c 257.9-0ubuntu2/src/shared/varlink-io.systemd.Resolve.Monitor.c
--- 257.7-1/src/shared/varlink-io.systemd.Resolve.Monitor.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/shared/varlink-io.systemd.Resolve.Monitor.c	2025-09-03 18:35:40.000000000 +0000
@@ -48,7 +48,9 @@ static SD_VARLINK_DEFINE_STRUCT_TYPE(
                 SD_VARLINK_DEFINE_FIELD(family, SD_VARLINK_INT, SD_VARLINK_NULLABLE),
                 SD_VARLINK_DEFINE_FIELD(ifindex, SD_VARLINK_INT, SD_VARLINK_NULLABLE),
                 SD_VARLINK_DEFINE_FIELD(ifname, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),
-                SD_VARLINK_DEFINE_FIELD_BY_TYPE(cache, CacheEntry, SD_VARLINK_ARRAY));
+                SD_VARLINK_DEFINE_FIELD_BY_TYPE(cache, CacheEntry, SD_VARLINK_ARRAY),
+                SD_VARLINK_DEFINE_FIELD(dnssec, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),
+                SD_VARLINK_DEFINE_FIELD(dnsOverTLS, SD_VARLINK_STRING, SD_VARLINK_NULLABLE));
 
 static SD_VARLINK_DEFINE_METHOD(
                 DumpCache,
diff -pruN 257.7-1/src/ssh-generator/meson.build 257.9-0ubuntu2/src/ssh-generator/meson.build
--- 257.7-1/src/ssh-generator/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/ssh-generator/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -13,7 +13,6 @@ executables += [
 
 if conf.get('ENABLE_SSH_PROXY_CONFIG') == 1
         custom_target(
-                '20-systemd-ssh-proxy.conf',
                 input : '20-systemd-ssh-proxy.conf.in',
                 output : '20-systemd-ssh-proxy.conf',
                 command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/src/sysext/sysext.c 257.9-0ubuntu2/src/sysext/sysext.c
--- 257.7-1/src/sysext/sysext.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/sysext/sysext.c	2025-09-03 18:35:40.000000000 +0000
@@ -1638,7 +1638,9 @@ static int merge_subprocess(
                 Hashmap *images,
                 const char *workspace) {
 
-        _cleanup_free_ char *host_os_release_id = NULL, *host_os_release_version_id = NULL, *host_os_release_api_level = NULL, *buf = NULL, *filename = NULL;
+        _cleanup_free_ char *host_os_release_id = NULL, *host_os_release_id_like = NULL,
+                            *host_os_release_version_id = NULL, *host_os_release_api_level = NULL,
+                            *buf = NULL, *filename = NULL;
         _cleanup_strv_free_ char **extensions = NULL, **extensions_v = NULL, **paths = NULL;
         size_t n_extensions = 0;
         unsigned n_ignored = 0;
@@ -1670,6 +1672,7 @@ static int merge_subprocess(
         r = parse_os_release(
                         arg_root,
                         "ID", &host_os_release_id,
+                        "ID_LIKE", &host_os_release_id_like,
                         "VERSION_ID", &host_os_release_version_id,
                         image_class_info[image_class].level_env, &host_os_release_api_level);
         if (r < 0)
@@ -1804,6 +1807,7 @@ static int merge_subprocess(
                         r = extension_release_validate(
                                         img->name,
                                         host_os_release_id,
+                                        host_os_release_id_like,
                                         host_os_release_version_id,
                                         host_os_release_api_level,
                                         in_initrd() ? "initrd" : "system",
diff -pruN 257.7-1/src/systemd/_sd-common.h 257.9-0ubuntu2/src/systemd/_sd-common.h
--- 257.7-1/src/systemd/_sd-common.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/systemd/_sd-common.h	2025-09-03 18:35:40.000000000 +0000
@@ -19,7 +19,7 @@
 
 /* This is a private header; never even think of including this directly! */
 
-#if defined(__INCLUDE_LEVEL__) && __INCLUDE_LEVEL__ <= 1 && !defined(__COVERITY__)
+#if defined(__INCLUDE_LEVEL__) && __INCLUDE_LEVEL__ <= 1 && !defined(__COVERITY__) && !defined(__clang_analyzer__) && !defined(__INTELLISENSE__)
 #  error "Do not include _sd-common.h directly; it is a private header."
 #endif
 
@@ -110,7 +110,7 @@ typedef void (*_sd_destroy_t)(void *user
         _SD_##id##_INT64_MAX = INT64_MAX
 
 /* In GCC 14 (C23) we can force enums to have the right types, and not solely rely on language extensions anymore */
-#if ((__GNUC__ >= 14) || (__STDC_VERSION__ >= 202311L)) && !defined(__cplusplus)
+#if ((__GNUC__ >= 14) || (__STDC_VERSION__ >= 202311L)) && !defined(__cplusplus) && !defined(__EDG__)
 #  define _SD_ENUM_TYPE_S64(id) id : int64_t
 #else
 #  define _SD_ENUM_TYPE_S64(id) id
diff -pruN 257.7-1/src/sysupdate/sysupdate-resource.c 257.9-0ubuntu2/src/sysupdate/sysupdate-resource.c
--- 257.7-1/src/sysupdate/sysupdate-resource.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/sysupdate/sysupdate-resource.c	2025-09-03 18:35:40.000000000 +0000
@@ -647,7 +647,7 @@ int resource_resolve_path(
 
         } else if (RESOURCE_IS_FILESYSTEM(rr->type)) {
                 _cleanup_free_ char *resolved = NULL, *relative_to = NULL;
-                ChaseFlags chase_flags = CHASE_PREFIX_ROOT;
+                ChaseFlags chase_flags = CHASE_NONEXISTENT | CHASE_PREFIX_ROOT;
 
                 if (rr->path_relative_to == PATH_RELATIVE_TO_EXPLICIT) {
                         assert(relative_to_directory);
diff -pruN 257.7-1/src/test/meson.build 257.9-0ubuntu2/src/test/meson.build
--- 257.7-1/src/test/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/test/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -2,7 +2,6 @@
 
 awkscript = 'test-hashmap-ordered.awk'
 test_hashmap_ordered_c = custom_target(
-        'test-hashmap-ordered.c',
         input : [awkscript, 'test-hashmap-plain.c'],
         output : 'test-hashmap-ordered.c',
         command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
@@ -10,15 +9,14 @@ test_hashmap_ordered_c = custom_target(
         build_by_default : want_tests != 'false')
 
 path = run_command(sh, '-c', 'echo "$PATH"', check: true).stdout().strip()
-test_env = environment()
-test_env.set('SYSTEMD_LANGUAGE_FALLBACK_MAP', language_fallback_map)
-test_env.set('PATH', meson.project_build_root() + ':' + path)
-test_env.set('PROJECT_BUILD_ROOT', meson.project_build_root())
-test_env.set('SYSTEMD_SLOW_TESTS', want_slow_tests ? '1' : '0')
-test_env.set('PYTHONDONTWRITEBYTECODE', '1')
-
-if efi_addon != ''
-        test_env.set('EFI_ADDON', efi_addon)
+test_env = {
+        'PATH' : meson.project_build_root() + ':' + path,
+        'PROJECT_BUILD_ROOT' : meson.project_build_root(),
+        'SYSTEMD_SLOW_TESTS' : want_slow_tests ? '1' : '0',
+        'PYTHONDONTWRITEBYTECODE' : '1',
+}
+if conf.get('ENABLE_LOCALED') == 1
+        test_env += {'SYSTEMD_LANGUAGE_FALLBACK_MAP' : language_fallback_map}
 endif
 
 ############################################################
@@ -26,7 +24,6 @@ endif
 generate_sym_test_py = find_program('generate-sym-test.py')
 
 test_libsystemd_sym_c = custom_target(
-        'test-libsystemd-sym.c',
         input : [libsystemd_sym_path] + systemd_headers + libsystemd_sources,
         output : 'test-libsystemd-sym.c',
         command : [generate_sym_test_py, libsystemd_sym_path, libsystemd_dir_path] + systemd_headers,
@@ -34,7 +31,6 @@ test_libsystemd_sym_c = custom_target(
         build_by_default : want_tests != 'false')
 
 test_libudev_sym_c = custom_target(
-        'test-libudev-sym.c',
         input : [libudev_sym_path, libudev_h_path] + libudev_sources,
         output : 'test-libudev-sym.c',
         command : [generate_sym_test_py, libudev_sym_path, libudev_dir_path, libudev_h_path],
diff -pruN 257.7-1/src/test/test-calendarspec.c 257.9-0ubuntu2/src/test/test-calendarspec.c
--- 257.7-1/src/test/test-calendarspec.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/test/test-calendarspec.c	2025-09-03 18:35:40.000000000 +0000
@@ -186,16 +186,16 @@ TEST(calendar_spec_one) {
 TEST(calendar_spec_next) {
         test_next("2016-03-27 03:17:00", "", 12345, 1459048620000000);
         test_next("2016-03-27 03:17:00", "Europe/Berlin", 12345, 1459041420000000);
-        test_next("2016-03-27 03:17:00", "Europe/Kyiv", 12345, -1);
+        test_next("2016-03-27 03:17:00", "Europe/Helsinki", 12345, -1);
         test_next("2016-03-27 03:17:00 UTC", NULL, 12345, 1459048620000000);
         test_next("2016-03-27 03:17:00 UTC", "", 12345, 1459048620000000);
         test_next("2016-03-27 03:17:00 UTC", "Europe/Berlin", 12345, 1459048620000000);
-        test_next("2016-03-27 03:17:00 UTC", "Europe/Kyiv", 12345, 1459048620000000);
-        test_next("2016-03-27 03:17:00.420000001 UTC", "Europe/Kyiv", 12345, 1459048620420000);
-        test_next("2016-03-27 03:17:00.4200005 UTC", "Europe/Kyiv", 12345, 1459048620420001);
-        test_next("2015-11-13 09:11:23.42", "Europe/Kyiv", 12345, 1447398683420000);
-        test_next("2015-11-13 09:11:23.42/1.77", "Europe/Kyiv", 1447398683420000, 1447398685190000);
-        test_next("2015-11-13 09:11:23.42/1.77", "Europe/Kyiv", 1447398683419999, 1447398683420000);
+        test_next("2016-03-27 03:17:00 UTC", "Europe/Helsinki", 12345, 1459048620000000);
+        test_next("2016-03-27 03:17:00.420000001 UTC", "Europe/Helsinki", 12345, 1459048620420000);
+        test_next("2016-03-27 03:17:00.4200005 UTC", "Europe/Helsinki", 12345, 1459048620420001);
+        test_next("2015-11-13 09:11:23.42", "Europe/Helsinki", 12345, 1447398683420000);
+        test_next("2015-11-13 09:11:23.42/1.77", "Europe/Helsinki", 1447398683420000, 1447398685190000);
+        test_next("2015-11-13 09:11:23.42/1.77", "Europe/Helsinki", 1447398683419999, 1447398683420000);
         test_next("Sun 16:00:00", "Europe/Berlin", 1456041600123456, 1456066800000000);
         test_next("*-04-31", "", 12345, -1);
         test_next("2016-02~01 UTC", "", 12345, 1456704000000000);
@@ -215,7 +215,7 @@ TEST(calendar_spec_next) {
         test_next("2017-04-02 03:30:00 Pacific/Auckland", "", 12345, 1491060600000000);
         /* Confirm that timezones in the Spec work regardless of current timezone */
         test_next("2017-09-09 20:42:00 Pacific/Auckland", "", 12345, 1504946520000000);
-        test_next("2017-09-09 20:42:00 Pacific/Auckland", "Europe/Kyiv", 12345, 1504946520000000);
+        test_next("2017-09-09 20:42:00 Pacific/Auckland", "Europe/Helsinki", 12345, 1504946520000000);
         /* Check that we don't start looping if mktime() moves us backwards */
         test_next("Sun *-*-* 01:00:00 Europe/Dublin", "", 1616412478000000, 1617494400000000);
         test_next("Sun *-*-* 01:00:00 Europe/Dublin", "IST", 1616412478000000, 1617494400000000);
diff -pruN 257.7-1/src/test/test-cgroup.c 257.9-0ubuntu2/src/test/test-cgroup.c
--- 257.7-1/src/test/test-cgroup.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/test/test-cgroup.c	2025-09-03 18:35:40.000000000 +0000
@@ -45,10 +45,8 @@ TEST(cg_create) {
         int r;
 
         r = cg_unified_cached(false);
-        if (IN_SET(r, -ENOMEDIUM, -ENOENT)) {
-                log_tests_skipped("cgroupfs is not mounted");
-                return;
-        }
+        if (IN_SET(r, -ENOMEDIUM, -ENOENT))
+                return (void) log_tests_skipped("cgroupfs is not mounted");
         ASSERT_OK(r);
 
         _cleanup_free_ char *here = NULL;
@@ -62,12 +60,12 @@ TEST(cg_create) {
 
         log_info("Paths for test:\n%s\n%s", test_a, test_b);
 
-        /* Possibly clean up left-overs from aboted previous runs */
+        /* Possibly clean up left-overs from aborted previous runs */
         (void) cg_trim(SYSTEMD_CGROUP_CONTROLLER, test_a, /* delete_root= */ true);
         (void) cg_trim(SYSTEMD_CGROUP_CONTROLLER, test_b, /* delete_root= */ true);
 
         r = cg_create(SYSTEMD_CGROUP_CONTROLLER, test_a);
-        if (IN_SET(r, -EPERM, -EACCES, -EROFS)) {
+        if (IN_SET(r, -EPERM, -EACCES, -EROFS, -ENOENT)) {
                 log_info_errno(r, "Skipping %s: %m", __func__);
                 return;
         }
@@ -123,6 +121,9 @@ TEST(cg_create) {
         ASSERT_OK_ZERO(cg_kill_recursive(test_b, 0, 0, NULL, NULL, NULL));
 
         ASSERT_OK(cg_trim(SYSTEMD_CGROUP_CONTROLLER, test_b, true));
+
+        ASSERT_OK_ZERO(cg_attach(SYSTEMD_CGROUP_CONTROLLER, here, 0));
+        ASSERT_OK(cg_trim(SYSTEMD_CGROUP_CONTROLLER, test_b, true));
 }
 
 TEST(id) {
@@ -132,14 +133,10 @@ TEST(id) {
         int r;
 
         r = cg_all_unified();
-        if (r == 0) {
-                log_tests_skipped("skipping cgroupid test, not running in unified mode");
-                return;
-        }
-        if (IN_SET(r, -ENOMEDIUM, -ENOENT)) {
-                log_tests_skipped("cgroupfs is not mounted");
-                return;
-        }
+        if (IN_SET(r, -ENOMEDIUM, -ENOENT))
+                return (void) log_tests_skipped("cgroupfs is not mounted");
+        if (r == 0)
+                return (void) log_tests_skipped("skipping cgroupid test, not running in unified mode");
         ASSERT_OK_POSITIVE(r);
 
         fd = cg_path_open(SYSTEMD_CGROUP_CONTROLLER, "/");
diff -pruN 257.7-1/src/test/test-dirent-util.c 257.9-0ubuntu2/src/test/test-dirent-util.c
--- 257.7-1/src/test/test-dirent-util.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/test/test-dirent-util.c	2025-09-03 18:35:40.000000000 +0000
@@ -16,7 +16,7 @@
 #include "tmpfile-util.h"
 #include "tests.h"
 
-TEST (test_dirent_ensure_type) {
+TEST(test_dirent_ensure_type) {
         int r, dir_fd;
         static struct dirent de = {
                 .d_type = DT_UNKNOWN,
@@ -38,7 +38,7 @@ TEST (test_dirent_ensure_type) {
         assert_se(de.d_type == DT_DIR);
 }
 
-TEST (test_dirent_is_file) {
+TEST(test_dirent_is_file) {
         _cleanup_(rm_rf_physical_and_freep) char *t = NULL;
         const char *name, *dotfile, *name_alias, *bakfile, *tilda;
         const struct dirent *de_reg, *de_lnk, *de_dot, *de_bak, *de_tilda;
@@ -114,7 +114,7 @@ TEST (test_dirent_is_file) {
         closedir(dir);
 }
 
-TEST (test_dirent_is_file_with_suffix) {
+TEST(test_dirent_is_file_with_suffix) {
         _cleanup_(rm_rf_physical_and_freep) char *t = NULL;
         const char *name, *dotfile, *name_alias, *dotdot, *chr;
         const struct dirent *de_reg, *de_lnk, *de_dot, *de_dotdot, *de_chr;
diff -pruN 257.7-1/src/test/test-fs-util.c 257.9-0ubuntu2/src/test/test-fs-util.c
--- 257.7-1/src/test/test-fs-util.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/test/test-fs-util.c	2025-09-03 18:35:40.000000000 +0000
@@ -185,8 +185,7 @@ TEST(touch_file) {
         r = touch_file(a, false, test_mtime, test_uid, test_gid, 0640);
         if (r < 0) {
                 assert_se(IN_SET(r, -EINVAL, -ENOSYS, -ENOTTY, -EPERM));
-                log_tests_skipped_errno(errno, "touch_file() not possible");
-                return;
+                return (void) log_tests_skipped_errno(errno, "touch_file() not possible");
         }
 
         assert_se(lstat(a, &st) >= 0);
diff -pruN 257.7-1/src/test/test-install-root.c 257.9-0ubuntu2/src/test/test-install-root.c
--- 257.7-1/src/test/test-install-root.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/test/test-install-root.c	2025-09-03 18:35:40.000000000 +0000
@@ -1199,7 +1199,7 @@ TEST(verify_alias) {
         verify_one(&bare_template, "foo.target.wants/plain.socket", -EXDEV, NULL);
         verify_one(&bare_template, "foo.target.wants/plain@.service", -EXDEV, NULL);
          /* Name mismatch: we cannot allow this, because plain@foo.service would be pulled in by foo.target,
-          * but would not be resolveable on its own, since systemd doesn't know how to load the fragment. */
+          * but would not be resolvable on its own, since systemd doesn't know how to load the fragment. */
         verify_one(&bare_template, "foo.target.wants/plain@foo.service", -EXDEV, NULL);
         verify_one(&bare_template, "foo.target.wants/template1@foo.service", 0, NULL);
         verify_one(&bare_template, "foo.target.wants/service", -EXDEV, NULL);
diff -pruN 257.7-1/src/test/test-local-addresses.c 257.9-0ubuntu2/src/test/test-local-addresses.c
--- 257.7-1/src/test/test-local-addresses.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/test/test-local-addresses.c	2025-09-03 18:35:40.000000000 +0000
@@ -11,6 +11,7 @@
 #include "in-addr-util.h"
 #include "local-addresses.h"
 #include "netlink-util.h"
+#include "sysctl-util.h"
 #include "tests.h"
 
 static bool support_rta_via = false;
@@ -26,50 +27,42 @@ TEST(local_addresses) {
         struct local_address *a = NULL;
         int n;
 
-        n = local_addresses(NULL, 0, AF_INET, &a);
-        assert_se(n >= 0);
+        ASSERT_OK(n = local_addresses(NULL, 0, AF_INET, &a));
         log_debug("/* Local Addresses(ifindex:0, AF_INET) */");
         print_local_addresses(a, n);
         a = mfree(a);
 
-        n = local_addresses(NULL, 0, AF_INET6, &a);
-        assert_se(n >= 0);
+        ASSERT_OK(n = local_addresses(NULL, 0, AF_INET6, &a));
         log_debug("/* Local Addresses(ifindex:0, AF_INET6) */");
         print_local_addresses(a, n);
         a = mfree(a);
 
-        n = local_addresses(NULL, 0, AF_UNSPEC, &a);
-        assert_se(n >= 0);
+        ASSERT_OK(n = local_addresses(NULL, 0, AF_UNSPEC, &a));
         log_debug("/* Local Addresses(ifindex:0, AF_UNSPEC) */");
         print_local_addresses(a, n);
         a = mfree(a);
 
-        n = local_addresses(NULL, 1, AF_INET, &a);
-        assert_se(n >= 0);
+        ASSERT_OK(n = local_addresses(NULL, 1, AF_INET, &a));
         log_debug("/* Local Addresses(ifindex:1, AF_INET) */");
         print_local_addresses(a, n);
         a = mfree(a);
 
-        n = local_addresses(NULL, 1, AF_INET6, &a);
-        assert_se(n >= 0);
+        ASSERT_OK(n = local_addresses(NULL, 1, AF_INET6, &a));
         log_debug("/* Local Addresses(ifindex:1, AF_INET6) */");
         print_local_addresses(a, n);
         a = mfree(a);
 
-        n = local_addresses(NULL, 1, AF_UNSPEC, &a);
-        assert_se(n >= 0);
+        ASSERT_OK(n = local_addresses(NULL, 1, AF_UNSPEC, &a));
         log_debug("/* Local Addresses(ifindex:1, AF_UNSPEC) */");
         print_local_addresses(a, n);
         a = mfree(a);
 
-        n = local_gateways(NULL, 0, AF_UNSPEC, &a);
-        assert_se(n >= 0);
+        ASSERT_OK(n = local_gateways(NULL, 0, AF_UNSPEC, &a));
         log_debug("/* Local Gateways */");
         print_local_addresses(a, n);
         a = mfree(a);
 
-        n = local_outbounds(NULL, 0, AF_UNSPEC, &a);
-        assert_se(n >= 0);
+        ASSERT_OK(n = local_outbounds(NULL, 0, AF_UNSPEC, &a));
         log_debug("/* Local Outbounds */");
         print_local_addresses(a, n);
         free(a);
@@ -82,36 +75,38 @@ static void check_local_addresses(sd_net
 
         log_debug("/* Local Addresses (ifindex:%i, %s) */", request_ifindex, family == AF_UNSPEC ? "AF_UNSPEC" : af_to_name(family));
 
-        n = local_addresses(rtnl, request_ifindex, family, &a);
-        assert_se(n >= 0);
+        ASSERT_OK(n = local_addresses(rtnl, request_ifindex, family, &a));
         print_local_addresses(a, n);
 
-        assert_se(in_addr_from_string(AF_INET, "10.123.123.123", &u) >= 0);
-        assert_se(has_local_address(a, n,
+        ASSERT_OK(in_addr_from_string(AF_INET, "10.123.123.123", &u));
+        ASSERT_EQ(has_local_address(a, n,
                                     &(struct local_address) {
                                             .ifindex = ifindex,
                                             .scope = RT_SCOPE_UNIVERSE,
                                             .family = AF_INET,
                                             .address = u,
-                                    }) == IN_SET(family, AF_UNSPEC, AF_INET));
+                                    }),
+                     IN_SET(family, AF_UNSPEC, AF_INET));
 
-        assert_se(in_addr_from_string(AF_INET6, "2001:db8:0:123::123", &u) >= 0);
-        assert_se(has_local_address(a, n,
+        ASSERT_OK(in_addr_from_string(AF_INET6, "2001:db8:0:123::123", &u));
+        ASSERT_EQ(has_local_address(a, n,
                                     &(struct local_address) {
                                             .ifindex = ifindex,
                                             .scope = RT_SCOPE_UNIVERSE,
                                             .family = AF_INET6,
                                             .address = u,
-                                    }) == IN_SET(family, AF_UNSPEC, AF_INET6));
+                                    }),
+                     IN_SET(family, AF_UNSPEC, AF_INET6));
 
-        assert_se(in_addr_from_string(AF_INET6, "2001:db8:1:123::123", &u) >= 0);
-        assert_se(has_local_address(a, n,
+        ASSERT_OK(in_addr_from_string(AF_INET6, "2001:db8:1:123::123", &u));
+        ASSERT_EQ(has_local_address(a, n,
                                     &(struct local_address) {
                                             .ifindex = ifindex,
                                             .scope = RT_SCOPE_UNIVERSE,
                                             .family = AF_INET6,
                                             .address = u,
-                                    }) == IN_SET(family, AF_UNSPEC, AF_INET6));
+                                    }),
+                     IN_SET(family, AF_UNSPEC, AF_INET6));
 }
 
 static void check_local_gateways(sd_netlink *rtnl, int ifindex, int request_ifindex, int family) {
@@ -121,36 +116,38 @@ static void check_local_gateways(sd_netl
 
         log_debug("/* Local Gateways (ifindex:%i, %s) */", request_ifindex, family == AF_UNSPEC ? "AF_UNSPEC" : af_to_name(family));
 
-        n = local_gateways(rtnl, request_ifindex, family, &a);
-        assert_se(n >= 0);
+        ASSERT_OK(n = local_gateways(rtnl, request_ifindex, family, &a));
         print_local_addresses(a, n);
 
-        assert_se(in_addr_from_string(AF_INET, "10.123.0.1", &u) >= 0);
-        assert_se(has_local_address(a, n,
+        ASSERT_OK(in_addr_from_string(AF_INET, "10.123.0.1", &u));
+        ASSERT_EQ(has_local_address(a, n,
                                     &(struct local_address) {
                                             .ifindex = ifindex,
                                             .priority = 1234,
                                             .family = AF_INET,
                                             .address = u,
-                                    }) == IN_SET(family, AF_UNSPEC, AF_INET));
+                                    }),
+                     IN_SET(family, AF_UNSPEC, AF_INET));
 
-        assert_se(in_addr_from_string(AF_INET6, "2001:db8:0:123::1", &u) >= 0);
-        assert_se(has_local_address(a, n,
+        ASSERT_OK(in_addr_from_string(AF_INET6, "2001:db8:0:123::1", &u));
+        ASSERT_EQ(has_local_address(a, n,
                                     &(struct local_address) {
                                             .ifindex = ifindex,
                                             .priority = 1234,
                                             .family = AF_INET6,
                                             .address = u,
-                                    }) == (family == AF_UNSPEC && support_rta_via));
+                                    }),
+                  family == AF_UNSPEC && support_rta_via);
 
-        assert_se(in_addr_from_string(AF_INET6, "2001:db8:1:123::1", &u) >= 0);
-        assert_se(has_local_address(a, n,
+        ASSERT_OK(in_addr_from_string(AF_INET6, "2001:db8:1:123::1", &u));
+        ASSERT_EQ(has_local_address(a, n,
                                     &(struct local_address) {
                                             .ifindex = ifindex,
                                             .priority = 1234,
                                             .family = AF_INET6,
                                             .address = u,
-                                    }) == IN_SET(family, AF_UNSPEC, AF_INET6));
+                                    }),
+                  IN_SET(family, AF_UNSPEC, AF_INET6));
 }
 
 static void check_local_outbounds(sd_netlink *rtnl, int ifindex, int request_ifindex, int family, const char *ipv6_expected) {
@@ -161,33 +158,35 @@ static void check_local_outbounds(sd_net
         log_debug("/* Local Outbounds (ifindex:%i, %s, expected_ipv6_address=%s) */",
                   request_ifindex, family == AF_UNSPEC ? "AF_UNSPEC" : af_to_name(family), ipv6_expected);
 
-        n = local_outbounds(rtnl, request_ifindex, family, &a);
-        assert_se(n >= 0);
+        ASSERT_OK(n = local_outbounds(rtnl, request_ifindex, family, &a));
         print_local_addresses(a, n);
 
-        assert_se(in_addr_from_string(AF_INET, "10.123.123.123", &u) >= 0);
-        assert_se(has_local_address(a, n,
+        ASSERT_OK(in_addr_from_string(AF_INET, "10.123.123.123", &u));
+        ASSERT_EQ(has_local_address(a, n,
                                     &(struct local_address) {
                                             .ifindex = ifindex,
                                             .family = AF_INET,
                                             .address = u,
-                                    }) == IN_SET(family, AF_UNSPEC, AF_INET));
+                                    }),
+                  IN_SET(family, AF_UNSPEC, AF_INET));
 
-        assert_se(in_addr_from_string(AF_INET6, "2001:db8:0:123::123", &u) >= 0);
-        assert_se(has_local_address(a, n,
+        ASSERT_OK(in_addr_from_string(AF_INET6, "2001:db8:0:123::123", &u));
+        ASSERT_EQ(has_local_address(a, n,
                                     &(struct local_address) {
                                             .ifindex = ifindex,
                                             .family = AF_INET6,
                                             .address = u,
-                                    }) == (family == AF_UNSPEC && support_rta_via));
+                                    }),
+                  family == AF_UNSPEC && support_rta_via);
 
-        assert_se(in_addr_from_string(AF_INET6, ipv6_expected, &u) >= 0);
-        assert_se(has_local_address(a, n,
+        ASSERT_OK(in_addr_from_string(AF_INET6, ipv6_expected, &u));
+        ASSERT_EQ(has_local_address(a, n,
                                     &(struct local_address) {
                                             .ifindex = ifindex,
                                             .family = AF_INET6,
                                             .address = u,
-                                    }) == IN_SET(family, AF_UNSPEC, AF_INET6));
+                                    }),
+                  IN_SET(family, AF_UNSPEC, AF_INET6));
 }
 
 TEST(local_addresses_with_dummy) {
@@ -196,108 +195,111 @@ TEST(local_addresses_with_dummy) {
         union in_addr_union u;
         int r, ifindex;
 
-        assert_se(sd_netlink_open(&rtnl) >= 0);
+        ASSERT_OK(sd_netlink_open(&rtnl));
 
         /* Create a dummy interface */
-        assert_se(sd_rtnl_message_new_link(rtnl, &message, RTM_NEWLINK, 0) >= 0);
-        assert_se(sd_netlink_message_append_string(message, IFLA_IFNAME, "test-local-addr") >= 0);
-        assert_se(sd_netlink_message_open_container(message, IFLA_LINKINFO) >= 0);
-        assert_se(sd_netlink_message_append_string(message, IFLA_INFO_KIND, "dummy") >= 0);
+        ASSERT_OK(sd_rtnl_message_new_link(rtnl, &message, RTM_NEWLINK, 0));
+        ASSERT_OK(sd_netlink_message_append_string(message, IFLA_IFNAME, "test-local-addr"));
+        ASSERT_OK(sd_netlink_message_open_container(message, IFLA_LINKINFO));
+        ASSERT_OK(sd_netlink_message_append_string(message, IFLA_INFO_KIND, "dummy"));
         r = sd_netlink_call(rtnl, message, 0, NULL);
         if (r == -EPERM)
                 return (void) log_tests_skipped("missing required capabilities");
         if (r == -EOPNOTSUPP)
                 return (void) log_tests_skipped("dummy network interface is not supported");
-        assert_se(r >= 0);
+        ASSERT_OK(r);
         message = sd_netlink_message_unref(message);
 
         /* Get ifindex */
-        assert_se(sd_rtnl_message_new_link(rtnl, &message, RTM_GETLINK, 0) >= 0);
-        assert_se(sd_netlink_message_append_string(message, IFLA_IFNAME, "test-local-addr") >= 0);
-        assert_se(sd_netlink_call(rtnl, message, 0, &reply) >= 0);
-        assert_se(sd_rtnl_message_link_get_ifindex(reply, &ifindex) >= 0);
-        assert_se(ifindex > 0);
+        ASSERT_OK(sd_rtnl_message_new_link(rtnl, &message, RTM_GETLINK, 0));
+        ASSERT_OK(sd_netlink_message_append_string(message, IFLA_IFNAME, "test-local-addr"));
+        ASSERT_OK(sd_netlink_call(rtnl, message, 0, &reply));
+        ASSERT_OK(sd_rtnl_message_link_get_ifindex(reply, &ifindex));
+        ASSERT_GT(ifindex, 0);
         message = sd_netlink_message_unref(message);
         reply = sd_netlink_message_unref(reply);
 
+        /* Enable IPv6 for the case that it is disabled by default. */
+        ASSERT_OK(sysctl_write_ip_property_boolean(AF_INET6, "test-local-addr", "disable_ipv6", false, /* shadow = */ NULL));
+
         /* Bring the interface up */
-        assert_se(sd_rtnl_message_new_link(rtnl, &message, RTM_SETLINK, ifindex) >= 0);
-        assert_se(sd_rtnl_message_link_set_flags(message, IFF_UP, IFF_UP) >= 0);
-        assert_se(sd_netlink_call(rtnl, message, 0, NULL) >= 0);
+        ASSERT_OK(sd_rtnl_message_new_link(rtnl, &message, RTM_SETLINK, ifindex));
+        ASSERT_OK(sd_rtnl_message_link_set_flags(message, IFF_UP, IFF_UP));
+        ASSERT_OK(sd_netlink_call(rtnl, message, 0, NULL));
         message = sd_netlink_message_unref(message);
 
         /* Add an IPv4 address */
-        assert_se(sd_rtnl_message_new_addr_update(rtnl, &message, ifindex, AF_INET) >= 0);
-        assert_se(sd_rtnl_message_addr_set_scope(message, RT_SCOPE_UNIVERSE) >= 0);
-        assert_se(sd_rtnl_message_addr_set_prefixlen(message, 16) >= 0);
-        assert_se(in_addr_from_string(AF_INET, "10.123.123.123", &u) >= 0);
-        assert_se(sd_netlink_message_append_in_addr(message, IFA_LOCAL, &u.in) >= 0);
-        assert_se(in_addr_from_string(AF_INET, "10.123.255.255", &u) >= 0);
-        assert_se(sd_netlink_message_append_in_addr(message, IFA_BROADCAST, &u.in) >= 0);
-        assert_se(sd_netlink_call(rtnl, message, 0, NULL) >= 0);
+        ASSERT_OK(sd_rtnl_message_new_addr_update(rtnl, &message, ifindex, AF_INET));
+        ASSERT_OK(sd_rtnl_message_addr_set_scope(message, RT_SCOPE_UNIVERSE));
+        ASSERT_OK(sd_rtnl_message_addr_set_prefixlen(message, 16));
+        ASSERT_OK(in_addr_from_string(AF_INET, "10.123.123.123", &u));
+        ASSERT_OK(sd_netlink_message_append_in_addr(message, IFA_LOCAL, &u.in));
+        ASSERT_OK(in_addr_from_string(AF_INET, "10.123.255.255", &u));
+        ASSERT_OK(sd_netlink_message_append_in_addr(message, IFA_BROADCAST, &u.in));
+        ASSERT_OK(sd_netlink_call(rtnl, message, 0, NULL));
         message = sd_netlink_message_unref(message);
 
         /* Add IPv6 addresses */
-        assert_se(sd_rtnl_message_new_addr_update(rtnl, &message, ifindex, AF_INET6) >= 0);
-        assert_se(sd_rtnl_message_addr_set_scope(message, RT_SCOPE_UNIVERSE) >= 0);
-        assert_se(sd_rtnl_message_addr_set_prefixlen(message, 64) >= 0);
-        assert_se(in_addr_from_string(AF_INET6, "2001:db8:0:123::123", &u) >= 0);
-        assert_se(sd_netlink_message_append_in6_addr(message, IFA_LOCAL, &u.in6) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, IFA_FLAGS, IFA_F_NODAD) >= 0);
-        assert_se(sd_netlink_call(rtnl, message, 0, NULL) >= 0);
-        message = sd_netlink_message_unref(message);
-
-        assert_se(sd_rtnl_message_new_addr_update(rtnl, &message, ifindex, AF_INET6) >= 0);
-        assert_se(sd_rtnl_message_addr_set_scope(message, RT_SCOPE_UNIVERSE) >= 0);
-        assert_se(sd_rtnl_message_addr_set_prefixlen(message, 64) >= 0);
-        assert_se(in_addr_from_string(AF_INET6, "2001:db8:1:123::123", &u) >= 0);
-        assert_se(sd_netlink_message_append_in6_addr(message, IFA_LOCAL, &u.in6) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, IFA_FLAGS, IFA_F_NODAD) >= 0);
-        assert_se(sd_netlink_call(rtnl, message, 0, NULL) >= 0);
+        ASSERT_OK(sd_rtnl_message_new_addr_update(rtnl, &message, ifindex, AF_INET6));
+        ASSERT_OK(sd_rtnl_message_addr_set_scope(message, RT_SCOPE_UNIVERSE));
+        ASSERT_OK(sd_rtnl_message_addr_set_prefixlen(message, 64));
+        ASSERT_OK(in_addr_from_string(AF_INET6, "2001:db8:0:123::123", &u));
+        ASSERT_OK(sd_netlink_message_append_in6_addr(message, IFA_LOCAL, &u.in6));
+        ASSERT_OK(sd_netlink_message_append_u32(message, IFA_FLAGS, IFA_F_NODAD));
+        ASSERT_OK(sd_netlink_call(rtnl, message, 0, NULL));
+        message = sd_netlink_message_unref(message);
+
+        ASSERT_OK(sd_rtnl_message_new_addr_update(rtnl, &message, ifindex, AF_INET6));
+        ASSERT_OK(sd_rtnl_message_addr_set_scope(message, RT_SCOPE_UNIVERSE));
+        ASSERT_OK(sd_rtnl_message_addr_set_prefixlen(message, 64));
+        ASSERT_OK(in_addr_from_string(AF_INET6, "2001:db8:1:123::123", &u));
+        ASSERT_OK(sd_netlink_message_append_in6_addr(message, IFA_LOCAL, &u.in6));
+        ASSERT_OK(sd_netlink_message_append_u32(message, IFA_FLAGS, IFA_F_NODAD));
+        ASSERT_OK(sd_netlink_call(rtnl, message, 0, NULL));
         message = sd_netlink_message_unref(message);
 
         /* Add an IPv4 default gateway (RTA_GATEWAY) */
-        assert_se(sd_rtnl_message_new_route(rtnl, &message, RTM_NEWROUTE, AF_INET, RTPROT_STATIC) >= 0);
-        assert_se(sd_rtnl_message_route_set_scope(message, RT_SCOPE_UNIVERSE) >= 0);
-        assert_se(sd_rtnl_message_route_set_type(message, RTN_UNICAST) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_PRIORITY, 1234) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_TABLE, RT_TABLE_MAIN) >= 0);
-        assert_se(in_addr_from_string(AF_INET, "10.123.0.1", &u) >= 0);
-        assert_se(sd_netlink_message_append_in_addr(message, RTA_GATEWAY, &u.in) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_OIF, ifindex) >= 0);
-        assert_se(sd_netlink_call(rtnl, message, 0, NULL) >= 0);
+        ASSERT_OK(sd_rtnl_message_new_route(rtnl, &message, RTM_NEWROUTE, AF_INET, RTPROT_STATIC));
+        ASSERT_OK(sd_rtnl_message_route_set_scope(message, RT_SCOPE_UNIVERSE));
+        ASSERT_OK(sd_rtnl_message_route_set_type(message, RTN_UNICAST));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_PRIORITY, 1234));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_TABLE, RT_TABLE_MAIN));
+        ASSERT_OK(in_addr_from_string(AF_INET, "10.123.0.1", &u));
+        ASSERT_OK(sd_netlink_message_append_in_addr(message, RTA_GATEWAY, &u.in));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_OIF, ifindex));
+        ASSERT_OK(sd_netlink_call(rtnl, message, 0, NULL));
         message = sd_netlink_message_unref(message);
 
         /* Add an IPv4 default gateway (RTA_VIA) */
-        assert_se(sd_rtnl_message_new_route(rtnl, &message, RTM_NEWROUTE, AF_INET, RTPROT_STATIC) >= 0);
-        assert_se(sd_rtnl_message_route_set_scope(message, RT_SCOPE_UNIVERSE) >= 0);
-        assert_se(sd_rtnl_message_route_set_type(message, RTN_UNICAST) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_PRIORITY, 1234) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_TABLE, RT_TABLE_MAIN) >= 0);
-        assert_se(in_addr_from_string(AF_INET6, "2001:db8:0:123::1", &u) >= 0);
-        assert_se(sd_netlink_message_append_data(message, RTA_VIA,
+        ASSERT_OK(sd_rtnl_message_new_route(rtnl, &message, RTM_NEWROUTE, AF_INET, RTPROT_STATIC));
+        ASSERT_OK(sd_rtnl_message_route_set_scope(message, RT_SCOPE_UNIVERSE));
+        ASSERT_OK(sd_rtnl_message_route_set_type(message, RTN_UNICAST));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_PRIORITY, 1234));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_TABLE, RT_TABLE_MAIN));
+        ASSERT_OK(in_addr_from_string(AF_INET6, "2001:db8:0:123::1", &u));
+        ASSERT_OK(sd_netlink_message_append_data(message, RTA_VIA,
                                                  &(RouteVia) {
                                                          .family = AF_INET6,
                                                          .address = u,
-                                                 }, sizeof(RouteVia)) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_OIF, ifindex) >= 0);
+                                                 }, sizeof(RouteVia)));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_OIF, ifindex));
         r = sd_netlink_call(rtnl, message, 0, NULL);
         if (r == -EINVAL)
                 log_debug_errno(r, "RTA_VIA is not supported, ignoring: %m");
         else
-                assert_se(r >= 0);
+                ASSERT_OK(r);
         support_rta_via = r >= 0;
         message = sd_netlink_message_unref(message);
 
         /* Add an IPv6 default gateway */
-        assert_se(sd_rtnl_message_new_route(rtnl, &message, RTM_NEWROUTE, AF_INET6, RTPROT_STATIC) >= 0);
-        assert_se(sd_rtnl_message_route_set_type(message, RTN_UNICAST) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_PRIORITY, 1234) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_TABLE, RT_TABLE_MAIN) >= 0);
-        assert_se(in_addr_from_string(AF_INET6, "2001:db8:1:123::1", &u) >= 0);
-        assert_se(sd_netlink_message_append_in6_addr(message, RTA_GATEWAY, &u.in6) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_OIF, ifindex) >= 0);
-        assert_se(sd_netlink_call(rtnl, message, 0, NULL) >= 0);
+        ASSERT_OK(sd_rtnl_message_new_route(rtnl, &message, RTM_NEWROUTE, AF_INET6, RTPROT_STATIC));
+        ASSERT_OK(sd_rtnl_message_route_set_type(message, RTN_UNICAST));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_PRIORITY, 1234));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_TABLE, RT_TABLE_MAIN));
+        ASSERT_OK(in_addr_from_string(AF_INET6, "2001:db8:1:123::1", &u));
+        ASSERT_OK(sd_netlink_message_append_in6_addr(message, RTA_GATEWAY, &u.in6));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_OIF, ifindex));
+        ASSERT_OK(sd_netlink_call(rtnl, message, 0, NULL));
         message = sd_netlink_message_unref(message);
 
         /* Check */
@@ -321,36 +323,36 @@ TEST(local_addresses_with_dummy) {
         check_local_outbounds(rtnl, ifindex, ifindex, AF_INET6, "2001:db8:1:123::123");
 
         /* Add one more IPv6 address. */
-        assert_se(sd_rtnl_message_new_addr_update(rtnl, &message, ifindex, AF_INET6) >= 0);
-        assert_se(sd_rtnl_message_addr_set_scope(message, RT_SCOPE_UNIVERSE) >= 0);
-        assert_se(sd_rtnl_message_addr_set_prefixlen(message, 64) >= 0);
-        assert_se(in_addr_from_string(AF_INET6, "2001:db8:1:123::124", &u) >= 0);
-        assert_se(sd_netlink_message_append_in6_addr(message, IFA_LOCAL, &u.in6) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, IFA_FLAGS, IFA_F_NODAD) >= 0);
-        assert_se(sd_netlink_call(rtnl, message, 0, NULL) >= 0);
+        ASSERT_OK(sd_rtnl_message_new_addr_update(rtnl, &message, ifindex, AF_INET6));
+        ASSERT_OK(sd_rtnl_message_addr_set_scope(message, RT_SCOPE_UNIVERSE));
+        ASSERT_OK(sd_rtnl_message_addr_set_prefixlen(message, 64));
+        ASSERT_OK(in_addr_from_string(AF_INET6, "2001:db8:1:123::124", &u));
+        ASSERT_OK(sd_netlink_message_append_in6_addr(message, IFA_LOCAL, &u.in6));
+        ASSERT_OK(sd_netlink_message_append_u32(message, IFA_FLAGS, IFA_F_NODAD));
+        ASSERT_OK(sd_netlink_call(rtnl, message, 0, NULL));
         message = sd_netlink_message_unref(message);
 
         /* Replace the previous IPv6 default gateway with one with preferred source address. */
-        assert_se(sd_rtnl_message_new_route(rtnl, &message, RTM_DELROUTE, AF_INET6, RTPROT_STATIC) >= 0);
-        assert_se(sd_rtnl_message_route_set_type(message, RTN_UNICAST) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_PRIORITY, 1234) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_TABLE, RT_TABLE_MAIN) >= 0);
-        assert_se(in_addr_from_string(AF_INET6, "2001:db8:1:123::1", &u) >= 0);
-        assert_se(sd_netlink_message_append_in6_addr(message, RTA_GATEWAY, &u.in6) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_OIF, ifindex) >= 0);
-        assert_se(sd_netlink_call(rtnl, message, 0, NULL) >= 0);
-        message = sd_netlink_message_unref(message);
-
-        assert_se(sd_rtnl_message_new_route(rtnl, &message, RTM_NEWROUTE, AF_INET6, RTPROT_STATIC) >= 0);
-        assert_se(sd_rtnl_message_route_set_type(message, RTN_UNICAST) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_PRIORITY, 1234) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_TABLE, RT_TABLE_MAIN) >= 0);
-        assert_se(in_addr_from_string(AF_INET6, "2001:db8:1:123::1", &u) >= 0);
-        assert_se(sd_netlink_message_append_in6_addr(message, RTA_GATEWAY, &u.in6) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_OIF, ifindex) >= 0);
-        assert_se(in_addr_from_string(AF_INET6, "2001:db8:1:123::123", &u) >= 0);
-        assert_se(sd_netlink_message_append_in6_addr(message, RTA_PREFSRC, &u.in6) >= 0);
-        assert_se(sd_netlink_call(rtnl, message, 0, NULL) >= 0);
+        ASSERT_OK(sd_rtnl_message_new_route(rtnl, &message, RTM_DELROUTE, AF_INET6, RTPROT_STATIC));
+        ASSERT_OK(sd_rtnl_message_route_set_type(message, RTN_UNICAST));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_PRIORITY, 1234));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_TABLE, RT_TABLE_MAIN));
+        ASSERT_OK(in_addr_from_string(AF_INET6, "2001:db8:1:123::1", &u));
+        ASSERT_OK(sd_netlink_message_append_in6_addr(message, RTA_GATEWAY, &u.in6));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_OIF, ifindex));
+        ASSERT_OK(sd_netlink_call(rtnl, message, 0, NULL));
+        message = sd_netlink_message_unref(message);
+
+        ASSERT_OK(sd_rtnl_message_new_route(rtnl, &message, RTM_NEWROUTE, AF_INET6, RTPROT_STATIC));
+        ASSERT_OK(sd_rtnl_message_route_set_type(message, RTN_UNICAST));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_PRIORITY, 1234));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_TABLE, RT_TABLE_MAIN));
+        ASSERT_OK(in_addr_from_string(AF_INET6, "2001:db8:1:123::1", &u));
+        ASSERT_OK(sd_netlink_message_append_in6_addr(message, RTA_GATEWAY, &u.in6));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_OIF, ifindex));
+        ASSERT_OK(in_addr_from_string(AF_INET6, "2001:db8:1:123::123", &u));
+        ASSERT_OK(sd_netlink_message_append_in6_addr(message, RTA_PREFSRC, &u.in6));
+        ASSERT_OK(sd_netlink_call(rtnl, message, 0, NULL));
         message = sd_netlink_message_unref(message);
 
         /* Check again. */
@@ -362,28 +364,28 @@ TEST(local_addresses_with_dummy) {
         check_local_outbounds(rtnl, ifindex, ifindex, AF_INET6, "2001:db8:1:123::123");
 
         /* Replace the preferred source address. */
-        assert_se(sd_rtnl_message_new_route(rtnl, &message, RTM_DELROUTE, AF_INET6, RTPROT_STATIC) >= 0);
-        assert_se(sd_rtnl_message_route_set_type(message, RTN_UNICAST) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_PRIORITY, 1234) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_TABLE, RT_TABLE_MAIN) >= 0);
-        assert_se(in_addr_from_string(AF_INET6, "2001:db8:1:123::1", &u) >= 0);
-        assert_se(sd_netlink_message_append_in6_addr(message, RTA_GATEWAY, &u.in6) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_OIF, ifindex) >= 0);
-        assert_se(in_addr_from_string(AF_INET6, "2001:db8:1:123::123", &u) >= 0);
-        assert_se(sd_netlink_message_append_in6_addr(message, RTA_PREFSRC, &u.in6) >= 0);
-        assert_se(sd_netlink_call(rtnl, message, 0, NULL) >= 0);
-        message = sd_netlink_message_unref(message);
-
-        assert_se(sd_rtnl_message_new_route(rtnl, &message, RTM_NEWROUTE, AF_INET6, RTPROT_STATIC) >= 0);
-        assert_se(sd_rtnl_message_route_set_type(message, RTN_UNICAST) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_PRIORITY, 1234) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_TABLE, RT_TABLE_MAIN) >= 0);
-        assert_se(in_addr_from_string(AF_INET6, "2001:db8:1:123::1", &u) >= 0);
-        assert_se(sd_netlink_message_append_in6_addr(message, RTA_GATEWAY, &u.in6) >= 0);
-        assert_se(sd_netlink_message_append_u32(message, RTA_OIF, ifindex) >= 0);
-        assert_se(in_addr_from_string(AF_INET6, "2001:db8:1:123::124", &u) >= 0);
-        assert_se(sd_netlink_message_append_in6_addr(message, RTA_PREFSRC, &u.in6) >= 0);
-        assert_se(sd_netlink_call(rtnl, message, 0, NULL) >= 0);
+        ASSERT_OK(sd_rtnl_message_new_route(rtnl, &message, RTM_DELROUTE, AF_INET6, RTPROT_STATIC));
+        ASSERT_OK(sd_rtnl_message_route_set_type(message, RTN_UNICAST));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_PRIORITY, 1234));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_TABLE, RT_TABLE_MAIN));
+        ASSERT_OK(in_addr_from_string(AF_INET6, "2001:db8:1:123::1", &u));
+        ASSERT_OK(sd_netlink_message_append_in6_addr(message, RTA_GATEWAY, &u.in6));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_OIF, ifindex));
+        ASSERT_OK(in_addr_from_string(AF_INET6, "2001:db8:1:123::123", &u));
+        ASSERT_OK(sd_netlink_message_append_in6_addr(message, RTA_PREFSRC, &u.in6));
+        ASSERT_OK(sd_netlink_call(rtnl, message, 0, NULL));
+        message = sd_netlink_message_unref(message);
+
+        ASSERT_OK(sd_rtnl_message_new_route(rtnl, &message, RTM_NEWROUTE, AF_INET6, RTPROT_STATIC));
+        ASSERT_OK(sd_rtnl_message_route_set_type(message, RTN_UNICAST));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_PRIORITY, 1234));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_TABLE, RT_TABLE_MAIN));
+        ASSERT_OK(in_addr_from_string(AF_INET6, "2001:db8:1:123::1", &u));
+        ASSERT_OK(sd_netlink_message_append_in6_addr(message, RTA_GATEWAY, &u.in6));
+        ASSERT_OK(sd_netlink_message_append_u32(message, RTA_OIF, ifindex));
+        ASSERT_OK(in_addr_from_string(AF_INET6, "2001:db8:1:123::124", &u));
+        ASSERT_OK(sd_netlink_message_append_in6_addr(message, RTA_PREFSRC, &u.in6));
+        ASSERT_OK(sd_netlink_call(rtnl, message, 0, NULL));
         message = sd_netlink_message_unref(message);
 
         /* Check again. */
@@ -395,8 +397,8 @@ TEST(local_addresses_with_dummy) {
         check_local_outbounds(rtnl, ifindex, ifindex, AF_INET6, "2001:db8:1:123::124");
 
         /* Cleanup */
-        assert_se(sd_rtnl_message_new_link(rtnl, &message, RTM_DELLINK, ifindex) >= 0);
-        assert_se(sd_netlink_call(rtnl, message, 0, NULL) >= 0);
+        ASSERT_OK(sd_rtnl_message_new_link(rtnl, &message, RTM_DELLINK, ifindex));
+        ASSERT_OK(sd_netlink_call(rtnl, message, 0, NULL));
         message = sd_netlink_message_unref(message);
 }
 
diff -pruN 257.7-1/src/test/test-mempress.c 257.9-0ubuntu2/src/test/test-mempress.c
--- 257.7-1/src/test/test-mempress.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/test/test-mempress.c	2025-09-03 18:35:40.000000000 +0000
@@ -196,10 +196,8 @@ TEST(real_pressure) {
         pid_t pid;
 
         r = sd_bus_open_system(&bus);
-        if (r < 0) {
-                log_notice_errno(r, "Can't connect to system bus, skipping test: %m");
-                return;
-        }
+        if (r < 0)
+                return (void) log_tests_skipped_errno(r, "can't connect to system bus");
 
         assert_se(bus_wait_for_jobs_new(bus, &w) >= 0);
 
@@ -213,10 +211,8 @@ TEST(real_pressure) {
         assert_se(sd_bus_message_append(m, "a(sa(sv))", 0) >= 0);
 
         r = sd_bus_call(bus, m, 0, &error, &reply);
-        if (r < 0) {
-                log_notice_errno(r, "Can't issue transient unit call, skipping test: %m");
-                return;
-        }
+        if (r < 0)
+                return (void) log_tests_skipped_errno(r, "can't issue transient unit call");
 
         assert_se(sd_bus_message_read(reply, "o", &object) >= 0);
 
@@ -245,10 +241,8 @@ TEST(real_pressure) {
         };
 
         r = sd_event_add_memory_pressure(e, &es, real_pressure_callback, &context);
-        if (r < 0) {
-                log_notice_errno(r, "Can't allocate memory pressure fd, skipping test: %m");
-                return;
-        }
+        if (r < 0)
+                return (void) log_tests_skipped_errno(r, "can't allocate memory pressure fd");
 
         assert_se(sd_event_source_set_description(es, "real pressure event source") >= 0);
         assert_se(sd_event_source_set_memory_pressure_type(es, "some") == 0);
@@ -267,10 +261,8 @@ TEST(real_pressure) {
         assert_se(sd_bus_get_property_trivial(bus, "org.freedesktop.systemd1", uo, "org.freedesktop.systemd1.Scope", "MemoryCurrent", &error, 't', &mcurrent) >= 0);
 
         printf("current: %" PRIu64 "\n", mcurrent);
-        if (mcurrent == UINT64_MAX) {
-                log_notice_errno(r, "Memory accounting not available, skipping test: %m");
-                return;
-        }
+        if (mcurrent == UINT64_MAX)
+                return (void) log_tests_skipped_errno(r, "memory accounting not available");
 
         m = sd_bus_message_unref(m);
 
diff -pruN 257.7-1/src/timesync/meson.build 257.9-0ubuntu2/src/timesync/meson.build
--- 257.7-1/src/timesync/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/timesync/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -12,7 +12,6 @@ systemd_timesyncd_sources = files(
 )
 
 sources += custom_target(
-        'timesyncd-gperf.c',
         input : 'timesyncd-gperf.gperf',
         output : 'timesyncd-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
@@ -60,7 +59,6 @@ executables += [
 ]
 
 custom_target(
-        'timesyncd.conf',
         input : 'timesyncd.conf.in',
         output : 'timesyncd.conf',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
@@ -68,12 +66,16 @@ custom_target(
         install_dir : pkgconfigfiledir)
 
 if conf.get('ENABLE_TIMESYNCD') == 1
-        install_data('org.freedesktop.timesync1.conf',
-                     install_dir : dbuspolicydir)
-        install_data('org.freedesktop.timesync1.service',
-                     install_dir : dbussystemservicedir)
-        install_data('80-systemd-timesync.list',
-                     install_dir : ntpservicelistdir)
-        install_data('org.freedesktop.timesync1.policy',
-                     install_dir : polkitpolicydir)
+        install_data(
+                'org.freedesktop.timesync1.conf',
+                install_dir : dbuspolicydir)
+        install_data(
+                'org.freedesktop.timesync1.service',
+                install_dir : dbussystemservicedir)
+        install_data(
+                '80-systemd-timesync.list',
+                install_dir : ntpservicelistdir)
+        install_data(
+                'org.freedesktop.timesync1.policy',
+                install_dir : polkitpolicydir)
 endif
diff -pruN 257.7-1/src/tmpfiles/tmpfiles.c 257.9-0ubuntu2/src/tmpfiles/tmpfiles.c
--- 257.7-1/src/tmpfiles/tmpfiles.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/tmpfiles/tmpfiles.c	2025-09-03 18:35:40.000000000 +0000
@@ -1069,6 +1069,12 @@ static int fd_set_perms(
         }
 
 shortcut:
+        if (arg_dry_run) {
+                log_debug("Would relabel \"%s\"", path);
+                return 0;
+        }
+
+        log_debug("Relabelling \"%s\"", path);
         return label_fix_full(fd, /* inode_path= */ NULL, /* label_path= */ path, 0);
 }
 
diff -pruN 257.7-1/src/udev/meson.build 257.9-0ubuntu2/src/udev/meson.build
--- 257.7-1/src/udev/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/udev/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -56,7 +56,6 @@ endif
 
 generate_keyboard_keys_list = find_program('generate-keyboard-keys-list.sh')
 keyboard_keys_list_txt = custom_target(
-        'keyboard-keys-list.txt',
         input : files('../basic/linux/input.h'),
         output : 'keyboard-keys-list.txt',
         command : [generate_keyboard_keys_list, cpp, '@INPUT@'],
@@ -65,7 +64,6 @@ keyboard_keys_list_txt = custom_target(
 generate_keyboard_keys_gperf = find_program('generate-keyboard-keys-gperf.sh')
 fname = 'keyboard-keys-from-name.gperf'
 gperf_file = custom_target(
-        fname,
         input : keyboard_keys_list_txt,
         output : fname,
         command : [generate_keyboard_keys_gperf, '@INPUT@'],
@@ -73,7 +71,6 @@ gperf_file = custom_target(
 
 fname = 'keyboard-keys-from-name.h'
 keyboard_keys_from_name_h = custom_target(
-        fname,
         input : gperf_file,
         output : fname,
         command : [gperf,
@@ -89,7 +86,6 @@ keyboard_keys_from_name_h = custom_targe
 udev_link_gperf_gperf = files('net/link-config-gperf.gperf')
 
 link_config_gperf_c = custom_target(
-        'link-config-gperf.c',
         input : udev_link_gperf_gperf,
         output : 'link-config-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
@@ -263,7 +259,6 @@ if install_sysconfdir_samples
 endif
 
 udev_pc = custom_target(
-        'udev.pc',
         input : 'udev.pc.in',
         output : 'udev.pc',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/src/udev/udev-node.c 257.9-0ubuntu2/src/udev/udev-node.c
--- 257.7-1/src/udev/udev-node.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/udev/udev-node.c	2025-09-03 18:35:40.000000000 +0000
@@ -208,6 +208,24 @@ static int stack_directory_find_prioriti
         return !!*ret;
 }
 
+static int link_search_and_update(sd_device *dev, const char *slink, int dirfd, bool add) {
+        int r;
+
+        assert(dev);
+        assert(slink);
+        assert(dirfd >= 0);
+
+        _cleanup_free_ char *devnode = NULL;
+        r = stack_directory_find_prioritized_devnode(dev, dirfd, add, &devnode);
+        if (r < 0)
+                return log_device_debug_errno(dev, r, "Failed to determine device node with the highest priority for '%s': %m", slink);
+        if (r > 0)
+                return node_create_symlink(dev, devnode, slink);
+
+        log_device_debug(dev, "No reference left for '%s', removing", slink);
+        return node_remove_symlink(dev, slink);
+}
+
 static int stack_directory_update(sd_device *dev, int fd, bool add) {
         const char *id;
         int r;
@@ -415,7 +433,7 @@ static int link_update(sd_device *dev, c
         _cleanup_(release_lock_file) LockFile lockfile = LOCK_FILE_INIT; /* #3 */
         _cleanup_(rmdir_and_freep) char *dirpath = NULL; /* #2 */
         _cleanup_close_ int dirfd = -EBADF; /* #1 */
-        _cleanup_free_ char *current_id = NULL, *devnode = NULL;
+        _cleanup_free_ char *current_id = NULL;
         int r, current_prio;
 
         assert(dev);
@@ -425,72 +443,104 @@ static int link_update(sd_device *dev, c
         if (r < 0)
                 return r;
 
-        r = node_get_current(slink, dirfd, &current_id, add ? &current_prio : NULL);
-        if (r < 0 && !ERRNO_IS_DEVICE_ABSENT(r))
-                return log_device_debug_errno(dev, r, "Failed to get the current device node priority for '%s': %m", slink);
+        if (add) {
+                r = node_get_current(slink, dirfd, &current_id, &current_prio);
+                if (r < 0 && !ERRNO_IS_DEVICE_ABSENT(r))
+                        return log_device_debug_errno(dev, r, "Failed to get the current device node priority for '%s': %m", slink);
+        }
 
         r = stack_directory_update(dev, dirfd, add);
         if (r < 0)
                 return log_device_debug_errno(dev, r, "Failed to update stack directory for '%s': %m", slink);
 
-        if (current_id) {
-                const char *id;
+        if (!add) {
+                _cleanup_free_ char *target = NULL;
 
-                r = sd_device_get_device_id(dev, &id);
+                /* Especially on 'remove' event, the device ID obtained by node_get_current() may not be
+                 * reliable, as the device node and/or device number may be reused. Hence, let's read the
+                 * devlink here and if it points to our device node, then we need to update the devlink. If
+                 * it points to another device node, then it is already owned by another device, hence we
+                 * should not touch it and keep it as is. */
+
+                r = readlink_malloc(slink, &target);
+                if (r < 0) {
+                        if (r != -ENOENT)
+                                log_device_debug_errno(dev, r, "Failed to read symbolic link '%s', ignoring: %m", slink);
+
+                        /* The devlink does not exist. Let's find the most suitable owner, and create the
+                         * devlink. This is typically not necessary and does nothing, but for safety in the
+                         * case that the devlink is removed manually. */
+                        return link_search_and_update(dev, slink, dirfd, add);
+                }
+
+                const char *node;
+                r = sd_device_get_devname(dev, &node);
                 if (r < 0)
-                        return log_device_debug_errno(dev, r, "Failed to get device id: %m");
+                        return log_device_debug_errno(dev, r, "Failed to get device node: %m");
 
-                if (add) {
-                        int prio;
+                if (streq(node, target)) /* owned by us, needs to update. */
+                        return link_search_and_update(dev, slink, dirfd, add);
 
-                        r = device_get_devlink_priority(dev, &prio);
-                        if (r < 0)
-                                return log_device_debug_errno(dev, r, "Failed to get devlink priority: %m");
-
-                        if (streq(current_id, id)) {
-                                if (current_prio <= prio)
-                                        /* The devlink is ours and already exists, and the new priority is
-                                         * equal or higher than the previous. Hence, it is not necessary to
-                                         * recreate it. */
-                                        return 0;
-
-                                /* The devlink priority is downgraded. Another device may have a higher
-                                 * priority now. Let's find the device node with the highest priority. */
-                        } else {
-                                if (current_prio > prio)
-                                        /* The devlink with a higher priority already exists and is owned by
-                                         * another device. Hence, it is not necessary to recreate it. */
-                                        return 0;
-
-                                /* This device has the equal or a higher priority than the current. Let's
-                                 * create the devlink to our device node. */
-                                return node_create_symlink(dev, /* devnode = */ NULL, slink);
-                        }
+                /* The devlink does not point to our device node. For extra safety, let's validate the
+                 * current devlink, in case that the devlink is manually modified by user. */
 
-                } else {
-                        if (!streq(current_id, id))
-                                /* The devlink already exists and is owned by another device. Hence, it is
-                                 * not necessary to recreate it. */
-                                return 0;
+                if (!path_startswith(target, "/dev/")) {
+                        log_device_debug(dev, "Symbolic link '%s' points to '%s' which is outside of '/dev/', updating it.", slink, target);
+                        return link_search_and_update(dev, slink, dirfd, add);
+                }
+
+                struct stat st;
+                if (lstat(target, &st) < 0) {
+                        if (errno != ENOENT)
+                                log_device_debug_errno(dev, errno, "Failed to stat '%s', ignoring: %m", target);
 
-                        /* The current devlink is ours, and the target device will be removed. Hence, we need
-                         * to search the device that has the highest priority. and update the devlink. */
+                        /* The current target device is also already removed? Let's update. */
+                        return link_search_and_update(dev, slink, dirfd, add);
                 }
-        } else {
+
+                if (!IN_SET(st.st_mode & S_IFMT, S_IFBLK, S_IFCHR)) {
+                        log_device_debug(dev, "Symbolic link '%s' points to '%s' which is not a device node, updating it.", slink, target);
+                        return link_search_and_update(dev, slink, dirfd, add);
+                }
+
+                return 0; /* the devlink is owned by another device, and we should keep it as is. */
+        }
+
+        if (!current_id)
                 /* The requested devlink does not exist, or the target device does not exist and the devlink
                  * points to a non-existing device. Let's search the device that has the highest priority,
                  * and update the devlink. */
-                ;
-        }
+                return link_search_and_update(dev, slink, dirfd, add);
 
-        r = stack_directory_find_prioritized_devnode(dev, dirfd, add, &devnode);
+        const char *id;
+        r = sd_device_get_device_id(dev, &id);
         if (r < 0)
-                return log_device_debug_errno(dev, r, "Failed to determine device node with the highest priority for '%s': %m", slink);
-        if (r > 0)
-                return node_create_symlink(dev, devnode, slink);
+                return log_device_debug_errno(dev, r, "Failed to get device id: %m");
 
-        log_device_debug(dev, "No reference left for '%s', removing", slink);
-        return node_remove_symlink(dev, slink);
+        int prio;
+        r = device_get_devlink_priority(dev, &prio);
+        if (r < 0)
+                return log_device_debug_errno(dev, r, "Failed to get devlink priority: %m");
+
+        if (streq(current_id, id)) {
+                if (current_prio <= prio)
+                        /* The devlink is ours and already exists, and the new priority is equal or higher
+                         * than the previous. Hence, it is not necessary to recreate it. */
+                        return 0;
+
+                /* The devlink priority is downgraded. Another device may have a higher priority now. Let's
+                 * find the device node with the highest priority. */
+                return link_search_and_update(dev, slink, dirfd, add);
+        }
+
+        if (current_prio > prio)
+                /* The devlink with a higher priority already exists and is owned by another device. Hence,
+                 * it is not necessary to recreate it. */
+                return 0;
+
+        /* This device has the equal or a higher priority than the current. Let's create the devlink to our
+         * device node. */
+        return node_create_symlink(dev, /* devnode = */ NULL, slink);
 }
 
 static int device_get_devpath_by_devnum(sd_device *dev, char **ret) {
diff -pruN 257.7-1/src/udev/udev-spawn.c 257.9-0ubuntu2/src/udev/udev-spawn.c
--- 257.7-1/src/udev/udev-spawn.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/udev/udev-spawn.c	2025-09-03 18:35:40.000000000 +0000
@@ -4,6 +4,7 @@
 
 #include "device-private.h"
 #include "device-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "path-util.h"
 #include "process-util.h"
@@ -35,6 +36,7 @@ typedef struct Spawn {
 
 static int on_spawn_io(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
         Spawn *spawn = ASSERT_PTR(userdata);
+        bool read_to_result;
         char buf[4096], *p;
         size_t size;
         ssize_t l;
@@ -43,35 +45,54 @@ static int on_spawn_io(sd_event_source *
         assert(fd == spawn->fd_stdout || fd == spawn->fd_stderr);
         assert(!spawn->result || spawn->result_len < spawn->result_size);
 
-        if (fd == spawn->fd_stdout && spawn->result) {
+        if (fd == spawn->fd_stdout && spawn->result && !spawn->truncated) {
+                /* When reading to the result buffer, use the maximum available size, to detect truncation. */
+                read_to_result = true;
                 p = spawn->result + spawn->result_len;
                 size = spawn->result_size - spawn->result_len;
+                assert(size > 0);
         } else {
+                /* When reading to the local buffer, keep the space for the trailing NUL. */
+                read_to_result = false;
                 p = buf;
-                size = sizeof(buf);
+                size = sizeof(buf) - 1;
         }
 
-        l = read(fd, p, size - (p == buf));
+        l = read(fd, p, size);
         if (l < 0) {
-                if (errno == EAGAIN)
-                        goto reenable;
-
-                log_device_error_errno(spawn->device, errno,
-                                       "Failed to read stdout of '%s': %m", spawn->cmd);
-
+                log_device_full_errno(spawn->device,
+                                      ERRNO_IS_TRANSIENT(errno) ? LOG_DEBUG : LOG_WARNING,
+                                      errno,
+                                      "Failed to read %s of '%s', ignoring: %m",
+                                      fd == spawn->fd_stdout ? "stdout" : "stderr",
+                                      spawn->cmd);
+                return 0;
+        }
+        if (l == 0) { /* EOF */
+                r = sd_event_source_set_enabled(s, SD_EVENT_OFF);
+                if (r < 0) {
+                        log_device_warning_errno(spawn->device, r,
+                                                 "Failed to disable %s event source of '%s': %m",
+                                                 fd == spawn->fd_stdout ? "stdout" : "stderr",
+                                                 spawn->cmd);
+                        (void) sd_event_exit(sd_event_source_get_event(s), r); /* propagate negative errno */
+                        return r;
+                }
                 return 0;
         }
 
-        if ((size_t) l == size) {
-                log_device_warning(spawn->device, "Truncating stdout of '%s' up to %zu byte.",
-                                   spawn->cmd, spawn->result_size);
-                l--;
-                spawn->truncated = true;
+        if (read_to_result) {
+                if ((size_t) l == size) {
+                        log_device_warning(spawn->device, "Truncating stdout of '%s' up to %zu byte.",
+                                           spawn->cmd, spawn->result_size - 1);
+                        l--;
+                        spawn->truncated = true;
+                }
+
+                spawn->result_len += l;
         }
 
         p[l] = '\0';
-        if (fd == spawn->fd_stdout && spawn->result)
-                spawn->result_len += l;
 
         /* Log output only if we watch stderr. */
         if (l > 0 && spawn->fd_stderr >= 0) {
@@ -88,16 +109,6 @@ static int on_spawn_io(sd_event_source *
                                          fd == spawn->fd_stdout ? "out" : "err", *q);
         }
 
-        if (l == 0 || spawn->truncated)
-                return 0;
-
-reenable:
-        /* Re-enable the event source if we did not encounter EOF */
-
-        r = sd_event_source_set_enabled(s, SD_EVENT_ONESHOT);
-        if (r < 0)
-                log_device_error_errno(spawn->device, r,
-                                       "Failed to reactivate IO source of '%s'", spawn->cmd);
         return 0;
 }
 
@@ -184,18 +195,12 @@ static int spawn_wait(Spawn *spawn) {
                 r = sd_event_add_io(e, &stdout_source, spawn->fd_stdout, EPOLLIN, on_spawn_io, spawn);
                 if (r < 0)
                         return log_device_debug_errno(spawn->device, r, "Failed to create stdio event source: %m");
-                r = sd_event_source_set_enabled(stdout_source, SD_EVENT_ONESHOT);
-                if (r < 0)
-                        return log_device_debug_errno(spawn->device, r, "Failed to enable stdio event source: %m");
         }
 
         if (spawn->fd_stderr >= 0) {
                 r = sd_event_add_io(e, &stderr_source, spawn->fd_stderr, EPOLLIN, on_spawn_io, spawn);
                 if (r < 0)
                         return log_device_debug_errno(spawn->device, r, "Failed to create stderr event source: %m");
-                r = sd_event_source_set_enabled(stderr_source, SD_EVENT_ONESHOT);
-                if (r < 0)
-                        return log_device_debug_errno(spawn->device, r, "Failed to enable stderr event source: %m");
         }
 
         r = sd_event_add_child(e, &sigchld_source, spawn->pid, WEXITED, on_spawn_sigchld, spawn);
diff -pruN 257.7-1/src/ukify/test/meson.build 257.9-0ubuntu2/src/ukify/test/meson.build
--- 257.7-1/src/ukify/test/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/ukify/test/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -15,7 +15,8 @@ if want_ukify and want_tests != 'false'
         test('test-ukify',
              files('test_ukify.py'),
              args: args,
-             env : test_env,
+             env : test_env + {'EFI_ADDON' : efi_addon.length() > 0 ? efi_addon[0].full_path() : ''},
              timeout : 120,
-             suite : 'ukify')
+             suite : 'ukify',
+             depends : efi_addon)
 endif
diff -pruN 257.7-1/src/ukify/ukify.py 257.9-0ubuntu2/src/ukify/ukify.py
--- 257.7-1/src/ukify/ukify.py	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/ukify/ukify.py	2025-09-03 18:35:40.000000000 +0000
@@ -164,20 +164,24 @@ def get_zboot_kernel(f: IO[bytes]) -> by
     f.seek(start)
     if comp_type.startswith(b'gzip'):
         gzip = try_import('gzip')
-        return cast(bytes, gzip.open(f).read(size))
+        data = f.read(size)
+        return cast(bytes, gzip.decompress(data))
     elif comp_type.startswith(b'lz4'):
         lz4 = try_import('lz4.frame', 'lz4')
-        return cast(bytes, lz4.frame.decompress(f.read(size)))
+        data = f.read(size)
+        return cast(bytes, lz4.frame.decompress(data))
     elif comp_type.startswith(b'lzma'):
         lzma = try_import('lzma')
-        return cast(bytes, lzma.open(f).read(size))
+        data = f.read(size)
+        return cast(bytes, lzma.decompress(data))
     elif comp_type.startswith(b'lzo'):
         raise NotImplementedError('lzo decompression not implemented')
     elif comp_type.startswith(b'xzkern'):
         raise NotImplementedError('xzkern decompression not implemented')
     elif comp_type.startswith(b'zstd'):
         zstd = try_import('zstandard')
-        return cast(bytes, zstd.ZstdDecompressor().stream_reader(f.read(size)).read())
+        data = f.read(size)
+        return cast(bytes, zstd.ZstdDecompressor().stream_reader(data).read())
 
     raise NotImplementedError(f'unknown compressed type: {comp_type!r}')
 
@@ -285,7 +289,7 @@ class UkifyConfig:
 class Uname:
     # This class is here purely as a namespace for the functions
 
-    VERSION_PATTERN = r'(?P<version>[a-z0-9._-]+) \([^ )]+\) (?:#.*)'
+    VERSION_PATTERN = r'(?P<version>[a-z0-9._+-]+) \([^ )]+\) (?:#.*)'
 
     NOTES_PATTERN = r'^\s+Linux\s+0x[0-9a-f]+\s+OPEN\n\s+description data: (?P<version>[0-9a-f ]+)\s*$'
 
@@ -463,7 +467,7 @@ class SignTool:
         raise NotImplementedError()
 
     @staticmethod
-    def verify(opts: UkifyConfig) -> bool:
+    def verify(input_f: Path, opts: UkifyConfig) -> bool:
         raise NotImplementedError()
 
     @staticmethod
@@ -499,11 +503,11 @@ class PeSign(SignTool):
         subprocess.check_call(cmd)
 
     @staticmethod
-    def verify(opts: UkifyConfig) -> bool:
-        assert opts.linux is not None
+    def verify(input_f: Path, opts: UkifyConfig) -> bool:
+        assert input_f is not None
 
         tool = find_tool('pesign', opts=opts)
-        cmd = [tool, '-i', opts.linux, '-S']
+        cmd = [tool, '-i', input_f, '-S']
 
         print('+', shell_join(cmd), file=sys.stderr)
         info = subprocess.check_output(cmd, text=True)
@@ -531,11 +535,11 @@ class SbSign(SignTool):
         subprocess.check_call(cmd)
 
     @staticmethod
-    def verify(opts: UkifyConfig) -> bool:
-        assert opts.linux is not None
+    def verify(input_f: Path, opts: UkifyConfig) -> bool:
+        assert input_f is not None
 
         tool = find_tool('sbverify', opts=opts)
-        cmd = [tool, '--list', opts.linux]
+        cmd = [tool, '--list', input_f]
 
         print('+', shell_join(cmd), file=sys.stderr)
         info = subprocess.check_output(cmd, text=True)
@@ -583,7 +587,7 @@ class SystemdSbSign(SignTool):
         subprocess.check_call(cmd)
 
     @staticmethod
-    def verify(opts: UkifyConfig) -> bool:
+    def verify(input_f: Path, opts: UkifyConfig) -> bool:
         raise NotImplementedError('systemd-sbsign cannot yet verify if existing PE binaries are signed')
 
 
@@ -941,6 +945,19 @@ def pe_add_sections(uki: UKI, output: st
         if section.name == '.linux':
             # Old kernels that use EFI handover protocol will be executed inline.
             new_section.IMAGE_SCN_CNT_CODE = True
+
+            # Check if the kernel PE has the NX_COMPAT flag set, if not strip it from the UKI as they need
+            # to have the same value, otherwise when firmwares start enforcing it, booting will fail.
+            # https://microsoft.github.io/mu/WhatAndWhy/enhancedmemoryprotection/
+            # https://www.kraxel.org/blog/2023/12/uefi-nx-linux-boot/
+            try:
+                inner_pe = pefile.PE(data=data, fast_load=True)
+                nxbit = pefile.DLL_CHARACTERISTICS['IMAGE_DLLCHARACTERISTICS_NX_COMPAT']
+                if not inner_pe.OPTIONAL_HEADER.DllCharacteristics & nxbit:
+                    pe.OPTIONAL_HEADER.DllCharacteristics &= ~nxbit
+            except pefile.PEFormatError:
+                # Unit tests build images with bogus data
+                print(f'{section.name} in {uki.executable} is not a valid PE, ignoring', file=sys.stderr)
         else:
             new_section.IMAGE_SCN_CNT_INITIALIZED_DATA = True
 
@@ -952,14 +969,13 @@ def pe_add_sections(uki: UKI, output: st
                 if new_section.Misc_VirtualSize > s.SizeOfRawData:
                     raise PEError(f'Not enough space in existing section {section.name} to append new data.')
 
-                padding = bytes(new_section.SizeOfRawData - new_section.Misc_VirtualSize)
+                padding = bytes(s.SizeOfRawData - new_section.Misc_VirtualSize)
                 pe.__data__ = (
                     pe.__data__[: s.PointerToRawData]
                     + data
                     + padding
                     + pe.__data__[pe.sections[i + 1].PointerToRawData :]
                 )
-                s.SizeOfRawData = new_section.SizeOfRawData
                 s.Misc_VirtualSize = new_section.Misc_VirtualSize
                 break
         else:
@@ -1058,7 +1074,7 @@ def pack_strings(strings: set[str], base
 
 
 def parse_hwid_dir(path: Path) -> bytes:
-    hwid_files = path.rglob('*.json')
+    hwid_files = sorted(path.rglob('*.json'))
 
     strings: set[str] = set()
     devices: collections.defaultdict[tuple[str, str], set[uuid.UUID]] = collections.defaultdict(set)
@@ -1131,7 +1147,7 @@ def make_uki(opts: UkifyConfig) -> None:
 
         if sign_kernel is None:
             # figure out if we should sign the kernel
-            sign_kernel = signtool.verify(opts)
+            sign_kernel = signtool.verify(linux, opts)
 
         if sign_kernel:
             linux_signed = tempfile.NamedTemporaryFile(prefix='linux-signed')
@@ -1464,7 +1480,7 @@ def inspect_section(
 
     if ttype == 'text':
         try:
-            struct['text'] = data.decode()
+            struct['text'] = data.rstrip(b'\0').replace(b'\0', b'\\0').decode()
         except UnicodeDecodeError as e:
             print(f'Section {name!r} is not valid text: {e}', file=sys.stderr)
             struct['text'] = '(not valid UTF-8)'
diff -pruN 257.7-1/src/userdb/meson.build 257.9-0ubuntu2/src/userdb/meson.build
--- 257.7-1/src/userdb/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/userdb/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -26,7 +26,6 @@ executables += [
 
 if conf.get('ENABLE_SSH_USERDB_CONFIG') == 1
         custom_target(
-                '20-systemd-userdb.conf',
                 input : '20-systemd-userdb.conf.in',
                 output : '20-systemd-userdb.conf',
                 command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/src/userdb/userdbctl.c 257.9-0ubuntu2/src/userdb/userdbctl.c
--- 257.7-1/src/userdb/userdbctl.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/userdb/userdbctl.c	2025-09-03 18:35:40.000000000 +0000
@@ -494,7 +494,7 @@ static int display_user(int argc, char *
                 if (!table_isempty(table)) {
                         r = table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, arg_legend);
                         if (r < 0)
-                                return table_log_print_error(r);
+                                return r;
                 }
 
                 if (arg_legend) {
@@ -829,7 +829,7 @@ static int display_group(int argc, char
                 if (!table_isempty(table)) {
                         r = table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, arg_legend);
                         if (r < 0)
-                                return table_log_print_error(r);
+                                return r;
                 }
 
                 if (arg_legend) {
@@ -978,7 +978,7 @@ static int display_memberships(int argc,
                 if (!table_isempty(table)) {
                         r = table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, arg_legend);
                         if (r < 0)
-                                return table_log_print_error(r);
+                                return r;
                 }
 
                 if (arg_legend) {
@@ -1043,7 +1043,7 @@ static int display_services(int argc, ch
         if (!table_isempty(t)) {
                 r = table_print_with_pager(t, arg_json_format_flags, arg_pager_flags, arg_legend);
                 if (r < 0)
-                        return table_log_print_error(r);
+                        return r;
         }
 
         if (arg_legend && arg_output != OUTPUT_JSON) {
diff -pruN 257.7-1/src/vmspawn/vmspawn-util.h 257.9-0ubuntu2/src/vmspawn/vmspawn-util.h
--- 257.7-1/src/vmspawn/vmspawn-util.h	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/vmspawn/vmspawn-util.h	2025-09-03 18:35:40.000000000 +0000
@@ -39,8 +39,14 @@
 #endif
 
 #if defined(__x86_64__) || defined(__i386__)
+#  define ARCHITECTURE_SUPPORTS_HPET 1
+#else
+#  define ARCHITECTURE_SUPPORTS_HPET 0
+#endif
+
+#if defined(__x86_64__) || defined(__i386__)
 #  define QEMU_MACHINE_TYPE "q35"
-#elif defined(__arm__) || defined(__aarch64__) || defined(__riscv) || defined(__loongarch64)
+#elif defined(__arm__) || defined(__aarch64__) || defined(__riscv) || defined(__loongarch64) || defined(__m68k__)
 #  define QEMU_MACHINE_TYPE "virt"
 #elif defined(__s390__) || defined(__s390x__)
 #  define QEMU_MACHINE_TYPE "s390-ccw-virtio"
@@ -48,8 +54,10 @@
 #  define QEMU_MACHINE_TYPE "pseries"
 #elif defined(__mips__)
 #  define QEMU_MACHINE_TYPE "malta"
+#elif defined(__sparc__)
+#  define QEMU_MACHINE_TYPE "sun4u"
 #else
-#  error "No qemu machine defined for this architecture"
+#  define QEMU_MACHINE_TYPE "none"
 #endif
 
 typedef struct OvmfConfig {
diff -pruN 257.7-1/src/vmspawn/vmspawn.c 257.9-0ubuntu2/src/vmspawn/vmspawn.c
--- 257.7-1/src/vmspawn/vmspawn.c	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/src/vmspawn/vmspawn.c	2025-09-03 18:35:40.000000000 +0000
@@ -662,9 +662,12 @@ static int read_vsock_notify(NotifyConne
 
         p = strv_find_startswith(tags, "EXIT_STATUS=");
         if (p) {
-                r = safe_atoi(p, d->exit_status);
+                uint8_t k = 0;
+                r = safe_atou8(p, &k);
                 if (r < 0)
                         log_warning_errno(r, "Failed to parse exit status from %s, ignoring: %m", p);
+                else
+                        *d->exit_status = k;
         }
 
         return 1; /* done */
@@ -1415,10 +1418,11 @@ static int run_virtual_machine(int kvm_d
                             "falling back to OVMF firmware blobs without Secure Boot support.");
 
         shm = arg_directory || arg_runtime_mounts.n_mounts != 0 ? ",memory-backend=mem" : "";
+        const char *hpet = ARCHITECTURE_SUPPORTS_HPET ? ",hpet=off" : "";
         if (ARCHITECTURE_SUPPORTS_SMM)
-                machine = strjoin("type=" QEMU_MACHINE_TYPE ",smm=", on_off(ovmf_config->supports_sb), shm);
+                machine = strjoin("type=" QEMU_MACHINE_TYPE ",smm=", on_off(ovmf_config->supports_sb), shm, hpet);
         else
-                machine = strjoin("type=" QEMU_MACHINE_TYPE, shm);
+                machine = strjoin("type=" QEMU_MACHINE_TYPE, shm, hpet);
         if (!machine)
                 return log_oom();
 
diff -pruN 257.7-1/sysctl.d/meson.build 257.9-0ubuntu2/sysctl.d/meson.build
--- 257.7-1/sysctl.d/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/sysctl.d/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -13,7 +13,6 @@ if cc.sizeof('long') > 4
 endif
 
 custom_target(
-        '50-coredump.conf',
         input : '50-coredump.conf.in',
         output : '50-coredump.conf',
         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/sysusers.d/meson.build 257.9-0ubuntu2/sysusers.d/meson.build
--- 257.7-1/sysusers.d/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/sysusers.d/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -20,7 +20,6 @@ in_files = [['basic.conf',            tr
 foreach tuple : in_files
         file = tuple[0]
         custom_target(
-                file,
                 input : file + '.in',
                 output: file,
                 command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/test/fuzz/meson.build 257.9-0ubuntu2/test/fuzz/meson.build
--- 257.7-1/test/fuzz/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/fuzz/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -11,7 +11,6 @@ directives = [['fuzz-network-parser', 'd
 
 foreach tuple : directives
         directive = custom_target(
-                tuple[1],
                 output: tuple[1],
                 command: [generate_directives_py, tuple[2]],
                 capture: true)
@@ -26,7 +25,6 @@ foreach section : ['Automount', 'Mount',
         sec_rx = section == 'Service' ? '(Service|Unit|Install)' : section
         name = 'directives.@0@'.format(unit_type)
         unit_directives += custom_target(
-                name,
                 output: name,
                 command: [generate_directives_py, load_fragment_gperf_gperf, sec_rx, unit_type],
                 capture: true)
diff -pruN 257.7-1/test/integration-test-setup.sh 257.9-0ubuntu2/test/integration-test-setup.sh
--- 257.7-1/test/integration-test-setup.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-test-setup.sh	2025-09-03 18:35:40.000000000 +0000
@@ -24,7 +24,7 @@ case "$1" in
                     pacman --upgrade --needed --noconfirm /work/build/*.pkg.tar
                     ;;
                 debian|ubuntu)
-                    apt-get install /work/build/*.deb
+                    DEBIAN_FRONTEND=noninteractive apt-get -y install /work/build/*.deb
                     ;;
                 opensuse*)
                     zypper --non-interactive install --allow-unsigned-rpm /work/build/*.rpm
diff -pruN 257.7-1/test/integration-tests/README.md 257.9-0ubuntu2/test/integration-tests/README.md
--- 257.7-1/test/integration-tests/README.md	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/README.md	2025-09-03 18:35:40.000000000 +0000
@@ -131,6 +131,10 @@ that make use of `run_testcases`.
 
 `TEST_SKIP_TESTCASE=testcase`: takes a space separated list of testcases to skip.
 
+`TEST_SAVE_JOURNAL=0|1|fail`: When `0`, journal file will be removed on exit.
+When `1`, journal file will be saved at `$BUILD_DIR/test/journal`. When `fail`,
+journal file will be saved only when the test is failed. Defaults to `fail`.
+
 `TEST_JOURNAL_USE_TMP=1`: Write test journal to `/tmp` while the test is in
 progress and only move the journal to its final location in the build directory
 (`$BUILD_DIR/test/journal`) when the test is finished.
@@ -263,8 +267,9 @@ $ ./mark-suite-dirty -A ppa:upstream-sys
 
 will create an empty 'noble' repository that can be used for 'noble' CI jobs.
 
-For infrastructure help, reaching out to 'qa-help' via the #ubuntu-quality
-channel on libera.chat is an effective way to receive support in general.
+For infrastructure help (e.g.: Github token refresh) a bug can be filed at:
+https://launchpad.net/auto-package-testing or an email can be sent to the
+ubuntu-quality mailing list: https://lists.ubuntu.com/mailman/listinfo/ubuntu-quality
 
 Given access to the shared secret, tests can be re-run using the generic
 retry-github-test tool:
diff -pruN 257.7-1/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/delegated-cgroup-filtering.service 257.9-0ubuntu2/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/delegated-cgroup-filtering.service
--- 257.7-1/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/delegated-cgroup-filtering.service	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/delegated-cgroup-filtering.service	2025-09-03 18:35:40.000000000 +0000
@@ -3,7 +3,7 @@ Description=Test service for delegated l
 
 [Service]
 Type=oneshot
-ExecStart=/usr/lib/systemd/tests/testdata/units/delegated_cgroup_filtering_payload.sh
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-04-JOURNAL.units/delegated_cgroup_filtering_payload.sh
 Delegate=yes
 SyslogLevel=notice
 LogLevelMax=info
diff -pruN 257.7-1/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/delegated_cgroup_filtering_payload.sh 257.9-0ubuntu2/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/delegated_cgroup_filtering_payload.sh
--- 257.7-1/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/delegated_cgroup_filtering_payload.sh	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/delegated_cgroup_filtering_payload.sh	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,12 @@
+#!/bin/bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+mkdir /sys/fs/cgroup/system.slice/delegated-cgroup-filtering.service/the_child
+/usr/lib/systemd/tests/testdata/TEST-04-JOURNAL.units/delegated_cgroup_filtering_payload_child.sh
+
+echo "parent_process: hello, world!"
+echo "parent_process: hello, people!"
+
+# If the service finishes extremely fast, journald cannot find the source of the
+# stream. Hence, we need to call 'journalctl --sync' before service finishes.
+journalctl --sync
diff -pruN 257.7-1/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/delegated_cgroup_filtering_payload_child.sh 257.9-0ubuntu2/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/delegated_cgroup_filtering_payload_child.sh
--- 257.7-1/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/delegated_cgroup_filtering_payload_child.sh	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/delegated_cgroup_filtering_payload_child.sh	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+echo $$ >/sys/fs/cgroup/system.slice/delegated-cgroup-filtering.service/the_child/cgroup.procs
+
+echo "child_process: hello, world!"
+echo "child_process: hello, people!"
+
+# If the service finishes extremely fast, journald cannot find the source of the
+# stream. Hence, we need to call 'journalctl --sync' before service finishes.
+journalctl --sync
diff -pruN 257.7-1/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering-syslog.py 257.9-0ubuntu2/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering-syslog.py
--- 257.7-1/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering-syslog.py	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering-syslog.py	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,14 @@
+#!/usr/bin/python3
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+import subprocess
+import syslog
+
+if __name__ == '__main__':
+    syslog.openlog(ident="logs-filtering", logoption=syslog.LOG_PID)
+    syslog.syslog(syslog.LOG_NOTICE, "Logging from the service, and ~more~ foo bar")
+
+    subprocess.check_output(
+        ['journalctl', '--sync'],
+        stdin=subprocess.DEVNULL,
+        text=True)
diff -pruN 257.7-1/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering-syslog.service 257.9-0ubuntu2/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering-syslog.service
--- 257.7-1/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering-syslog.service	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering-syslog.service	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,8 @@
+[Unit]
+Description=Log filtering unit
+
+[Service]
+Type=oneshot
+ExecStart=/usr/lib/systemd/tests/testdata/TEST-04-JOURNAL.units/logs-filtering-syslog.py
+SyslogLevel=notice
+LogLevelMax=info
diff -pruN 257.7-1/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering.service 257.9-0ubuntu2/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering.service
--- 257.7-1/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering.service	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/logs-filtering.service	2025-09-03 18:35:40.000000000 +0000
@@ -5,6 +5,6 @@ Description=Log filtering unit
 Type=oneshot
 # If the service finishes extremely fast, journald cannot find the source of the
 # stream. Hence, we need to call 'journalctl --sync' before service finishes.
-ExecStart=sh -c 'echo "Logging from the service, and ~more~ foo bar"; journalctl --sync'
+ExecStart=bash -c 'echo "Logging from the service, and ~more~ foo bar"; journalctl --sync'
 SyslogLevel=notice
 LogLevelMax=info
diff -pruN 257.7-1/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/silent-success.service 257.9-0ubuntu2/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/silent-success.service
--- 257.7-1/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/silent-success.service	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/silent-success.service	2025-09-03 18:35:40.000000000 +0000
@@ -5,7 +5,6 @@ Description=Silent successful service
 [Service]
 Type=oneshot
 LogLevelMax=notice
-ExecStart=/bin/true
 # If the service finishes extremely fast, journald cannot find the source of the
 # stream. Hence, we need to call 'journalctl --sync' before service finishes.
 ExecStart=journalctl --sync
diff -pruN 257.7-1/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/verbose-success.service 257.9-0ubuntu2/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/verbose-success.service
--- 257.7-1/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/verbose-success.service	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units/verbose-success.service	2025-09-03 18:35:40.000000000 +0000
@@ -4,10 +4,7 @@ Description=Verbose successful service
 
 [Service]
 Type=oneshot
-ExecStart=echo success
 # If the service finishes extremely fast, journald cannot find the source of the
 # stream. Hence, we need to call 'journalctl --sync' before service finishes.
-ExecStart=journalctl --sync
-# Suppress debugging logs from PID1 or sd-executor. Otherwise, the client context
-# may be outdated when the stream from 'echo' command in the above comes.
+ExecStart=bash -c 'echo success; journalctl --sync'
 LogLevelMax=info
diff -pruN 257.7-1/test/integration-tests/TEST-07-PID1/TEST-07-PID1.units/defer-reactivation.service 257.9-0ubuntu2/test/integration-tests/TEST-07-PID1/TEST-07-PID1.units/defer-reactivation.service
--- 257.7-1/test/integration-tests/TEST-07-PID1/TEST-07-PID1.units/defer-reactivation.service	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/TEST-07-PID1/TEST-07-PID1.units/defer-reactivation.service	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,6 @@
+[Unit]
+Description=Test for DeferReactivation=yes (service)
+
+[Service]
+Type=simple
+ExecStart=sh -c 'date +%%s >>/tmp/defer-reactivation.log; sleep 5'
diff -pruN 257.7-1/test/integration-tests/TEST-07-PID1/TEST-07-PID1.units/defer-reactivation.timer 257.9-0ubuntu2/test/integration-tests/TEST-07-PID1/TEST-07-PID1.units/defer-reactivation.timer
--- 257.7-1/test/integration-tests/TEST-07-PID1/TEST-07-PID1.units/defer-reactivation.timer	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/TEST-07-PID1/TEST-07-PID1.units/defer-reactivation.timer	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,7 @@
+[Unit]
+Description=Test for DeferReactivation=yes (timer)
+
+[Timer]
+OnCalendar=*:*:0/5
+AccuracySec=1us
+DeferReactivation=yes
diff -pruN 257.7-1/test/integration-tests/TEST-10-MOUNT/meson.build 257.9-0ubuntu2/test/integration-tests/TEST-10-MOUNT/meson.build
--- 257.7-1/test/integration-tests/TEST-10-MOUNT/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/TEST-10-MOUNT/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+integration_tests += [
+        integration_test_template + {
+                'name' : fs.name(meson.current_source_dir()),
+                'vm' : true,
+        },
+]
diff -pruN 257.7-1/test/integration-tests/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/fail-stop.service 257.9-0ubuntu2/test/integration-tests/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/fail-stop.service
--- 257.7-1/test/integration-tests/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/fail-stop.service	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units/fail-stop.service	2025-09-03 18:35:40.000000000 +0000
@@ -12,5 +12,5 @@ RuntimeMaxSec=4
 Environment=SERVICE=fail_stop extend_timeout_interval=5 sleep_interval=7 start_intervals=0 run_intervals=0 stop_intervals=2
 ExecStart=/usr/lib/systemd/tests/testdata/TEST-16-EXTEND-TIMEOUT.units/extend-timeout.sh
 # Due to 6041a7ee2c1bbff6301082f192fc1b0882400d42 SIGTERM isn't sent as the service shuts down with STOPPING=1
-# This file makes the test assess.sh quicker by notifing it that this test has finished.
+# This file makes the test assess.sh quicker by notifying it that this test has finished.
 ExecStopPost=/bin/bash -c '[[ $SERVICE_RESULT == timeout && $EXIT_CODE == killed ]] && touch /fail_runtime.terminated'
diff -pruN 257.7-1/test/integration-tests/TEST-50-DISSECT/meson.build 257.9-0ubuntu2/test/integration-tests/TEST-50-DISSECT/meson.build
--- 257.7-1/test/integration-tests/TEST-50-DISSECT/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/TEST-50-DISSECT/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -4,5 +4,6 @@ integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
                 'vm' : true,
+                'firmware' : 'auto',
         },
 ]
diff -pruN 257.7-1/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build 257.9-0ubuntu2/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build
--- 257.7-1/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/TEST-64-UDEV-STORAGE/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -7,7 +7,10 @@ udev_storage_test_template = {
 }
 
 qemu = find_program('qemu-system-@0@'.format(host_machine.cpu_family()), 'qemu-kvm', dirs : ['/usr/libexec'], native : true, required : false)
-if qemu.found()
+if qemu.found() and host_machine.cpu_family() == 'aarch64'
+        # qemu-system-aarch64 errors out if no machine is specified
+        devices = run_command(qemu, '-device', 'help', '-machine', 'virt', check : true).stdout().strip()
+elif qemu.found()
         devices = run_command(qemu, '-device', 'help', check : true).stdout().strip()
 else
         devices = ''
diff -pruN 257.7-1/test/integration-tests/TEST-74-AUX-UTILS/TEST-74-AUX-UTILS.units/realtime-test.service 257.9-0ubuntu2/test/integration-tests/TEST-74-AUX-UTILS/TEST-74-AUX-UTILS.units/realtime-test.service
--- 257.7-1/test/integration-tests/TEST-74-AUX-UTILS/TEST-74-AUX-UTILS.units/realtime-test.service	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/TEST-74-AUX-UTILS/TEST-74-AUX-UTILS.units/realtime-test.service	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-[Unit]
-Description=Testing systemd timers
-
-[Service]
-Type=simple
-ExecStart=sh -c 'date +%%s >>/tmp/realtime-test.log ; sleep 5'
diff -pruN 257.7-1/test/integration-tests/TEST-74-AUX-UTILS/TEST-74-AUX-UTILS.units/realtime-test.timer 257.9-0ubuntu2/test/integration-tests/TEST-74-AUX-UTILS/TEST-74-AUX-UTILS.units/realtime-test.timer
--- 257.7-1/test/integration-tests/TEST-74-AUX-UTILS/TEST-74-AUX-UTILS.units/realtime-test.timer	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/TEST-74-AUX-UTILS/TEST-74-AUX-UTILS.units/realtime-test.timer	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-[Unit]
-Description=Testing systemd timers
-
-[Timer]
-OnCalendar=*:*:0/5
-AccuracySec=1us
-DeferReactivation=true
-
-[Install]
-WantedBy=timers.target
diff -pruN 257.7-1/test/integration-tests/TEST-87-AUX-UTILS-VM/meson.build 257.9-0ubuntu2/test/integration-tests/TEST-87-AUX-UTILS-VM/meson.build
--- 257.7-1/test/integration-tests/TEST-87-AUX-UTILS-VM/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/TEST-87-AUX-UTILS-VM/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -7,5 +7,6 @@ integration_tests += [
                 'storage': 'persistent',
                 'coredump-exclude-regex' : '/(test-usr-dump|test-dump|bash)$',
                 'vm' : true,
+                'firmware' : 'auto',
         },
 ]
diff -pruN 257.7-1/test/integration-tests/integration-test-wrapper.py 257.9-0ubuntu2/test/integration-tests/integration-test-wrapper.py
--- 257.7-1/test/integration-tests/integration-test-wrapper.py	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/integration-test-wrapper.py	2025-09-03 18:35:40.000000000 +0000
@@ -537,15 +537,9 @@ def main() -> None:
     else:
         rtc = None
 
-    # mkosi will use the UEFI secure boot firmware by default on UEFI platforms. However, this breaks on
-    # Github Actions in combination with KVM because of a HyperV bug so make sure we use the non secure
-    # boot firmware on Github Actions.
-    # TODO: Drop after the HyperV bug that breaks secure boot KVM guests is solved
-    if args.firmware == 'auto' and os.getenv('GITHUB_ACTIONS'):
-        firmware = 'uefi'
     # Whenever possible, boot without an initrd. This requires the target distribution kernel to have the
     # necessary modules (virtio-blk, ext4) builtin.
-    elif args.firmware == 'linux-noinitrd' and (summary.distribution, summary.release) not in (
+    if args.firmware == 'linux-noinitrd' and (summary.distribution, summary.release) not in (
         ('fedora', 'rawhide'),
         ('arch', 'rolling'),
     ):
@@ -637,10 +631,15 @@ def main() -> None:
     elif os.getenv('TEST_JOURNAL_USE_TMP', '0') == '1' and journal_file.exists():
         dst = args.meson_build_dir / f'test/journal/{name}.journal'
         dst.parent.mkdir(parents=True, exist_ok=True)
-        journal_file = shutil.move(journal_file, dst)
+        journal_file = Path(shutil.move(journal_file, dst))
 
     if shell or (result.returncode in (args.exit_code, 77) and not coredumps and not sanitizer):
-        exit(0 if shell or result.returncode == args.exit_code else 77)
+        exit_code = 0 if shell or result.returncode == args.exit_code else 77
+        exit_str = 'succeeded' if exit_code == 0 else 'skipped'
+    else:
+        # 0 also means we failed so translate that to a non-zero exit code to mark the test as failed.
+        exit_code = result.returncode or 1
+        exit_str = 'failed'
 
     if journal_file.exists():
         ops = []
@@ -655,10 +654,11 @@ def main() -> None:
 
         ops += [f'journalctl --file {journal_file} --no-hostname -o short-monotonic -u {args.unit} -p info']
 
-        print(f'Test failed, relevant logs can be viewed with: \n\n{(" && ".join(ops))}\n', file=sys.stderr)
+        print(
+            f'Test {exit_str}, relevant logs can be viewed with: \n\n{(" && ".join(ops))}\n', file=sys.stderr
+        )
 
-    # 0 also means we failed so translate that to a non-zero exit code to mark the test as failed.
-    exit(result.returncode or 1)
+    exit(exit_code)
 
 
 if __name__ == '__main__':
diff -pruN 257.7-1/test/integration-tests/meson.build 257.9-0ubuntu2/test/integration-tests/meson.build
--- 257.7-1/test/integration-tests/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/integration-tests/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -38,6 +38,7 @@ foreach dirname : [
         'TEST-07-PID1',
         'TEST-08-INITRD',
         'TEST-09-REBOOT',
+        'TEST-10-MOUNT',
         'TEST-13-NSPAWN',
         'TEST-15-DROPIN',
         'TEST-16-EXTEND-TIMEOUT',
diff -pruN 257.7-1/test/meson.build 257.9-0ubuntu2/test/meson.build
--- 257.7-1/test/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -220,7 +220,8 @@ if rpm.found() and rpmspec.found()
                 test('test-rpm-macros',
                      test_rpm_macros,
                      suite : 'dist',
-                     args : [meson.project_build_root()])
+                     args : [meson.project_build_root()],
+                     depends : rpm_depends)
         endif
 else
       message('Skipping test-rpm-macros since rpm and/or rpmspec are not available')
@@ -334,7 +335,6 @@ if install_tests
                 'integration-tests/TEST-30-ONCLOCKCHANGE/TEST-30-ONCLOCKCHANGE.units',
                 'integration-tests/TEST-52-HONORFIRSTSHUTDOWN/TEST-52-HONORFIRSTSHUTDOWN.units',
                 'integration-tests/TEST-63-PATH/TEST-63-PATH.units',
-                'integration-tests/TEST-74-AUX-UTILS/TEST-74-AUX-UTILS.units',
                 'integration-tests/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units',
         ]
 
diff -pruN 257.7-1/test/units/TEST-02-UNITTESTS.sh 257.9-0ubuntu2/test/units/TEST-02-UNITTESTS.sh
--- 257.7-1/test/units/TEST-02-UNITTESTS.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-02-UNITTESTS.sh	2025-09-03 18:35:40.000000000 +0000
@@ -32,6 +32,11 @@ if ! systemd-detect-virt -qc; then
     sysctl net.ipv4.ping_group_range="0 2147483647"
 fi
 
+# Disable firewalld and friends to make them not disturb test-firewall-util
+systemctl disable --now firewalld.service || :
+systemctl disable --now iptables.service || :
+systemctl disable --now ip6tables.service || :
+
 # Check & report test results
 # Arguments:
 #   $1: test path
diff -pruN 257.7-1/test/units/TEST-03-JOBS.sh 257.9-0ubuntu2/test/units/TEST-03-JOBS.sh
--- 257.7-1/test/units/TEST-03-JOBS.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-03-JOBS.sh	2025-09-03 18:35:40.000000000 +0000
@@ -17,25 +17,16 @@ systemctl daemon-reexec
 
 systemctl start --no-block hello-after-sleep.target
 
-systemctl list-jobs >/root/list-jobs.txt
-until grep 'sleep\.service.*running' /root/list-jobs.txt; do
-    systemctl list-jobs >/root/list-jobs.txt
-done
-
+timeout 10 bash -c "until systemctl list-jobs | tee /root/list-jobs.txt | grep 'sleep\.service.*running'; do sleep .1; done"
 grep 'hello\.service.*waiting' /root/list-jobs.txt
 
 # This is supposed to finish quickly, not wait for sleep to finish.
-START_SEC=$(date -u '+%s')
-systemctl start --job-mode=ignore-dependencies hello
-END_SEC=$(date -u '+%s')
-ELAPSED=$((END_SEC-START_SEC))
-
-test "$ELAPSED" -lt 3
+timeout 10 systemctl start --job-mode=ignore-dependencies hello
 
 # sleep should still be running, hello not.
 systemctl list-jobs >/root/list-jobs.txt
 grep 'sleep\.service.*running' /root/list-jobs.txt
-grep 'hello\.service' /root/list-jobs.txt && exit 1
+(! grep 'hello\.service' /root/list-jobs.txt)
 systemctl stop sleep.service hello-after-sleep.target
 
 # Some basic testing that --show-transaction does something useful
@@ -62,13 +53,13 @@ ACTIVATING_ID_PRE=$(systemctl show -P In
 systemctl -T start always-activating.socket # Wait for the socket to come up
 systemctl -T restart always-activating.socket
 ACTIVATING_ID_POST=$(systemctl show -P InvocationID always-activating.service)
-[ "$ACTIVATING_ID_PRE" != "$ACTIVATING_ID_POST" ] || exit 1
+[[ "$ACTIVATING_ID_PRE" != "$ACTIVATING_ID_POST" ]]
 
 # Test for irreversible jobs
 systemctl start unstoppable.service
 
 # This is expected to fail with 'job cancelled'
-systemctl stop unstoppable.service && exit 1
+(! systemctl stop unstoppable.service)
 # But this should succeed
 systemctl stop --job-mode=replace-irreversibly unstoppable.service
 
@@ -93,27 +84,28 @@ EOF
 
 # wait2 succeeds
 START_SEC=$(date -u '+%s')
-systemctl start --wait wait2.service
+timeout 10 systemctl start --wait wait2.service
 END_SEC=$(date -u '+%s')
 ELAPSED=$((END_SEC-START_SEC))
-[[ "$ELAPSED" -ge 2 ]] && [[ "$ELAPSED" -le 4 ]] || exit 1
+[[ "$ELAPSED" -ge 2 ]]
 
 # wait5fail fails, so systemctl should fail
 START_SEC=$(date -u '+%s')
 (! systemctl start --wait wait2.service wait5fail.service)
 END_SEC=$(date -u '+%s')
 ELAPSED=$((END_SEC-START_SEC))
-[[ "$ELAPSED" -ge 5 ]] && [[ "$ELAPSED" -le 7 ]] || exit 1
+[[ "$ELAPSED" -ge 5 ]]
 
 # Test time-limited scopes
 START_SEC=$(date -u '+%s')
 set +e
-systemd-run --scope --property=RuntimeMaxSec=3s sleep 10
+systemd-run --scope --property=RuntimeMaxSec=3s sleep 30
 RESULT=$?
 END_SEC=$(date -u '+%s')
 ELAPSED=$((END_SEC-START_SEC))
-[[ "$ELAPSED" -ge 3 ]] && [[ "$ELAPSED" -le 5 ]] || exit 1
-[[ "$RESULT" -ne 0 ]] || exit 1
+[[ "$ELAPSED" -ge 3 ]]
+[[ "$ELAPSED" -le 10 ]]
+[[ "$RESULT" -ne 0 ]]
 
 # Test transactions with cycles
 # Provides coverage for issues like https://github.com/systemd/systemd/issues/26872
diff -pruN 257.7-1/test/units/TEST-04-JOURNAL.LogFilterPatterns.sh 257.9-0ubuntu2/test/units/TEST-04-JOURNAL.LogFilterPatterns.sh
--- 257.7-1/test/units/TEST-04-JOURNAL.LogFilterPatterns.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-04-JOURNAL.LogFilterPatterns.sh	2025-09-03 18:35:40.000000000 +0000
@@ -36,6 +36,7 @@ run_service_and_fetch_logs() {
     fi
 
     systemctl start "$unit"
+    journalctl --sync
     journalctl -q -u "$unit" -I -p notice
 }
 
@@ -46,51 +47,79 @@ at_exit() {
 
 trap at_exit EXIT
 
-# Accept all log messages
-add_logs_filtering_override "logs-filtering.service" "00-reset" ""
-[[ -n $(run_service_and_fetch_logs "logs-filtering.service") ]]
-
-add_logs_filtering_override "logs-filtering.service" "01-allow-all" ".*"
-[[ -n $(run_service_and_fetch_logs "logs-filtering.service") ]]
-
-# Discard all log messages
-add_logs_filtering_override "logs-filtering.service" "02-discard-all" "~.*"
-[[ -z $(run_service_and_fetch_logs "logs-filtering.service") ]]
-
-# Accept all test messages
-add_logs_filtering_override "logs-filtering.service" "03-reset" ""
-[[ -n $(run_service_and_fetch_logs "logs-filtering.service") ]]
-
-# Discard all test messages
-add_logs_filtering_override "logs-filtering.service" "04-discard-gg" "~.*gg.*"
-[[ -z $(run_service_and_fetch_logs "logs-filtering.service") ]]
-
-# Deny filter takes precedence
-add_logs_filtering_override "logs-filtering.service" "05-allow-all-but-too-late" ".*"
-[[ -z $(run_service_and_fetch_logs "logs-filtering.service") ]]
-
-# Use tilde in a deny pattern
-add_logs_filtering_override "logs-filtering.service" "06-reset" ""
-add_logs_filtering_override "logs-filtering.service" "07-prevent-tilde" "~~more~"
-[[ -z $(run_service_and_fetch_logs "logs-filtering.service") ]]
-
-# Only allow a pattern that won't be matched
-add_logs_filtering_override "logs-filtering.service" "08-reset" ""
-add_logs_filtering_override "logs-filtering.service" "09-allow-only-non-existing" "non-existing string"
-[[ -z $(run_service_and_fetch_logs "logs-filtering.service") ]]
-
-# Allow a pattern starting with a tilde
-add_logs_filtering_override "logs-filtering.service" "10-allow-with-escape-char" "\\\\x7emore~"
-[[ -n $(run_service_and_fetch_logs "logs-filtering.service") ]]
-
-add_logs_filtering_override "logs-filtering.service" "11-reset" ""
-add_logs_filtering_override "logs-filtering.service" "12-allow-with-spaces" "foo bar"
-[[ -n $(run_service_and_fetch_logs "logs-filtering.service") ]]
+test_service() {
+    service="${1:?}"
 
-add_logs_filtering_override "delegated-cgroup-filtering.service" "00-allow-all" ".*"
-[[ -n $(run_service_and_fetch_logs "delegated-cgroup-filtering.service") ]]
+    # Accept all log messages
+    add_logs_filtering_override "$service" "00-reset" ""
+    [[ -n $(run_service_and_fetch_logs "$service") ]]
+
+    add_logs_filtering_override "$service" "01-allow-all" ".*"
+    [[ -n $(run_service_and_fetch_logs "$service") ]]
+
+    # Discard all log messages
+    add_logs_filtering_override "$service" "02-discard-all" "~.*"
+    [[ -z $(run_service_and_fetch_logs "$service") ]]
+
+    # Accept all test messages
+    add_logs_filtering_override "$service" "03-reset" ""
+    [[ -n $(run_service_and_fetch_logs "$service") ]]
+
+    # Discard all test messages
+    add_logs_filtering_override "$service" "04-discard-gg" "~.*gg.*"
+    [[ -z $(run_service_and_fetch_logs "$service") ]]
+
+    # Deny filter takes precedence
+    add_logs_filtering_override "$service" "05-allow-all-but-too-late" ".*"
+    [[ -z $(run_service_and_fetch_logs "$service") ]]
+
+    # Use tilde in a deny pattern
+    add_logs_filtering_override "$service" "06-reset" ""
+    add_logs_filtering_override "$service" "07-prevent-tilde" "~~more~"
+    [[ -z $(run_service_and_fetch_logs "$service") ]]
+
+    # Only allow a pattern that won't be matched
+    add_logs_filtering_override "$service" "08-reset" ""
+    add_logs_filtering_override "$service" "09-allow-only-non-existing" "non-existing string"
+    [[ -z $(run_service_and_fetch_logs "$service") ]]
+
+    # Allow a pattern starting with a tilde
+    add_logs_filtering_override "$service" "10-allow-with-escape-char" "\\\\x7emore~"
+    [[ -n $(run_service_and_fetch_logs "$service") ]]
+
+    add_logs_filtering_override "$service" "11-reset" ""
+    add_logs_filtering_override "$service" "12-allow-with-spaces" "foo bar"
+    [[ -n $(run_service_and_fetch_logs "$service") ]]
+
+    add_logs_filtering_override "$service" "13-reset" ""
+    add_logs_filtering_override "$service" "14-exclude-head" "~^Logging"
+    [[ -z $(run_service_and_fetch_logs "$service") ]]
+
+    add_logs_filtering_override "$service" "15-reset" ""
+    add_logs_filtering_override "$service" "16-exclude-head-no-match" "~^foo"
+    [[ -n $(run_service_and_fetch_logs "$service") ]]
+
+    add_logs_filtering_override "$service" "17-reset" ""
+    add_logs_filtering_override "$service" "18-include-head" "^Logging"
+    [[ -n $(run_service_and_fetch_logs "$service") ]]
+
+    add_logs_filtering_override "$service" "19-reset" ""
+    add_logs_filtering_override "$service" "20-include-head-no-match" "^foo"
+    [[ -z $(run_service_and_fetch_logs "$service") ]]
+}
+
+test_delegate() {
+    local service="${1:?}"
+
+    add_logs_filtering_override "$service" "00-allow-all" ".*"
+    [[ -n $(run_service_and_fetch_logs "$service") ]]
+
+    add_logs_filtering_override "$service" "01-discard-hello" "~hello"
+    [[ -z $(run_service_and_fetch_logs "$service") ]]
+}
 
-add_logs_filtering_override "delegated-cgroup-filtering.service" "01-discard-hello" "~hello"
-[[ -z $(run_service_and_fetch_logs "delegated-cgroup-filtering.service") ]]
+test_service logs-filtering.service
+test_service logs-filtering-syslog.service
+test_delegate delegated-cgroup-filtering.service
 
 systemctl log-level "$SAVED_LOG_LEVEL"
diff -pruN 257.7-1/test/units/TEST-04-JOURNAL.journal-append.sh 257.9-0ubuntu2/test/units/TEST-04-JOURNAL.journal-append.sh
--- 257.7-1/test/units/TEST-04-JOURNAL.journal-append.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-04-JOURNAL.journal-append.sh	2025-09-03 18:35:40.000000000 +0000
@@ -12,35 +12,35 @@ TEST_JOURNAL_APPEND=/usr/lib/systemd/tes
 [[ -x "$TEST_JOURNAL_APPEND" ]]
 
 # Corrupt the first ~1024 bytes, this should be pretty quick
-"$TEST_JOURNAL_APPEND" --sequential --start-offset=0 --iterations=350 --iteration-step=3
+SYSTEMD_LOG_LEVEL=info "$TEST_JOURNAL_APPEND" --sequential --start-offset=0 --iterations=350 --iteration-step=3
 
 # Skip most of the test when running without acceleration, as it's excruciatingly slow
 # (this shouldn't be an issue, as it should run in nspawn as well)
 if ! [[ "$(systemd-detect-virt -v)" == "qemu" ]]; then
     # Corrupt the beginning of every 1K block between 1K - 32K
     for ((i = 1024; i <= (32 * 1024); i += 1024)); do
-        "$TEST_JOURNAL_APPEND" --sequential --start-offset="$i" --iterations=5 --iteration-step=13
+        SYSTEMD_LOG_LEVEL=info "$TEST_JOURNAL_APPEND" --sequential --start-offset="$i" --iterations=5 --iteration-step=13
     done
 
     # Corrupt the beginning of every 16K block between 32K - 128K
     for ((i = (32 * 1024); i <= (256 * 1024); i += (16 * 1024))); do
-        "$TEST_JOURNAL_APPEND" --sequential --start-offset="$i" --iterations=5 --iteration-step=13
+        SYSTEMD_LOG_LEVEL=info "$TEST_JOURNAL_APPEND" --sequential --start-offset="$i" --iterations=5 --iteration-step=13
     done
 
     # Corrupt the beginning of every 128K block between 128K - 1M
     for ((i = (128 * 1024); i <= (1 * 1024 * 1024); i += (128 * 1024))); do
-        "$TEST_JOURNAL_APPEND" --sequential --start-offset="$i" --iterations=5 --iteration-step=13
+        SYSTEMD_LOG_LEVEL=info "$TEST_JOURNAL_APPEND" --sequential --start-offset="$i" --iterations=5 --iteration-step=13
     done
 
     # And finally the beginning of every 1M block between 1M and 8M
     for ((i = (1 * 1024 * 1024); i < (8 * 1024 * 1024); i += (1 * 1024 * 1024))); do
-        "$TEST_JOURNAL_APPEND" --sequential --start-offset="$i" --iterations=5 --iteration-step=13
+        SYSTEMD_LOG_LEVEL=info "$TEST_JOURNAL_APPEND" --sequential --start-offset="$i" --iterations=5 --iteration-step=13
     done
 
     if [[ "$(nproc)" -ge 2 ]]; then
         # Try to corrupt random bytes throughout the journal
-        "$TEST_JOURNAL_APPEND" --iterations=25
+        SYSTEMD_LOG_LEVEL=info "$TEST_JOURNAL_APPEND" --iterations=25
     fi
 else
-    "$TEST_JOURNAL_APPEND" --iterations=10
+    SYSTEMD_LOG_LEVEL=info "$TEST_JOURNAL_APPEND" --iterations=10
 fi
diff -pruN 257.7-1/test/units/TEST-04-JOURNAL.journal.sh 257.9-0ubuntu2/test/units/TEST-04-JOURNAL.journal.sh
--- 257.7-1/test/units/TEST-04-JOURNAL.journal.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-04-JOURNAL.journal.sh	2025-09-03 18:35:40.000000000 +0000
@@ -109,10 +109,10 @@ systemctl start silent-success
 # Test syslog identifiers exclusion
 systemctl start verbose-success.service
 [[ -n "$(journalctl -b -q -u verbose-success.service -t systemd)" ]]
-[[ -n "$(journalctl -b -q -u verbose-success.service -t echo)" ]]
+[[ -n "$(journalctl -b -q -u verbose-success.service -t bash)" ]]
 [[ -n "$(journalctl -b -q -u verbose-success.service -T systemd)" ]]
-[[ -n "$(journalctl -b -q -u verbose-success.service -T echo)" ]]
-[[ -z "$(journalctl -b -q -u verbose-success.service -T echo -T '(echo)' -T sleep -T '(sleep)' -T systemd -T '(systemd)' -T systemd-executor)" ]]
+[[ -n "$(journalctl -b -q -u verbose-success.service -T bash)" ]]
+[[ -z "$(journalctl -b -q -u verbose-success.service -T bash -T '(bash)' -T systemd -T '(systemd)')" ]]
 
 # Exercise the matching machinery
 SYSTEMD_LOG_LEVEL=debug journalctl -b -n 1 /dev/null /dev/zero /dev/null /dev/null /dev/null
diff -pruN 257.7-1/test/units/TEST-07-PID1.DeferReactivation.sh 257.9-0ubuntu2/test/units/TEST-07-PID1.DeferReactivation.sh
--- 257.7-1/test/units/TEST-07-PID1.DeferReactivation.sh	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-07-PID1.DeferReactivation.sh	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# shellcheck disable=SC2016
+set -eux
+set -o pipefail
+
+systemctl start defer-reactivation.timer
+
+timeout 20 bash -c 'until [[ -e /tmp/defer-reactivation.log ]]; do sleep .5; done'
+timeout 60 bash -c 'until (( $(cat /tmp/defer-reactivation.log | wc -l) >= 3 )); do sleep 5; done'
+
+systemctl stop defer-reactivation.timer
+
+# If the 'date' command is the service called instantaneously when the timer is triggered, each time delta
+# must be 10 seconds. But in a realistic situation, the command is slightly delayed after the timer is
+# triggered, and the delay has some fluctuations. If a trigger event calls the command at 00:00:01.01, and
+# the next event does at 00:00:10.99, the delta is calculated as 9 seconds. So, let's accept 9 here.
+mindelta=9
+
+last=
+while read -r time; do
+    if [[ -n "$last" ]]; then
+        delta=$(( time - last ))
+        if (( delta < mindelta )); then
+            echo "Timer fired too early: $delta < $mindelta" >/failed
+            exit 1
+        fi
+    fi
+    last=$time
+done </tmp/defer-reactivation.log
diff -pruN 257.7-1/test/units/TEST-07-PID1.issue-38320.sh 257.9-0ubuntu2/test/units/TEST-07-PID1.issue-38320.sh
--- 257.7-1/test/units/TEST-07-PID1.issue-38320.sh	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-07-PID1.issue-38320.sh	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+set -eux
+set -o pipefail
+
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
+
+UNIT_NAME="TEST-07-PID1-issue-38320-$RANDOM"
+
+at_exit() {
+    systemctl stop "$UNIT_NAME".{socket,service}
+    rm -f /run/systemd/system/"$UNIT_NAME".{socket,service}
+}
+
+trap at_exit EXIT
+
+cat >/run/systemd/system/"$UNIT_NAME.socket" <<EOF
+[Socket]
+ListenStream=/tmp/$UNIT_NAME
+EOF
+
+cat >/run/systemd/system/"$UNIT_NAME.service" <<EOF
+[Service]
+ExecStart=true
+EOF
+
+(! systemd-analyze fdstore "$UNIT_NAME.socket")
+
+systemctl restart "$UNIT_NAME.socket"
+(! systemd-analyze fdstore "$UNIT_NAME.socket")
+
+systemctl daemon-reload
+(! systemd-analyze fdstore "$UNIT_NAME.socket")
+
+systemctl is-active "$UNIT_NAME.socket"
diff -pruN 257.7-1/test/units/TEST-10-MOUNT.sh 257.9-0ubuntu2/test/units/TEST-10-MOUNT.sh
--- 257.7-1/test/units/TEST-10-MOUNT.sh	1970-01-01 00:00:00.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-10-MOUNT.sh	2025-09-03 18:35:40.000000000 +0000
@@ -0,0 +1,169 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+set -eux
+set -o pipefail
+
+# shellcheck source=test/units/test-control.sh
+. "$(dirname "$0")"/test-control.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
+
+teardown_test_dependencies() (
+    set +eux
+
+    if mountpoint /tmp/deptest; then
+        umount /tmp/deptest
+    fi
+
+    if [[ -n "${LOOP}" ]]; then
+        losetup -d "${LOOP}" || :
+    fi
+    if [[ -n "${LOOP_0}" ]]; then
+        losetup -d "${LOOP_0}" || :
+    fi
+    if [[ -n "${LOOP_1}" ]]; then
+        losetup -d "${LOOP_1}" || :
+    fi
+
+    rm -f /tmp/TEST-60-MOUNT-RATELIMIT-dependencies-0.img
+    rm -f /tmp/TEST-60-MOUNT-RATELIMIT-dependencies-1.img
+
+    rm -f /run/systemd/system/tmp-deptest.mount
+    systemctl daemon-reload
+
+    return 0
+)
+
+setup_loop() {
+    truncate -s 30m "/tmp/TEST-60-MOUNT-RATELIMIT-dependencies-${1?}.img"
+    sfdisk --wipe=always "/tmp/TEST-60-MOUNT-RATELIMIT-dependencies-${1?}.img" <<EOF
+label:gpt
+
+name="loop${1?}-part1"
+EOF
+    LOOP=$(losetup -P --show -f "/tmp/TEST-60-MOUNT-RATELIMIT-dependencies-${1?}.img")
+    udevadm wait --settle --timeout=30 "${LOOP}"
+    udevadm lock --timeout=30 --device="${LOOP}" mkfs.ext4 -L "partname${1?}-1" "${LOOP}p1"
+}
+
+check_dependencies() {
+    local escaped_0 escaped_1 after
+
+    escaped_0=$(systemd-escape -p "${LOOP_0}p1")
+    escaped_1=$(systemd-escape -p "${LOOP_1}p1")
+
+    if [[ -f /run/systemd/system/tmp-deptest.mount ]]; then
+        after=$(systemctl show --property=After --value tmp-deptest.mount)
+        assert_not_in "local-fs-pre.target" "$after"
+        assert_in "remote-fs-pre.target" "$after"
+        assert_in "network.target" "$after"
+    fi
+
+    # mount LOOP_0
+    mount -t ext4 "${LOOP_0}p1" /tmp/deptest
+    timeout 10 bash -c 'until systemctl -q is-active tmp-deptest.mount; do sleep .1; done'
+    after=$(systemctl show --property=After --value tmp-deptest.mount)
+    assert_in "local-fs-pre.target" "$after"
+    assert_not_in "remote-fs-pre.target" "$after"
+    assert_not_in "network.target" "$after"
+    assert_in "${escaped_0}.device" "$after"
+    assert_in "blockdev@${escaped_0}.target" "$after"
+    assert_not_in "${escaped_1}.device" "$after"
+    assert_not_in "blockdev@${escaped_1}.target" "$after"
+    systemctl stop tmp-deptest.mount
+
+    if [[ -f /run/systemd/system/tmp-deptest.mount ]]; then
+        after=$(systemctl show --property=After --value tmp-deptest.mount)
+        assert_not_in "local-fs-pre.target" "$after"
+        assert_in "remote-fs-pre.target" "$after"
+        assert_in "network.target" "$after"
+    fi
+
+    # mount LOOP_1 (using fake _netdev option)
+    mount -t ext4 -o _netdev "${LOOP_1}p1" /tmp/deptest
+    timeout 10 bash -c 'until systemctl -q is-active tmp-deptest.mount; do sleep .1; done'
+    # When a device is mounted with userspace options such as _netdev, even when the mount event source is
+    # triggered, only /proc/self/mountinfo may be updated, and /run/mount/utab may not be updated yet.
+    # Hence, the mount unit may be created/updated without the userspace options. In that case, the mount
+    # event source will be retriggered when /run/mount/utab is updated, and the mount unit will be updated
+    # again with the userspace options. Typically, the window between the two calls is very short, but when
+    # the mount event source is ratelimited after the first event, processing the second event may be delayed
+    # about 1 second. Hence, here we need to wait for a while.
+    timeout 10 bash -c 'until systemctl show --property=After --value tmp-deptest.mount | grep -q -F remote-fs-pre.target; do sleep .1; done'
+    after=$(systemctl show --property=After --value tmp-deptest.mount)
+    assert_not_in "local-fs-pre.target" "$after"
+    assert_in "remote-fs-pre.target" "$after"
+    assert_in "network.target" "$after"
+    assert_not_in "${escaped_0}.device" "$after"
+    assert_not_in "blockdev@${escaped_0}.target" "$after"
+    assert_in "${escaped_1}.device" "$after"
+    assert_in "blockdev@${escaped_1}.target" "$after"
+    systemctl stop tmp-deptest.mount
+
+    if [[ -f /run/systemd/system/tmp-deptest.mount ]]; then
+        after=$(systemctl show --property=After --value tmp-deptest.mount)
+        assert_not_in "local-fs-pre.target" "$after"
+        assert_in "remote-fs-pre.target" "$after"
+        assert_in "network.target" "$after"
+    fi
+
+    # mount tmpfs
+    mount -t tmpfs tmpfs /tmp/deptest
+    timeout 10 bash -c 'until systemctl -q is-active tmp-deptest.mount; do sleep .1; done'
+    after=$(systemctl show --property=After --value tmp-deptest.mount)
+    assert_in "local-fs-pre.target" "$after"
+    assert_not_in "remote-fs-pre.target" "$after"
+    assert_not_in "network.target" "$after"
+    assert_not_in "${escaped_0}.device" "$after"
+    assert_not_in "blockdev@${escaped_0}.target" "$after"
+    assert_not_in "${escaped_1}.device" "$after"
+    assert_not_in "blockdev@${escaped_1}.target" "$after"
+    systemctl stop tmp-deptest.mount
+
+    if [[ -f /run/systemd/system/tmp-deptest.mount ]]; then
+        after=$(systemctl show --property=After --value tmp-deptest.mount)
+        assert_not_in "local-fs-pre.target" "$after"
+        assert_in "remote-fs-pre.target" "$after"
+        assert_in "network.target" "$after"
+    fi
+}
+
+testcase_dependencies() {
+    # test for issue #19983 and #23552.
+
+    if systemd-detect-virt --quiet --container; then
+        echo "Skipping test_dependencies in container"
+        return
+    fi
+
+    trap teardown_test_dependencies RETURN EXIT ERR INT TERM
+
+    setup_loop 0
+    LOOP_0="${LOOP}"
+    LOOP=
+    setup_loop 1
+    LOOP_1="${LOOP}"
+    LOOP=
+
+    mkdir -p /tmp/deptest
+
+    # without .mount file
+    check_dependencies
+
+    # create .mount file
+    mkdir -p /run/systemd/system
+    cat >/run/systemd/system/tmp-deptest.mount <<EOF
+[Mount]
+Where=/tmp/deptest
+What=192.168.0.1:/tmp/mnt
+Type=nfs
+EOF
+    systemctl daemon-reload
+
+    # with .mount file
+    check_dependencies
+}
+
+run_testcases
+
+touch /testok
diff -pruN 257.7-1/test/units/TEST-13-NSPAWN.machined.sh 257.9-0ubuntu2/test/units/TEST-13-NSPAWN.machined.sh
--- 257.7-1/test/units/TEST-13-NSPAWN.machined.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-13-NSPAWN.machined.sh	2025-09-03 18:35:40.000000000 +0000
@@ -13,7 +13,7 @@ at_exit() {
     set +e
 
     machinectl status long-running &>/dev/null && machinectl kill --signal=KILL long-running
-    mountpoint -q /var/lib/machines && timeout 10 sh -c "until umount /var/lib/machines; do sleep .5; done"
+    mountpoint -q /var/lib/machines && timeout 30 sh -c "until umount /var/lib/machines; do sleep .5; done"
     [[ -n "${NSPAWN_FRAGMENT:-}" ]] && rm -f "/etc/systemd/nspawn/$NSPAWN_FRAGMENT" "/var/lib/machines/$NSPAWN_FRAGMENT"
     rm -f /run/systemd/nspawn/*.nspawn
 }
@@ -118,22 +118,22 @@ machinectl disable long-running long-run
 # Equivalent to machinectl kill --signal=SIGRTMIN+4 --kill-whom=leader
 rm -f /var/lib/machines/long-running/poweroff
 machinectl poweroff long-running
-timeout 10 bash -c "until test -e /var/lib/machines/long-running/poweroff; do sleep .5; done"
+timeout 30 bash -c "until test -e /var/lib/machines/long-running/poweroff; do sleep .5; done"
 # Equivalent to machinectl kill --signal=SIGINT --kill-whom=leader
 rm -f /var/lib/machines/long-running/reboot
 machinectl reboot long-running
-timeout 10 bash -c "until test -e /var/lib/machines/long-running/reboot; do sleep .5; done"
+timeout 30 bash -c "until test -e /var/lib/machines/long-running/reboot; do sleep .5; done"
 # Test for 'machinectl terminate'
 rm -f /var/lib/machines/long-running/terminate
 machinectl terminate long-running
-timeout 10 bash -c "until test -e /var/lib/machines/long-running/terminate; do sleep .5; done"
-timeout 10 bash -c "while machinectl status long-running &>/dev/null; do sleep .5; done"
+timeout 30 bash -c "until test -e /var/lib/machines/long-running/terminate; do sleep .5; done"
+timeout 30 bash -c "while machinectl status long-running &>/dev/null; do sleep .5; done"
 # Restart container
 long_running_machine_start
 # Test for 'machinectl kill'
 rm -f /var/lib/machines/long-running/trap
 machinectl kill --signal=SIGTRAP --kill-whom=leader long-running
-timeout 10 bash -c "until test -e /var/lib/machines/long-running/trap; do sleep .5; done"
+timeout 30 bash -c "until test -e /var/lib/machines/long-running/trap; do sleep .5; done"
 # Multiple machines at once
 machinectl poweroff long-running long-running long-running
 machinectl reboot long-running long-running long-running
@@ -221,7 +221,7 @@ machinectl import-fs /var/tmp/container.
 machinectl start container-dir
 rm -fr /var/tmp/container.dir
 
-timeout 10 bash -c "until machinectl clean --all; do sleep .5; done"
+timeout 30 bash -c "until machinectl clean --all; do sleep .5; done"
 
 NSPAWN_FRAGMENT="machinectl-test-$RANDOM.nspawn"
 cat >"/var/lib/machines/$NSPAWN_FRAGMENT" <<EOF
diff -pruN 257.7-1/test/units/TEST-13-NSPAWN.nspawn.sh 257.9-0ubuntu2/test/units/TEST-13-NSPAWN.nspawn.sh
--- 257.7-1/test/units/TEST-13-NSPAWN.nspawn.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-13-NSPAWN.nspawn.sh	2025-09-03 18:35:40.000000000 +0000
@@ -394,7 +394,7 @@ testcase_nspawn_settings() {
     for dev in sd-host-only sd-shared{1,2,3} sd-macvlan{1,2} sd-macvlanloong sd-ipvlan{1,2} sd-ipvlanlooong; do
         ip link add "$dev" type dummy
     done
-    udevadm settle
+    udevadm settle --timeout=30
     ip link property add dev sd-shared3 altname sd-altname3 altname sd-altname-tooooooooooooo-long
     ip link
     trap nspawn_settings_cleanup RETURN
@@ -796,7 +796,7 @@ EOF
 
 testcase_machinectl_bind() {
     local service_path service_name root container_name ec
-    local cmd='for i in $(seq 1 20); do if test -f /tmp/marker; then exit 0; fi; sleep .5; done; exit 1;'
+    local cmd="timeout 10 bash -c 'until [[ -f /tmp/marker ]]; do sleep .5; done'; sleep 3"
 
     root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.machinectl-bind.XXX)"
     create_dummy_container "$root"
@@ -995,7 +995,10 @@ testcase_check_os_release() {
     base="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.check_os_release_base.XXX)"
     root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.check_os_release.XXX)"
     create_dummy_container "$base"
-    cp -d "$base"/{bin,sbin,lib,lib64} "$root/"
+    cp -d "$base"/{bin,sbin,lib} "$root/"
+    if [ -d "$base"/lib64 ]; then
+        cp -d "$base"/lib64 "$root/"
+    fi
     common_opts=(
         --boot
         --register=no
@@ -1134,9 +1137,9 @@ testcase_unpriv() {
     create_dummy_ddi "$tmpdir" "$name"
     chown --recursive testuser: "$tmpdir"
 
-    systemd-run \
+    run0 --pipe -u testuser systemd-run \
+        --user \
         --pipe \
-        --uid=testuser \
         --property=Delegate=yes \
         -- \
         systemd-nspawn --pipe --private-network --register=no --keep-unit --image="$tmpdir/$name.raw" echo hello >"$tmpdir/stdout.txt"
@@ -1203,9 +1206,9 @@ testcase_unpriv_fuse() {
     create_dummy_ddi "$tmpdir" "$name"
     chown --recursive testuser: "$tmpdir"
 
-    [[ "$(systemd-run \
+    [[ "$(run0 -u testuser --pipe systemd-run \
+              --user \
               --pipe \
-              --uid=testuser \
               --property=Delegate=yes \
               --setenv=SYSTEMD_LOG_LEVEL \
               --setenv=SYSTEMD_LOG_TARGET \
@@ -1265,5 +1268,29 @@ testcase_dev_net_tun() {
 
     rm -fr "$root"
 }
+
+testcase_link_journa_hostl() {
+    local root hoge i
+
+    root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.link-journal.XXX)"
+    create_dummy_container "$root"
+
+    systemd-id128 new > "$root"/etc/machine-id
+
+    mkdir -p /var/log/journal
+
+    hoge="/var/log/journal/$(cat "$root"/etc/machine-id)/hoge"
+
+    for i in no yes pick; do
+        systemd-nspawn \
+            --directory="$root" --private-users="$i" --link-journal=host \
+            bash -xec 'p="/var/log/journal/$(cat /etc/machine-id)"; mountpoint "$p"; [[ "$(stat "$p" --format=%u)" == 0 ]]; touch "$p/hoge"'
+
+        [[ "$(stat "$hoge" --format=%u)" == 0 ]]
+        rm "$hoge"
+    done
+
+    rm -fr "$root"
+}
 
 run_testcases
diff -pruN 257.7-1/test/units/TEST-13-NSPAWN.nss-mymachines.sh 257.9-0ubuntu2/test/units/TEST-13-NSPAWN.nss-mymachines.sh
--- 257.7-1/test/units/TEST-13-NSPAWN.nss-mymachines.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-13-NSPAWN.nss-mymachines.sh	2025-09-03 18:35:40.000000000 +0000
@@ -11,7 +11,7 @@ at_exit() {
     set +e
 
     machinectl kill --signal=KILL nss-mymachines-{noip,singleip,manyips}
-    mountpoint -q /var/lib/machines && timeout 10 sh -c "until umount /var/lib/machines; do sleep .5; done"
+    mountpoint -q /var/lib/machines && timeout 30 sh -c "until umount /var/lib/machines; do sleep .5; done"
     rm -f /run/systemd/nspawn/*.nspawn
 }
 
diff -pruN 257.7-1/test/units/TEST-15-DROPIN.sh 257.9-0ubuntu2/test/units/TEST-15-DROPIN.sh
--- 257.7-1/test/units/TEST-15-DROPIN.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-15-DROPIN.sh	2025-09-03 18:35:40.000000000 +0000
@@ -335,7 +335,7 @@ testcase_transient_slice_dropins() {
     # FIXME: implement reloading of individual units.
     #
     # The settings here are loaded twice. For most settings it doesn't matter,
-    # but Documentation is not deduplicated, so we current get repeated entried
+    # but Documentation is not deduplicated, so we currently get repeated entries
     # which is a bug.
 
     mkdir -p /etc/systemd/system/slice.d
diff -pruN 257.7-1/test/units/TEST-17-UDEV.06.sh 257.9-0ubuntu2/test/units/TEST-17-UDEV.06.sh
--- 257.7-1/test/units/TEST-17-UDEV.06.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-17-UDEV.06.sh	2025-09-03 18:35:40.000000000 +0000
@@ -19,7 +19,7 @@ function check() {
     for _ in {1..2}; do
         systemctl restart systemd-udevd.service
         udevadm control --ping
-        udevadm settle
+        udevadm settle --timeout=30
         check_validity
 
         for _ in {1..2}; do
diff -pruN 257.7-1/test/units/TEST-17-UDEV.10.sh 257.9-0ubuntu2/test/units/TEST-17-UDEV.10.sh
--- 257.7-1/test/units/TEST-17-UDEV.10.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-17-UDEV.10.sh	2025-09-03 18:35:40.000000000 +0000
@@ -28,6 +28,9 @@ blk="$(mktemp)"
 dd if=/dev/zero of="$blk" bs=1M count=1
 loopdev="$(losetup --show -f "$blk")"
 
+# Wait for devices created in the above being processed.
+udevadm settle --timeout=30
+
 udevadm -h
 
 udevadm control -e
@@ -155,8 +158,8 @@ udevadm test-builtin uaccess /dev/null
 # systemd-hwdb update is extremely slow when combined with sanitizers and run
 # in a VM without acceleration, so let's just skip the one particular test
 # if we detect this combination
-if ! [[ -v ASAN_OPTIONS && "$(systemd-detect-virt -v)" == "qemu" ]]; then
-    modprobe scsi_debug
+# scsi_debug is not available in all architectures/kernels combinations
+if ! [[ -v ASAN_OPTIONS && "$(systemd-detect-virt -v)" == "qemu" ]] && modprobe scsi_debug; then
     scsidev=$(readlink -f /sys/bus/pseudo/drivers/scsi_debug/adapter*/host*/target*/[0-9]*)
     mkdir -p /etc/udev/hwdb.d
     cat >/etc/udev/hwdb.d/99-test.hwdb <<EOF
diff -pruN 257.7-1/test/units/TEST-17-UDEV.11.sh 257.9-0ubuntu2/test/units/TEST-17-UDEV.11.sh
--- 257.7-1/test/units/TEST-17-UDEV.11.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-17-UDEV.11.sh	2025-09-03 18:35:40.000000000 +0000
@@ -76,7 +76,6 @@ assert_1_impl() {
     udevadm verify "$@" >"${out}" 2>"${err}"
     rc=$?
     set -e
-    assert_eq "$rc" 1
 
     if [ -f "${exp}" ]; then
         diff -u "${exp}" "${err}"
@@ -87,6 +86,7 @@ assert_1_impl() {
     elif [ -f "${rules}" ]; then
         diff -u "${workdir}/default_output_1_fail" "${out}"
     fi
+    assert_eq "$rc" 1
 }
 
 assert_1() {
diff -pruN 257.7-1/test/units/TEST-17-UDEV.SYSTEMD_WANTS-escape.sh 257.9-0ubuntu2/test/units/TEST-17-UDEV.SYSTEMD_WANTS-escape.sh
--- 257.7-1/test/units/TEST-17-UDEV.SYSTEMD_WANTS-escape.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-17-UDEV.SYSTEMD_WANTS-escape.sh	2025-09-03 18:35:40.000000000 +0000
@@ -27,7 +27,7 @@ at_exit() {
 
 trap at_exit EXIT
 
-udevadm settle --timeout 30
+udevadm settle --timeout=30
 
 mkdir -p /run/systemd/system/
 cat >/run/systemd/system/test@.service <<EOF
@@ -53,7 +53,7 @@ ESCAPED=$(systemd-escape -p "${SYSPATH}"
 SHELL_ESCAPED=$(printf '%q' "${ESCAPED}")
 assert_eq "$(systemd-escape -u -p "${ESCAPED}")" "${SYSPATH}"
 
-udevadm wait --timeout 30 --settle "/sys/class/net/${IFNAME}"
+udevadm wait --timeout=30 --settle "/sys/class/net/${IFNAME}"
 assert_eq "$(udevadm info --query=property --property SYSTEMD_WANTS --value "/sys/class/net/${IFNAME}")" "test@${ESCAPED}.service"
 # The value shown by systemctl is doubly escaped and quoted.
 assert_eq "$(systemctl show -p Wants --value "${ESCAPED}.device")" "\"test@${SHELL_ESCAPED}.service\""
diff -pruN 257.7-1/test/units/TEST-17-UDEV.database.sh 257.9-0ubuntu2/test/units/TEST-17-UDEV.database.sh
--- 257.7-1/test/units/TEST-17-UDEV.database.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-17-UDEV.database.sh	2025-09-03 18:35:40.000000000 +0000
@@ -8,12 +8,12 @@ udevadm control --log-level=debug
 IFNAME=test-udev-aaa
 ip link add "$IFNAME" type dummy
 IFINDEX=$(ip -json link show "$IFNAME" | jq '.[].ifindex')
-udevadm wait --timeout 10 "/sys/class/net/$IFNAME"
+udevadm wait --timeout=10 "/sys/class/net/$IFNAME"
 # Check if the database file is created.
 [[ -e "/run/udev/data/n$IFINDEX" ]]
 
 ip link del "$IFNAME"
-udevadm wait --timeout 10 --removed --settle "/sys/class/net/$IFNAME"
+udevadm wait --timeout=10 --removed --settle "/sys/class/net/$IFNAME"
 # CHeck if the database file is removed.
 [[ ! -e "/run/udev/data/n$IFINDEX" ]]
 
diff -pruN 257.7-1/test/units/TEST-17-UDEV.device_is_processing.sh 257.9-0ubuntu2/test/units/TEST-17-UDEV.device_is_processing.sh
--- 257.7-1/test/units/TEST-17-UDEV.device_is_processing.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-17-UDEV.device_is_processing.sh	2025-09-03 18:35:40.000000000 +0000
@@ -24,7 +24,7 @@ at_exit() {
 
 trap at_exit EXIT
 
-udevadm settle
+udevadm settle --timeout=30
 
 mkdir -p /run/udev/udev.conf.d/
 cat >/run/udev/udev.conf.d/timeout.conf <<EOF
diff -pruN 257.7-1/test/units/TEST-17-UDEV.diskseq.sh 257.9-0ubuntu2/test/units/TEST-17-UDEV.diskseq.sh
--- 257.7-1/test/units/TEST-17-UDEV.diskseq.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-17-UDEV.diskseq.sh	2025-09-03 18:35:40.000000000 +0000
@@ -42,7 +42,7 @@ MountImages=$TMPDIR/foo.raw:/var
 EOF
 systemctl daemon-reload
 
-udevadm settle
+udevadm settle --timeout=30
 
 # Check if no lock file exists, if the lock directory exists.
 if [[ -d /run/udev/links.lock/ ]]; then
@@ -62,7 +62,7 @@ done
 
 systemctl stop test-diskseq.service || :
 
-udevadm settle
+udevadm settle --timeout=30
 
 # Check if the lock directory exists, but no lock file exists in it.
 [[ -d /run/udev/links.lock/ ]]
diff -pruN 257.7-1/test/units/TEST-21-DFUZZER.sh 257.9-0ubuntu2/test/units/TEST-21-DFUZZER.sh
--- 257.7-1/test/units/TEST-21-DFUZZER.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-21-DFUZZER.sh	2025-09-03 18:35:40.000000000 +0000
@@ -43,61 +43,135 @@ trap at_exit EXIT
 
 systemctl log-level info
 
-# FIXME: systemd-run doesn't play well with daemon-reexec
-# See: https://github.com/systemd/systemd/issues/27204
-add_suppression "org.freedesktop.systemd1" "org.freedesktop.systemd1.Manager:Reexecute FIXME"
-
-add_suppression "org.freedesktop.systemd1" "org.freedesktop.systemd1.Manager:SoftReboot destructive"
-add_suppression "org.freedesktop.login1" "Sleep destructive"
-
 # Skip calling start and stop methods on unit objects, as doing that is not only time consuming, but it also
 # starts/stops units that interfere with the machine state. The actual code paths should be covered (to some
 # degree) by the respective method counterparts on the manager object.
-for method in Start Stop Restart ReloadOrRestart ReloadOrTryRestart Kill; do
+MANAGER_METHOD_FILTER=(
+    StartUnit
+    StartUnitWithFlags
+    StartUnitReplace
+    StopUnit
+    RestartUnit
+    TryRestartUnit
+    ReloadOrRestartUnit
+    ReloadOrTryRestartUnit
+    KillUnit
+    QueueSignalUnit
+    FreezeUnit
+    AttachProcessesToUnit
+    RemoveSubgroupFromUnit
+    AbandonScope
+    CancelJob
+    Exit
+    Reboot
+    SoftReboot
+    PowerOff
+    Halt
+    KExec
+    SwitchRoot
+    EnqueueMarkedJobs
+)
+UNIT_METHOD_FILTER=(
+    Start
+    Stop
+    Restart
+    TryRestart
+    ReloadOrRestart
+    ReloadOrTryRestart
+    Kill
+    QueueSignal
+    Freeze
+)
+SCOPE_METHOD_FILTER=(
+    Abandon
+)
+JOB_METHOD_FILTER=(
+    Cancel
+)
+LOGIN_METHOD_FILTER=(
+    FlushDevices # This triggers all devices and makes the system super heavy
+    PowerOff
+    PowerOffWithFlags
+    Reboot
+    RebootWithFlags
+    Halt
+    HaltWithFlags
+    Suspend
+    SuspendWithFlags
+    Hibernate
+    HibernateWithFlags
+    HybridSleep
+    HybridSleepWithFlags
+    SuspendThenHibernate
+    SuspendThenHibernateWithFlags
+    ScheduleShutdown
+)
+for method in "${MANAGER_METHOD_FILTER[@]}"; do
+    add_suppression "org.freedesktop.systemd1" "org.freedesktop.systemd1.Manager:$method"
+done
+for method in "${UNIT_METHOD_FILTER[@]}"; do
     add_suppression "org.freedesktop.systemd1" "org.freedesktop.systemd1.Unit:$method"
 done
+for method in "${SCOPE_METHOD_FILTER[@]}"; do
+    add_suppression "org.freedesktop.systemd1" "org.freedesktop.systemd1.Scope:$method"
+done
+for method in "${JOB_METHOD_FILTER[@]}"; do
+    add_suppression "org.freedesktop.systemd1" "org.freedesktop.systemd1.Job:$method"
+done
+for method in "${LOGIN_METHOD_FILTER[@]}"; do
+    add_suppression "org.freedesktop.login1" "org.freedesktop.login1.Manager:$method"
+done
 
 cat /etc/dfuzzer.conf
 
 # TODO
 #   * check for possibly newly introduced buses?
-BUS_LIST=(
-    org.freedesktop.home1
-    org.freedesktop.hostname1
-    org.freedesktop.import1
-    org.freedesktop.locale1
-    org.freedesktop.login1
-    org.freedesktop.machine1
-    org.freedesktop.portable1
-    org.freedesktop.resolve1
-    org.freedesktop.systemd1
-    org.freedesktop.timedate1
+NAME_LIST=(
+    home
+    hostname
+    import
+    locale
+    login
+    machine
+    portable
+    resolve
+    timedate
 )
 
-# systemd-oomd requires PSI
-if tail -n +1 /proc/pressure/{cpu,io,memory}; then
-    BUS_LIST+=(
-        org.freedesktop.oom1
-    )
-fi
-
 # Some services require specific conditions:
+#   - systemd-oomd requires PSI
 #   - systemd-timesyncd can't run in a container
 #   - systemd-networkd can run in a container if it has CAP_NET_ADMIN capability
+if tail -n +1 /proc/pressure/{cpu,io,memory}; then
+    NAME_LIST+=( oom )
+fi
+
 if ! systemd-detect-virt --container; then
-    BUS_LIST+=(
-        org.freedesktop.network1
-        org.freedesktop.timesync1
-    )
-elif busctl introspect org.freedesktop.network1 / &>/dev/null; then
-    BUS_LIST+=(
-        org.freedesktop.network1
-    )
+    NAME_LIST+=( timesync )
 fi
 
-SESSION_BUS_LIST=(
-    org.freedesktop.systemd1
-)
+if ip link add dummy-fuzz type dummy; then
+    # if a dummy interface is created, then let's also setup it for resolved
+    ip link set dummy-fuzz up
+    ip address add 192.0.2.1/24 dev dummy-fuzz
+
+    # When we can create a dummy interface, we definitely have CAP_NET_ADMIN
+    NAME_LIST+=( network )
+
+    # Create unit files for another dummy interface for networkd
+    mkdir -p /run/systemd/network
+    cat >/run/systemd/network/10-dummy-fuzz2.netdev <<EOF
+[NetDev]
+Kind=dummy
+Name=dummy-fuzz2
+EOF
+    cat >/run/systemd/network/10-dummy-fuzz2.network <<EOF
+[Match]
+Name=dummy-fuzz2
+[Network]
+Address=192.0.2.2/24
+EOF
+fi
 
 # Maximum payload size generated by dfuzzer (in bytes) - default: 50K
 PAYLOAD_MAX=50000
@@ -107,33 +181,64 @@ if [[ -v ASAN_OPTIONS || -v UBSAN_OPTION
     PAYLOAD_MAX=10000 # 10K
 fi
 
+# Disable debugging logs from systemd-homed, systemd-nsresourced, and systemd-userdbd.
+# Otherwise, journal is filled with the debugging logs by them.
+systemctl service-log-level systemd-homed.service info
+for service in systemd-nsresourced.service systemd-userdbd.service; do
+    mkdir -p "/run/systemd/system/${service}.d"
+    cat >"/run/systemd/system/${service}.d/10-disable-debug.conf" <<EOF
+[Service]
+Environment=SYSTEMD_LOG_LEVEL=info
+EOF
+    systemctl daemon-reload
+    systemctl restart "$service"
+done
+
+test_systemd() {
+    systemd-run "$@" --pipe --wait \
+                -- dfuzzer -b "$PAYLOAD_MAX" -n org.freedesktop.systemd1
+
+    # Let's reload the systemd user daemon to test (de)serialization as well
+    systemctl "$@" daemon-reload
+    # FIXME: explicitly trigger reexecute until systemd/systemd#27204 is resolved
+    systemctl "$@" daemon-reexec
+}
+
+# Let's first test the session bus before the system one, as it may be in a
+# spurious state after fuzzing the system bus or login bus.
+echo "Bus: org.freedesktop.systemd1 (session)"
+test_systemd --machine 'testuser@.host' --user
+
 # Overmount /var/lib/machines with a size-limited tmpfs, as fuzzing
 # the org.freedesktop.machine1 stuff makes quite a mess
 mount -t tmpfs -o size=50M tmpfs /var/lib/machines
 
-# Fuzz both the system and the session buses (where applicable)
-for bus in "${BUS_LIST[@]}"; do
-    echo "Bus: $bus (system)"
+# Next, test the system service buses, as the services may be in a spurious
+# state after fuzzing the system service manager bus.
+for name in "${NAME_LIST[@]}"; do
+    bus="org.freedesktop.${name}1"
+    service="systemd-${name}d.service"
+
+    echo "Bus: $bus"
+
+    # Unmask and enable the service.
+    systemctl unmask "$service"
+    systemctl enable "$service"
+
+    # enable debugging logs
+    systemctl service-log-level "$service" debug || :
+
     systemd-run --pipe --wait \
                 -- dfuzzer -b "$PAYLOAD_MAX" -n "$bus"
 
-    # Let's reload the systemd daemon to test (de)serialization as well
-    systemctl daemon-reload
-    # FIXME: explicitly trigger reexecute until systemd/systemd#27204 is resolved
-    systemctl daemon-reexec
+    # disable debugging logs
+    systemctl service-log-level "$service" info || :
 done
 
 umount /var/lib/machines
 
-for bus in "${SESSION_BUS_LIST[@]}"; do
-    echo "Bus: $bus (session)"
-    systemd-run --machine 'testuser@.host' --user --pipe --wait \
-                -- dfuzzer -b "$PAYLOAD_MAX" -n "$bus"
-
-    # Let's reload the systemd user daemon to test (de)serialization as well
-    systemctl --machine 'testuser@.host' --user daemon-reload
-    # FIXME: explicitly trigger reexecute until systemd/systemd#27204 is resolved
-    systemctl --machine 'testuser@.host' --user daemon-reexec
-done
+# Finally, test the system bus.
+echo "Bus: org.freedesktop.systemd1 (system)"
+test_systemd
 
 touch /testok
diff -pruN 257.7-1/test/units/TEST-23-UNIT-FILE.Upholds.sh 257.9-0ubuntu2/test/units/TEST-23-UNIT-FILE.Upholds.sh
--- 257.7-1/test/units/TEST-23-UNIT-FILE.Upholds.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-23-UNIT-FILE.Upholds.sh	2025-09-03 18:35:40.000000000 +0000
@@ -24,9 +24,13 @@ trap -p SIGUSR1
 
 systemctl start TEST-23-UNIT-FILE-success.service
 
-while [ "$sigusr1" -eq 0 ] ; do
+for _ in {1..120}; do
     sleep .5
+    if [[ "$sigusr1" == 1 ]]; then
+       break
+    fi
 done
+[[ "$sigusr1" == 1 ]]
 
 systemctl stop TEST-23-UNIT-FILE-uphold.service
 
@@ -46,17 +50,13 @@ rm -f /tmp/TEST-23-UNIT-FILE-retry-fail
 systemctl start TEST-23-UNIT-FILE-retry-uphold.service
 systemctl is-active TEST-23-UNIT-FILE-upheldby-install.service
 
-until systemctl is-failed TEST-23-UNIT-FILE-retry-fail.service ; do
-    sleep .5
-done
+timeout 60 bash -c 'until systemctl is-failed TEST-23-UNIT-FILE-retry-fail.service; do sleep .5; done'
 
 (! systemctl is-active TEST-23-UNIT-FILE-retry-upheld.service)
 
 touch /tmp/TEST-23-UNIT-FILE-retry-fail
 
-until systemctl is-active TEST-23-UNIT-FILE-retry-upheld.service ; do
-    sleep .5
-done
+timeout 60 bash -c 'until systemctl is-active TEST-23-UNIT-FILE-retry-upheld.service; do sleep .5; done'
 
 systemctl stop TEST-23-UNIT-FILE-retry-uphold.service TEST-23-UNIT-FILE-retry-fail.service TEST-23-UNIT-FILE-retry-upheld.service
 
@@ -74,10 +74,13 @@ trap sigusr2=1 SIGUSR2
 
 systemctl start TEST-23-UNIT-FILE-prop-stop-one.service
 
-while [ "$sigusr2" -eq 0 ] ; do
+for _ in {1..120}; do
     sleep .5
+    if [[ "$sigusr2" == 1 ]]; then
+       break
+    fi
 done
-
+[[ "$sigusr2" == 1 ]]
 
 # Idea is this:
 #    1. we start TEST-23-UNIT-FILE-binds-to.service
@@ -92,8 +95,12 @@ trap sigrtmin1=1 SIGRTMIN+1
 
 systemctl start TEST-23-UNIT-FILE-binds-to.service
 
-while [ "$sigrtmin1" -eq 0 ] ; do
+for _ in {1..120}; do
     sleep .5
+    if [[ "$sigrtmin1" == 1 ]]; then
+       break
+    fi
 done
+[[ "$sigrtmin1" == 1 ]]
 
 systemd-analyze log-level info
diff -pruN 257.7-1/test/units/TEST-23-UNIT-FILE.verify-unit-files.sh 257.9-0ubuntu2/test/units/TEST-23-UNIT-FILE.verify-unit-files.sh
--- 257.7-1/test/units/TEST-23-UNIT-FILE.verify-unit-files.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-23-UNIT-FILE.verify-unit-files.sh	2025-09-03 18:35:40.000000000 +0000
@@ -41,5 +41,12 @@ for unit_file in "${UNIT_FILES[@]}"; do
         continue
     fi
 
+    # Skip masked unit files
+    resolved=$(readlink -f "$unit_file")
+    if [[ "$resolved" == "/dev/null" || "$(systemctl is-enabled "${resolved##*/}" 2>/dev/null || :)" == "masked" ]]; then
+        echo "$unit_file is masked, skipping"
+        continue
+    fi
+
     systemd-analyze --recursive-errors=no --man=no verify "$unit_file"
 done
diff -pruN 257.7-1/test/units/TEST-24-CRYPTSETUP.sh 257.9-0ubuntu2/test/units/TEST-24-CRYPTSETUP.sh
--- 257.7-1/test/units/TEST-24-CRYPTSETUP.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-24-CRYPTSETUP.sh	2025-09-03 18:35:40.000000000 +0000
@@ -143,18 +143,18 @@ cryptsetup luksAddKey --batch-mode \
 STORE_IMAGE="$WORKDIR/store.img"
 truncate -s 64M "$STORE_IMAGE"
 STORE_LOOP="$(losetup --show --find --partscan "$STORE_IMAGE")"
-udevadm lock --device "$STORE_LOOP" sfdisk "$STORE_LOOP" <<EOF
+udevadm lock --timeout=30 --device "$STORE_LOOP" sfdisk "$STORE_LOOP" <<EOF
 label: gpt
 type=0FC63DAF-8483-4772-8E79-3D69D8477DE4 name=header_store size=32M
 type=0FC63DAF-8483-4772-8E79-3D69D8477DE4 name=keyfile_store
 EOF
 udevadm settle --timeout=60
 mkdir -p /mnt
-udevadm lock --device "/dev/disk/by-partlabel/header_store" mkfs.ext4 -L header_store "/dev/disk/by-partlabel/header_store"
+udevadm lock --timeout=30 --device "/dev/disk/by-partlabel/header_store" mkfs.ext4 -L header_store "/dev/disk/by-partlabel/header_store"
 mount "/dev/disk/by-partlabel/header_store" /mnt
 cp "$IMAGE_DETACHED_HEADER" /mnt/header
 umount /mnt
-udevadm lock --device "/dev/disk/by-partlabel/keyfile_store" mkfs.ext4 -L keyfile_store "/dev/disk/by-partlabel/keyfile_store"
+udevadm lock --timeout=30 --device "/dev/disk/by-partlabel/keyfile_store" mkfs.ext4 -L keyfile_store "/dev/disk/by-partlabel/keyfile_store"
 mount "/dev/disk/by-partlabel/keyfile_store" /mnt
 cp "$IMAGE_DETACHED_KEYFILE2" /mnt/keyfile
 umount /mnt
diff -pruN 257.7-1/test/units/TEST-35-LOGIN.sh 257.9-0ubuntu2/test/units/TEST-35-LOGIN.sh
--- 257.7-1/test/units/TEST-35-LOGIN.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-35-LOGIN.sh	2025-09-03 18:35:40.000000000 +0000
@@ -207,7 +207,7 @@ EOF
     input_name=${input_name%/device/name}
     lid_dev=/dev/${input_name#/sys/class/}
     udevadm info --wait-for-initialization=10s "$lid_dev"
-    udevadm settle
+    udevadm settle --timeout=30
 
     # close lid
     evemu-event "$lid_dev" --sync --type 5 --code 0 --value 1
@@ -298,7 +298,7 @@ teardown_session() (
 
     rm -f /run/udev/rules.d/70-logindtest-scsi_debug-user.rules
     udevadm control --reload
-    rmmod scsi_debug
+    rmmod scsi_debug || true
 
     return 0
 )
@@ -446,14 +446,18 @@ EOF
 
     # coldplug: logind started with existing device
     systemctl stop systemd-logind.service
-    modprobe scsi_debug
+    if ! modprobe scsi_debug; then
+        echo "scsi_debug module not available, skipping test ${FUNCNAME[0]}."
+        systemctl start systemd-logind.service
+        return
+    fi
     timeout 30 bash -c 'until ls /sys/bus/pseudo/drivers/scsi_debug/adapter*/host*/target*/*:*/block 2>/dev/null; do sleep 1; done'
     dev=/dev/$(ls /sys/bus/pseudo/drivers/scsi_debug/adapter*/host*/target*/*:*/block 2>/dev/null)
     if [[ ! -b "$dev" ]]; then
         echo "cannot find suitable scsi block device" >&2
         exit 1
     fi
-    udevadm settle
+    udevadm settle --timeout=30
     udevadm info "$dev"
 
     # trigger logind and activate session
@@ -472,7 +476,7 @@ EOF
         echo "cannot find suitable scsi block device" >&2
         exit 1
     fi
-    udevadm settle
+    udevadm settle --timeout=30
 
     # check ACL
     sleep 1
diff -pruN 257.7-1/test/units/TEST-38-FREEZER.sh 257.9-0ubuntu2/test/units/TEST-38-FREEZER.sh
--- 257.7-1/test/units/TEST-38-FREEZER.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-38-FREEZER.sh	2025-09-03 18:35:40.000000000 +0000
@@ -69,42 +69,18 @@ dbus_thaw_unit() {
            "$1"
 }
 
-dbus_can_freeze() {
-    local name object_path suffix
-
-    suffix="${1##*.}"
-    name="${1%".$suffix"}"
-    object_path="/org/freedesktop/systemd1/unit/${name//-/_2d}_2e${suffix}"
-
-    busctl get-property \
-           org.freedesktop.systemd1 \
-           "${object_path}" \
-           org.freedesktop.systemd1.Unit \
-           CanFreeze
-}
-
 check_freezer_state() {
-    local name object_path suffix
+    local name state expected
 
-    suffix="${1##*.}"
-    name="${1%".$suffix"}"
-    object_path="/org/freedesktop/systemd1/unit/${name//-/_2d}_2e${suffix}"
-
-    for _ in {0..10}; do
-        state=$(busctl get-property \
-                       org.freedesktop.systemd1 \
-                       "${object_path}" \
-                       org.freedesktop.systemd1.Unit \
-                       FreezerState | cut -d " " -f2 | tr -d '"')
-
-        # Ignore the intermediate freezing & thawing states in case we check
-        # the unit state too quickly
-        [[ "$state" =~ ^(freezing|thawing) ]] || break
-        sleep .5
-    done
+    name="${1:?}"
+    expected="${2:?}"
 
-    [ "$state" = "$2" ] || {
-        echo "error: unexpected freezer state, expected: $2, actual: $state" >&2
+    # Ignore the intermediate freezing & thawing states in case we check the unit state too quickly.
+    timeout 10 bash -c "while [[ \"\$(systemctl show \"$name\" --property FreezerState --value)\" =~ (freezing|thawing) ]]; do sleep .5; done"
+
+    state="$(systemctl show "$name" --property FreezerState --value)"
+    [[ "$state" = "$expected" ]] || {
+        echo "error: unexpected freezer state, expected: $expected, actual: $state" >&2
         exit 1
     }
 }
@@ -146,9 +122,8 @@ testcase_dbus_api() {
     check_cgroup_state "$unit" 0
     echo "[ OK ]"
 
-    echo -n "  - CanFreeze(): "
-    output=$(dbus_can_freeze "${unit}")
-    [ "$output" = "b true" ]
+    echo -n "  - CanFreeze: "
+    [[ "$(systemctl show "${unit}" --property=CanFreeze --value)" == 'yes' ]]
     echo "[ OK ]"
 
     echo
@@ -360,6 +335,50 @@ testcase_preserve_state() {
     echo
 }
 
+testcase_watchdog() {
+    local unit="wd.service"
+
+    systemd-run --collect --unit "$unit" --property WatchdogSec=4s --property Type=notify \
+        /bin/bash -c 'systemd-notify --ready; while true; do systemd-notify WATCHDOG=1; sleep 1; done'
+
+    systemctl freeze "$unit"
+    check_freezer_state "$unit" "frozen"
+    sleep 6
+    check_freezer_state "$unit" "frozen"
+
+    systemctl thaw "$unit"
+    check_freezer_state "$unit" "running"
+    sleep 6
+    check_freezer_state "$unit" "running"
+    systemctl is-active "$unit"
+
+    systemctl freeze "$unit"
+    check_freezer_state "$unit" "frozen"
+    systemctl daemon-reload
+    sleep 6
+    check_freezer_state "$unit" "frozen"
+
+    systemctl thaw "$unit"
+    check_freezer_state "$unit" "running"
+    sleep 6
+    check_freezer_state "$unit" "running"
+    systemctl is-active "$unit"
+
+    systemctl freeze "$unit"
+    check_freezer_state "$unit" "frozen"
+    systemctl daemon-reexec
+    sleep 6
+    check_freezer_state "$unit" "frozen"
+
+    systemctl thaw "$unit"
+    check_freezer_state "$unit" "running"
+    sleep 6
+    check_freezer_state "$unit" "running"
+    systemctl is-active "$unit"
+
+    systemctl stop "$unit"
+}
+
 if [[ -e /sys/fs/cgroup/system.slice/cgroup.freeze ]]; then
     start_test_service
     run_testcases
diff -pruN 257.7-1/test/units/TEST-45-TIMEDATE.sh 257.9-0ubuntu2/test/units/TEST-45-TIMEDATE.sh
--- 257.7-1/test/units/TEST-45-TIMEDATE.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-45-TIMEDATE.sh	2025-09-03 18:35:40.000000000 +0000
@@ -224,6 +224,9 @@ assert_timedated_signal() {
 
     for _ in {0..9}; do
         if journalctl "${args[@]}" --grep .; then
+            # Make the found entry in the archived journal, to avoid the following failure:
+            # Journal file /run/log/journal/.../system.journal is truncated, ignoring file.
+            journalctl --rotate
             [[ "$(journalctl "${args[@]}" -o cat | jq -r '.payload.data[1].NTP.data')" == "$value" ]];
             return 0
         fi
@@ -304,6 +307,9 @@ assert_timesyncd_signal() {
 
     for _ in {0..9}; do
         if journalctl "${args[@]}" --grep .; then
+            # Make the found entry in the archived journal, to avoid the following failure:
+            # Journal file /run/log/journal/.../system.journal is truncated, ignoring file.
+            journalctl --rotate
             [[ "$(journalctl "${args[@]}" -o cat | jq -r ".payload.data[1].$property.data | join(\" \")")" == "$value" ]];
             return 0
         fi
diff -pruN 257.7-1/test/units/TEST-46-HOMED.sh 257.9-0ubuntu2/test/units/TEST-46-HOMED.sh
--- 257.7-1/test/units/TEST-46-HOMED.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-46-HOMED.sh	2025-09-03 18:35:40.000000000 +0000
@@ -4,9 +4,9 @@ set -eux
 set -o pipefail
 
 # Check if homectl is installed, and if it isn't bail out early instead of failing
-if ! test -x /usr/bin/homectl ; then
-        echo "no homed" >/skipped
-        exit 77
+if ! command -v homectl >/dev/null; then
+    echo "no homed" >/skipped
+    exit 77
 fi
 
 inspect() {
@@ -27,10 +27,7 @@ inspect() {
 }
 
 wait_for_state() {
-    for i in {1..10}; do
-        (( i > 1 )) && sleep 0.5
-        homectl inspect "$1" | grep -qF "State: $2" && break
-    done
+    timeout 2m bash -c "until homectl inspect '${1:?}' | grep -qF 'State: $2'; do sleep 2; done"
 }
 
 FSTYPE="$(stat --file-system --format "%T" /)"
@@ -109,32 +106,32 @@ inspect test-user
 # Do some keyring tests, but only on real kernels, since keyring access inside of containers will fail
 # (See: https://github.com/systemd/systemd/issues/17606)
 if ! systemd-detect-virt -cq ; then
-        PASSWORD=xEhErW0ndafV4s homectl activate test-user
-        inspect test-user
+    PASSWORD=xEhErW0ndafV4s homectl activate test-user
+    inspect test-user
 
-        # Key should now be in the keyring
-        homectl update test-user --real-name "Keyring Test"
-        inspect test-user
+    # Key should now be in the keyring
+    homectl update test-user --real-name "Keyring Test"
+    inspect test-user
 
-        # These commands shouldn't use the keyring
-        (! timeout 5s homectl authenticate test-user )
-        (! NEWPASSWORD="foobar" timeout 5s homectl passwd test-user )
+    # These commands shouldn't use the keyring
+    (! timeout 5s homectl authenticate test-user )
+    (! NEWPASSWORD="foobar" timeout 5s homectl passwd test-user )
 
-        homectl lock test-user
-        inspect test-user
+    homectl lock test-user
+    inspect test-user
 
-        # Key should be gone from keyring
-        (! timeout 5s homectl update test-user --real-name "Keyring Test 2" )
+    # Key should be gone from keyring
+    (! timeout 5s homectl update test-user --real-name "Keyring Test 2" )
 
-        PASSWORD=xEhErW0ndafV4s homectl unlock test-user
-        inspect test-user
+    PASSWORD=xEhErW0ndafV4s homectl unlock test-user
+    inspect test-user
 
-        # Key should have been re-instantiated into the keyring
-        homectl update test-user --real-name "Keyring Test 3"
-        inspect test-user
+    # Key should have been re-instantiated into the keyring
+    homectl update test-user --real-name "Keyring Test 3"
+    inspect test-user
 
-        homectl deactivate test-user
-        inspect test-user
+    homectl deactivate test-user
+    inspect test-user
 fi
 
 # Do some resize tests, but only if we run on real kernels and are on btrfs, as quota inside of containers
@@ -228,13 +225,13 @@ homectl remove test-user
 # blob directory tests
 # See docs/USER_RECORD_BLOB_DIRS.md
 checkblob() {
-        test -f "/var/cache/systemd/home/blob-user/$1"
-        stat -c "%u %#a" "/var/cache/systemd/home/blob-user/$1" | grep "^0 0644"
-        test -f "/home/blob-user/.identity-blob/$1"
-        stat -c "%u %#a" "/home/blob-user/.identity-blob/$1" | grep "^12345 0644"
+    test -f "/var/cache/systemd/home/blob-user/$1"
+    stat -c "%u %#a" "/var/cache/systemd/home/blob-user/$1" | grep "^0 0644"
+    test -f "/home/blob-user/.identity-blob/$1"
+    stat -c "%u %#a" "/home/blob-user/.identity-blob/$1" | grep "^12345 0644"
 
-        diff "/var/cache/systemd/home/blob-user/$1" "$2"
-        diff "/var/cache/systemd/home/blob-user/$1" "/home/blob-user/.identity-blob/$1"
+    diff "/var/cache/systemd/home/blob-user/$1" "$2"
+    diff "/var/cache/systemd/home/blob-user/$1" "/home/blob-user/.identity-blob/$1"
 }
 
 mkdir /tmp/blob1 /tmp/blob2
@@ -538,6 +535,7 @@ if command -v ssh &>/dev/null && command
         systemctl is-active -q mysshserver.socket && systemctl stop mysshserver.socket
         rm -f /tmp/homed.id_ecdsa /run/systemd/system/mysshserver{@.service,.socket}
         systemctl daemon-reload
+        wait_for_state homedsshtest inactive
         homectl remove homedsshtest
         for dir in /etc /usr/lib; do
             if [[ -f "$dir/pam.d/sshd.bak" ]]; then
@@ -626,7 +624,8 @@ EOF
         -o "SetEnv PASSWORD=hunter4711" -o "StrictHostKeyChecking no" \
         homedsshtest@localhost env
 
-    wait_for_state homedsshtest inactive
+    trap - EXIT
+    at_exit
 fi
 
 systemd-analyze log-level info
diff -pruN 257.7-1/test/units/TEST-50-DISSECT.dissect.sh 257.9-0ubuntu2/test/units/TEST-50-DISSECT.dissect.sh
--- 257.7-1/test/units/TEST-50-DISSECT.dissect.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-50-DISSECT.dissect.sh	2025-09-03 18:35:40.000000000 +0000
@@ -9,6 +9,18 @@ set -o pipefail
 # shellcheck source=test/units/util.sh
 . "$(dirname "$0")"/util.sh
 
+# Requires kernel built with certain kconfigs, as listed in README:
+# https://oracle.github.io/kconfigs/?config=UTS_RELEASE&config=DM_VERITY_VERIFY_ROOTHASH_SIG&config=DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING&config=DM_VERITY_VERIFY_ROOTHASH_SIG_PLATFORM_KEYRING&config=IMA_ARCH_POLICY&config=INTEGRITY_MACHINE_KEYRING
+if grep -q "$(openssl x509 -noout -subject -in /usr/share/mkosi.crt | sed 's/^.*CN=//')" /proc/keys && \
+        ( . /etc/os-release; [ "$ID" != "centos" ] || systemd-analyze compare-versions "$VERSION_ID" ge 10 ) && \
+        ( . /etc/os-release; [ "$ID" != "debian" ] || systemd-analyze compare-versions "$VERSION_ID" ge 13 ) && \
+        ( . /etc/os-release; [ "$ID" != "ubuntu" ] || systemd-analyze compare-versions "$VERSION_ID" ge 24.04 ) && \
+        systemd-analyze compare-versions "$(cryptsetup --version | sed 's/^cryptsetup \([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/')" ge 2.3.0; then
+    verity_sig_supported=1
+else
+    verity_sig_supported=0
+fi
+
 systemd-dissect --json=short "$MINIMAL_IMAGE.raw" | \
     grep -q -F '{"rw":"ro","designator":"root","partition_uuid":null,"partition_label":null,"fstype":"squashfs","architecture":null,"verity":"external"'
 systemd-dissect "$MINIMAL_IMAGE.raw" | grep -q -F "MARKER=1"
@@ -71,6 +83,10 @@ if [[ "$verity_count" -lt 1 ]]; then
     echo "Verity device $MINIMAL_IMAGE.raw not found in /dev/mapper/"
     exit 1
 fi
+# Ensure the kernel is verifying the signature if the mkosi key is in the keyring
+if [ "$verity_sig_supported" -eq 1 ]; then
+    veritysetup status "$(cat "$MINIMAL_IMAGE.roothash")-verity" | grep -q "verified (with signature)"
+fi
 systemd-dissect --umount "$IMAGE_DIR/mount"
 systemd-dissect --umount "$IMAGE_DIR/mount2"
 
diff -pruN 257.7-1/test/units/TEST-50-DISSECT.mountfsd.sh 257.9-0ubuntu2/test/units/TEST-50-DISSECT.mountfsd.sh
--- 257.7-1/test/units/TEST-50-DISSECT.mountfsd.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-50-DISSECT.mountfsd.sh	2025-09-03 18:35:40.000000000 +0000
@@ -6,12 +6,12 @@ set -o pipefail
 # shellcheck source=test/units/util.sh
 . "$(dirname "$0")"/util.sh
 
-if [[ ! -f /usr/lib/systemd/system/systemd-mountfsd.socket ]] || \
-   [[ ! -f /usr/lib/systemd/system/systemd-nsresourced.socket ]] || \
-   ! command -v mksquashfs || \
+if [[ ! -f /usr/lib/systemd/system/systemd-mountfsd.socket ]] ||
+   [[ ! -f /usr/lib/systemd/system/systemd-nsresourced.socket ]] ||
+   ! command -v mksquashfs ||
    ! grep -q bpf /sys/kernel/security/lsm ||
-   ! find /usr/lib* -name libbpf.so.1 2>/dev/null | grep . || \
-   systemd-analyze compare-versions "$(uname -r)" lt 6.5 || \
+   ! find /usr/lib* -name libbpf.so.1 2>/dev/null | grep . ||
+   systemd-analyze compare-versions "$(uname -r)" lt 6.5 ||
    systemd-analyze compare-versions "$(pkcheck --version | awk '{print $3}')" lt 124; then
     echo "Skipping mountfsd/nsresourced tests"
     exit 0
diff -pruN 257.7-1/test/units/TEST-50-DISSECT.sh 257.9-0ubuntu2/test/units/TEST-50-DISSECT.sh
--- 257.7-1/test/units/TEST-50-DISSECT.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-50-DISSECT.sh	2025-09-03 18:35:40.000000000 +0000
@@ -110,17 +110,9 @@ install_extension_images
 
 OS_RELEASE="$(test -e /etc/os-release && echo /etc/os-release || echo /usr/lib/os-release)"
 
-if systemctl --version | grep -q -- +OPENSSL ; then
-    # The openssl binary is installed conditionally. If we have OpenSSL support enabled and openssl is
-    # missing, fail early with a proper error message.
-    if ! command -v openssl &>/dev/null; then
-        echo "openssl binary is missing" >/failed
-        exit 1
-    fi
-
-    OPENSSL_CONFIG="$(mktemp)"
-    # Unfortunately OpenSSL insists on reading some config file, hence provide one with mostly placeholder contents
-    cat >"${OPENSSL_CONFIG:?}" <<EOF
+OPENSSL_CONFIG="$(mktemp)"
+# Unfortunately OpenSSL insists on reading some config file, hence provide one with mostly placeholder contents
+cat >"${OPENSSL_CONFIG:?}" <<EOF
 [ req ]
 prompt = no
 distinguished_name = req_distinguished_name
@@ -134,7 +126,6 @@ OU = Org Unit Name
 CN = Common Name
 emailAddress = test@email.com
 EOF
-fi
 
 # Make a GPT disk on the fly, with the squashfs as partition 1 and the verity hash tree as partition 2
 #
@@ -154,25 +145,17 @@ fi
 verity_size="$((verity_size * 2))KiB"
 signature_size="$((signature_size * 2))KiB"
 
-if [[ -n "${OPENSSL_CONFIG:-}" ]]; then
-    # Create key pair
-    openssl req -config "$OPENSSL_CONFIG" -new -x509 -newkey rsa:1024 \
-                -keyout "$MINIMAL_IMAGE.key" -out "$MINIMAL_IMAGE.crt" -days 365 -nodes
-    # Sign Verity root hash with it
-    openssl smime -sign -nocerts -noattr -binary \
-                  -in "$MINIMAL_IMAGE.roothash" \
-                  -inkey "$MINIMAL_IMAGE.key" \
-                  -signer "$MINIMAL_IMAGE.crt" \
-                  -outform der \
-                  -out "$MINIMAL_IMAGE.roothash.p7s"
-    # Generate signature partition JSON data
-    echo '{"rootHash":"'"$MINIMAL_IMAGE_ROOTHASH"'","signature":"'"$(base64 -w 0 <"$MINIMAL_IMAGE.roothash.p7s")"'"}' >"$MINIMAL_IMAGE.verity-sig"
-    # Pad it
-    truncate -s "$signature_size" "$MINIMAL_IMAGE.verity-sig"
-    # Register certificate in the (userspace) verity key ring
-    mkdir -p /run/verity.d
-    ln -s "$MINIMAL_IMAGE.crt" /run/verity.d/ok.crt
-fi
+# Sign Verity root hash with mkosi key
+openssl smime -sign -nocerts -noattr -binary \
+                -in "$MINIMAL_IMAGE.roothash" \
+                -inkey /usr/share/mkosi.key \
+                -signer /usr/share/mkosi.crt \
+                -outform der \
+                -out "$MINIMAL_IMAGE.roothash.p7s"
+# Generate signature partition JSON data
+echo '{"rootHash":"'"$MINIMAL_IMAGE_ROOTHASH"'","signature":"'"$(base64 -w 0 <"$MINIMAL_IMAGE.roothash.p7s")"'"}' >"$MINIMAL_IMAGE.verity-sig"
+# Pad it
+truncate -s "$signature_size" "$MINIMAL_IMAGE.verity-sig"
 
 # Construct a UUID from hash
 # input:  11111111222233334444555566667777
@@ -181,30 +164,23 @@ uuid="$(head -c 32 "$MINIMAL_IMAGE.rooth
 echo -e "label: gpt\nsize=$root_size, type=$ROOT_GUID, uuid=$uuid" | sfdisk "$MINIMAL_IMAGE.gpt"
 uuid="$(tail -c 32 "$MINIMAL_IMAGE.roothash" | sed -r 's/(.{8})(.{4})(.{4})(.{4})(.+)/\1-\2-\3-\4-\5/')"
 echo -e "size=$verity_size, type=$VERITY_GUID, uuid=$uuid" | sfdisk "$MINIMAL_IMAGE.gpt" --append
-if [[ -n "${OPENSSL_CONFIG:-}" ]]; then
-    echo -e "size=$signature_size, type=$SIGNATURE_GUID" | sfdisk "$MINIMAL_IMAGE.gpt" --append
-fi
+echo -e "size=$signature_size, type=$SIGNATURE_GUID" | sfdisk "$MINIMAL_IMAGE.gpt" --append
+
 sfdisk --part-label "$MINIMAL_IMAGE.gpt" 1 "Root Partition"
 sfdisk --part-label "$MINIMAL_IMAGE.gpt" 2 "Verity Partition"
-if [[ -n "${OPENSSL_CONFIG:-}" ]]; then
-    sfdisk --part-label "$MINIMAL_IMAGE.gpt" 3 "Signature Partition"
-fi
+sfdisk --part-label "$MINIMAL_IMAGE.gpt" 3 "Signature Partition"
 loop="$(losetup --show -P -f "$MINIMAL_IMAGE.gpt")"
 partitions=(
     "${loop:?}p1"
     "${loop:?}p2"
+    "${loop:?}p3"
 )
-if [[ -n "${OPENSSL_CONFIG:-}" ]]; then
-    partitions+=("${loop:?}p3")
-fi
 # The kernel sometimes(?) does not emit "add" uevent for loop block partition devices.
 # Let's not expect the devices to be initialized.
-udevadm wait --timeout 60 --settle --initialized=no "${partitions[@]}"
-udevadm lock --device="${loop}p1" dd if="$MINIMAL_IMAGE.raw" of="${loop}p1"
-udevadm lock --device="${loop}p2" dd if="$MINIMAL_IMAGE.verity" of="${loop}p2"
-if [[ -n "${OPENSSL_CONFIG:-}" ]]; then
-    udevadm lock --device="${loop}p3" dd if="$MINIMAL_IMAGE.verity-sig" of="${loop}p3"
-fi
+udevadm wait --timeout=60 --settle --initialized=no "${partitions[@]}"
+udevadm lock --timeout=60 --device="${loop}p1" dd if="$MINIMAL_IMAGE.raw" of="${loop}p1"
+udevadm lock --timeout=60 --device="${loop}p2" dd if="$MINIMAL_IMAGE.verity" of="${loop}p2"
+udevadm lock --timeout=60 --device="${loop}p3" dd if="$MINIMAL_IMAGE.verity-sig" of="${loop}p3"
 losetup -d "$loop"
 udevadm settle --timeout=60
 
diff -pruN 257.7-1/test/units/TEST-50-DISSECT.sysext.sh 257.9-0ubuntu2/test/units/TEST-50-DISSECT.sysext.sh
--- 257.7-1/test/units/TEST-50-DISSECT.sysext.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-50-DISSECT.sysext.sh	2025-09-03 18:35:40.000000000 +0000
@@ -85,9 +85,15 @@ prepare_root() {
 
     {
         echo "ID=testtest"
+        echo "ID_LIKE=\"foobar test_alike something-else\""
         echo "VERSION=1.2.3"
     } >"$root/usr/lib/os-release"
 
+    if [[ -e $root/etc/os-release ]] && [[ ! -L $root/etc/os-release ]]; then
+        mv "$root/etc/os-release" "$root/etc/os-release.orig"
+        cp "$root/usr/lib/os-release" "$root/etc/os-release"
+    fi
+
     prepend_trap "cleanup_os_release ${root@Q}"
 }
 
@@ -102,6 +108,11 @@ cleanup_os_release() {
         # shellcheck disable=SC2317 # It is not unreachable, used in a trap couple lines above.
         mv "$root/usr/lib/os-release.orig" "$root/usr/lib/os-release"
     fi
+    # shellcheck disable=SC2317 # It is not unreachable, used in a trap couple lines above.
+    if [[ -e $root/etc/os-release.orig ]]; then
+        # shellcheck disable=SC2317 # It is not unreachable, used in a trap couple lines above.
+        mv "$root/etc/os-release.orig" "$root/etc/os-release"
+    fi
 }
 
 prepare_extension_image() {
@@ -120,6 +131,38 @@ prepare_extension_image() {
     prepend_trap "rm -rf ${ext_dir@Q}"
 }
 
+prepare_extension_image_with_matching_id() {
+    local root=${1:-}
+    local hierarchy=${2:?}
+    local ext_dir ext_release name
+
+    name="test-extension-matching-id"
+    ext_dir="$root/var/lib/extensions/$name"
+    ext_release="$ext_dir/usr/lib/extension-release.d/extension-release.$name"
+    mkdir -p "${ext_release%/*}"
+    echo "ID=testtest" >"$ext_release"
+    mkdir -p "$ext_dir/$hierarchy"
+    touch "$ext_dir$hierarchy/preexisting-file-in-extension-image"
+
+    prepend_trap "rm -rf ${ext_dir@Q}"
+}
+
+prepare_extension_image_with_matching_id_like() {
+    local root=${1:-}
+    local hierarchy=${2:?}
+    local ext_dir ext_release name
+
+    name="test-extension-matching-id-like"
+    ext_dir="$root/var/lib/extensions/$name"
+    ext_release="$ext_dir/usr/lib/extension-release.d/extension-release.$name"
+    mkdir -p "${ext_release%/*}"
+    echo "ID=test_alike" >"$ext_release"
+    mkdir -p "$ext_dir/$hierarchy"
+    touch "$ext_dir$hierarchy/preexisting-file-in-extension-image"
+
+    prepend_trap "rm -rf ${ext_dir@Q}"
+}
+
 prepare_extension_mutable_dir() {
     local dir=${1:?}
 
@@ -982,6 +1025,40 @@ done
 
 
 ( init_trap
+: "Check if merging an extension with matching ID succeeds"
+fake_root=${roots_dir:+"$roots_dir/matching-id"}
+hierarchy=/opt
+
+prepare_root "$fake_root" "$hierarchy"
+prepare_extension_image_with_matching_id "$fake_root" "$hierarchy"
+prepare_read_only_hierarchy "$fake_root" "$hierarchy"
+
+run_systemd_sysext "$fake_root" merge
+extension_verify_after_merge "$fake_root" "$hierarchy" -e -h
+
+run_systemd_sysext "$fake_root" unmerge
+extension_verify_after_unmerge "$fake_root" "$hierarchy" -h
+)
+
+
+( init_trap
+: "Check if merging an extension that matches host ID_LIKE succeeds"
+fake_root=${roots_dir:+"$roots_dir/matching-id-like"}
+hierarchy=/opt
+
+prepare_root "$fake_root" "$hierarchy"
+prepare_extension_image_with_matching_id_like "$fake_root" "$hierarchy"
+prepare_read_only_hierarchy "$fake_root" "$hierarchy"
+
+run_systemd_sysext "$fake_root" merge
+extension_verify_after_merge "$fake_root" "$hierarchy" -e -h
+
+run_systemd_sysext "$fake_root" unmerge
+extension_verify_after_unmerge "$fake_root" "$hierarchy" -h
+)
+
+
+( init_trap
 : "Check if merging fails in case of invalid mutable directory permissions"
 
 fake_root=${roots_dir:+"$roots_dir/mutable-directory-with-invalid-permissions"}
diff -pruN 257.7-1/test/units/TEST-58-REPART.sh 257.9-0ubuntu2/test/units/TEST-58-REPART.sh
--- 257.7-1/test/units/TEST-58-REPART.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-58-REPART.sh	2025-09-03 18:35:40.000000000 +0000
@@ -373,7 +373,7 @@ $imgs/zzz7 : start=     6291416, size=
     fi
 
     loop="$(losetup -P --show --find "$imgs/zzz")"
-    udevadm wait --timeout 60 --settle "${loop:?}p7"
+    udevadm wait --timeout=60 --settle "${loop:?}p7"
 
     volume="test-repart-$RANDOM"
 
@@ -961,7 +961,7 @@ EOF
     # shellcheck disable=SC2064
     trap "rm -rf '$defs' '$imgs' ; losetup -d '$loop'" RETURN ERR
 
-    udevadm wait --timeout 60 --settle "${loop:?}p1" "${loop:?}p2"
+    udevadm wait --timeout=60 --settle "${loop:?}p1" "${loop:?}p2"
 
     # Check that the verity block sizes are as expected
     veritysetup dump "${loop}p2" | grep 'Data block size:' | grep -q '4096'
@@ -1021,7 +1021,7 @@ EOF
     # shellcheck disable=SC2064
     trap "rm -rf '$defs' '$imgs' ; losetup -d '$loop'" RETURN ERR
 
-    udevadm wait --timeout 60 --settle "${loop:?}p1" "${loop:?}p2"
+    udevadm wait --timeout=60 --settle "${loop:?}p1" "${loop:?}p2"
 
     output=$(sfdisk -J "$loop")
 
@@ -1103,7 +1103,7 @@ EOF
     fi
 
     loop=$(losetup -P --show -f "$imgs/zzz")
-    udevadm wait --timeout 60 --settle "${loop:?}p1" "${loop:?}p2"
+    udevadm wait --timeout=60 --settle "${loop:?}p1" "${loop:?}p2"
 
     # Test that /usr/def did not end up in the root partition but other files did.
     mkdir "$imgs/mnt"
@@ -1316,7 +1316,7 @@ EOF
 
     truncate -s 100m "$imgs/$sector.img"
     loop=$(losetup -b "$sector" -P --show -f "$imgs/$sector.img" )
-    udevadm wait --timeout 60 --settle "${loop:?}"
+    udevadm wait --timeout=60 --settle "${loop:?}"
 
     systemd-repart --offline="$OFFLINE" \
                    --pretty=yes \
diff -pruN 257.7-1/test/units/TEST-60-MOUNT-RATELIMIT.sh 257.9-0ubuntu2/test/units/TEST-60-MOUNT-RATELIMIT.sh
--- 257.7-1/test/units/TEST-60-MOUNT-RATELIMIT.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-60-MOUNT-RATELIMIT.sh	2025-09-03 18:35:40.000000000 +0000
@@ -8,154 +8,6 @@ set -o pipefail
 # shellcheck source=test/units/util.sh
 . "$(dirname "$0")"/util.sh
 
-teardown_test_dependencies() (
-    set +eux
-
-    if mountpoint /tmp/deptest; then
-        umount /tmp/deptest
-    fi
-
-    if [[ -n "${LOOP}" ]]; then
-        losetup -d "${LOOP}" || :
-    fi
-    if [[ -n "${LOOP_0}" ]]; then
-        losetup -d "${LOOP_0}" || :
-    fi
-    if [[ -n "${LOOP_1}" ]]; then
-        losetup -d "${LOOP_1}" || :
-    fi
-
-    rm -f /tmp/TEST-60-MOUNT-RATELIMIT-dependencies-0.img
-    rm -f /tmp/TEST-60-MOUNT-RATELIMIT-dependencies-1.img
-
-    rm -f /run/systemd/system/tmp-deptest.mount
-    systemctl daemon-reload
-
-    return 0
-)
-
-setup_loop() {
-    truncate -s 30m "/tmp/TEST-60-MOUNT-RATELIMIT-dependencies-${1?}.img"
-    sfdisk --wipe=always "/tmp/TEST-60-MOUNT-RATELIMIT-dependencies-${1?}.img" <<EOF
-label:gpt
-
-name="loop${1?}-part1"
-EOF
-    LOOP=$(losetup -P --show -f "/tmp/TEST-60-MOUNT-RATELIMIT-dependencies-${1?}.img")
-    udevadm wait --settle --timeout=10 "${LOOP}"
-    udevadm lock --device="${LOOP}" mkfs.ext4 -L "partname${1?}-1" "${LOOP}p1"
-}
-
-check_dependencies() {
-    local escaped_0 escaped_1 after
-
-    escaped_0=$(systemd-escape -p "${LOOP_0}p1")
-    escaped_1=$(systemd-escape -p "${LOOP_1}p1")
-
-    if [[ -f /run/systemd/system/tmp-deptest.mount ]]; then
-        after=$(systemctl show --property=After --value tmp-deptest.mount)
-        assert_not_in "local-fs-pre.target" "$after"
-        assert_in "remote-fs-pre.target" "$after"
-        assert_in "network.target" "$after"
-    fi
-
-    # mount LOOP_0
-    mount -t ext4 "${LOOP_0}p1" /tmp/deptest
-    timeout 10 bash -c 'until systemctl -q is-active tmp-deptest.mount; do sleep .1; done'
-    after=$(systemctl show --property=After --value tmp-deptest.mount)
-    assert_in "local-fs-pre.target" "$after"
-    assert_not_in "remote-fs-pre.target" "$after"
-    assert_not_in "network.target" "$after"
-    assert_in "${escaped_0}.device" "$after"
-    assert_in "blockdev@${escaped_0}.target" "$after"
-    assert_not_in "${escaped_1}.device" "$after"
-    assert_not_in "blockdev@${escaped_1}.target" "$after"
-    systemctl stop tmp-deptest.mount
-
-    if [[ -f /run/systemd/system/tmp-deptest.mount ]]; then
-        after=$(systemctl show --property=After --value tmp-deptest.mount)
-        assert_not_in "local-fs-pre.target" "$after"
-        assert_in "remote-fs-pre.target" "$after"
-        assert_in "network.target" "$after"
-    fi
-
-    # mount LOOP_1 (using fake _netdev option)
-    mount -t ext4 -o _netdev "${LOOP_1}p1" /tmp/deptest
-    timeout 10 bash -c 'until systemctl -q is-active tmp-deptest.mount; do sleep .1; done'
-    after=$(systemctl show --property=After --value tmp-deptest.mount)
-    assert_not_in "local-fs-pre.target" "$after"
-    assert_in "remote-fs-pre.target" "$after"
-    assert_in "network.target" "$after"
-    assert_not_in "${escaped_0}.device" "$after"
-    assert_not_in "blockdev@${escaped_0}.target" "$after"
-    assert_in "${escaped_1}.device" "$after"
-    assert_in "blockdev@${escaped_1}.target" "$after"
-    systemctl stop tmp-deptest.mount
-
-    if [[ -f /run/systemd/system/tmp-deptest.mount ]]; then
-        after=$(systemctl show --property=After --value tmp-deptest.mount)
-        assert_not_in "local-fs-pre.target" "$after"
-        assert_in "remote-fs-pre.target" "$after"
-        assert_in "network.target" "$after"
-    fi
-
-    # mount tmpfs
-    mount -t tmpfs tmpfs /tmp/deptest
-    timeout 10 bash -c 'until systemctl -q is-active tmp-deptest.mount; do sleep .1; done'
-    after=$(systemctl show --property=After --value tmp-deptest.mount)
-    assert_in "local-fs-pre.target" "$after"
-    assert_not_in "remote-fs-pre.target" "$after"
-    assert_not_in "network.target" "$after"
-    assert_not_in "${escaped_0}.device" "$after"
-    assert_not_in "blockdev@${escaped_0}.target" "$after"
-    assert_not_in "${escaped_1}.device" "$after"
-    assert_not_in "blockdev@${escaped_1}.target" "$after"
-    systemctl stop tmp-deptest.mount
-
-    if [[ -f /run/systemd/system/tmp-deptest.mount ]]; then
-        after=$(systemctl show --property=After --value tmp-deptest.mount)
-        assert_not_in "local-fs-pre.target" "$after"
-        assert_in "remote-fs-pre.target" "$after"
-        assert_in "network.target" "$after"
-    fi
-}
-
-testcase_dependencies() {
-    # test for issue #19983 and #23552.
-
-    if systemd-detect-virt --quiet --container; then
-        echo "Skipping test_dependencies in container"
-        return
-    fi
-
-    trap teardown_test_dependencies RETURN
-
-    setup_loop 0
-    LOOP_0="${LOOP}"
-    LOOP=
-    setup_loop 1
-    LOOP_1="${LOOP}"
-    LOOP=
-
-    mkdir -p /tmp/deptest
-
-    # without .mount file
-    check_dependencies
-
-    # create .mount file
-    mkdir -p /run/systemd/system
-    cat >/run/systemd/system/tmp-deptest.mount <<EOF
-[Mount]
-Where=/tmp/deptest
-What=192.168.0.1:/tmp/mnt
-Type=nfs
-EOF
-    systemctl daemon-reload
-
-    # with .mount file
-    check_dependencies
-}
-
 testcase_issue_20329() {
     # test that handling of mount start jobs is delayed when /proc/self/mouninfo monitor is rate limited
 
@@ -243,9 +95,9 @@ EOF
 
         sleep 1
 
-        if [[ "$(systemctl is-failed tmp-hoge.mount)" == "failed" ]] || \
+        if [[ "$(systemctl is-failed tmp-hoge.mount)" == "failed" ]] ||
            journalctl --since="$since" -u tmp-hoge.mount -q --grep "but there is no mount"; then
-                exit 1
+            exit 1
         fi
 
         systemctl stop tmp-hoge.mount
diff -pruN 257.7-1/test/units/TEST-64-UDEV-STORAGE.sh 257.9-0ubuntu2/test/units/TEST-64-UDEV-STORAGE.sh
--- 257.7-1/test/units/TEST-64-UDEV-STORAGE.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-64-UDEV-STORAGE.sh	2025-09-03 18:35:40.000000000 +0000
@@ -117,7 +117,7 @@ check_device_unit() {(
         fi
     done
 
-    read -r -a links < <(udevadm info "$syspath" | sed -ne '/SYSTEMD_ALIAS=/ { s/^E: SYSTEMD_ALIAS=//; p }' 2>/dev/null)
+    read -r -a links < <(udevadm info -q property --property SYSTEMD_ALIAS --value "$syspath" 2>/dev/null)
     for link in "${links[@]}"; do
         if [[ "$link" == "$path" ]]; then # SYSTEMD_ALIAS= are absolute
             return 0
@@ -131,7 +131,7 @@ check_device_unit() {(
 check_device_units() {(
     set +x
 
-    local log_level path paths
+    local log_level path paths unit units
 
     log_level="${1?}"
     shift
@@ -143,12 +143,13 @@ check_device_units() {(
         fi
     done
 
-    while read -r unit _; do
+    read -r -a units < <(systemctl list-units --all --type=device --no-legend dev-* | awk '$1 !~ /dev-tty.+/ && $4 == "plugged" { print $1 }' | sed -e 's/\.device$//')
+    for unit in "${units[@]}"; do
         path=$(systemd-escape --path --unescape "$unit")
         if ! check_device_unit "$log_level" "$path"; then
            return 1
         fi
-    done < <(systemctl list-units --all --type=device --no-legend dev-* | awk '$1 !~ /dev-tty.+/ && $4 == "plugged" { print $1 }' | sed -e 's/\.device$//')
+    done
 
     return 0
 )}
@@ -214,7 +215,6 @@ testcase_nvme_basic() {
         )
     done
 
-    udevadm settle
     ls /dev/disk/by-id
     for i in "${expected_symlinks[@]}"; do
         udevadm wait --settle --timeout=30 "$i"
@@ -250,7 +250,7 @@ testcase_virtio_scsi_identically_named_p
     fi
 
     for ((i = 0; i < num_disk; i++)); do
-        udevadm lock --device "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive$i" \
+        udevadm lock --timeout=30 --device "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive$i" \
                 sfdisk "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive$i" <<EOF
 label: gpt
 
@@ -258,7 +258,7 @@ $(for ((j = 1; j <= num_part; j++)); do
 EOF
     done
 
-    udevadm settle
+    udevadm settle --timeout=30
     lsblk --noheadings -a -o NAME,PARTLABEL
     [[ "$(lsblk --noheadings -a -o NAME,PARTLABEL | grep -c "Hello world")" -eq "$((num_part * num_disk))" ]]
 }
@@ -283,7 +283,7 @@ blacklist {
 }
 EOF
 
-    udevadm lock --device /dev/disk/by-id/wwn-0xdeaddeadbeef0000 \
+    udevadm lock --timeout=30 --device /dev/disk/by-id/wwn-0xdeaddeadbeef0000 \
             sfdisk /dev/disk/by-id/wwn-0xdeaddeadbeef0000 <<EOF
 label: gpt
 
@@ -291,19 +291,19 @@ name="first_partition", size=5M
 uuid="deadbeef-dead-dead-beef-000000000000", name="failover_part", size=5M
 EOF
     # Partitioning triggers a synthesized event. Wait for the event being finished.
-    udevadm settle
+    udevadm settle --timeout=30
 
-    udevadm lock --device /dev/disk/by-id/wwn-0xdeaddeadbeef0000-part2 \
+    udevadm lock --timeout=30 --device /dev/disk/by-id/wwn-0xdeaddeadbeef0000-part2 \
             mkfs.ext4 -U "deadbeef-dead-dead-beef-111111111111" -L "failover_vol" /dev/disk/by-id/wwn-0xdeaddeadbeef0000-part2
     # Making filesystem triggers a synthesized event. Wait for the event being finished.
-    udevadm settle
+    udevadm settle --timeout=30
 
     modprobe -v dm_multipath
     systemctl start multipathd.service
     systemctl status multipathd.service
     # multipathd touches many devices on start. multipath command may fail if it is invoked before the
     # initial setup finished. Let's wait for a while.
-    udevadm settle
+    udevadm settle --timeout=30
     multipath -ll
     ls -l /dev/disk/by-id/
 
@@ -381,9 +381,8 @@ EOF
 }
 
 testcase_simultaneous_events_1() {
-    local disk expected i iterations key link num_part part partscript rule target timeout
-    local -a devices symlinks
-    local -A running
+    local disk expected i iterations link num_part part partscript rule target timeout
+    local -a devices symlinks running
 
     if [[ -v ASAN_OPTIONS || "$(systemd-detect-virt -v)" == "qemu" ]]; then
         num_part=2
@@ -428,7 +427,7 @@ EOF
 
     # initialize partition table
     for disk in {0..9}; do
-        echo 'label: gpt' | udevadm lock --device="${devices[$disk]}" sfdisk -q "${devices[$disk]}"
+        echo 'label: gpt' | udevadm lock --timeout=30 --device="${devices[$disk]}" sfdisk -q "${devices[$disk]}"
     done
 
     # Delete the partitions, immediately recreate them, wait for udev to settle
@@ -438,18 +437,20 @@ EOF
     # On unpatched udev versions the delete-recreate cycle may trigger a race
     # leading to dead symlinks in /dev/disk/
     for ((i = 1; i <= iterations; i++)); do
+        running=()
         for disk in {0..9}; do
             if ((disk % 2 == i % 2)); then
-                udevadm lock --device="${devices[$disk]}" sfdisk -q --delete "${devices[$disk]}" &
+                udevadm lock --timeout=30 --device="${devices[$disk]}" sfdisk -q --delete "${devices[$disk]}" &
             else
-                udevadm lock --device="${devices[$disk]}" sfdisk -q -X gpt "${devices[$disk]}" <"$partscript" &
+                udevadm lock --timeout=30 --device="${devices[$disk]}" sfdisk -q -X gpt "${devices[$disk]}" <"$partscript" &
             fi
-            running[$disk]=$!
+
+            # shellcheck disable=SC2190
+            running+=( "$!" )
         done
 
-        for key in "${!running[@]}"; do
-            wait "${running[$key]}"
-            unset "running[$key]"
+        for j in "${running[@]}"; do
+            wait "$j"
         done
 
         if ((i % 10 <= 1)); then
@@ -473,28 +474,36 @@ EOF
     done
 
     helper_check_device_units
-    rm -f "$rule" "$partscript"
 
+    # Cleanup and check if unnecessary devlinks are removed.
+    for disk in {0..9}; do
+        udevadm lock --timeout="$timeout" --device="${devices[$disk]}" sfdisk -q --delete "${devices[$disk]}" || :
+    done
+    udevadm settle --timeout="$timeout"
+    for ((part = 1; part <= num_part; part++)); do
+        udevadm wait --timeout=10 --removed "/dev/disk/by-partlabel/test${part}"
+    done
+
+    rm -f "$rule" "$partscript"
     udevadm control --reload
 }
 
 testcase_simultaneous_events_2() {
-    local disk expected i iterations key link num_part part script_dir target timeout
-    local -a devices symlinks
-    local -A running
+    local disk i iterations link num_part part script_dir target timeout
+    local -a devices running
 
     script_dir="$(mktemp --directory "/tmp/test-udev-storage.script.XXXXXXXXXX")"
     # shellcheck disable=SC2064
     trap "rm -rf '$script_dir'" RETURN
 
     if [[ -v ASAN_OPTIONS || "$(systemd-detect-virt -v)" == "qemu" ]]; then
-        num_part=20
-        iterations=1
-        timeout=2400
-    else
-        num_part=100
-        iterations=3
+        num_part=10
+        iterations=2
         timeout=300
+    else
+        num_part=40
+        iterations=5
+        timeout=200
     fi
 
     for disk in {0..9}; do
@@ -514,37 +523,97 @@ $(for ((part = 1; part <= num_part; part
 EOF
     done
 
+    ls -l /dev/disk/by-partlabel
+
     echo "## $iterations iterations start: $(date '+%H:%M:%S.%N')"
-    for ((i = 1; i <= iterations; i++)); do
+    running=()
+    for disk in "${devices[@]}"; do
+        udevadm lock --timeout=30 --device="$disk" \
+                bash -c "for ((i = 1; i <= $iterations; i++)); do sfdisk -q --delete $disk; sfdisk -q -X gpt $disk <$script_dir/partscript-\$i; done" &
 
-        for disk in {0..9}; do
-            udevadm lock --device="${devices[$disk]}" sfdisk -q --delete "${devices[$disk]}" &
-            running[$disk]=$!
-        done
+        # shellcheck disable=SC2190
+        running+=( "$!" )
+    done
 
-        for key in "${!running[@]}"; do
-            wait "${running[$key]}"
-            unset "running[$key]"
-        done
+    for i in "${running[@]}"; do
+        wait "$i"
+    done
 
-        for disk in {0..9}; do
-            udevadm lock --device="${devices[$disk]}" sfdisk -q -X gpt "${devices[$disk]}" <"$script_dir/partscript-$i" &
-            running[$disk]=$!
-        done
+    udevadm settle --timeout="$timeout"
+    echo "## $iterations iterations end: $(date '+%H:%M:%S.%N')"
 
-        for key in "${!running[@]}"; do
-            wait "${running[$key]}"
-            unset "running[$key]"
-        done
+    ls -l /dev/disk/by-partlabel
+
+    # Check if unnecessary devlinks are removed.
+    for ((i = 1; i < iterations; i++)); do
+        udevadm wait --timeout=10 --removed "/dev/disk/by-partlabel/testlabel-$i"
+    done
+
+    helper_check_device_units
+
+    # Cleanup
+    for disk in "${devices[@]}"; do
+        udevadm lock --timeout=30 --device="$disk" sfdisk -q --delete "$disk"
+    done
+    udevadm settle --timeout="$timeout"
+    udevadm wait --timeout=10 --removed "/dev/disk/by-partlabel/testlabel-$iterations"
+}
+
+testcase_simultaneous_events_3() {
+    local device i iterations link num_part part script_dir target timeout
+
+    # for issue #37823
+
+    script_dir="$(mktemp --directory "/tmp/test-udev-storage.script.XXXXXXXXXX")"
+    # shellcheck disable=SC2064
+    trap "rm -rf '$script_dir'" RETURN
+
+    num_part=5
+    iterations=30
+    if [[ -v ASAN_OPTIONS || "$(systemd-detect-virt -v)" == "qemu" ]]; then
+        timeout=120
+    else
+        timeout=60
+    fi
+
+    link="/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_deadbeeftest0"
+    device="$(readlink -f "$link")"
+    if [[ ! -b "$device" ]]; then
+        echo "ERROR: failed to find the test SCSI block device $link"
+        return 1
+    fi
 
-        udevadm wait --settle --timeout="$timeout" "${devices[@]}" "/dev/disk/by-partlabel/testlabel-$i"
+    for ((i = 1; i <= iterations; i++)); do
+        cat >"$script_dir/partscript-$i" <<EOF
+$(for ((part = 1; part <= num_part; part++)); do printf 'name="test3-%d", size=1M\n' "$i"; done)
+EOF
     done
+
+    ls -l /dev/disk/by-partlabel/
+
+    echo "## $iterations iterations start: $(date '+%H:%M:%S.%N')"
+    udevadm lock --timeout="$timeout" --device="$device" \
+            bash -c "for ((i = 1; i <= $iterations; i++)); do sfdisk -q -X gpt $device <$script_dir/partscript-\$i; done"
+    udevadm settle --timeout="$timeout"
     echo "## $iterations iterations end: $(date '+%H:%M:%S.%N')"
+
+    ls -l /dev/disk/by-partlabel/
+
+    # Check devlinks
+    for ((i = 1; i < iterations; i++)); do
+        udevadm wait --settle --timeout=10 --removed "/dev/disk/by-partlabel/test3-$i"
+    done
+    udevadm wait --settle --timeout=10 "/dev/disk/by-partlabel/test3-$iterations"
+
+    # Cleanup and check if the last devlink is removed
+    udevadm lock --timeout="$timeout" --device="$device" sfdisk -q --delete "$device"
+    udevadm wait --settle --timeout="$timeout" --removed "/dev/disk/by-partlabel/test3-$iterations"
 }
 
 testcase_simultaneous_events() {
     testcase_simultaneous_events_1
     testcase_simultaneous_events_2
+    testcase_simultaneous_events_3
 }
 
 testcase_lvm_basic() {
@@ -744,7 +813,7 @@ testcase_btrfs_basic() {
     echo "Single device: default settings"
     uuid="deadbeef-dead-dead-beef-000000000000"
     label="btrfs_root"
-    udevadm lock --device="${devices[0]}" mkfs.btrfs -f -L "$label" -U "$uuid" "${devices[0]}"
+    udevadm lock --timeout=30 --device="${devices[0]}" mkfs.btrfs -f -L "$label" -U "$uuid" "${devices[0]}"
     udevadm wait --settle --timeout=30 "${devices[0]}" "/dev/disk/by-uuid/$uuid" "/dev/disk/by-label/$label"
     btrfs filesystem show
     helper_check_device_symlinks
@@ -753,7 +822,7 @@ testcase_btrfs_basic() {
     echo "Multiple devices: using partitions, data: single, metadata: raid1"
     uuid="deadbeef-dead-dead-beef-000000000001"
     label="btrfs_mpart"
-    udevadm lock --device="${devices[0]}" sfdisk --wipe=always "${devices[0]}" <<EOF
+    udevadm lock --timeout=30 --device="${devices[0]}" sfdisk --wipe=always "${devices[0]}" <<EOF
 label: gpt
 
 name="diskpart1", size=85M
@@ -762,7 +831,7 @@ name="diskpart3", size=85M
 name="diskpart4", size=85M
 EOF
     udevadm wait --settle --timeout=30 /dev/disk/by-partlabel/diskpart{1..4}
-    udevadm lock --device="${devices[0]}" mkfs.btrfs -f -d single -m raid1 -L "$label" -U "$uuid" /dev/disk/by-partlabel/diskpart{1..4}
+    udevadm lock --timeout=30 --device="${devices[0]}" mkfs.btrfs -f -d single -m raid1 -L "$label" -U "$uuid" /dev/disk/by-partlabel/diskpart{1..4}
     udevadm wait --settle --timeout=30 "/dev/disk/by-uuid/$uuid" "/dev/disk/by-label/$label"
     btrfs filesystem show
     helper_check_device_symlinks
@@ -774,6 +843,7 @@ EOF
     uuid="deadbeef-dead-dead-beef-000000000002"
     label="btrfs_mdisk"
     udevadm lock \
+            --timeout=30 \
             --device=/dev/disk/by-id/scsi-0systemd_foobar_deadbeefbtrfs0 \
             --device=/dev/disk/by-id/scsi-0systemd_foobar_deadbeefbtrfs1 \
             --device=/dev/disk/by-id/scsi-0systemd_foobar_deadbeefbtrfs2 \
@@ -798,7 +868,7 @@ EOF
     for ((i = 0; i < ${#devices[@]}; i++)); do
         # Intentionally use weaker cipher-related settings, since we don't care
         # about security here as it's a throwaway LUKS partition
-        udevadm lock --device="${devices[$i]}" \
+        udevadm lock --timeout=30 --device="${devices[$i]}" \
                 cryptsetup luksFormat -q \
                 --use-urandom --pbkdf pbkdf2 --pbkdf-force-iterations 1000 \
                 --uuid "deadbeef-dead-dead-beef-11111111111$i" --label "encdisk$i" "${devices[$i]}" /etc/btrfs_keyfile
@@ -815,6 +885,7 @@ EOF
     ls -l /dev/mapper/encbtrfs{0..3}
     # Create a multi-device btrfs filesystem on the LUKS devices
     udevadm lock \
+            --timeout=30 \
             --device=/dev/mapper/encbtrfs0 \
             --device=/dev/mapper/encbtrfs1 \
             --device=/dev/mapper/encbtrfs2 \
@@ -858,7 +929,7 @@ EOF
     : >/etc/crypttab
     rm -fr "$mpoint"
     systemctl daemon-reload
-    udevadm settle
+    udevadm settle --timeout=30
 }
 
 testcase_iscsi_lvm() {
@@ -925,7 +996,7 @@ testcase_iscsi_lvm() {
     mpoint="$(mktemp -d /iscsi_storeXXX)"
     expected_symlinks=()
     # Use the first device as it's configured with larger capacity
-    udevadm lock --device "${devices[0]}" mkfs.ext4 -L iscsi_store "${devices[0]}"
+    udevadm lock --timeout=30 --device "${devices[0]}" mkfs.ext4 -L iscsi_store "${devices[0]}"
     udevadm wait --settle --timeout=30 "${devices[0]}"
     mount "${devices[0]}" "$mpoint"
     for i in {1..4}; do
@@ -1012,15 +1083,15 @@ testcase_long_sysfs_path() {
     stat "/sys/block/${dev}"
     readlink -f "/sys/block/${dev}/dev"
 
-    udevadm lock --device "/dev/${dev}" sfdisk "/dev/${dev}" <<EOF
+    udevadm lock --timeout=30 --device "/dev/${dev}" sfdisk "/dev/${dev}" <<EOF
 label: gpt
 
 name="test_swap", size=32M
 uuid="deadbeef-dead-dead-beef-000000000000", name="test_part", size=5M
 EOF
-    udevadm settle
-    udevadm lock --device "/dev/${dev}1" mkswap -U "deadbeef-dead-dead-beef-111111111111" -L "swap_vol" "/dev/${dev}1"
-    udevadm lock --device "/dev/${dev}2" mkfs.ext4 -U "deadbeef-dead-dead-beef-222222222222" -L "data_vol" "/dev/${dev}2"
+    udevadm settle --timeout=30
+    udevadm lock --timeout=30 --device "/dev/${dev}1" mkswap -U "deadbeef-dead-dead-beef-111111111111" -L "swap_vol" "/dev/${dev}1"
+    udevadm lock --timeout=30 --device "/dev/${dev}2" mkfs.ext4 -U "deadbeef-dead-dead-beef-222222222222" -L "data_vol" "/dev/${dev}2"
     udevadm wait --settle --timeout=30 "${expected_symlinks[@]}"
 
     # Try to mount the data partition manually (using its label)
@@ -1040,7 +1111,7 @@ EOF
     swapon -v -L swap_vol
     swapoff -v -L swap_vol
 
-    udevadm settle
+    udevadm settle --timeout=30
 
     logfile="$(mktemp)"
     # Check state of affairs after https://github.com/systemd/systemd/pull/22759
@@ -1164,7 +1235,12 @@ uuid="deadbeef-dead-dead-beef-1111111111
 uuid="deadbeef-dead-dead-beef-222222222222", name="mdpart2", size=32M
 uuid="deadbeef-dead-dead-beef-333333333333", name="mdpart3", size=16M
 EOF
-    udevadm trigger --settle --parent-match "$raid_dev"
+    udevadm wait --settle --timeout=30 "$raid_dev" "${raid_dev}1" "${raid_dev}2" "${raid_dev}3"
+    # FIXME: For some reasons, the command sometimes stuck and the test will timeout.
+    # Let's enable debug logging and set a timeout to make not consume CI resource.
+    # UPDATE: The above 'udevadm wait' command should fix the issue.
+    # But, let's keep the debug option for a while.
+    SYSTEMD_LOG_LEVEL=debug timeout 30 udevadm trigger --settle --parent-match "$raid_dev"
     udevadm wait --settle --timeout=30 "/dev/disk/by-id/md-uuid-$uuid-part2"
     mkfs.ext4 -L "$part_name" "/dev/disk/by-id/md-uuid-$uuid-part2"
     udevadm trigger --settle "/dev/disk/by-id/md-uuid-$uuid-part2"
@@ -1180,6 +1256,14 @@ EOF
     helper_check_device_units
     # Cleanup
     mdadm -v --stop "$raid_dev"
+
+    # Clear superblocks to make the MD device will not be restarted even if the VM is restarted.
+    # This is a workaround for issue #38240.
+    udevadm settle --timeout=30
+    # shellcheck disable=SC2046
+    mdadm -v --zero-superblock --force $(readlink -f "${devices[@]}")
+    udevadm settle --timeout=30
+
     # Check if all expected symlinks were removed after the cleanup
     udevadm wait --settle --timeout=30 --removed "${expected_symlinks[@]}"
     helper_check_device_units
@@ -1237,6 +1321,14 @@ testcase_mdadm_lvm() {
     # Cleanup
     lvm vgchange -an "$vgroup"
     mdadm -v --stop "$raid_dev"
+
+    # Clear superblocks to make the MD device will not be restarted even if the VM is restarted.
+    # This is a workaround for issue #38240.
+    udevadm settle --timeout=30
+    # shellcheck disable=SC2046
+    mdadm -v --zero-superblock --force $(readlink -f "${devices[@]}")
+    udevadm settle --timeout=30
+
     # Check if all expected symlinks were removed after the cleanup
     udevadm wait --settle --timeout=30 --removed "${expected_symlinks[@]}"
     helper_check_device_units
@@ -1258,7 +1350,7 @@ fi
 
 echo "TEST_FUNCTION_NAME=$TEST_FUNCTION_NAME"
 "$TEST_FUNCTION_NAME"
-udevadm settle
+udevadm settle --timeout=60
 
 echo "Check if all symlinks under /dev/disk/ are valid (post-test)"
 helper_check_device_symlinks
diff -pruN 257.7-1/test/units/TEST-65-ANALYZE.sh 257.9-0ubuntu2/test/units/TEST-65-ANALYZE.sh
--- 257.7-1/test/units/TEST-65-ANALYZE.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-65-ANALYZE.sh	2025-09-03 18:35:40.000000000 +0000
@@ -882,13 +882,13 @@ systemd-analyze security --threshold=90
                            --security-policy=/tmp/testfile.json \
                            --root=/tmp/img/ testfile.service
 
-# The strict profile adds a lot of sanboxing options
+# The strict profile adds a lot of sandboxing options
 systemd-analyze security --threshold=25 --offline=true \
                            --security-policy=/tmp/testfile.json \
                            --profile=strict \
                            --root=/tmp/img/ testfile.service
 
-# The trusted profile doesn't add any sanboxing options
+# The trusted profile doesn't add any sandboxing options
 (! systemd-analyze security --threshold=25 --offline=true \
                            --security-policy=/tmp/testfile.json \
                            --profile=/usr/lib/systemd/portable/profile/trusted/service.conf \
diff -pruN 257.7-1/test/units/TEST-67-INTEGRITY.sh 257.9-0ubuntu2/test/units/TEST-67-INTEGRITY.sh
--- 257.7-1/test/units/TEST-67-INTEGRITY.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-67-INTEGRITY.sh	2025-09-03 18:35:40.000000000 +0000
@@ -87,7 +87,7 @@ test_one() {
     udevadm wait --timeout=30 --settle "${DM_NODE}"
     mkfs.ext4 -U "${FS_UUID}" "${DM_NODE}"
     # Wait for synthetic events being processed.
-    udevadm settle
+    udevadm settle --timeout=30
     integritysetup close "${DM_NAME}"
     udevadm wait --timeout=30 --settle --removed "${DM_NODE}"
 
diff -pruN 257.7-1/test/units/TEST-70-TPM2.pcrlock.sh 257.9-0ubuntu2/test/units/TEST-70-TPM2.pcrlock.sh
--- 257.7-1/test/units/TEST-70-TPM2.pcrlock.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-70-TPM2.pcrlock.sh	2025-09-03 18:35:40.000000000 +0000
@@ -155,7 +155,11 @@ test -f "$CREDENTIAL_FILE"
 CREDENTIAL_NAME=${CREDENTIAL_FILE#/tmp/fakexbootldr/loader/credentials/}
 CREDENTIAL_NAME=${CREDENTIAL_NAME%.cred}
 
-systemd-creds decrypt --name="$CREDENTIAL_NAME" "$CREDENTIAL_FILE"
+# If SB is enabled then this will fail as it's not locked but TPM2 is enabled
+if cmp /sys/firmware/efi/efivars/SecureBoot-8be4df61-93ca-11d2-aa0d-00e098032b8c <(printf '\6\0\0\0\1'); then
+    ALLOW_NULL=--allow-null
+fi
+systemd-creds decrypt "${ALLOW_NULL:-}" --name="$CREDENTIAL_NAME" "$CREDENTIAL_FILE"
 ln -s "$CREDENTIAL_FILE" /tmp/fakexbootldr/loader/credentials/"$CREDENTIAL_NAME"
 test -f /tmp/fakexbootldr/loader/credentials/"$CREDENTIAL_NAME"
 
diff -pruN 257.7-1/test/units/TEST-71-HOSTNAME.sh 257.9-0ubuntu2/test/units/TEST-71-HOSTNAME.sh
--- 257.7-1/test/units/TEST-71-HOSTNAME.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-71-HOSTNAME.sh	2025-09-03 18:35:40.000000000 +0000
@@ -62,7 +62,7 @@ get_chassis() (
 )
 
 stop_hostnamed() {
-    systemctl stop systemd-hostnamed.service
+    systemctl stop --job-mode=replace-irreversibly systemd-hostnamed.service
     # Reset trigger limit. This might fail if the unit was unloaded already, so ignore any errors.
     systemctl reset-failed systemd-hostnamed || :
 }
diff -pruN 257.7-1/test/units/TEST-72-SYSUPDATE.sh 257.9-0ubuntu2/test/units/TEST-72-SYSUPDATE.sh
--- 257.7-1/test/units/TEST-72-SYSUPDATE.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-72-SYSUPDATE.sh	2025-09-03 18:35:40.000000000 +0000
@@ -54,15 +54,18 @@ at_exit() {
 trap at_exit EXIT
 
 update_checksums() {
-	(cd "$WORKDIR/source" && sha256sum uki* part* dir-*.tar.gz >SHA256SUMS)
+    (cd "$WORKDIR/source" && sha256sum uki* part* dir-*.tar.gz >SHA256SUMS)
 }
 
 new_version() {
     local sector_size="${1:?}"
     local version="${2:?}"
 
-    # Create a pair of random partition payloads, and compress one
-    dd if=/dev/urandom of="$WORKDIR/source/part1-$version.raw" bs="$sector_size" count=2048
+    # Create a pair of random partition payloads, and compress one.
+    # To make not the initial bytes of part1-xxx.raw accidentally match one of the compression header,
+    # let's make the first sector filled by zero.
+    dd if=/dev/zero of="$WORKDIR/source/part1-$version.raw" bs="$sector_size" count=1
+    dd if=/dev/urandom of="$WORKDIR/source/part1-$version.raw" bs="$sector_size" count=2047 conv=notrunc oflag=append
     dd if=/dev/urandom of="$WORKDIR/source/part2-$version.raw" bs="$sector_size" count=2048
     gzip -k -f "$WORKDIR/source/part2-$version.raw"
 
@@ -354,7 +357,7 @@ EOF
         updatectl check
         rm -r /run/sysupdate.test.d
     fi
-    
+
     # Create seventh version, and update through a file:// URL. This should be
     # almost as good as testing HTTP, but is simpler for us to set up. file:// is
     # abstracted in curl for us, and since our main goal is to test our own code
diff -pruN 257.7-1/test/units/TEST-74-AUX-UTILS.defer_reactivation.sh 257.9-0ubuntu2/test/units/TEST-74-AUX-UTILS.defer_reactivation.sh
--- 257.7-1/test/units/TEST-74-AUX-UTILS.defer_reactivation.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-74-AUX-UTILS.defer_reactivation.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-set -eux
-set -o pipefail
-
-systemctl start realtime-test.timer
-
-sleep 35
-mindelta=10
-
-last=
-while read -r time; do
-    if [ -n "$last" ]; then
-        delta=$((time - last))
-        if [ "$delta" -lt $mindelta ]; then
-            echo "Timer fired too early: $delta < $mindelta" >/failed
-            break
-        fi
-    fi
-    last=$time
-done </tmp/realtime-test.log
-
-test ! -s /failed
diff -pruN 257.7-1/test/units/TEST-74-AUX-UTILS.networkctl.sh 257.9-0ubuntu2/test/units/TEST-74-AUX-UTILS.networkctl.sh
--- 257.7-1/test/units/TEST-74-AUX-UTILS.networkctl.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-74-AUX-UTILS.networkctl.sh	2025-09-03 18:35:40.000000000 +0000
@@ -43,6 +43,7 @@ touch /usr/lib/systemd/network/donotexis
 (! networkctl unmask "donotexist.network")
 rm /usr/lib/systemd/network/donotexist.network
 
+(! networkctl cat "/usr/lib/systemd/network/$NETWORK_NAME")
 networkctl cat "$NETWORK_NAME" | tail -n +2 | cmp - "/usr/lib/systemd/network/$NETWORK_NAME"
 
 cat >new <<EOF
@@ -50,6 +51,7 @@ cat >new <<EOF
 Name=test2
 EOF
 
+(! networkctl edit "/usr/lib/systemd/network/$NETWORK_NAME")
 EDITOR='mv new' script -ec 'networkctl edit --runtime "$NETWORK_NAME"' /dev/null
 (! networkctl mask --runtime "$NETWORK_NAME")
 printf '%s\n' '[Match]' 'Name=test2' | cmp - "/run/systemd/network/$NETWORK_NAME"
diff -pruN 257.7-1/test/units/TEST-74-AUX-UTILS.run.sh 257.9-0ubuntu2/test/units/TEST-74-AUX-UTILS.run.sh
--- 257.7-1/test/units/TEST-74-AUX-UTILS.run.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-74-AUX-UTILS.run.sh	2025-09-03 18:35:40.000000000 +0000
@@ -280,4 +280,4 @@ if [[ -e /usr/lib/pam.d/systemd-run0 ]]
 fi
 
 # Tests whether intermediate disconnects corrupt us (modified testcase from https://github.com/systemd/systemd/issues/27204)
-assert_rc "37" systemd-run --unit=disconnecttest --wait --pipe --user -M testuser@.host bash -ec 'systemctl --user daemon-reexec; sleep 3; exit 37'
+assert_rc "37" timeout 300 systemd-run --unit=disconnecttest --wait --pipe --user -M testuser@.host bash -ec 'systemctl --user daemon-reexec; sleep 3; exit 37'
diff -pruN 257.7-1/test/units/TEST-75-RESOLVED.sh 257.9-0ubuntu2/test/units/TEST-75-RESOLVED.sh
--- 257.7-1/test/units/TEST-75-RESOLVED.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-75-RESOLVED.sh	2025-09-03 18:35:40.000000000 +0000
@@ -134,7 +134,7 @@ EOF
         echo "FallbackDNS="
         echo "DNSSEC=allow-downgrade"
         echo "DNSOverTLS=opportunistic"
-    } >/run/systemd/resolved.conf.d/test.conf
+    } >/run/systemd/resolved.conf.d/10-test.conf
     ln -svf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
     # Override the default NTA list, which turns off DNSSEC validation for (among
     # others) the test. domain
@@ -231,7 +231,6 @@ manual_testcase_01_resolvectl() {
     # Cleanup
     # shellcheck disable=SC2317
     cleanup() {
-        rm -f /run/systemd/resolved.conf.d/mdns-llmnr.conf
         ip link del hoge
         ip link del hoge.foo
     }
@@ -319,7 +318,7 @@ manual_testcase_02_mdns_llmnr() {
 
     # Cleanup
     cleanup() {
-        rm -f /run/systemd/resolved.conf.d/mdns-llmnr.conf
+        rm -f /run/systemd/resolved.conf.d/90-mdns-llmnr.conf
         ip link del hoge
         ip link del hoge.foo
     }
@@ -331,7 +330,7 @@ manual_testcase_02_mdns_llmnr() {
         echo "[Resolve]"
         echo "MulticastDNS=no"
         echo "LLMNR=no"
-    } >/run/systemd/resolved.conf.d/mdns-llmnr.conf
+    } >/run/systemd/resolved.conf.d/90-mdns-llmnr.conf
     restart_resolved
     # make sure networkd is not running.
     systemctl stop systemd-networkd.service
@@ -342,7 +341,7 @@ manual_testcase_02_mdns_llmnr() {
         echo "[Resolve]"
         echo "MulticastDNS=yes"
         echo "LLMNR=yes"
-    } >/run/systemd/resolved.conf.d/mdns-llmnr.conf
+    } >/run/systemd/resolved.conf.d/90-mdns-llmnr.conf
     systemctl reload systemd-resolved.service
     # defaults to yes (both the global and per-link settings are yes)
     assert_in 'yes' "$(resolvectl mdns hoge)"
@@ -366,7 +365,7 @@ manual_testcase_02_mdns_llmnr() {
         echo "[Resolve]"
         echo "MulticastDNS=resolve"
         echo "LLMNR=resolve"
-    } >/run/systemd/resolved.conf.d/mdns-llmnr.conf
+    } >/run/systemd/resolved.conf.d/90-mdns-llmnr.conf
     systemctl reload systemd-resolved.service
     # set per-link setting
     resolvectl mdns hoge yes
@@ -386,7 +385,7 @@ manual_testcase_02_mdns_llmnr() {
         echo "[Resolve]"
         echo "MulticastDNS=no"
         echo "LLMNR=no"
-    } >/run/systemd/resolved.conf.d/mdns-llmnr.conf
+    } >/run/systemd/resolved.conf.d/90-mdns-llmnr.conf
     systemctl reload systemd-resolved.service
     (! lsof -p "$(systemctl show --property MainPID --value systemd-resolved.service)" | grep -q ":mdns\|:5353")
     # set per-link setting
@@ -790,10 +789,62 @@ testcase_08_resolved() {
 }
 
 testcase_09_resolvectl_showcache() {
+    # Cleanup
+    # shellcheck disable=SC2317
+    cleanup() {
+        rm -f /run/systemd/resolved.conf.d/90-resolved.conf
+        rm -f /run/systemd/network/10-dns2.netdev
+        rm -f /run/systemd/network/10-dns2.network
+        networkctl reload
+        systemctl reload systemd-resolved.service
+        resolvectl revert dns0
+    }
+
+    trap cleanup RETURN
+
     ### Test resolvectl show-cache
     run resolvectl show-cache
     run resolvectl show-cache --json=short
     run resolvectl show-cache --json=pretty
+
+    # Use resolvectl show-cache to check that reloding resolved updates scope
+    # DNSSEC and DNSOverTLS modes.
+    {
+        echo "[NetDev]"
+        echo "Name=dns2"
+        echo "Kind=dummy"
+    } > /run/systemd/network/10-dns2.netdev
+    {
+        echo "[Match]"
+        echo "Name=dns2"
+        echo "[Network]"
+        echo "IPv6AcceptRA=no"
+        echo "Address=10.123.0.1/24"
+        echo "DNS=10.0.0.1"
+    } > /run/systemd/network/10-dns2.network
+    networkctl reload
+    networkctl reconfigure dns2
+
+    mkdir -p /run/systemd/resolved.conf.d/
+    {
+        echo "[Resolve]"
+        echo "DNSSEC=no"
+        echo "DNSOverTLS=no"
+    } > /run/systemd/resolved.conf.d/90-resolved.conf
+    systemctl reload systemd-resolved.service
+
+    test "$(resolvectl show-cache --json=short | jq -rc '.[] | select(.ifname == "dns2" and .protocol == "dns") | .dnssec')" == 'no'
+    test "$(resolvectl show-cache --json=short | jq -rc '.[] | select(.ifname == "dns2" and .protocol == "dns") | .dnsOverTLS')" == 'no'
+
+    {
+        echo "[Resolve]"
+        echo "DNSSEC=allow-downgrade"
+        echo "DNSOverTLS=opportunistic"
+    } > /run/systemd/resolved.conf.d/90-resolved.conf
+    systemctl reload systemd-resolved.service
+
+    test "$(resolvectl show-cache --json=short | jq -rc '.[] | select(.ifname == "dns2" and .protocol == "dns") | .dnssec')" == 'allow-downgrade'
+    test "$(resolvectl show-cache --json=short | jq -rc '.[] | select(.ifname == "dns2" and .protocol == "dns") | .dnsOverTLS')" == 'opportunistic'
 }
 
 testcase_10_resolvectl_json() {
@@ -855,7 +906,7 @@ testcase_11_nft() {
     {
         echo "[Resolve]"
         echo "StaleRetentionSec=1d"
-    } >/run/systemd/resolved.conf.d/test.conf
+    } >/run/systemd/resolved.conf.d/10-test.conf
     ln -svf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
     systemctl reload systemd-resolved.service
 
@@ -947,7 +998,7 @@ testcase_12_resolvectl2() {
     # Cleanup
     # shellcheck disable=SC2317
     cleanup() {
-        rm -f /run/systemd/resolved.conf.d/reload.conf
+        rm -f /run/systemd/resolved.conf.d/90-reload.conf
         systemctl reload systemd-resolved.service
     }
 
@@ -1001,7 +1052,7 @@ testcase_12_resolvectl2() {
         echo "[Resolve]"
         echo "DNS=8.8.8.8"
         echo "DNSStubListenerExtra=127.0.0.153"
-    } >/run/systemd/resolved.conf.d/reload.conf
+    } >/run/systemd/resolved.conf.d/90-reload.conf
     resolvectl dns dns0 1.1.1.1
     systemctl reload systemd-resolved.service
     resolvectl status
@@ -1019,7 +1070,7 @@ testcase_12_resolvectl2() {
         echo "[Resolve]"
         echo "DNS=8.8.4.4"
         echo "DNSStubListenerExtra=127.0.0.154"
-    } >/run/systemd/resolved.conf.d/reload.conf
+    } >/run/systemd/resolved.conf.d/90-reload.conf
     systemctl reload systemd-resolved.service
     resolvectl status
 
diff -pruN 257.7-1/test/units/TEST-76-SYSCTL.sh 257.9-0ubuntu2/test/units/TEST-76-SYSCTL.sh
--- 257.7-1/test/units/TEST-76-SYSCTL.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-76-SYSCTL.sh	2025-09-03 18:35:40.000000000 +0000
@@ -18,7 +18,7 @@ assert_rc 0 /usr/lib/systemd/systemd-sys
 
 if ! systemd-detect-virt --quiet --container; then
     ip link add hoge type dummy
-    udevadm wait /sys/class/net/hoge
+    udevadm wait --timeout=30 /sys/class/net/hoge
 
     cat >/tmp/foo.conf <<EOF
 net.ipv4.conf.*.drop_gratuitous_arp=1
diff -pruN 257.7-1/test/units/TEST-84-STORAGETM.sh 257.9-0ubuntu2/test/units/TEST-84-STORAGETM.sh
--- 257.7-1/test/units/TEST-84-STORAGETM.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-84-STORAGETM.sh	2025-09-03 18:35:40.000000000 +0000
@@ -30,7 +30,7 @@ systemd-run -u teststoragetm.service -p
 NVME_DEVICE="/dev/disk/by-id/nvme-uuid.${NVME_UUID:?}"
 
 nvme connect-all "${VERBOSE}" -t tcp -a 127.0.0.1 -s 16858 --hostnqn="$(nvme gen-hostnqn)"
-udevadm wait --settle "$NVME_DEVICE"
+udevadm wait --settle --timeout=30 "$NVME_DEVICE"
 
 dd if="$NVME_DEVICE" bs=1024 | cmp /var/tmp/storagetm.test -
 
diff -pruN 257.7-1/test/units/TEST-87-AUX-UTILS-VM.bootctl.sh 257.9-0ubuntu2/test/units/TEST-87-AUX-UTILS-VM.bootctl.sh
--- 257.7-1/test/units/TEST-87-AUX-UTILS-VM.bootctl.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-87-AUX-UTILS-VM.bootctl.sh	2025-09-03 18:35:40.000000000 +0000
@@ -21,7 +21,42 @@ fi
 
 (! systemd-detect-virt -cq)
 
+restore_esp() {
+    if [ ! -d /tmp/esp.bak ]; then
+        return
+    fi
+
+    if [ -d /tmp/esp.bak/EFI/ ]; then
+        cp -r /tmp/esp.bak/EFI/* "$(bootctl --print-esp-path)/EFI/"
+    fi
+    if [ -d /tmp/esp.bak/loader/ ]; then
+        cp -r /tmp/esp.bak/loader/* "$(bootctl --print-esp-path)/loader/"
+    fi
+    rm -rf /tmp/esp.bak
+}
+
+backup_esp() {
+    if [ -d /tmp/esp.bak ]; then
+        return
+    fi
+
+    if [[ -d "$(bootctl --print-esp-path)/EFI" ]]; then
+        mkdir -p /tmp/esp.bak
+        cp -r "$(bootctl --print-esp-path)/EFI/" /tmp/esp.bak/
+    fi
+    if [[ -d "$(bootctl --print-esp-path)/loader" ]]; then
+        mkdir -p /tmp/esp.bak
+        cp -r "$(bootctl --print-esp-path)/loader/" /tmp/esp.bak/
+    fi
+}
+
 basic_tests() {
+    # Ensure the system's ESP (no --image/--root args) is still available for the next tests
+    if [ $# -eq 0 ]; then
+        backup_esp
+        trap restore_esp RETURN ERR
+    fi
+
     bootctl "$@" --help
     bootctl "$@" --version
 
@@ -77,7 +112,7 @@ cleanup_image() (
         unset LOOPDEV
     fi
 
-    udevadm settle
+    udevadm settle --timeout=30
 
     rm -rf "${IMAGE_DIR}"
     unset IMAGE_DIR
@@ -101,7 +136,7 @@ EOF
     LOOPDEV="$(losetup --show -P -f "${IMAGE_DIR}/image")"
     sfdisk "$LOOPDEV" <"${IMAGE_DIR}/partscript"
 
-    udevadm settle
+    udevadm settle --timeout=30
 
     mkfs.vfat -n esp  "${LOOPDEV}p1"
     mkfs.ext4 -L root "${LOOPDEV}p2"
@@ -158,7 +193,7 @@ cleanup_raid() (
         mdadm --misc --force --zero-superblock "${LOOPDEV2}p2"
     fi
 
-    udevadm settle
+    udevadm settle --timeout=30
 
     if [[ -n "${LOOPDEV1:-}" ]]; then
         mdadm --misc --force --zero-superblock "${LOOPDEV1}p1"
@@ -174,7 +209,7 @@ cleanup_raid() (
         unset LOOPDEV2
     fi
 
-    udevadm settle
+    udevadm settle --timeout=30
 
     rm -rf "${IMAGE_DIR}"
 
@@ -210,7 +245,7 @@ EOF
     sfdisk "$LOOPDEV1" <"${IMAGE_DIR}/partscript"
     sfdisk "$LOOPDEV2" <"${IMAGE_DIR}/partscript"
 
-    udevadm settle
+    udevadm settle --timeout=30
 
     printf 'y\ny\n' | mdadm --create /dev/md/raid-esp --name "raid-esp" "${LOOPDEV1}p1" "${LOOPDEV2}p1" -v -f --level=1 --raid-devices=2
     mkfs.vfat /dev/md/raid-esp
@@ -274,6 +309,10 @@ testcase_bootctl_varlink() {
 }
 
 testcase_bootctl_secure_boot_auto_enroll() {
+    # mkosi can also add keys here, so back them up and restored them
+    backup_esp
+    trap restore_esp RETURN ERR
+
     cat >/tmp/openssl.conf <<EOF
 [ req ]
 prompt = no
@@ -293,6 +332,9 @@ EOF
             -x509 -sha256 -nodes -days 365 -newkey rsa:4096 \
             -keyout /tmp/sb.key -out /tmp/sb.crt
 
+    # This will fail if there are already keys in the ESP, so we remove them first
+    rm -rf "$(bootctl --print-esp-path)/loader/keys/auto"
+
     bootctl install --make-entry-directory=yes --secure-boot-auto-enroll=yes --certificate /tmp/sb.crt --private-key /tmp/sb.key
     for var in PK KEK db; do
         test -f "$(bootctl --print-esp-path)/loader/keys/auto/$var.auth"
@@ -300,4 +342,21 @@ EOF
     bootctl remove
 }
 
+testcase_secureboot() {
+    if [ ! -d /sys/firmware/efi ]; then
+        echo "Not booted with EFI, skipping secureboot tests."
+        return 0
+    fi
+
+    # Ensure secure boot is enabled and not in setup mode
+    cmp /sys/firmware/efi/efivars/SecureBoot-8be4df61-93ca-11d2-aa0d-00e098032b8c <(printf '\6\0\0\0\1')
+    cmp /sys/firmware/efi/efivars/SetupMode-8be4df61-93ca-11d2-aa0d-00e098032b8c <(printf '\6\0\0\0\0')
+    bootctl status | grep -q "Secure Boot: enabled"
+
+    # Ensure the addon is fully loaded and parsed
+    bootctl status | grep -q "global-addon: loader/addons/test.addon.efi"
+    bootctl status | grep "cmdline" | grep -q addonfoobar
+    grep -q addonfoobar /proc/cmdline
+}
+
 run_testcases
diff -pruN 257.7-1/test/units/TEST-87-AUX-UTILS-VM.coredump.sh 257.9-0ubuntu2/test/units/TEST-87-AUX-UTILS-VM.coredump.sh
--- 257.7-1/test/units/TEST-87-AUX-UTILS-VM.coredump.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-87-AUX-UTILS-VM.coredump.sh	2025-09-03 18:35:40.000000000 +0000
@@ -23,7 +23,8 @@ at_exit() {
 
 trap at_exit EXIT
 
-# To make all coredump entries stored in system.journal.
+# Sync and rotate journal to make all coredump entries stored in system.journal.
+journalctl --sync
 journalctl --rotate
 
 # Check that we're the ones to receive coredumps
@@ -109,6 +110,16 @@ EOF
     unset CONTAINER
 fi
 
+# Sync and rotate journals (again) to make coredumps stored in archived journal. Otherwise, the main active
+# journal file may be already mostly filled with the coredumps, and may trigger rotation during the sanity
+# checks below. If coredumpctl accesses the main journal currently rotationg, then it warns the following and
+# skips reading the main journal, and cannot find the recent coredumps:
+# TEST-87-AUX-UTILS-VM.sh[839]: + coredumpctl -n 1
+# TEST-87-AUX-UTILS-VM.sh[1172]: Journal file /var/log/journal/a8285330872602d1377cbaaf68869946/system.journal is truncated, ignoring file.
+# TEST-87-AUX-UTILS-VM.sh[1172]: No coredumps found.
+journalctl --sync
+journalctl --rotate
+
 coredumpctl
 SYSTEMD_LOG_LEVEL=debug coredumpctl
 coredumpctl --help
diff -pruN 257.7-1/test/units/TEST-87-AUX-UTILS-VM.mount.sh 257.9-0ubuntu2/test/units/TEST-87-AUX-UTILS-VM.mount.sh
--- 257.7-1/test/units/TEST-87-AUX-UTILS-VM.mount.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/TEST-87-AUX-UTILS-VM.mount.sh	2025-09-03 18:35:40.000000000 +0000
@@ -46,7 +46,7 @@ systemd-umount "$WORK_DIR/overlay"
 dd if=/dev/zero of="$WORK_DIR/simple.img" bs=1M count=16
 mkfs.ext4 -L sd-mount-test "$WORK_DIR/simple.img"
 LOOP="$(losetup --show --find "$WORK_DIR/simple.img")"
-udevadm wait --timeout 60 --settle "$LOOP"
+udevadm wait --timeout=60 --settle "$LOOP"
 # Also wait for the .device unit for the loop device is active. Otherwise, the .device unit activation
 # that is triggered by the .mount unit introduced by systemd-mount below may time out.
 timeout 60 bash -c "until systemctl is-active $LOOP; do sleep 1; done"
@@ -139,7 +139,7 @@ systemd-mount --discover "$WORK_DIR/simp
 # We can access files in the image even if the loopback block device is not initialized by udevd.
 test -e /run/media/system/simple.img/foo.bar
 # systemd-mount --list and systemd-umount require the loopback block device is initialized by udevd.
-udevadm settle --timeout 30
+udevadm settle --timeout=30
 assert_in "/dev/loop.* ext4 +sd-mount-test" "$(systemd-mount --list --full)"
 LOOP_AUTO=$(systemd-mount --list --full --no-legend | awk '$7 == "sd-mount-test" { print $1 }')
 LOOP_AUTO_DEVPATH=$(udevadm info --query property --property DEVPATH --value "$LOOP_AUTO")
diff -pruN 257.7-1/test/units/delegated_cgroup_filtering_payload.sh 257.9-0ubuntu2/test/units/delegated_cgroup_filtering_payload.sh
--- 257.7-1/test/units/delegated_cgroup_filtering_payload.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/delegated_cgroup_filtering_payload.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-mkdir /sys/fs/cgroup/system.slice/delegated-cgroup-filtering.service/the_child
-/bin/sh /usr/lib/systemd/tests/testdata/units/delegated_cgroup_filtering_payload_child.sh
-
-echo "parent_process: hello, world!"
-echo "parent_process: hello, people!"
-
-# If the service finishes extremely fast, journald cannot find the source of the
-# stream. Hence, we need to call 'journalctl --sync' before service finishes.
-journalctl --sync
diff -pruN 257.7-1/test/units/delegated_cgroup_filtering_payload_child.sh 257.9-0ubuntu2/test/units/delegated_cgroup_filtering_payload_child.sh
--- 257.7-1/test/units/delegated_cgroup_filtering_payload_child.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/test/units/delegated_cgroup_filtering_payload_child.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-echo $$ >/sys/fs/cgroup/system.slice/delegated-cgroup-filtering.service/the_child/cgroup.procs
-
-echo "child_process: hello, world!"
-echo "child_process: hello, people!"
-sleep .15
diff -pruN 257.7-1/tmpfiles.d/meson.build 257.9-0ubuntu2/tmpfiles.d/meson.build
--- 257.7-1/tmpfiles.d/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/tmpfiles.d/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -44,7 +44,6 @@ in_files = [
 foreach f : in_files
         if f.length() == 1 or conf.get(f[1]) == 1
                 custom_target(
-                        f[0],
                         input : f[0] + '.in',
                         output: f[0],
                         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/tools/check-version-history.py 257.9-0ubuntu2/tools/check-version-history.py
--- 257.7-1/tools/check-version-history.py	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/tools/check-version-history.py	2025-09-03 18:35:40.000000000 +0000
@@ -23,7 +23,7 @@ def find_undocumented_functions(pages, i
         assert pagetree.getroot().tag == "refentry"
 
         hist_section = pagetree.find("refsect1[title='History']")
-        for func in pagetree.findall("//funcprototype/funcdef/function"):
+        for func in pagetree.findall(".//funcprototype/funcdef/function"):
             path = f"./refsynopsisdiv/funcsynopsis/funcprototype/funcdef/function[.='{func.text}']"
             assert pagetree.findall(path) == [func]
 
diff -pruN 257.7-1/tools/elf2efi.py 257.9-0ubuntu2/tools/elf2efi.py
--- 257.7-1/tools/elf2efi.py	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/tools/elf2efi.py	2025-09-03 18:35:40.000000000 +0000
@@ -214,6 +214,7 @@ IGNORE_SECTIONS = [
     ".eh_frame_hdr",
     ".ARM.exidx",
     ".relro_padding",
+    ".sframe",
 ]
 
 IGNORE_SECTION_TYPES = [
diff -pruN 257.7-1/tools/fetch-mkosi.py 257.9-0ubuntu2/tools/fetch-mkosi.py
--- 257.7-1/tools/fetch-mkosi.py	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/tools/fetch-mkosi.py	2025-09-03 18:35:40.000000000 +0000
@@ -75,7 +75,7 @@ def update_mkosi(args):
         print(f'mkosi: commit {new_commit!s} is still fresh')
         return
 
-    cmd = ['git', '-C', args.dir.as_posix(), 'log', '--graph',
+    cmd = ['git', '-C', args.dir.as_posix(), 'log', '--graph', '--first-parent', '--no-merges',
            '--pretty=oneline', '--no-decorate', '--abbrev-commit', '--abbrev=10',
            f'{old_commit}..{new_commit}']
     print(f"+ {shlex.join(cmd)}")
diff -pruN 257.7-1/tools/vcs-tag.sh 257.9-0ubuntu2/tools/vcs-tag.sh
--- 257.7-1/tools/vcs-tag.sh	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/tools/vcs-tag.sh	2025-09-03 18:35:40.000000000 +0000
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 
diff -pruN 257.7-1/units/initrd-cleanup.service 257.9-0ubuntu2/units/initrd-cleanup.service
--- 257.7-1/units/initrd-cleanup.service	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/units/initrd-cleanup.service	2025-09-03 18:35:40.000000000 +0000
@@ -14,6 +14,7 @@ AssertPathExists=/etc/initrd-release
 OnFailure=emergency.target
 OnFailureJobMode=replace-irreversibly
 After=initrd-root-fs.target initrd-fs.target initrd.target
+Conflicts=emergency.target
 
 [Service]
 Type=oneshot
diff -pruN 257.7-1/units/kmod-static-nodes.service.in 257.9-0ubuntu2/units/kmod-static-nodes.service.in
--- 257.7-1/units/kmod-static-nodes.service.in	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/units/kmod-static-nodes.service.in	2025-09-03 18:35:40.000000000 +0000
@@ -13,6 +13,7 @@ DefaultDependencies=no
 Before=sysinit.target systemd-tmpfiles-setup-dev-early.service
 ConditionCapability=CAP_SYS_MODULE
 ConditionFileNotEmpty=/lib/modules/%v/modules.devname
+ConditionPathExists={{KMOD}}
 
 [Service]
 Type=oneshot
diff -pruN 257.7-1/units/meson.build 257.9-0ubuntu2/units/meson.build
--- 257.7-1/units/meson.build	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/units/meson.build	2025-09-03 18:35:40.000000000 +0000
@@ -820,7 +820,6 @@ foreach unit : units
 
         if needs_jinja
                 custom_target(
-                        name,
                         input : source,
                         output : name,
                         command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
diff -pruN 257.7-1/units/ssh-access.target 257.9-0ubuntu2/units/ssh-access.target
--- 257.7-1/units/ssh-access.target	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/units/ssh-access.target	2025-09-03 18:35:40.000000000 +0000
@@ -10,3 +10,4 @@
 [Unit]
 Description=SSH Access Available
 Documentation=man:systemd.special(7)
+StopWhenUnneeded=yes
diff -pruN 257.7-1/units/systemd-oomd.service.in 257.9-0ubuntu2/units/systemd-oomd.service.in
--- 257.7-1/units/systemd-oomd.service.in	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/units/systemd-oomd.service.in	2025-09-03 18:35:40.000000000 +0000
@@ -20,7 +20,7 @@ ConditionPathExists=/proc/pressure/cpu
 ConditionPathExists=/proc/pressure/io
 ConditionPathExists=/proc/pressure/memory
 Requires=systemd-oomd.socket
-After=systemd-oomd.socket
+After=systemd-oomd.socket systemd-sysusers.service
 
 [Service]
 AmbientCapabilities=CAP_KILL CAP_DAC_OVERRIDE
diff -pruN 257.7-1/units/systemd-portabled.service.in 257.9-0ubuntu2/units/systemd-portabled.service.in
--- 257.7-1/units/systemd-portabled.service.in	2025-06-25 12:36:51.000000000 +0000
+++ 257.9-0ubuntu2/units/systemd-portabled.service.in	2025-09-03 18:35:40.000000000 +0000
@@ -12,6 +12,8 @@ Description=Portable Service Manager
 Documentation=man:systemd-portabled.service(8)
 Documentation=man:org.freedesktop.portable1(5)
 RequiresMountsFor=/var/lib/portables
+Wants=modprobe@loop.service
+After=modprobe@loop.service
 
 [Service]
 ExecStart={{LIBEXECDIR}}/systemd-portabled
