mkosi: Relax separate branch check in mkosi.sync

There's no guarantee that $GIT_BRANCH is always the same across
stable release branches and main. But we still need to make sure
we switch commits if we're switching between main and release branches.

To make this work, let's not check if the current HEAD commit is an
ancestor of the currently configured origin branch. Instead, let's
check if any of the origin branches contains the current HEAD commit.
This still makes sure that we won't switch commits if we're working
on a local branch while making sure that we do switch commits if we're
switching between main and stable release branches with different
git branches configured for the packaging repo checkout.

(cherry picked from commit 1207ba48d7405ca9bf9b987d8e83525b677a82ca)

.github/workflows/build-test.sh

@@ -125,10 +125,15 @@ 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
+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[@]}"
@@ -139,6 +144,11 @@ sudo apt-get -y install "${PACKAGES[@]}"
 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

.github/workflows/build-test.yml

@@ -17,22 +17,35 @@ permissions:
 
 jobs:
   build:
-    runs-on: ubuntu-24.04
+    runs-on: ${{ matrix.runner }}
     concurrency:
-      group: ${{ github.workflow }}-${{ toJSON(matrix.env) }}-${{ github.ref }}
+      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

.github/workflows/linter.yml

@@ -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

.github/workflows/mkosi.yml

@@ -61,6 +61,17 @@ jobs:
             cflags: "-O2 -D_FORTIFY_SOURCE=3"
             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: ""

docs/NETWORK_ONLINE.md

@@ -243,7 +243,7 @@ that matches various links, but also by settings like
 [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:
 

hwdb.d/20-acpi-vendor.hwdb.patch

@@ -1,5 +1,5 @@
---- 20-acpi-vendor.hwdb.base	2025-08-04 12:23:12.909334713 +0100
-+++ 20-acpi-vendor.hwdb	2025-08-04 12:23:12.917334855 +0100
+--- 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

hwdb.d/60-autosuspend-fingerprint-reader.hwdb

@@ -188,6 +188,7 @@ usb:v2808pA78A*
 # Supported by libfprint driver fpcmoc
 usb:v10A5pFFE0*
 usb:v10A5pA305*
+usb:v10A5pA306*
 usb:v10A5pDA04*
 usb:v10A5pD805*
 usb:v10A5pD205*

hwdb.d/60-autosuspend.hwdb

@@ -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
 #########################################

hwdb.d/60-evdev.hwdb

@@ -749,6 +749,7 @@ evdev:name:AlpsPS/2 ALPS GlidePoint:dmi:*svnLENOVO:*pvrLenovoU41-70:*
 # 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

hwdb.d/60-keyboard.hwdb

@@ -251,7 +251,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAcer*:pnNitro*ANV*15-51:pvr*
 
 # 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
@@ -285,20 +285,8 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnASUS:pn*:*
  KEYBOARD_KEY_ee=volumedown
  KEYBOARD_KEY_ef=mute
 
-# Asus ROG series
-# Prevents the keyboard from sending POWER and SLEEP key presses
-# when the keyboard goes to sleep.
-evdev:input:b*v0B05p*e0111*
- KEYBOARD_KEY_10081=reserved
- KEYBOARD_KEY_10082=reserved
- KEYBOARD_KEY_70070=reserved
- KEYBOARD_KEY_70071=reserved
- KEYBOARD_KEY_70072=reserved
- KEYBOARD_KEY_70073=reserved
- KEYBOARD_KEY_70074=reserved
- KEYBOARD_KEY_70075=reserved
- KEYBOARD_KEY_70076=reserved
- KEYBOARD_KEY_70077=reserved
+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
@@ -408,7 +396,7 @@ evdev:name:gpio-keys:phys:gpio-keys/input0:ev:3:dmi:bvn*:bvr*:bd*:svncube:pni1-T
 ###########################################################
 
 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
@@ -2027,6 +2015,13 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnSystem76*:pnPangolin*:pvrpang15*
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnT-bao:pnTbookair:*
  KEYBOARD_KEY_76=touchpad_toggle                        # Touchpad toggle
 
+###########################################################
+# TongFang
+###########################################################
+# TongFang GX4 (X4SP4NAL)
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAiStone:pnX4SP4NAL:*
+ KEYBOARD_KEY_f8=fn
+
 ###########################################################
 # Toshiba
 ###########################################################

hwdb.d/60-sensor.hwdb

@@ -662,6 +662,10 @@ sensor:modalias:acpi:BMA250*:dmi:*:bvritWORKS.G.WI71C.JGBMRB*:*:svnInsyde:pni71c
 # 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

hwdb.d/70-mouse.hwdb

@@ -191,6 +191,14 @@ mouse:bluetooth:v256fpc63a:name:*
 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 Laser Mouse:*
 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 Receiver:*
 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 Abyssus:*
 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
 ##########################################

hwdb.d/70-software-radio.hwdb

@@ -21,21 +21,6 @@
 # Allowed properties are:
 #   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
 ##########################################
@@ -67,6 +52,21 @@ usb:v3923p7813*
 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
 ##########################################

hwdb.d/ma-medium.txt

@@ -7151,6 +7151,18 @@ F0-12-04   (hex)		MetaX
 				Shanghai    200000
 				CN
 
+2C-7A-F4   (hex)		Kegao Intelligent Garden Technology(Guangdong) Co.,Ltd.
+400000-4FFFFF     (base 16)		Kegao Intelligent Garden Technology(Guangdong) Co.,Ltd.
+				8/F Building D,No.39, East Keji Avenue, Shishan Town Nanhai District
+				Foshan   Guangdong   528225 
+				CN
+
+2C-7A-F4   (hex)		Shenzhen Yitoa Digital Technology Co., Ltd.
+300000-3FFFFF     (base 16)		Shenzhen Yitoa Digital Technology Co., Ltd.
+				7th floor, Building 1, Jiancang Technology Park, Bao'an, Shenzhen, China
+				Shenzhen  GuangDong  518000
+				CN
+
 2C-7A-F4   (hex)		ShangYu Auto Technology Co.,Ltd
 600000-6FFFFF     (base 16)		ShangYu Auto Technology Co.,Ltd
 				No. 69 Yuanda Road, Anting Town, Jiading District, Shanghai
@@ -7163,18 +7175,6 @@ F0-12-04   (hex)		MetaX
 				Xi'An  Shaanxi  710000
 				CN
 
-2C-7A-F4   (hex)		Shenzhen Yitoa Digital Technology Co., Ltd.
-300000-3FFFFF     (base 16)		Shenzhen Yitoa Digital Technology Co., Ltd.
-				7th floor, Building 1, Jiancang Technology Park, Bao'an, Shenzhen, China
-				Shenzhen  GuangDong  518000
-				CN
-
-2C-7A-F4   (hex)		Kegao Intelligent Garden Technology(Guangdong) Co.,Ltd.
-400000-4FFFFF     (base 16)		Kegao Intelligent Garden Technology(Guangdong) Co.,Ltd.
-				8/F Building D,No.39, East Keji Avenue, Shishan Town Nanhai District
-				Foshan   Guangdong   528225 
-				CN
-
 FC-A2-DF   (hex)		TiGHT AV
 C00000-CFFFFF     (base 16)		TiGHT AV
 				Uggledalsvägen 23
@@ -7295,6 +7295,36 @@ E00000-EFFFFF     (base 16)		Oppermann Regelgeräte GmbH
 				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
 				Floor 5th, Block 9th, Sunny Industrial Zone, Xili Town, Nanshan District, Shenzhen, China 
@@ -13958,12 +13988,6 @@ C00000-CFFFFF     (base 16)		Faaftech
 				Goiânia  Goias  74093020
 				BR
 
-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
-
 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
@@ -13982,6 +14006,12 @@ A00000-AFFFFF     (base 16)		Skylight
 				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
@@ -14030,6 +14060,18 @@ FC-E4-98   (hex)		NTCSOFT
 				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
@@ -14042,18 +14084,60 @@ C00000-CFFFFF     (base 16)		CYBERTEL BRIDGE
 				Seoul    08389
 				KR
 
-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)		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
@@ -21185,24 +21269,30 @@ E00000-EFFFFF     (base 16)		Orion Power Systems, Inc.
 				Yenimahalle  ANKARA  06374
 				TR
 
-04-58-5D   (hex)		Rexon Technology
-C00000-CFFFFF     (base 16)		Rexon Technology
-				No. 261, Renhua Rd., Dali Dist.
-				Taichung City     412037
-				TW
-
 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 
@@ -21215,11 +21305,11 @@ B0-CC-CE   (hex)		Gateview Technologies
 				JACKSONVILLE  FL  32226
 				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)		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.
@@ -21227,11 +21317,11 @@ B0-CC-CE   (hex)		Beijing Viazijing Technology Co., Ltd.
 				Beijing    100085
 				CN
 
-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
+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.
@@ -21239,18 +21329,18 @@ D00000-DFFFFF     (base 16)		Xiaomi EV Technology Co., Ltd.
 				Newton  MA  02460
 				US
 
-F8-2B-E6   (hex)		MaiaEdge, Inc.
-C00000-CFFFFF     (base 16)		MaiaEdge, Inc.
-				77 S. Bedford Street
-				Burlington  MA  01803
-				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
@@ -21269,18 +21359,18 @@ E00000-EFFFFF     (base 16)		Aplex Technology Inc.
 				Zhonghe District  New Taipei City 235   -
 				TW
 
-FC-E4-98   (hex)		SM Instruments
-500000-5FFFFF     (base 16)		SM Instruments
-				20, Yuseong-daero 1184beon-gil
-				Daejeon  Yuseong-gu  34109
-				KR
-
 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
@@ -21299,12 +21389,6 @@ C00000-CFFFFF     (base 16)		Shenzhen Mifasuolla Smart Co.,Ltd
 				Shenzhen  Guangdong  518052
 				CN
 
-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)		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
@@ -21317,30 +21401,78 @@ E00000-EFFFFF     (base 16)		Viettel Manufacturing Corporation One Member Limite
 				Mughalsarai  Uttar Pradesh(UP)  232101
 				IN
 
-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
-
 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
@@ -28214,40 +28346,34 @@ FC-A2-DF   (hex)		SpacemiT
 				zhuhai  guangdong  519000
 				CN
 
-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
-
 04-58-5D   (hex)		Wetatronics Limited
 000000-0FFFFF     (base 16)		Wetatronics Limited
 				45 Bath StreetParnell
 				Auckland  Auckland  1052
 				NZ
 
-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)		Corelase Oy
-500000-5FFFFF     (base 16)		Corelase Oy
-				Kauhakorvenkatu 52
-				Tampere  Pirkanmaa  33720
-				FI
-
 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)		Spatial Hover  Inc
-B00000-BFFFFF     (base 16)		Spatial Hover  Inc
-				10415 A Westpark Dr.
-				Houston  TX  77042
+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
@@ -28256,6 +28382,12 @@ D4-A0-FB   (hex)		NEXXUS NETWORKS INDIA PRIVATE LIMITED
 				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
@@ -28286,12 +28418,6 @@ B0-CC-CE   (hex)		Agrisys A/S
 				Seongnam    13590
 				KR
 
-FC-E4-98   (hex)		QuEL, Inc.
-100000-1FFFFF     (base 16)		QuEL, Inc.
-				ON Build. 5F 4-7-14 Myojincho
-				Hachioji  Tokyo  192-0046
-				JP
-
 FC-E4-98   (hex)		Infinity Electronics Ltd
 D00000-DFFFFF     (base 16)		Infinity Electronics Ltd
 				167-169 Great Portland Street
@@ -28310,6 +28436,12 @@ FC-E4-98   (hex)		AVCON Information Technology Co.,Ltd.
 				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
@@ -28340,6 +28472,60 @@ B00000-BFFFFF     (base 16)		Aeterlink Corp.
 				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
@@ -35339,11 +35525,11 @@ C00000-CFFFFF     (base 16)		Reonel Oy
 				ji nan shi  shandong  250031
 				CN
 
-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)		BPL MEDICAL TECHNOLOGIES PRIVATE LIMITED
+A00000-AFFFFF     (base 16)		BPL MEDICAL TECHNOLOGIES PRIVATE LIMITED
+				11KM BANNERGHATTA MAIN ROAD ARAKERE BANGALORE
+				BANGALORE  KARNATAKA  560076
+				IN
 
 FC-A2-DF   (hex)		Annapurna labs
 500000-5FFFFF     (base 16)		Annapurna labs
@@ -35351,11 +35537,11 @@ FC-A2-DF   (hex)		Annapurna labs
 				Mail box 15123  Haifa  3508409
 				IL
 
-FC-A2-DF   (hex)		BPL MEDICAL TECHNOLOGIES PRIVATE LIMITED
-A00000-AFFFFF     (base 16)		BPL MEDICAL TECHNOLOGIES PRIVATE LIMITED
-				11KM BANNERGHATTA MAIN ROAD ARAKERE BANGALORE
-				BANGALORE  KARNATAKA  560076
-				IN
+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.
@@ -35363,12 +35549,6 @@ D00000-DFFFFF     (base 16)		MBio Diagnostics, Inc.
 				Loveland    80538
 				US
 
-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)		Dron Edge India Private Limited
 900000-9FFFFF     (base 16)		Dron Edge India Private Limited
 				A 93 SECTOR 65 NOIDA 201301
@@ -35387,6 +35567,12 @@ D00000-DFFFFF     (base 16)		MBio Diagnostics, Inc.
 				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
@@ -35399,18 +35585,18 @@ A00000-AFFFFF     (base 16)		IMPULSE CCTV NETWORKS INDIA PVT. LTD.
 				GREATER NOIDA WEST  UTTAR PRADESH  201306
 				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)		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
@@ -35423,30 +35609,12 @@ A00000-AFFFFF     (base 16)		Shenzhen Dangs Science and Technology CO.,Ltd.
 				Shenzhen  Guangdong  518063
 				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
-
 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)		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
-
 78-78-35   (hex)		ENQT GmbH
 100000-1FFFFF     (base 16)		ENQT GmbH
 				Spaldingstrasse 210
@@ -35459,12 +35627,30 @@ C00000-CFFFFF     (base 16)		DBG Communications Technology Co.,Ltd.
 				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
@@ -35477,11 +35663,11 @@ FC-E4-98   (hex)		E Haute Intelligent Technology Co., Ltd
 				Shenzhen  Guangdong  518000
 				CN
 
-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
+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
@@ -35489,20 +35675,50 @@ FC-E4-98   (hex)		E Haute Intelligent Technology Co., Ltd
 				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
 
-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)		TRULY ELECTRONICS MFG.,LTD
+000000-0FFFFF     (base 16)		TRULY ELECTRONICS MFG.,LTD
+				Truly industry city，shanwei guangdong，P.R.C
+				shanwei  guangdong  516600
+				CN
 
-34-B5-F3   (hex)		Satco Europe GmbH
-100000-1FFFFF     (base 16)		Satco Europe GmbH
-				Waidhauserstr. 3
-				Vohenstrauß    92546
-				DE
+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

hwdb.d/ma-small.txt

@@ -7787,12 +7787,6 @@ DD2000-DD2FFF     (base 16)		SHIELD-CCTV CO.,LTD.
 				Poway  CA  92064
 				US
 
-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)		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,
@@ -7805,11 +7799,11 @@ A5D000-A5DFFF     (base 16)		Shenzhen zhushida Technology lnformation Co.,Ltd
 				SHENZHEN  Bao'an District  518000
 				CN
 
-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)		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
@@ -7817,18 +7811,36 @@ A5D000-A5DFFF     (base 16)		Shenzhen zhushida Technology lnformation Co.,Ltd
 				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
@@ -7841,18 +7853,6 @@ C09000-C09FFF     (base 16)		S.E.I. CO.,LTD.
 				Izunokuni  Shizuoka  4102133
 				JP
 
-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)		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)		Boon Arthur Engineering Pte Ltd
 D8A000-D8AFFF     (base 16)		Boon Arthur Engineering Pte Ltd
 				629 Aljunied Road #06-06 Cititech Industrial Building
@@ -7877,18 +7877,6 @@ C74000-C74FFF     (base 16)		Nippon Techno Lab Inc
 				Chiyoda-ku  Tokyo   102-0083
 				JP
 
-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
-
-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.
 986000-986FFF     (base 16)		Aplex Technology Inc.
 				15F-1, No.186, Jian Yi Road
@@ -7901,18 +7889,36 @@ F00000-F00FFF     (base 16)		Aplex Technology Inc.
 				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,,
@@ -7925,11 +7931,23 @@ CCF000-CCFFFF     (base 16)		Tiptop Platform P. Ltd
 				Jaipur  Rajasthan  302001
 				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)		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.
@@ -15701,18 +15719,18 @@ F03000-F03FFF     (base 16)		Faust ApS
 				Helsinki    00150
 				FI
 
-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)		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
@@ -15737,36 +15755,36 @@ B41000-B41FFF     (base 16)		STATE GRID INTELLIGENCE TECHNOLOGY CO.,LTD.
 				Muenster  North Rhine-Westphalia  48163
 				DE
 
-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)		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
-8FE000-8FEFFF     (base 16)		Potter Electric Signal Co. LLC
-				5757 Phantom Drive
-				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
@@ -15791,15 +15809,15 @@ F8C000-F8CFFF     (base 16)		BK LAB
 				Hangzhou    310024
 				CN
 
-8C-1F-64   (hex)		Private
-1A8000-1A8FFF     (base 16)		Private
-
 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 
@@ -15860,6 +15878,9 @@ C58000-C58FFF     (base 16)		Kitagawa Corporation
 				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
@@ -15872,8 +15893,23 @@ BBA000-BBAFFF     (base 16)		elysia GmbH
 				Nettetal    41334
 				DE
 
-8C-1F-64   (hex)		Private
-CE5000-CE5FFF     (base 16)		Private
+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
@@ -23597,12 +23633,6 @@ C36000-C36FFF     (base 16)		ODTech Co., Ltd.
 				Wanju_gun  Jeonbuk-do  55322
 				KR
 
-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)		Inspinia Technology s.r.o.
 595000-595FFF     (base 16)		Inspinia Technology s.r.o.
 				Paleckeho 493
@@ -23615,48 +23645,48 @@ CB1000-CB1FFF     (base 16)		Xi’an Sunway Communication Co., Ltd.
 				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)		DEUTA Werke GmbH
-5ED000-5EDFFF     (base 16)		DEUTA Werke GmbH
-				ET
-				Bergisch Gladbach  NRW  51465
-				DE
-
-8C-1F-64   (hex)		TelecomWadi
-1F9000-1F9FFF     (base 16)		TelecomWadi
-				First Al Sheikh Zayed, Giza Governorate 3244530
-				Giza    3244530
-				EG
-
 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)		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)		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
@@ -23675,18 +23705,18 @@ FE0000-FE0FFF     (base 16)		Potter Electric Signal Co. LLC
 				Hazelwood  MO  63042
 				US
 
-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)		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
@@ -23699,36 +23729,36 @@ EBB000-EBBFFF     (base 16)		Potter Electric Signal Co. LLC
 				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)		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)		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)		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)		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
@@ -23748,7 +23778,7 @@ D8D000-D8DFFF     (base 16)		Wi-Tronix, LLC
 				TW
 
 70-B3-D5   (hex)		Aplex Technology Inc.
-F57000-F57FFF     (base 16)		Aplex Technology Inc.
+906000-906FFF     (base 16)		Aplex Technology Inc.
 				15F-1, No.186, Jian Yi Road
 				Zhonghe District  New Taipei City 235   -
 				TW
@@ -23759,29 +23789,17 @@ B96000-B96FFF     (base 16)		Observable Space
 				Los Angeles  CA  90064
 				US
 
-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)		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)		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)		REO AG
-CD0000-CD0FFF     (base 16)		REO AG
-				Brühlerstr. 100
-				Solingen    42657
-				DE
-
-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)		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
@@ -23789,6 +23807,12 @@ A20000-A20FFF     (base 16)		Intenseye Inc.
 				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
@@ -23807,12 +23831,24 @@ ED0000-ED0FFF     (base 16)		Shanghai Jupper Technology Co.Ltd
 				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
@@ -23849,12 +23885,48 @@ BA9000-BA9FFF     (base 16)		Beijing Fuzheng Transportation Technology Co., Ltd
 				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
@@ -31649,18 +31721,18 @@ AB3000-AB3FFF     (base 16)		VELVU TECHNOLOGIES PRIVATE LIMITED
 				Skovlunde    2740
 				DK
 
-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)		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
@@ -31751,18 +31823,18 @@ B33000-B33FFF     (base 16)		Aplex Technology Inc.
 				Zhonghe District  New Taipei City 235   -
 				TW
 
-8C-1F-64   (hex)		Jemac Sweden AB
-42D000-42DFFF     (base 16)		Jemac Sweden AB
-				Trångsundsvägen 20A
-				Kalmar    39356
-				SE
-
 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 
@@ -31817,6 +31889,30 @@ A9D000-A9DFFF     (base 16)		Aegex Technologies LLC Magyarországi Fióktelepe
 				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.
@@ -35492,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
@@ -39509,11 +39599,11 @@ C75000-C75FFF     (base 16)		Abbott Diagnostics Technologies AS
 				Oslo  Oslo  0504
 				NO
 
-8C-1F-64   (hex)		OnAsset Intelligence
-415000-415FFF     (base 16)		OnAsset Intelligence
-				8407 Sterling Street
-				Irving  TX  75063
-				US
+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
@@ -39527,16 +39617,10 @@ C19000-C19FFF     (base 16)		OOO Mig Trading
 				Dinkelsbuehl  Bavaria  91550
 				DE
 
-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)		Pulcro.io LLC
-C22000-C22FFF     (base 16)		Pulcro.io LLC
-				551 S IH 35, Ste 300
-				Round Rock  TX  78664
+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.
@@ -39545,29 +39629,29 @@ C22000-C22FFF     (base 16)		Pulcro.io LLC
 				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)		wonder meditec
-B2D000-B2DFFF     (base 16)		wonder meditec
-				2F, 12-11, Seonjam-ro, Seongbuk-gu
-				Seoul, Korea    02836
-				KR
-
 8C-1F-64   (hex)		IGL
 8F0000-8F0FFF     (base 16)		IGL
 				1, Allée des Chevreuils,
 				Lissieu    69380
 				FR
 
-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)		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
@@ -39593,6 +39677,12 @@ D64000-D64FFF     (base 16)		Potter Electric Signal Co. LLC
 				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
@@ -39605,30 +39695,30 @@ D64000-D64FFF     (base 16)		Potter Electric Signal Co. LLC
 				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
-
 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
 
-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
-
 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
@@ -39640,3 +39730,45 @@ CDA000-CDAFFF     (base 16)		SPX Flow Technology BV
 				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

man/bootctl.xml

@@ -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>
 

man/importctl.xml

@@ -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>

man/libsystemd.xml

@@ -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>

man/loader.conf.xml

@@ -254,6 +254,26 @@
         <xi:include href="version-info.xml" xpointer="v239"/></listitem>
       </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>
 

man/org.freedesktop.timedate1.xml

@@ -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>

man/org.freedesktop.timesync1.xml

@@ -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>

man/os-release.xml

@@ -640,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>

man/rules/meson.build

@@ -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',

man/sd-path.xml

@@ -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>

man/systemd-dissect.xml

@@ -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>

man/systemd-vmspawn.xml

@@ -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

man/systemd.special.xml

@@ -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>,

meson.build

@@ -2038,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')

mkosi/mkosi.conf.d/fedora/mkosi.conf.d/rawhide-42.conf

@@ -4,6 +4,7 @@
 Release=|rawhide
 Release=|42
 Release=|43
+Release=|44
 
 [Content]
 Packages=util-linux-script

mkosi/mkosi.conf.d/opensuse/mkosi.conf

@@ -48,6 +48,7 @@ Packages=
         group(wheel)
         gzip
         hostname
+        iproute2
         iputils
         kernel-default
         kmod

mkosi/mkosi.finalize

@@ -13,3 +13,6 @@ if [ -n "$EFI_ARCHITECTURE" ]; then
         --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/"

mkosi/mkosi.images/minimal-0/mkosi.postinst

@@ -8,4 +8,7 @@ cat >>"$BUILDROOT/usr/lib/os-release" <<EOF
 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"

mkosi/mkosi.images/minimal-1/mkosi.postinst

@@ -8,4 +8,7 @@ cat >>"$BUILDROOT/usr/lib/os-release" <<EOF
 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"

mkosi/mkosi.sync

@@ -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
 

src/analyze/analyze-architectures.c

@@ -82,7 +82,7 @@ int verb_architectures(int argc, char *argv[], void *userdata) {
 
         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;
 }

src/analyze/analyze-capability.c

@@ -81,7 +81,7 @@ int verb_capabilities(int argc, char *argv[], void *userdata) {
 
         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;
 }

src/analyze/analyze-exit-status.c

@@ -48,7 +48,7 @@ int verb_exit_status(int argc, char *argv[], void *userdata) {
 
         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;
 }

src/analyze/analyze-pcrs.c

@@ -138,7 +138,7 @@ int verb_pcrs(int argc, char *argv[], void *userdata) {
 
         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;
 }

src/analyze/analyze-security.c

@@ -1880,7 +1880,7 @@ static int assess(const SecurityInfo *info,
 
                 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;
 }

src/basic/linux/batman_adv.h

@@ -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

src/basic/linux/bpf.h

@@ -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 {

src/basic/linux/btrfs.h

@@ -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];

src/basic/linux/const.h

@@ -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.
  *

src/basic/linux/dm-ioctl.h

@@ -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 */

src/basic/linux/ethtool.h

@@ -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_duplex(__u8 duplex)
  * 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) */
+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.
- */
-#define GTPU_V4_FLOW 0x13	/* hash only */
-#define GTPU_V6_FLOW 0x14	/* hash only */
+	/* 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).
- */
-#define GTPC_V4_FLOW 0x15	/* hash only */
-#define GTPC_V6_FLOW 0x16	/* 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.
- */
-#define GTPC_TEID_V4_FLOW 0x17	/* hash only */
-#define GTPC_TEID_V6_FLOW 0x18	/* 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.
- */
-#define GTPU_EH_V4_FLOW 0x19	/* hash only */
-#define GTPU_EH_V6_FLOW 0x1a	/* 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.
- */
-#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 */
+	/* 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_duplex(__u8 duplex)
 /* 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)

src/basic/linux/fib_rules.h

@@ -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
 };
 

src/basic/linux/if_bridge.h

@@ -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
 };
 

src/basic/linux/if_link.h

@@ -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 */

src/basic/linux/if_tun.h

@@ -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 {

src/basic/linux/in6.h

@@ -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:

src/basic/linux/input-event-codes.h

@@ -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)
 
 /*

src/basic/linux/input.h

@@ -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

src/basic/linux/ipv6.h

@@ -199,6 +199,7 @@ enum {
 	DEVCONF_NDISC_EVICT_NOCARRIER,
 	DEVCONF_ACCEPT_UNTRACKED_NA,
 	DEVCONF_ACCEPT_RA_MIN_LFT,
+	DEVCONF_FORCE_FORWARDING,
 	DEVCONF_MAX
 };
 

src/basic/linux/neighbour.h

@@ -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 {

src/basic/linux/netfilter/nf_tables.h

@@ -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)

src/basic/linux/nl80211.h

@@ -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 */

src/basic/linux/pkt_sched.h

@@ -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

src/basic/linux/rtnetlink.h

@@ -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 */

src/basic/linux/stddef.h

@@ -70,4 +70,6 @@
 #define __counted_by_be(m)
 #endif
 
+#define __kernel_nonstring
+
 #endif /* _LINUX_STDDEF_H */

src/basic/linux/vm_sockets.h

@@ -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>
 

src/basic/linux/wireguard.h

@@ -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)

src/basic/meson.build

@@ -200,6 +200,7 @@ arch_list = [
         'powerpc64',
         'riscv32',
         'riscv64',
+        'sh',
         's390',
         's390x',
         'sparc',

src/basic/missing_syscall_def.h

@@ -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_close_range);
 #    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 == systemd_NR_copy_file_range);
 #    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_fchmodat2);
 #    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_getrandom);
 #    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_NR_memfd_create);
 #    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_NR_mount_setattr);
 #    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_move_mount);
 #    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 == systemd_NR_name_to_handle_at);
 #    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_open_tree);
 #    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_openat2);
 #    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_pidfd_open);
 #    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 == systemd_NR_pidfd_send_signal);
 #    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_NR_pkey_mprotect);
 #    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_renameat2);
 #    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__)

src/basic/missing_syscalls.py

@@ -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__)

src/basic/syscall-list.txt

@@ -83,6 +83,8 @@ fcntl
 fcntl64
 fdatasync
 fgetxattr
+file_getattr
+file_setattr
 finit_module
 flistxattr
 flock

src/basic/syscalls-alpha.txt

@@ -83,6 +83,8 @@ fcntl	92
 fcntl64
 fdatasync	447
 fgetxattr	387
+file_getattr	578
+file_setattr	579
 finit_module	507
 flistxattr	390
 flock	131

src/basic/syscalls-arc.txt

@@ -83,6 +83,8 @@ fcntl
 fcntl64	25
 fdatasync	83
 fgetxattr	10
+file_getattr	468
+file_setattr	469
 finit_module	273
 flistxattr	13
 flock	32

src/basic/syscalls-arm.txt

@@ -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

src/basic/syscalls-arm64.txt

@@ -83,6 +83,8 @@ fcntl	25
 fcntl64
 fdatasync	83
 fgetxattr	10
+file_getattr	468
+file_setattr	469
 finit_module	273
 flistxattr	13
 flock	32

src/basic/syscalls-i386.txt

@@ -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

src/basic/syscalls-loongarch64.txt

@@ -83,6 +83,8 @@ fcntl	25
 fcntl64
 fdatasync	83
 fgetxattr	10
+file_getattr	468
+file_setattr	469
 finit_module	273
 flistxattr	13
 flock	32

src/basic/syscalls-m68k.txt

@@ -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

src/basic/syscalls-mips64.txt

@@ -83,6 +83,8 @@ fcntl	5070
 fcntl64
 fdatasync	5073
 fgetxattr	5185
+file_getattr	5468
+file_setattr	5469
 finit_module	5307
 flistxattr	5188
 flock	5071

src/basic/syscalls-mips64n32.txt

@@ -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

src/basic/syscalls-mipso32.txt

@@ -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

src/basic/syscalls-parisc.txt

@@ -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

src/basic/syscalls-powerpc.txt

@@ -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

src/basic/syscalls-powerpc64.txt

@@ -83,6 +83,8 @@ fcntl	55
 fcntl64
 fdatasync	148
 fgetxattr	214
+file_getattr	468
+file_setattr	469
 finit_module	353
 flistxattr	217
 flock	143

src/basic/syscalls-riscv32.txt

@@ -83,6 +83,8 @@ fcntl
 fcntl64	25
 fdatasync	83
 fgetxattr	10
+file_getattr	468
+file_setattr	469
 finit_module	273
 flistxattr	13
 flock	32

src/basic/syscalls-riscv64.txt

@@ -83,6 +83,8 @@ fcntl	25
 fcntl64
 fdatasync	83
 fgetxattr	10
+file_getattr	468
+file_setattr	469
 finit_module	273
 flistxattr	13
 flock	32

src/basic/syscalls-s390.txt

@@ -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

src/basic/syscalls-s390x.txt

@@ -83,6 +83,8 @@ fcntl	55
 fcntl64
 fdatasync	148
 fgetxattr	229
+file_getattr	468
+file_setattr	469
 finit_module	344
 flistxattr	232
 flock	143

src/basic/syscalls-sh.txt

@@ -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

src/basic/syscalls-sparc.txt

@@ -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

src/basic/syscalls-x86_64.txt

@@ -83,6 +83,8 @@ fcntl	72
 fcntl64
 fdatasync	75
 fgetxattr	193
+file_getattr	468
+file_setattr	469
 finit_module	313
 flistxattr	196
 flock	73

src/basic/virt.c

@@ -471,6 +471,13 @@ Virtualization detect_vm(void) {
                    VIRTUALIZATION_ORACLE,
                    VIRTUALIZATION_XEN,
                    VIRTUALIZATION_AMAZON,
+                   /* 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;

src/bootctl/bootctl-status.c

@@ -730,7 +730,7 @@ static int unlink_entry(const BootConfig *config, const char *root, const char *
 
         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 *config, const char *root, const char *
                 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[], void *userdata) {
                 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]));
         }
 }
 

src/bootctl/bootctl.c

@@ -248,8 +248,10 @@ static int help(int argc, char *argv[], void *userdata) {
                "  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"

src/core/cgroup.c

@@ -1880,10 +1880,10 @@ void unit_modify_nft_set(Unit *u, bool add) {
 
                 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);
         }
 }

src/core/exec-invoke.c

@@ -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;
 

src/core/service.c

@@ -408,6 +408,12 @@ static void service_extend_timeout(Service *s, usec_t extend_timeout_usec) {
 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);
 }
@@ -1432,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)) {
@@ -5518,6 +5525,22 @@ int service_determine_exec_selinux_label(Service *s, char **ret) {
         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",
@@ -5655,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,

src/core/unit.c

@@ -2219,17 +2219,17 @@ static void retroactively_start_dependencies(Unit *u) {
         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_dependencies(Unit *u) {
         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 *u, UnitDependencyAtom atom) {
         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);
 }
@@ -5191,10 +5191,10 @@ static void unit_modify_user_nft_set(Unit *u, bool add, NFTSetSource source, uin
 
                 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);
         }
 }

src/cryptsetup/cryptsetup.c

@@ -533,7 +533,7 @@ static int parse_one_option(const char *option) {
 #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 *option) {
                         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;
 

src/home/user-record-sign.c

@@ -75,7 +75,7 @@ int user_record_sign(UserRecord *ur, EVP_PKEY *private_key, UserRecord **ret) {
                 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)

src/import/import-compress.c

@@ -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(ImportCompress *c, const void *data, size_t size) {
 
         c->encoding = false;
 
+        log_debug("Detected compression type: %s", import_compress_type_to_string(c->type));
         return 1;
 }
 

src/import/importctl.c

@@ -848,7 +848,7 @@ static int list_transfers(int argc, char *argv[], void *userdata) {
         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 *argv[], void *userdata) {
         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) {

src/import/pull-common.c

@@ -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_job, PullJob *job) {
                 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 */

src/journal/journalctl-misc.c

@@ -146,7 +146,7 @@ static int show_log_ids(const LogId *ids, size_t n_ids, const char *name) {
 
         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;
 }