2026-04-11 09:34:51 +02:00
22 changed files with 766 additions and 1782 deletions
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@ -48,7 +48,7 @@ jobs:
          dry-run: false
          sanitizer: ${{ matrix.sanitizer }}
      - name: Upload Crash
-        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2
+        uses: actions/upload-artifact@da838ae9595ac94171fa2d4de5a2f117b3e7ac32
        if: failure() && steps.build.outcome == 'success'
        with:
          name: ${{ matrix.sanitizer }}-artifacts
--- a/49
+++ b/49
@ -187,12 +187,6 @@ CHANGES WITH 250 in spe:
          hyperlinks in modern terminals) may now be turned off altogether
          during build-time.
        * Path units gained new TriggerLimitBurst= and TriggerLimitIntervalSec=
          that default to '200' and '2s' respectively. This ensures that a path
          unit cannot cause pid1 to busy loop when it is trying to trigger a
          service that is skipped because of a Condition*= not being satisfied.
          This matches the configuration and behaviour of socket units.
        * The TPM2/FIDO2/PKCS11 support in systemd-cryptsetup is now also built
          as a plug-in for cryptsetup. This means the plain cryptsetup command
          may now be used to unlock volumes set up this way.
@ -521,49 +515,6 @@ CHANGES WITH 250 in spe:
          may be used to set the boot menu time-out of the boot loader (for all
          or just the subsequent boot).
        * bootctl and kernel-install will now read KERNEL_INSTALL_MACHINE_ID
          and KERNEL_INSTALL_LAYOUT from kernel/install.conf. The first
          variable specifies the machine-id to use for installation. It would
          previously be used if set in the environment, and now it'll also be
          read automatically from the config file. The second variable is new.
          When set, it specifies the layout to use for installation directories
          on the boot partition, so that tools don't need to guess it based on
          the already-existing directories. The only value that is defined
          natively is "bls", corresponding to the layout specified in
          https://systemd.io/BOOT_LOADER_SPECIFICATION/. Plugins for
          kernel-install that implement a different layout can declare other
          values for this variable.
          'bootctl install' will now write KERNEL_INSTALL_LAYOUT=bls, on the
          assumption that if the user installed sd-boot to the ESP, they intend
          to use the entry layout understood by sd-boot. It'll also write
          KERNEL_INSTALL_MACHINE_ID= if it creates any directories using the ID
          (and it wasn't specified in the config file yet). Similarly,
          kernel-install will now write KERNEL_INSTALL_MACHINE_ID= (if it
          wasn't specified in the config file yet). Effectively, those changes
          mean that the machine-id used for boot loader entry installation is
          "frozen" upon first use and becomes independent of the actual
          machine-id.
          Configuring KERNEL_INSTALL_MACHINE_ID fixes the following problem:
          images created for distribution ("golden images") are built with no
          machine-id, so that a unique machine-id can be created on the first
          boot. But those images may contain boot loader entries with the
          machine-id used during build included in paths. Using a "frozen"
          value allows unambiguously identifying entries that match the
          specific installation, while still permitting parallel installations
          without conflict.
          Configuring KERNEL_INSTALL_LAYOUT obviates the need for
          kernel-install to guess the installation layout. This fixes the
          problem where a (possibly empty) directory in the boot partition is
          created from a different layout causing kernel-install plugins to
          assume the wrong layout. A particular example of how this may happen
          is the grub2 package in Fedora which includes directories under /boot
          directly in its file list. Various other packages pull in grub2 as a
          dependency, so it may be installed even if unused, breaking
          installations that use the bls layout.
        * bootctl and systemd-bless-boot can now be linked statically.
        * systemd-sysext now optionally doesn't insist on extension-release.d/
--- a/hwdb.d/20-OUI.hwdb
+++ b/hwdb.d/20-OUI.hwdb
@ -36860,9 +36860,6 @@ OUI:00BD82*
 OUI:00BE3B*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:00BE43*
 ID_OUI_FROM_DATABASE=Dell Inc.
 OUI:00BE75*
 ID_OUI_FROM_DATABASE=Cisco Systems, Inc
@ -37664,9 +37661,6 @@ OUI:00C1B1*
 OUI:00C2C6*
 ID_OUI_FROM_DATABASE=Intel Corporate
 OUI:00C30A*
 ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 OUI:00C343*
 ID_OUI_FROM_DATABASE=E-T-A Circuit Breakers Ltd
@ -39662,9 +39656,6 @@ OUI:041552*
 OUI:0415D9*
 ID_OUI_FROM_DATABASE=Viwone
 OUI:0417B6*
 ID_OUI_FROM_DATABASE=Smart Innovation LLC
 OUI:04180F*
 ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
@ -40535,9 +40526,6 @@ OUI:04E662*
 OUI:04E676*
 ID_OUI_FROM_DATABASE=AMPAK Technology, Inc.
 OUI:04E69E*
 ID_OUI_FROM_DATABASE=ZHONGGUANCUN XINHAIZEYOU TECHNOLOGY CO.,LTD
 OUI:04E77E*
 ID_OUI_FROM_DATABASE=We Corporation Inc.
@ -41879,9 +41867,6 @@ OUI:08DF1F*
 OUI:08DFCB*
 ID_OUI_FROM_DATABASE=Systrome Networks
 OUI:08E021*
 ID_OUI_FROM_DATABASE=Honor Device Co., Ltd.
 OUI:08E4DF*
 ID_OUI_FROM_DATABASE=Shenzhen Sande Dacom Electronics Co., Ltd
@ -42143,9 +42128,6 @@ OUI:0C1A10*
 OUI:0C1C19*
 ID_OUI_FROM_DATABASE=LONGCONN ELECTRONICS(SHENZHEN) CO.,LTD
 OUI:0C1C1A*
 ID_OUI_FROM_DATABASE=eero inc.
 OUI:0C1C20*
 ID_OUI_FROM_DATABASE=Kakao Corp
@ -43463,12 +43445,6 @@ OUI:10521C*
 OUI:105403*
 ID_OUI_FROM_DATABASE=INTARSO GmbH
 OUI:1054D22*
 ID_OUI_FROM_DATABASE=ComNav Technology Ltd.
 OUI:1054D2C*
 ID_OUI_FROM_DATABASE=LUXSHARE-ICT Co., Ltd.
 OUI:1055E4*
 ID_OUI_FROM_DATABASE=Shenzhen Skyworth  Digital  Technology  CO., Ltd
@ -51935,9 +51911,6 @@ OUI:30215B*
 OUI:302303*
 ID_OUI_FROM_DATABASE=Belkin International Inc.
 OUI:302364*
 ID_OUI_FROM_DATABASE=Nokia Shanghai Bell Co., Ltd.
 OUI:302432*
 ID_OUI_FROM_DATABASE=Intel Corporate
@ -51974,9 +51947,6 @@ OUI:3032D4*
 OUI:303335*
 ID_OUI_FROM_DATABASE=Boosty
 OUI:303422*
 ID_OUI_FROM_DATABASE=eero inc.
 OUI:3034D2*
 ID_OUI_FROM_DATABASE=Availink, Inc.
@ -53144,9 +53114,6 @@ OUI:346178*
 OUI:346288*
 ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 OUI:3462B4*
 ID_OUI_FROM_DATABASE=Renesas Electronics (Penang) Sdn. Bhd.
 OUI:3463D4*
 ID_OUI_FROM_DATABASE=BIONIX SUPPLYCHAIN TECHNOLOGIES SLU
@ -53213,9 +53180,6 @@ OUI:34732D*
 OUI:34735A*
 ID_OUI_FROM_DATABASE=Dell Inc.
 OUI:347379*
 ID_OUI_FROM_DATABASE=xFusion Digital Technologies Co., Limited
 OUI:347563*
 ID_OUI_FROM_DATABASE=SHENZHEN RF-LINK TECHNOLOGY CO.,LTD.
@ -54188,9 +54152,6 @@ OUI:3859F9*
 OUI:385AA8*
 ID_OUI_FROM_DATABASE=Beijing Zhongdun Security Technology Development Co.
 OUI:385B44*
 ID_OUI_FROM_DATABASE=Silicon Laboratories
 OUI:385C76*
 ID_OUI_FROM_DATABASE=PLANTRONICS, INC.
@ -55430,9 +55391,6 @@ OUI:3C5CC4*
 OUI:3C5CF1*
 ID_OUI_FROM_DATABASE=eero inc.
 OUI:3C5D29*
 ID_OUI_FROM_DATABASE=Zhejiang Tmall Technology Co., Ltd.
 OUI:3C5EC3*
 ID_OUI_FROM_DATABASE=Cisco Systems, Inc
@ -57221,9 +57179,6 @@ OUI:44070B*
 OUI:4409B8*
 ID_OUI_FROM_DATABASE=Salcomp (Shenzhen) CO., LTD.
 OUI:440CEE*
 ID_OUI_FROM_DATABASE=Robert Bosch Elektronika Kft
 OUI:440CFD*
 ID_OUI_FROM_DATABASE=NetMan Co., Ltd.
@ -57263,9 +57218,6 @@ OUI:4418FD*
 OUI:4419B6*
 ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
 OUI:441AAC*
 ID_OUI_FROM_DATABASE=Elektrik Uretim AS EOS
 OUI:441AFA*
 ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
@ -60488,9 +60440,6 @@ OUI:50464A*
 OUI:50465D*
 ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
 OUI:5046AE*
 ID_OUI_FROM_DATABASE=MERCURY CORPORATION
 OUI:5048EB*
 ID_OUI_FROM_DATABASE=BEIJING HAIHEJINSHENG NETWORK TECHNOLOGY CO. LTD.
@ -67055,9 +67004,6 @@ OUI:68FB95*
 OUI:68FCB3*
 ID_OUI_FROM_DATABASE=Next Level Security Systems, Inc.
 OUI:68FCCA*
 ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 OUI:68FEDA*
 ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
@ -67562,9 +67508,6 @@ OUI:6C8CDB*
 OUI:6C8D65*
 ID_OUI_FROM_DATABASE=Wireless Glue Networks, Inc.
 OUI:6C8D77*
 ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 OUI:6C8DC1*
 ID_OUI_FROM_DATABASE=Apple, Inc.
@ -67820,9 +67763,6 @@ OUI:6CD68A*
 OUI:6CD704*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:6CD719*
 ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 OUI:6CD71F*
 ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
@ -81353,9 +81293,6 @@ OUI:740CEE*
 OUI:740EDB*
 ID_OUI_FROM_DATABASE=Optowiz Co., Ltd
 OUI:7411B2*
 ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 OUI:7412B3*
 ID_OUI_FROM_DATABASE=CHONGQING FUGUI ELECTRONICS CO.,LTD.
@ -83117,9 +83054,6 @@ OUI:789F87*
 OUI:789FAA*
 ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 OUI:78A03F*
 ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 OUI:78A051*
 ID_OUI_FROM_DATABASE=iiNet Labs Pty Ltd
@ -84320,9 +84254,6 @@ OUI:7C8956*
 OUI:7C89C1*
 ID_OUI_FROM_DATABASE=Palo Alto Networks
 OUI:7C8AC0*
 ID_OUI_FROM_DATABASE=EVBox BV
 OUI:7C8AE1*
 ID_OUI_FROM_DATABASE=COMPAL INFORMATION (KUNSHAN) CO., LTD.
@ -84893,9 +84824,6 @@ OUI:800010*
 OUI:80006E*
 ID_OUI_FROM_DATABASE=Apple, Inc.
 OUI:80015C*
 ID_OUI_FROM_DATABASE=Synaptics, Inc
 OUI:800184*
 ID_OUI_FROM_DATABASE=HTC Corporation
@ -87158,9 +87086,6 @@ OUI:88517A*
 OUI:8851FB*
 ID_OUI_FROM_DATABASE=Hewlett Packard
 OUI:8852EB*
 ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 OUI:88532E*
 ID_OUI_FROM_DATABASE=Intel Corporate
@ -88169,21 +88094,12 @@ OUI:8C1F64077*
 OUI:8C1F6407E*
 ID_OUI_FROM_DATABASE=FLOYD inc.
 OUI:8C1F64085*
 ID_OUI_FROM_DATABASE=SORB ENGINEERING LLC
 OUI:8C1F64086*
 ID_OUI_FROM_DATABASE=WEPTECH elektronik GmbH
 OUI:8C1F6408B*
 ID_OUI_FROM_DATABASE=Shanghai Shenxu Technology Co., Ltd
 OUI:8C1F64099*
 ID_OUI_FROM_DATABASE=Pantherun Technologies Pvt Ltd
 OUI:8C1F6409B*
 ID_OUI_FROM_DATABASE=Taiv
 OUI:8C1F6409F*
 ID_OUI_FROM_DATABASE=MB connect line GmbH Fernwartungssysteme
@ -88199,9 +88115,6 @@ OUI:8C1F640B8*
 OUI:8C1F640C5*
 ID_OUI_FROM_DATABASE=TechnipFMC
 OUI:8C1F640D6*
 ID_OUI_FROM_DATABASE=AVD INNOVATION LIMITED
 OUI:8C1F640E0*
 ID_OUI_FROM_DATABASE=Autopharma
@ -88355,9 +88268,6 @@ OUI:8C1F642F5*
 OUI:8C1F64304*
 ID_OUI_FROM_DATABASE=Jemac Sweden AB
 OUI:8C1F64306*
 ID_OUI_FROM_DATABASE=Corigine, Inc
 OUI:8C1F6430A*
 ID_OUI_FROM_DATABASE=XCOM Labs
@ -88496,9 +88406,6 @@ OUI:8C1F644F0*
 OUI:8C1F644FA*
 ID_OUI_FROM_DATABASE=Sanskruti
 OUI:8C1F6450A*
 ID_OUI_FROM_DATABASE=BELLCO TRADING COMPANY (PVT) LTD
 OUI:8C1F64510*
 ID_OUI_FROM_DATABASE=Novanta Corp / Novanta IMS
@ -88586,9 +88493,6 @@ OUI:8C1F64611*
 OUI:8C1F64619*
 ID_OUI_FROM_DATABASE=Labtrino AB
 OUI:8C1F6461F*
 ID_OUI_FROM_DATABASE=Lightworks GmbH
 OUI:8C1F64638*
 ID_OUI_FROM_DATABASE=THUNDER DATA TAIWAN CO., LTD.
@ -88619,9 +88523,6 @@ OUI:8C1F6466C*
 OUI:8C1F64675*
 ID_OUI_FROM_DATABASE=Transit Solutions, LLC.
 OUI:8C1F6469E*
 ID_OUI_FROM_DATABASE=AT-Automation Technology GmbH
 OUI:8C1F646A8*
 ID_OUI_FROM_DATABASE=Bulwark
@ -88775,9 +88676,6 @@ OUI:8C1F6485B*
 OUI:8C1F64878*
 ID_OUI_FROM_DATABASE=Green Access Ltd
 OUI:8C1F6488D*
 ID_OUI_FROM_DATABASE=Pantherun Technologies Pvt Ltd
 OUI:8C1F64892*
 ID_OUI_FROM_DATABASE=MDI Industrial
@ -88904,9 +88802,6 @@ OUI:8C1F64A07*
 OUI:8C1F64A29*
 ID_OUI_FROM_DATABASE=Ringtail Security
 OUI:8C1F64A2B*
 ID_OUI_FROM_DATABASE=WENet Vietnam Joint Stock company
 OUI:8C1F64A32*
 ID_OUI_FROM_DATABASE=Nautel LTD
@ -89162,9 +89057,6 @@ OUI:8C1F64DCA*
 OUI:8C1F64DE1*
 ID_OUI_FROM_DATABASE=Franke Aquarotter GmbH
 OUI:8C1F64E02*
 ID_OUI_FROM_DATABASE=ITS Teknik A/S
 OUI:8C1F64E21*
 ID_OUI_FROM_DATABASE=LG-LHT Aircraft Solutions GmbH
@ -89213,9 +89105,6 @@ OUI:8C1F64EAC*
 OUI:8C1F64EB2*
 ID_OUI_FROM_DATABASE=Aqua Broadcast Ltd
 OUI:8C1F64EB7*
 ID_OUI_FROM_DATABASE=Delta Solutions LLC
 OUI:8C1F64EB9*
 ID_OUI_FROM_DATABASE=KxS Technologies Oy
@ -89237,9 +89126,6 @@ OUI:8C1F64EEF*
 OUI:8C1F64EF1*
 ID_OUI_FROM_DATABASE=BIOTAGE GB LTD
 OUI:8C1F64EFB*
 ID_OUI_FROM_DATABASE=WARECUBE,INC
 OUI:8C1F64F04*
 ID_OUI_FROM_DATABASE=IoTSecure, LLC
@ -89270,9 +89156,6 @@ OUI:8C1F64F5C*
 OUI:8C1F64F72*
 ID_OUI_FROM_DATABASE=Contrader
 OUI:8C1F64F74*
 ID_OUI_FROM_DATABASE=GE AVIC Civil Avionics Systems Company Limited
 OUI:8C1F64F78*
 ID_OUI_FROM_DATABASE=Ternary Research Corporation
@ -89993,9 +89876,6 @@ OUI:8CC681*
 OUI:8CC7AA*
 ID_OUI_FROM_DATABASE=Radinet Communications Inc.
 OUI:8CC7C3*
 ID_OUI_FROM_DATABASE=NETLINK ICT
 OUI:8CC7D0*
 ID_OUI_FROM_DATABASE=zhejiang ebang communication co.,ltd
@ -91179,7 +91059,7 @@ OUI:90EA60*
 ID_OUI_FROM_DATABASE=SPI Lasers Ltd
 OUI:90EB48*
- ID_OUI_FROM_DATABASE=Shanghai XinMiaoLink Technology Co., Ltd
+ ID_OUI_FROM_DATABASE=Shanghai ChipFresh Internet of Things Technology C
 OUI:90EC50*
 ID_OUI_FROM_DATABASE=C.O.B.O. SPA
@ -91469,9 +91349,6 @@ OUI:9431CB*
 OUI:9433DD*
 ID_OUI_FROM_DATABASE=Taco Inc
 OUI:943469*
 ID_OUI_FROM_DATABASE=Silicon Laboratories
 OUI:94350A*
 ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
@ -93035,12 +92912,6 @@ OUI:988ED4*
 OUI:988EDD*
 ID_OUI_FROM_DATABASE=TE Connectivity Limerick
 OUI:988FE00*
 ID_OUI_FROM_DATABASE=Valinso B.V.
 OUI:988FE01*
 ID_OUI_FROM_DATABASE=GUANGZHOU HERYSTORM TECHNOLOGY CO.,LTD.
 OUI:988FE02*
 ID_OUI_FROM_DATABASE=vhf elektronik GmbH
@ -93065,21 +92936,12 @@ OUI:988FE08*
 OUI:988FE09*
 ID_OUI_FROM_DATABASE=Nawon Machinery
 OUI:988FE0A*
 ID_OUI_FROM_DATABASE=Pavana Technologies JSC.
 OUI:988FE0B*
 ID_OUI_FROM_DATABASE=Dongguan Synst Electronics Co., LTD.
 OUI:988FE0C*
 ID_OUI_FROM_DATABASE=Shenzhen Micro&Nano Perception Computing Technology Co.,Ltd
 OUI:988FE0D*
 ID_OUI_FROM_DATABASE=Shenzhen Vitalitim Technology Co., Ltd
 OUI:988FE0E*
 ID_OUI_FROM_DATABASE=CEL Terminus (Shanghai) Information Technologies Co.,Ltd.
 OUI:989080*
 ID_OUI_FROM_DATABASE=Linkpower Network System Inc Ltd.
@ -94292,9 +94154,6 @@ OUI:9CC077*
 OUI:9CC0D2*
 ID_OUI_FROM_DATABASE=Conductix-Wampfler GmbH
 OUI:9CC12D*
 ID_OUI_FROM_DATABASE=GD Midea Air-Conditioning Equipment Co.,Ltd.
 OUI:9CC172*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
@ -97211,9 +97070,6 @@ OUI:A85081*
 OUI:A8515B*
 ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 OUI:A8537D*
 ID_OUI_FROM_DATABASE=Mist Systems, Inc.
 OUI:A854B2*
 ID_OUI_FROM_DATABASE=Wistron Neweb Corporation
@ -98360,9 +98216,6 @@ OUI:AC7E8A*
 OUI:AC7F3E*
 ID_OUI_FROM_DATABASE=Apple, Inc.
 OUI:AC80AE*
 ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 OUI:AC80D6*
 ID_OUI_FROM_DATABASE=Hexatronic AB
@ -98855,9 +98708,6 @@ OUI:B01886*
 OUI:B019C6*
 ID_OUI_FROM_DATABASE=Apple, Inc.
 OUI:B01B4B*
 ID_OUI_FROM_DATABASE=Invisible Fun Studio Limited
 OUI:B01B7C*
 ID_OUI_FROM_DATABASE=Ontrol A.S.
@ -99107,9 +98957,6 @@ OUI:B05B1F*
 OUI:B05B67*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:B05C16*
 ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 OUI:B05CDA*
 ID_OUI_FROM_DATABASE=HP Inc.
@ -99311,9 +99158,6 @@ OUI:B098BC*
 OUI:B09928*
 ID_OUI_FROM_DATABASE=FUJITSU LIMITED
 OUI:B099D7*
 ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 OUI:B09AE2*
 ID_OUI_FROM_DATABASE=STEMMER IMAGING GmbH
@ -99923,9 +99767,6 @@ OUI:B424E7*
 OUI:B4265D*
 ID_OUI_FROM_DATABASE=Taicang T&W Electronics
 OUI:B42875*
 ID_OUI_FROM_DATABASE=Futecho Solutions Private Limited
 OUI:B428F1*
 ID_OUI_FROM_DATABASE=E-Prime Co., Ltd.
@ -100505,9 +100346,6 @@ OUI:B4B676*
 OUI:B4B686*
 ID_OUI_FROM_DATABASE=Hewlett Packard
 OUI:B4B742*
 ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 OUI:B4B859*
 ID_OUI_FROM_DATABASE=Texa Spa
@ -100646,9 +100484,6 @@ OUI:B4E1C4*
 OUI:B4E1EB*
 ID_OUI_FROM_DATABASE=Private
 OUI:B4E265*
 ID_OUI_FROM_DATABASE=Shenzhen SDMC Technology Co.,LTD
 OUI:B4E3F9*
 ID_OUI_FROM_DATABASE=Silicon Laboratories
@ -102026,15 +101861,9 @@ OUI:BC5FF6*
 OUI:BC6010*
 ID_OUI_FROM_DATABASE=Qingdao Hisense Communications Co.,Ltd.
 OUI:BC606B*
 ID_OUI_FROM_DATABASE=Shanghai Baud Data Communication Co.,Ltd.
 OUI:BC60A7*
 ID_OUI_FROM_DATABASE=Sony Interactive Entertainment Inc.
 OUI:BC6193*
 ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 OUI:BC620E*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
@ -106688,9 +106517,6 @@ OUI:CCE8AC*
 OUI:CCEA1C*
 ID_OUI_FROM_DATABASE=DCONWORKS  Co., Ltd
 OUI:CCEB18*
 ID_OUI_FROM_DATABASE=OOO TSS
 OUI:CCED21*
 ID_OUI_FROM_DATABASE=Nokia Shanghai Bell Co., Ltd.
@ -107417,9 +107243,6 @@ OUI:D08CFF*
 OUI:D08E79*
 ID_OUI_FROM_DATABASE=Dell Inc.
 OUI:D09200*
 ID_OUI_FROM_DATABASE=FiRa Consortium
 OUI:D0929E*
 ID_OUI_FROM_DATABASE=Microsoft Corporation
@ -109073,9 +108896,6 @@ OUI:D832E3*
 OUI:D8337F*
 ID_OUI_FROM_DATABASE=Office FA.com Co.,Ltd.
 OUI:D833B7*
 ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 OUI:D834EE*
 ID_OUI_FROM_DATABASE=Stem Audio
@ -109100,9 +108920,6 @@ OUI:D83BBF*
 OUI:D83C69*
 ID_OUI_FROM_DATABASE=Shenzhen TINNO Mobile Technology Corp.
 OUI:D83DCC*
 ID_OUI_FROM_DATABASE=shenzhen UDD Technologies,co.,Ltd
 OUI:D84008*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
@ -109163,9 +108980,6 @@ OUI:D84F37*
 OUI:D84FB8*
 ID_OUI_FROM_DATABASE=LG ELECTRONICS
 OUI:D850A1*
 ID_OUI_FROM_DATABASE=Hunan Danuo Technology Co.,LTD
 OUI:D850E6*
 ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
@ -110822,9 +110636,6 @@ OUI:DCFE07*
 OUI:DCFE18*
 ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 OUI:DCFE23*
 ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
 OUI:E00084*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
@ -111518,9 +111329,6 @@ OUI:E0B9E5*
 OUI:E0BAB4*
 ID_OUI_FROM_DATABASE=Arrcus, Inc
 OUI:E0BB0C*
 ID_OUI_FROM_DATABASE=Synertau LLC
 OUI:E0BB9E*
 ID_OUI_FROM_DATABASE=Seiko Epson Corporation
@ -112199,9 +112007,6 @@ OUI:E47185*
 OUI:E472E2*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:E47305*
 ID_OUI_FROM_DATABASE=Shenzhen INVT Electric CO.,Ltd
 OUI:E4751E*
 ID_OUI_FROM_DATABASE=Getinge Sterilization AB
@ -113270,9 +113075,6 @@ OUI:E89309*
 OUI:E89363*
 ID_OUI_FROM_DATABASE=Nokia
 OUI:E893F3*
 ID_OUI_FROM_DATABASE=Graphiant Inc
 OUI:E8944C*
 ID_OUI_FROM_DATABASE=Cogent Healthcare Systems Ltd
@ -113534,9 +113336,6 @@ OUI:E8D11B*
 OUI:E8D2FF*
 ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 OUI:E8D322*
 ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 OUI:E8D483*
 ID_OUI_FROM_DATABASE=ULTIMATE Europe Transportation Equipment GmbH
@ -114051,7 +113850,7 @@ OUI:EC7097*
 ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 OUI:EC71DB*
- ID_OUI_FROM_DATABASE=Reolink Innovation Limited
+ ID_OUI_FROM_DATABASE=Shenzhen Baichuan Digital Technology Co., Ltd.
 OUI:EC74BA*
 ID_OUI_FROM_DATABASE=Hirschmann Automation and Control GmbH
@ -117734,9 +117533,6 @@ OUI:F8E4E3*
 OUI:F8E4FB*
 ID_OUI_FROM_DATABASE=Actiontec Electronics, Inc
 OUI:F8E57E*
 ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 OUI:F8E5CF*
 ID_OUI_FROM_DATABASE=CGI IT UK LIMITED
--- a/hwdb.d/20-acpi-vendor.hwdb
+++ b/hwdb.d/20-acpi-vendor.hwdb
@ -579,9 +579,6 @@ acpi:AKM*:
 acpi:AKP*:
 ID_VENDOR_FROM_DATABASE=Atom Komplex Prylad
 acpi:AKR*:
 ID_VENDOR_FROM_DATABASE=Anker Innovations Limited
 acpi:AKY*:
 ID_VENDOR_FROM_DATABASE=Askey Computer Corporation
@ -6435,9 +6432,6 @@ acpi:SPL*:
 acpi:SPN*:
 ID_VENDOR_FROM_DATABASE=Sapience Corporation
 acpi:SPO*:
 ID_VENDOR_FROM_DATABASE=SAMPO CORPORATION
 acpi:SPR*:
 ID_VENDOR_FROM_DATABASE=pmns GmbH
--- a/hwdb.d/20-acpi-vendor.hwdb.patch
+++ b/hwdb.d/20-acpi-vendor.hwdb.patch
@ -1,5 +1,5 @@
--- 20-acpi-vendor.hwdb.base	2021-12-20 13:17:23.659810877 +0100
+--- 20-acpi-vendor.hwdb.base	2021-12-09 11:01:54.284913786 +0100
-+++ 20-acpi-vendor.hwdb	2021-12-20 13:17:23.677811073 +0100
+++ 20-acpi-vendor.hwdb	2021-12-09 11:01:54.304914014 +0100
@@ -3,6 +3,8 @@
 # Data imported from:
 #     https://uefi.org/uefi-pnp-export
@ -48,7 +48,7 @@
  ID_VENDOR_FROM_DATABASE=Aspen Tech Inc
 acpi:ACR*:
-@@ -673,6 +678,9 @@
+@@ -670,6 +675,9 @@
 acpi:AMT*:
  ID_VENDOR_FROM_DATABASE=AMT International Industry
@ -58,7 +58,7 @@
 acpi:AMX*:
  ID_VENDOR_FROM_DATABASE=AMX LLC
-@@ -721,6 +729,9 @@
+@@ -718,6 +726,9 @@
 acpi:AOA*:
  ID_VENDOR_FROM_DATABASE=AOpen Inc.
@ -68,7 +68,7 @@
 acpi:AOE*:
  ID_VENDOR_FROM_DATABASE=Advanced Optics Electronics, Inc.
-@@ -730,6 +741,9 @@
+@@ -727,6 +738,9 @@
 acpi:AOT*:
  ID_VENDOR_FROM_DATABASE=Alcatel
@ -78,7 +78,7 @@
 acpi:APC*:
  ID_VENDOR_FROM_DATABASE=American Power Conversion
-@@ -905,7 +919,7 @@
+@@ -902,7 +916,7 @@
  ID_VENDOR_FROM_DATABASE=ALPS ALPINE CO., LTD.
 acpi:AUO*:
@ -87,7 +87,7 @@
 acpi:AUR*:
  ID_VENDOR_FROM_DATABASE=Aureal Semiconductor
-@@ -985,6 +999,9 @@
+@@ -982,6 +996,9 @@
 acpi:AXE*:
  ID_VENDOR_FROM_DATABASE=Axell Corporation
@ -97,7 +97,7 @@
 acpi:AXI*:
  ID_VENDOR_FROM_DATABASE=American Magnetics
-@@ -1135,6 +1152,9 @@
+@@ -1132,6 +1149,9 @@
 acpi:BML*:
  ID_VENDOR_FROM_DATABASE=BIOMED Lab
@ -107,7 +107,7 @@
 acpi:BMS*:
  ID_VENDOR_FROM_DATABASE=BIOMEDISYS
-@@ -1147,6 +1167,9 @@
+@@ -1144,6 +1164,9 @@
 acpi:BNO*:
  ID_VENDOR_FROM_DATABASE=Bang & Olufsen
@ -117,7 +117,7 @@
 acpi:BNS*:
  ID_VENDOR_FROM_DATABASE=Boulder Nonlinear Systems
-@@ -1390,6 +1413,9 @@
+@@ -1387,6 +1410,9 @@
 acpi:CHA*:
  ID_VENDOR_FROM_DATABASE=Chase Research PLC
@ -127,7 +127,7 @@
 acpi:CHD*:
  ID_VENDOR_FROM_DATABASE=ChangHong Electric Co.,Ltd
-@@ -1552,6 +1578,9 @@
+@@ -1549,6 +1575,9 @@
 acpi:COD*:
  ID_VENDOR_FROM_DATABASE=CODAN Pty. Ltd.
@ -137,7 +137,7 @@
 acpi:COI*:
  ID_VENDOR_FROM_DATABASE=Codec Inc.
-@@ -1961,7 +1990,7 @@
+@@ -1958,7 +1987,7 @@
  ID_VENDOR_FROM_DATABASE=Dragon Information Technology
 acpi:DJE*:
@ -146,7 +146,7 @@
 acpi:DJP*:
  ID_VENDOR_FROM_DATABASE=Maygay Machines, Ltd
-@@ -2299,6 +2328,9 @@
+@@ -2296,6 +2325,9 @@
 acpi:EIN*:
  ID_VENDOR_FROM_DATABASE=Elegant Invention
@ -156,7 +156,7 @@
 acpi:EKA*:
  ID_VENDOR_FROM_DATABASE=MagTek Inc.
-@@ -2563,6 +2595,9 @@
+@@ -2560,6 +2592,9 @@
 acpi:FCG*:
  ID_VENDOR_FROM_DATABASE=First International Computer Ltd
@ -166,7 +166,7 @@
 acpi:FCS*:
  ID_VENDOR_FROM_DATABASE=Focus Enhancements, Inc.
-@@ -2939,7 +2974,7 @@
+@@ -2936,7 +2971,7 @@
  ID_VENDOR_FROM_DATABASE=General Standards Corporation
 acpi:GSM*:
@ -175,7 +175,7 @@
 acpi:GSN*:
  ID_VENDOR_FROM_DATABASE=Grandstream Networks, Inc.
-@@ -3040,6 +3075,9 @@
+@@ -3037,6 +3072,9 @@
 acpi:HEC*:
  ID_VENDOR_FROM_DATABASE=Hisense Electric Co., Ltd.
@ -185,7 +185,7 @@
 acpi:HEL*:
  ID_VENDOR_FROM_DATABASE=Hitachi Micro Systems Europe Ltd
-@@ -3172,6 +3210,9 @@
+@@ -3169,6 +3207,9 @@
 acpi:HSD*:
  ID_VENDOR_FROM_DATABASE=HannStar Display Corp
@ -195,7 +195,7 @@
 acpi:HSM*:
  ID_VENDOR_FROM_DATABASE=AT&T Microelectronics
-@@ -3298,6 +3339,9 @@
+@@ -3295,6 +3336,9 @@
 acpi:ICI*:
  ID_VENDOR_FROM_DATABASE=Infotek Communication Inc
@ -205,7 +205,7 @@
 acpi:ICM*:
  ID_VENDOR_FROM_DATABASE=Intracom SA
-@@ -3394,6 +3438,9 @@
+@@ -3391,6 +3435,9 @@
 acpi:IKE*:
  ID_VENDOR_FROM_DATABASE=Ikegami Tsushinki Co. Ltd.
@ -215,7 +215,7 @@
 acpi:IKS*:
  ID_VENDOR_FROM_DATABASE=Ikos Systems Inc
-@@ -3439,6 +3486,9 @@
+@@ -3436,6 +3483,9 @@
 acpi:IMT*:
  ID_VENDOR_FROM_DATABASE=Inmax Technology Corporation
@ -225,7 +225,7 @@
 acpi:INA*:
  ID_VENDOR_FROM_DATABASE=Inventec Corporation
-@@ -3955,6 +4005,9 @@
+@@ -3952,6 +4002,9 @@
 acpi:LAN*:
  ID_VENDOR_FROM_DATABASE=Sodeman Lancom Inc
@ -235,7 +235,7 @@
 acpi:LAS*:
  ID_VENDOR_FROM_DATABASE=LASAT Comm. A/S
-@@ -4003,6 +4056,9 @@
+@@ -4000,6 +4053,9 @@
 acpi:LED*:
  ID_VENDOR_FROM_DATABASE=Long Engineering Design Inc
@ -245,7 +245,7 @@
 acpi:LEG*:
  ID_VENDOR_FROM_DATABASE=Legerity, Inc
-@@ -4018,6 +4074,9 @@
+@@ -4015,6 +4071,9 @@
 acpi:LGC*:
  ID_VENDOR_FROM_DATABASE=Logic Ltd
@ -255,7 +255,7 @@
 acpi:LGI*:
  ID_VENDOR_FROM_DATABASE=Logitech Inc
-@@ -4075,6 +4134,9 @@
+@@ -4072,6 +4131,9 @@
 acpi:LND*:
  ID_VENDOR_FROM_DATABASE=Land Computer Company Ltd
@ -265,7 +265,7 @@
 acpi:LNK*:
  ID_VENDOR_FROM_DATABASE=Link Tech Inc
-@@ -4109,7 +4171,7 @@
+@@ -4106,7 +4168,7 @@
  ID_VENDOR_FROM_DATABASE=Design Technology
 acpi:LPL*:
@ -274,7 +274,7 @@
 acpi:LSC*:
  ID_VENDOR_FROM_DATABASE=LifeSize Communications
-@@ -4285,6 +4347,9 @@
+@@ -4282,6 +4344,9 @@
 acpi:MCX*:
  ID_VENDOR_FROM_DATABASE=Millson Custom Solutions Inc.
@ -284,7 +284,7 @@
 acpi:MDA*:
  ID_VENDOR_FROM_DATABASE=Media4 Inc
-@@ -4525,6 +4590,9 @@
+@@ -4522,6 +4587,9 @@
 acpi:MOM*:
  ID_VENDOR_FROM_DATABASE=Momentum Data Systems
@ -294,7 +294,7 @@
 acpi:MOS*:
  ID_VENDOR_FROM_DATABASE=Moses Corporation
-@@ -4759,6 +4827,9 @@
+@@ -4756,6 +4824,9 @@
 acpi:NAL*:
  ID_VENDOR_FROM_DATABASE=Network Alchemy
@ -304,7 +304,7 @@
 acpi:NAT*:
  ID_VENDOR_FROM_DATABASE=NaturalPoint Inc.
-@@ -5281,6 +5352,9 @@
+@@ -5278,6 +5349,9 @@
 acpi:PCX*:
  ID_VENDOR_FROM_DATABASE=PC Xperten
@ -314,7 +314,7 @@
 acpi:PDM*:
  ID_VENDOR_FROM_DATABASE=Psion Dacom Plc.
-@@ -5344,9 +5418,6 @@
+@@ -5341,9 +5415,6 @@
 acpi:PHE*:
  ID_VENDOR_FROM_DATABASE=Philips Medical Systems Boeblingen GmbH
@ -324,7 +324,7 @@
 acpi:PHL*:
  ID_VENDOR_FROM_DATABASE=Philips Consumer Electronics Company
-@@ -5437,9 +5508,6 @@
+@@ -5434,9 +5505,6 @@
 acpi:PNL*:
  ID_VENDOR_FROM_DATABASE=Panelview, Inc.
@ -334,7 +334,7 @@
 acpi:PNR*:
  ID_VENDOR_FROM_DATABASE=Planar Systems, Inc.
-@@ -5575,15 +5643,9 @@
+@@ -5572,15 +5640,9 @@
 acpi:PTS*:
  ID_VENDOR_FROM_DATABASE=Plain Tree Systems Inc
@ -350,7 +350,7 @@
 acpi:PVG*:
  ID_VENDOR_FROM_DATABASE=Proview Global Co., Ltd
-@@ -5899,9 +5961,6 @@
+@@ -5896,9 +5958,6 @@
 acpi:RTI*:
  ID_VENDOR_FROM_DATABASE=Rancho Tech Inc
@ -360,7 +360,7 @@
 acpi:RTL*:
  ID_VENDOR_FROM_DATABASE=Realtek Semiconductor Company Ltd
-@@ -6070,9 +6129,6 @@
+@@ -6067,9 +6126,6 @@
 acpi:SEE*:
  ID_VENDOR_FROM_DATABASE=SeeColor Corporation
@ -370,7 +370,7 @@
 acpi:SEI*:
  ID_VENDOR_FROM_DATABASE=Seitz & Associates Inc
-@@ -6541,6 +6597,9 @@
+@@ -6535,6 +6591,9 @@
 acpi:SVD*:
  ID_VENDOR_FROM_DATABASE=SVD Computer
@ -380,7 +380,7 @@
 acpi:SVI*:
  ID_VENDOR_FROM_DATABASE=Sun Microsystems
-@@ -6625,6 +6684,9 @@
+@@ -6619,6 +6678,9 @@
 acpi:SZM*:
  ID_VENDOR_FROM_DATABASE=Shenzhen MTC Co., Ltd
@ -390,7 +390,7 @@
 acpi:TAA*:
  ID_VENDOR_FROM_DATABASE=Tandberg
-@@ -6715,6 +6777,9 @@
+@@ -6709,6 +6771,9 @@
 acpi:TDG*:
  ID_VENDOR_FROM_DATABASE=Six15 Technologies
@ -400,7 +400,7 @@
 acpi:TDM*:
  ID_VENDOR_FROM_DATABASE=Tandem Computer Europe Inc
-@@ -6757,6 +6822,9 @@
+@@ -6751,6 +6816,9 @@
 acpi:TEV*:
  ID_VENDOR_FROM_DATABASE=Televés, S.A.
@ -410,7 +410,7 @@
 acpi:TEZ*:
  ID_VENDOR_FROM_DATABASE=Tech Source Inc.
-@@ -6880,9 +6948,6 @@
+@@ -6874,9 +6942,6 @@
 acpi:TNC*:
  ID_VENDOR_FROM_DATABASE=TNC Industrial Company Ltd
@ -420,7 +420,7 @@
 acpi:TNM*:
  ID_VENDOR_FROM_DATABASE=TECNIMAGEN SA
-@@ -7192,14 +7257,14 @@
+@@ -7186,14 +7251,14 @@
 acpi:UNC*:
  ID_VENDOR_FROM_DATABASE=Unisys Corporation
@ -441,7 +441,7 @@
 acpi:UNI*:
  ID_VENDOR_FROM_DATABASE=Uniform Industry Corp.
-@@ -7234,6 +7299,9 @@
+@@ -7228,6 +7293,9 @@
 acpi:USA*:
  ID_VENDOR_FROM_DATABASE=Utimaco Safeware AG
@ -451,7 +451,7 @@
 acpi:USD*:
  ID_VENDOR_FROM_DATABASE=U.S. Digital Corporation
-@@ -7489,9 +7557,6 @@
+@@ -7483,9 +7551,6 @@
 acpi:WAL*:
  ID_VENDOR_FROM_DATABASE=Wave Access
@ -461,7 +461,7 @@
 acpi:WAV*:
  ID_VENDOR_FROM_DATABASE=Wavephore
-@@ -7616,7 +7681,7 @@
+@@ -7610,7 +7675,7 @@
  ID_VENDOR_FROM_DATABASE=WyreStorm Technologies LLC
 acpi:WYS*:
@ -470,7 +470,7 @@
 acpi:WYT*:
  ID_VENDOR_FROM_DATABASE=Wooyoung Image & Information Co.,Ltd.
-@@ -7630,9 +7695,6 @@
+@@ -7624,9 +7689,6 @@
 acpi:XDM*:
  ID_VENDOR_FROM_DATABASE=XDM Ltd.
@ -480,7 +480,7 @@
 acpi:XES*:
  ID_VENDOR_FROM_DATABASE=Extreme Engineering Solutions, Inc.
-@@ -7663,9 +7725,6 @@
+@@ -7657,9 +7719,6 @@
 acpi:XNT*:
  ID_VENDOR_FROM_DATABASE=XN Technologies, Inc.
@ -490,7 +490,7 @@
 acpi:XQU*:
  ID_VENDOR_FROM_DATABASE=SHANGHAI SVA-DAV ELECTRONICS CO., LTD
-@@ -7732,6 +7791,9 @@
+@@ -7726,6 +7785,9 @@
 acpi:ZBX*:
  ID_VENDOR_FROM_DATABASE=Zebax Technologies
--- a/hwdb.d/20-pci-vendor-model.hwdb
+++ b/hwdb.d/20-pci-vendor-model.hwdb
@ -8052,7 +8052,7 @@ pci:v00001002d000067DFsv00001DA2sd0000E366*
 ID_MODEL_FROM_DATABASE=Ellesmere [Radeon RX 470/480/570/570X/580/580X/590] (Nitro+ Radeon RX 570/580/590)
 pci:v00001002d000067DFsv00001DA2sd0000E387*
- ID_MODEL_FROM_DATABASE=Ellesmere [Radeon RX 470/480/570/570X/580/580X/590] (Radeon RX 580 Pulse 4GB)
+ ID_MODEL_FROM_DATABASE=Ellesmere [Radeon RX 470/480/570/570X/580/580X/590] (Radeon RX 570 Pulse 4GB)
 pci:v00001002d000067E0*
 ID_MODEL_FROM_DATABASE=Baffin [Radeon Pro WX 4170]
@ -8858,9 +8858,6 @@ pci:v00001002d0000687Fsv00001002sd00000B36*
 pci:v00001002d0000687Fsv00001002sd00006B76*
 ID_MODEL_FROM_DATABASE=Vega 10 XL/XT [Radeon RX Vega 56/64] (RX Vega64)
 pci:v00001002d0000687Fsv00001043sd000004C4*
 ID_MODEL_FROM_DATABASE=Vega 10 XL/XT [Radeon RX Vega 56/64] (Radeon RX Vega 64)
 pci:v00001002d0000687Fsv00001458sd0000230C*
 ID_MODEL_FROM_DATABASE=Vega 10 XL/XT [Radeon RX Vega 56/64] (Radeon RX VEGA 56 GAMING OC 8G)
@ -30273,7 +30270,7 @@ pci:v000010DEd00000332*
 ID_MODEL_FROM_DATABASE=NV35 [GeForce FX 5900XT]
 pci:v000010DEd00000333*
- ID_MODEL_FROM_DATABASE=NV38 [GeForce FX 5950 Ultra]
+ ID_MODEL_FROM_DATABASE=NV38 [GeForce FX 5950 Ultra / PCX 5950]
 pci:v000010DEd00000334*
 ID_MODEL_FROM_DATABASE=NV35 [GeForce FX 5900ZT]
@ -61533,7 +61530,7 @@ pci:v000015B3d0000197B*
 ID_MODEL_FROM_DATABASE=MT43244 Family [BlueField-3 SoC PCIe Bridge]
 pci:v000015B3d0000197C*
- ID_MODEL_FROM_DATABASE=ConnectX/BlueField Family mlx5Gen PCIe Bridge [PCIe Bridge]
+ ID_MODEL_FROM_DATABASE=CX8 Family [ConnectX-8 PCIe Bridge]
 pci:v000015B3d00002020*
 ID_MODEL_FROM_DATABASE=MT2892 Family [ConnectX-6 Dx Emulated PCIe Bridge]
@ -61548,7 +61545,7 @@ pci:v000015B3d00002024*
 ID_MODEL_FROM_DATABASE=MT43244 Family [BlueField-3 SoC Emulated PCIe Bridge]
 pci:v000015B3d00002025*
- ID_MODEL_FROM_DATABASE=ConnectX/BlueField Family mlx5Gen Emulated PCIe Bridge [Emulated PCIe Bridge]
+ ID_MODEL_FROM_DATABASE=CX8 Family [ConnectX-8 Emulated PCIe Bridge]
 pci:v000015B3d00004117*
 ID_MODEL_FROM_DATABASE=MT27712A0-FDCF-AE
@ -71138,24 +71135,6 @@ pci:v00001DE5d00002000*
 pci:v00001DE5d00003000*
 ID_MODEL_FROM_DATABASE=eBPF-based PCIe Accelerator
 pci:v00001DED*
 ID_VENDOR_FROM_DATABASE=Alibaba (China) Co., Ltd.
 pci:v00001DEDd00008000*
 ID_MODEL_FROM_DATABASE=M1 Root Port
 pci:v00001DEDd00008001*
 ID_MODEL_FROM_DATABASE=ACC-RCiEP
 pci:v00001DEDd00008002*
 ID_MODEL_FROM_DATABASE=RCiEP VF
 pci:v00001DEDd00008003*
 ID_MODEL_FROM_DATABASE=RCEC PF
 pci:v00001DEDd00008004*
 ID_MODEL_FROM_DATABASE=RCEC VF
 pci:v00001DEE*
 ID_VENDOR_FROM_DATABASE=Biwin Storage Technology Co., Ltd.
@ -71492,93 +71471,6 @@ pci:v00001E39*
 pci:v00001E3B*
 ID_VENDOR_FROM_DATABASE=Shenzhen DAPU Microelectronics Co., Ltd
 pci:v00001E3Bd00000600*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600
 pci:v00001E3Bd00000600sv00001E3Bsd00000030*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 3.84TB (J5100))
 pci:v00001E3Bd00000600sv00001E3Bsd00000031*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 7.68TB (J5100))
 pci:v00001E3Bd00000600sv00001E3Bsd00000032*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 15.36TB (J5100))
 pci:v00001E3Bd00000600sv00001E3Bsd00000033*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 3.20TB (J5300))
 pci:v00001E3Bd00000600sv00001E3Bsd00000034*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 6.40TB (J5300))
 pci:v00001E3Bd00000600sv00001E3Bsd00000035*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 12.80TB (J5300))
 pci:v00001E3Bd00000600sv00001E3Bsd00000036*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD AIC 7.68TB (J5110))
 pci:v00001E3Bd00000600sv00001E3Bsd00000037*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD AIC 6.40TB (J5310))
 pci:v00001E3Bd00000600sv00001E3Bsd0000003E*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD AIC 3.84TB (J5110))
 pci:v00001E3Bd00000600sv00001E3Bsd0000003F*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD AIC 3.20TB (J5310))
 pci:v00001E3Bd00000600sv00001E3Bsd00000050*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 3.84TB (R5100))
 pci:v00001E3Bd00000600sv00001E3Bsd00000051*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 7.68TB (R5100))
 pci:v00001E3Bd00000600sv00001E3Bsd00000052*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 15.36TB (R5100))
 pci:v00001E3Bd00000600sv00001E3Bsd00000053*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 3.20TB (R5300))
 pci:v00001E3Bd00000600sv00001E3Bsd00000054*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 6.40TB (R5300))
 pci:v00001E3Bd00000600sv00001E3Bsd00000055*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 12.80TB (R5300))
 pci:v00001E3Bd00000600sv00001E3Bsd00000056*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 3.84TB (R5101))
 pci:v00001E3Bd00000600sv00001E3Bsd00000059*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 3.20TB (R5301))
 pci:v00001E3Bd00000600sv00001E3Bsd00000060*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 3.84TB (R5100D))
 pci:v00001E3Bd00000600sv00001E3Bsd00000061*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 7.68TB (R5100D))
 pci:v00001E3Bd00000600sv00001E3Bsd00000063*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 3.20TB (R5300D))
 pci:v00001E3Bd00000600sv00001E3Bsd00000064*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 6.40TB (R5300D))
 pci:v00001E3Bd00000600sv00001E3Bsd000000F0*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 0.40TB (X2900))
 pci:v00001E3Bd00000600sv00001E3Bsd000000F1*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 0.80TB (X2900))
 pci:v00001E3Bd00000600sv00001E3Bsd000000F2*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 1.60TB (X2900))
 pci:v00001E3Bd00000600sv00001E3Bsd000000F3*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 3.20TB (X2900))
 pci:v00001E3Bd00000600sv00001E3Bsd000000F5*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 0.40TB (X2900P))
 pci:v00001E3Bd00000600sv00001E3Bsd000000F6*
 ID_MODEL_FROM_DATABASE=NVMe SSD Controller DPU600 (Enterprise NVMe SSD U.2 0.80TB (X2900P))
 pci:v00001E3Bd00001098*
 ID_MODEL_FROM_DATABASE=Haishen NVMe SSD
@ -80105,9 +79997,6 @@ pci:v00008086d00001572sv00001BD4sd00000056*
 pci:v00008086d00001572sv00001BD4sd00000065*
 ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (F102IX710)
 pci:v00008086d00001572sv00001BD4sd00000074*
 ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Network Adapter X710-BM2 for lldp)
 pci:v00008086d00001572sv00008086sd00000000*
 ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Converged Network Adapter X710)
--- a/hwdb.d/ma-large.txt
+++ b/hwdb.d/ma-large.txt
--- a/hwdb.d/ma-medium.txt
+++ b/hwdb.d/ma-medium.txt
@ -9356,18 +9356,18 @@ B00000-BFFFFF     (base 16)		Hunan Yaguan Communication Technology Co.,Ltd
 				Gyeonggi-do  Gyeonggi-do  14671
 				KR
 04-EE-E8   (hex)		Best Integration Technology Co., Ltd.
 E00000-EFFFFF     (base 16)		Best Integration Technology Co., Ltd.
 				5F., No.1, Ln.63, Guanxin Rd., East Dist
 				Hsinchu City  Taiwan  30072
 				TW
 04-EE-E8   (hex)		Zoomlion Huanuo(Beijing)Technology Co.,Ltd
 000000-0FFFFF     (base 16)		Zoomlion Huanuo(Beijing)Technology Co.,Ltd
 				Room 401, floor 4, unit 2, building 26, yard 1, Disheng North Street, Beijing Economic and Technological Development Zone, Beijing
 				Beijing    100000
 				CN
 18-D7-93   (hex)		Torsa Global
 800000-8FFFFF     (base 16)		Torsa Global
 				C/ Severo Ochoa, 19
 				Malaga  Malaga  29590
 				ES
 18-D7-93   (hex)		Shenzhen JieXingTong Technology Co.,LTD
 000000-0FFFFF     (base 16)		Shenzhen JieXingTong Technology Co.,LTD
 				3rd floor,block C,B6 building,China Merchants guangming science and technology park,No.3009 guanguang road,Guangming New District,
@ -9380,11 +9380,11 @@ E00000-EFFFFF     (base 16)		Best Integration Technology Co., Ltd.
 				shenzhen  guangdong  518057
 				CN
-18-D7-93   (hex)		Torsa Global
+04-EE-E8   (hex)		Best Integration Technology Co., Ltd.
-800000-8FFFFF     (base 16)		Torsa Global
+E00000-EFFFFF     (base 16)		Best Integration Technology Co., Ltd.
-				C/ Severo Ochoa, 19
+				5F., No.1, Ln.63, Guanxin Rd., East Dist
-				Malaga  Malaga  29590
+				Hsinchu City  Taiwan  30072
-				ES
+				TW
 DC-36-43   (hex)		Wuhan Linptech Co. ,Ltd.
 200000-2FFFFF     (base 16)		Wuhan Linptech Co. ,Ltd.
@ -9392,6 +9392,18 @@ DC-36-43   (hex)		Wuhan Linptech Co. ,Ltd.
 				Wuhan  Hubei  430074
 				CN
 08-26-AE   (hex)		ShineTech Electronics Co., Ltd
 800000-8FFFFF     (base 16)		ShineTech Electronics Co., Ltd
 				No.169, Anji St., Zuoying Dist.
 				Kaohsiung    813018
 				TW
 08-26-AE   (hex)		SHENNAN CIRCUITS CO.,LTD
 500000-5FFFFF     (base 16)		SHENNAN CIRCUITS CO.,LTD
 				Gao Qiao Industrial Park East,Long Gang District,
 				Shenzhen  Guangdong  518117
 				CN
 08-26-AE   (hex)		F-Plus Mobile LLC
 B00000-BFFFFF     (base 16)		F-Plus Mobile LLC
 				Preobrazhenskaya square, 8, floor 27, pom. LXXXVI, room 1.
@ -9410,24 +9422,6 @@ DC-36-43   (hex)		Shenzhen smart-core technology co.,ltd.
 				Shenzhen  Guangdong  518057
 				CN
 08-26-AE   (hex)		ShineTech Electronics Co., Ltd
 800000-8FFFFF     (base 16)		ShineTech Electronics Co., Ltd
 				No.169, Anji St., Zuoying Dist.
 				Kaohsiung    813018
 				TW
 08-26-AE   (hex)		SHENNAN CIRCUITS CO.,LTD
 500000-5FFFFF     (base 16)		SHENNAN CIRCUITS CO.,LTD
 				Gao Qiao Industrial Park East,Long Gang District,
 				Shenzhen  Guangdong  518117
 				CN
 DC-36-43   (hex)		UKG
 700000-7FFFFF     (base 16)		UKG
 				900 Chelmsford St
 				Lowell  MA  01851
 				US
 DC-36-43   (hex)		Beijing L&S Lancom Platform Tech. Co., Ltd.
 E00000-EFFFFF     (base 16)		Beijing L&S Lancom Platform Tech. Co., Ltd.
 				901,floor 9, jelly loft, building 28, yard 9, Huinan Road, Changping District.
@ -9440,17 +9434,11 @@ E00000-EFFFFF     (base 16)		Beijing L&S Lancom Platform Tech. Co., Ltd.
 				Mail box 15123  Haifa  3508409
 				IL
-98-8F-E0   (hex)		Shenzhen Vitalitim Technology Co., Ltd
+DC-36-43   (hex)		UKG
-D00000-DFFFFF     (base 16)		Shenzhen Vitalitim Technology Co., Ltd
+700000-7FFFFF     (base 16)		UKG
-				83C21J, 3rd Floor, Tianjing Building, Tian'an Digital City, No. 6, Tairan 5th Road, Tian'an Community, Shatou Street, Futian District,
+				900 Chelmsford St
-				Shenzhen  Guangdong  518000
+				Lowell  MA  01851
-				CN
+				US
 98-8F-E0   (hex)		GUANGZHOU HERYSTORM TECHNOLOGY CO.,LTD.
 100000-1FFFFF     (base 16)		GUANGZHOU HERYSTORM TECHNOLOGY CO.,LTD.
 				No.2-8,Nancun North Street,Panyun District,
 				Guangzhou    511400
 				CN
 20-85-93   (hex)		UNILUMIN GROUP CO.,LTD
 300000-3FFFFF     (base 16)		UNILUMIN GROUP CO.,LTD
@ -14201,10 +14189,10 @@ B00000-BFFFFF     (base 16)		3D Biomedicine Science & Technology Co., Limited
 				Alleroed    3450
 				DK
-04-EE-E8   (hex)		Hengke Technology Industry Co., Ltd.
+04-EE-E8   (hex)		Shenzhen Daotong Technology Co.,Ltd
-200000-2FFFFF     (base 16)		Hengke Technology Industry Co., Ltd.
+400000-4FFFFF     (base 16)		Shenzhen Daotong Technology Co.,Ltd
-				No.305-1 Torch Road, High District, WeiHai
+				7th, 8th, 10th Floor, Building B1, Zhiyuan Road, No. 1001 Xueyuan Avenue, Xili Street, Nanshan District, Shenzhen
-				WeiHai  ShanDong  264200
+				SHENZHEN    518000
 				CN
 50-A0-30   (hex)		Annapurna labs
@ -14213,41 +14201,35 @@ B00000-BFFFFF     (base 16)		3D Biomedicine Science & Technology Co., Limited
 				Mail box 15123  Haifa  3508409
 				IL
 04-EE-E8   (hex)		Shenzhen Daotong Technology Co.,Ltd
 400000-4FFFFF     (base 16)		Shenzhen Daotong Technology Co.,Ltd
 				7th, 8th, 10th Floor, Building B1, Zhiyuan Road, No. 1001 Xueyuan Avenue, Xili Street, Nanshan District, Shenzhen
 				SHENZHEN    518000
 				CN
 04-EE-E8   (hex)		RealWear
 500000-5FFFFF     (base 16)		RealWear
 				600 Hathaway Rd, Ste 105
 				Vancouver  WA  98661
 				US
 04-EE-E8   (hex)		Hengke Technology Industry Co., Ltd.
 200000-2FFFFF     (base 16)		Hengke Technology Industry Co., Ltd.
 				No.305-1 Torch Road, High District, WeiHai
 				WeiHai  ShanDong  264200
 				CN
 04-EE-E8   (hex)		Fluid Management Technology
 300000-3FFFFF     (base 16)		Fluid Management Technology
 				169 Grange Rd, Beverley
 				169 Grange Rd, Beverley, South Australia 5009 AU.  South Australia  5009
 				AU
 18-D7-93   (hex)		EcoG
 B00000-BFFFFF     (base 16)		EcoG
 				Gaenslerweg 24
 				Furth  Bavaria  82041
 				DE
 18-D7-93   (hex)		Teegarden Applied Science Inc
 E00000-EFFFFF     (base 16)		Teegarden Applied Science Inc
 				2510 rue de l'Aeroport
 				St-Mathieu-de-Beloeil  Quebec  J3G0C9
 				CA
-DC-36-43   (hex)		Meier Tobler AG
+18-D7-93   (hex)		EcoG
-000000-0FFFFF     (base 16)		Meier Tobler AG
+B00000-BFFFFF     (base 16)		EcoG
-				Bahnstrasse 24
+				Gaenslerweg 24
-				Schwerzenbach  ZH  8603
+				Furth  Bavaria  82041
-				CH
+				DE
 DC-36-43   (hex)		nami.ai
 B00000-BFFFFF     (base 16)		nami.ai
@ -14261,18 +14243,24 @@ DC-36-43   (hex)		WIS Networks
 				foshan  guangdong  528000
 				CN
 DC-36-43   (hex)		Dongguan Pengchen Earth Instrument CO. LT
 100000-1FFFFF     (base 16)		Dongguan Pengchen Earth Instrument CO. LT
 				Room 301, Building 1, No.6, North Huwu Road, Liuwu Village, Shijie Town, Dongguan city, Guangdong Province
 				Dongguan    523290
 				CN
 DC-36-43   (hex)		Hangzhou Huanyu Vision Technology Co., Ltd
 D00000-DFFFFF     (base 16)		Hangzhou Huanyu Vision Technology Co., Ltd
 				 Room 701, block n, No. 88, China (Hangzhou) smart information industrial park, Gongshu District,
 				Hangzhou  Zhejiang  310011
 				CN
 DC-36-43   (hex)		Meier Tobler AG
 000000-0FFFFF     (base 16)		Meier Tobler AG
 				Bahnstrasse 24
 				Schwerzenbach  ZH  8603
 				CH
 DC-36-43   (hex)		Dongguan Pengchen Earth Instrument CO. LT
 100000-1FFFFF     (base 16)		Dongguan Pengchen Earth Instrument CO. LT
 				Room 301, Building 1, No.6, North Huwu Road, Liuwu Village, Shijie Town, Dongguan city, Guangdong Province
 				Dongguan    523290
 				CN
 08-26-AE   (hex)		BANGJOO Co., Ltd.
 400000-4FFFFF     (base 16)		BANGJOO Co., Ltd.
 				745-34, Samnam-ro,Jinwi-myeon
@ -14309,18 +14297,6 @@ C00000-CFFFFF     (base 16)		Brannstrom Sweden AB
 				Eschlikon    8360
 				CH
 98-8F-E0   (hex)		Pavana Technologies JSC.
 A00000-AFFFFF     (base 16)		Pavana Technologies JSC.
 				Lot F1-2-3, Thang Long Vinh Phuc IP., Tam Hop Commune, Binh Xuyen District
 				Vinh Phuc    35000
 				VN
 10-54-D2   (hex)		LUXSHARE-ICT Co., Ltd.
 C00000-CFFFFF     (base 16)		LUXSHARE-ICT Co., Ltd.
 				1F, No. 22, Lane 35, Jihu Road, Neihu district
 				Taipei City  Taiwan  114754
 				TW
 4C-4B-F9   (hex)		Shandong Linkotech Electronic Co., Ltd.
 600000-6FFFFF     (base 16)		Shandong Linkotech Electronic Co., Ltd.
 				22nd Floor, Building 2, Aosheng Building, No.1166 Xinyi Street, High-tech Zone
@ -19022,12 +18998,6 @@ A00000-AFFFFF     (base 16)		Missing-Link Oy
 				ShenZhen  GuangDong  518000
 				CN
 18-D7-93   (hex)		Autel lntelligent Technology Corp.,Ltd
 600000-6FFFFF     (base 16)		Autel lntelligent Technology Corp.,Ltd
 				7th, 8th, 10th Floor, Building B1, Zhiyuan Road, No. 1001 Xueyuan Avenue, Xili Street, Nanshan District, Shenzhen
 				Shenzhen    518000
 				CN
 18-D7-93   (hex)		Remote Engineer B.V.
 400000-4FFFFF     (base 16)		Remote Engineer B.V.
 				It Vegelinskampke, 11
@ -19037,40 +19007,40 @@ A00000-AFFFFF     (base 16)		Missing-Link Oy
 18-D7-93   (hex)		Private
 C00000-CFFFFF     (base 16)		Private
 18-D7-93   (hex)		Autel lntelligent Technology Corp.,Ltd
 600000-6FFFFF     (base 16)		Autel lntelligent Technology Corp.,Ltd
 				7th, 8th, 10th Floor, Building B1, Zhiyuan Road, No. 1001 Xueyuan Avenue, Xili Street, Nanshan District, Shenzhen
 				Shenzhen    518000
 				CN
 DC-36-43   (hex)		Hangzhou Chingan Tech Co., Ltd.
 500000-5FFFFF     (base 16)		Hangzhou Chingan Tech Co., Ltd.
 				4F, BLDG. 4, 16# XIYUAN YI ROAD HANGZHOU, ZHEJIANG,CHINA 310030
 				hangzhou  zhejiang  310000
 				CN
 08-26-AE   (hex)		Flextronics International Kft.
 A00000-AFFFFF     (base 16)		Flextronics International Kft.
 				Zrínyi Miklós str. 38.
 				Zalaegerszeg    8900
 				HU
 08-26-AE   (hex)		Wuhan Tianyu Information Industry Co., Ltd.
 000000-0FFFFF     (base 16)		Wuhan Tianyu Information Industry Co., Ltd.
 				Tianyu Building, S.&T.Park, Huazhong University of S.&T.,East Lake Development Zone
 				Wuhan  Hubei  430000
 				CN
 DC-36-43   (hex)		Hefei EA Excelsior Information Security Co., Ltd.
 900000-9FFFFF     (base 16)		Hefei EA Excelsior Information Security Co., Ltd.
 				1F, Block A, Tsinghua Unis Infoport, Langshan Rd, Hi-Tech Industrial (North), Nanshan
 				Shenzhen  Guangdong  518000
 				CN
 08-26-AE   (hex)		Flextronics International Kft.
 A00000-AFFFFF     (base 16)		Flextronics International Kft.
 				Zrínyi Miklós str. 38.
 				Zalaegerszeg    8900
 				HU
 08-26-AE   (hex)		EVTECH SOLUTIONS LTD. DBA 3D-P
 700000-7FFFFF     (base 16)		EVTECH SOLUTIONS LTD. DBA 3D-P
 				UNIT 101  2609 15TH STREET NE
 				CALGARY  Alberta  T2E 8Y4
 				CA
-98-8F-E0   (hex)		KuaiZhu SmartTechnology?Suzhou?CO.,Ltd
+08-26-AE   (hex)		Wuhan Tianyu Information Industry Co., Ltd.
-500000-5FFFFF     (base 16)		KuaiZhu SmartTechnology?Suzhou?CO.,Ltd
+000000-0FFFFF     (base 16)		Wuhan Tianyu Information Industry Co., Ltd.
-				NO.209 Zhu Yuan Road
+				Tianyu Building, S.&T.Park, Huazhong University of S.&T.,East Lake Development Zone
-				suzhou  jiangsu  215100
+				Wuhan  Hubei  430000
 				CN
 98-8F-E0   (hex)		Nawon Machinery
@ -19079,16 +19049,10 @@ DC-36-43   (hex)		Hefei EA Excelsior Information Security Co., Ltd.
 				Paju-si  Gyeonggi-do  10863
 				KR
-98-8F-E0   (hex)		Valinso B.V.
+98-8F-E0   (hex)		KuaiZhu SmartTechnology?Suzhou?CO.,Ltd
-000000-0FFFFF     (base 16)		Valinso B.V.
+500000-5FFFFF     (base 16)		KuaiZhu SmartTechnology?Suzhou?CO.,Ltd
-				Uithof 5
+				NO.209 Zhu Yuan Road
-				Wijk en Aalburg    4261 LN
+				suzhou  jiangsu  215100
 				NL
 10-54-D2   (hex)		ComNav Technology Ltd.
 200000-2FFFFF     (base 16)		ComNav Technology Ltd.
 				3 floor Building 2,No.618 Chengliu Middle RD. Malu town,
 				Shanghai    200000
 				CN
 20-85-93   (hex)		Great Lite International
@ -23852,18 +23816,18 @@ DC-36-43   (hex)		OAK INFORMATION SYSTEM CO.
 				Shinagawa-ku  Tokyo  140-0002
 				JP
 DC-36-43   (hex)		KUANTECH (CAMBODIA) CORPORATION LIMITED
 A00000-AFFFFF     (base 16)		KUANTECH (CAMBODIA) CORPORATION LIMITED
 				PHUM CHORMPUL, KHUM P'PEL, SROK TRAMKORK
 				KINGDOM OF CAMBODIA  TAKEO PROVINCE  210209
 				KH
 08-26-AE   (hex)		Veth Propulsion bv
 D00000-DFFFFF     (base 16)		Veth Propulsion bv
 				Nanengat 17
 				Papendrecht    3356AA
 				NL
 DC-36-43   (hex)		KUANTECH (CAMBODIA) CORPORATION LIMITED
 A00000-AFFFFF     (base 16)		KUANTECH (CAMBODIA) CORPORATION LIMITED
 				PHUM CHORMPUL, KHUM P'PEL, SROK TRAMKORK
 				KINGDOM OF CAMBODIA  TAKEO PROVINCE  210209
 				KH
 08-26-AE   (hex)		Mass Electronics Pty Ltd
 E00000-EFFFFF     (base 16)		Mass Electronics Pty Ltd
 				12 McKechnie Drive
@ -23875,9 +23839,3 @@ E00000-EFFFFF     (base 16)		Mass Electronics Pty Ltd
 				5F, Building 1, Lane 60 Na Xian Road, Pudong District, Shanghai 201210 P.R.China
 				Shanghai    200127
 				CN
 98-8F-E0   (hex)		CEL Terminus (Shanghai) Information Technologies Co.,Ltd.
 E00000-EFFFFF     (base 16)		CEL Terminus (Shanghai) Information Technologies Co.,Ltd.
 				18F, Building 2, CES West Bund Center, No.277 Longlan Rd, Xuhui District,
 				Shanghai    200000
 				CN
--- a/hwdb.d/ma-small.txt
+++ b/hwdb.d/ma-small.txt
@ -5621,18 +5621,18 @@ F25000-F25FFF     (base 16)		Misaka Network, Inc.
 				Seongnam-si   Gyeonggi-do Korea  13486
 				KR
 8C-1F-64   (hex)		KRONOTECH SRL
 103000-103FFF     (base 16)		KRONOTECH SRL
 				VIALE UNGHERIA 125
 				UDINE  ITALY/UDINE  33100
 				IT
 8C-1F-64   (hex)		Senior Group LLC
 647000-647FFF     (base 16)		Senior Group LLC
 				1300 West Main Street
 				Louisville  KY  40203
 				US
 8C-1F-64   (hex)		KRONOTECH SRL
 103000-103FFF     (base 16)		KRONOTECH SRL
 				VIALE UNGHERIA 125
 				UDINE  ITALY/UDINE  33100
 				IT
 8C-1F-64   (hex)		Deviceroy
 7B9000-7B9FFF     (base 16)		Deviceroy
 				231 W VINEYARD WAY
@ -5651,42 +5651,24 @@ E99000-E99FFF     (base 16)		Pantherun Technologies Pvt Ltd
 				Wuhu  Anhui  241000
 				CN
 8C-1F-64   (hex)		SMILICS TECHNOLOGIES, S.L.
 FD3000-FD3FFF     (base 16)		SMILICS TECHNOLOGIES, S.L.
 				C/Lepanto, 43
 				Barcelona  Barcelona  08223
 				ES
 8C-1F-64   (hex)		Samwell International Inc
 E49000-E49FFF     (base 16)		Samwell International Inc
 				No. 317-1, Sec.2, An Kang Rd., Hsintien Dist
 				New Taipei City    231
 				TW
 8C-1F-64   (hex)		SMILICS TECHNOLOGIES, S.L.
 FD3000-FD3FFF     (base 16)		SMILICS TECHNOLOGIES, S.L.
 				C/Lepanto, 43
 				Barcelona  Barcelona  08223
 				ES
 8C-1F-64   (hex)		Magnet-Physik Dr. Steingroever GmbH
 C97000-C97FFF     (base 16)		Magnet-Physik Dr. Steingroever GmbH
 				Emil-Hoffmann Str. 3
 				Köln  Nordrhein-W estfalen   50996
 				DE
 8C-1F-64   (hex)		Pantherun Technologies Pvt Ltd
 88D000-88DFFF     (base 16)		Pantherun Technologies Pvt Ltd
 				311 6th main road Hal 2nd stage
 				Bangalore  Karnataka  560038
 				IN
 8C-1F-64   (hex)		Pantherun Technologies Pvt Ltd
 099000-099FFF     (base 16)		Pantherun Technologies Pvt Ltd
 				311 6th main road Hal 2nd stage
 				Bangalore  Karnataka  560038
 				IN
 8C-1F-64   (hex)		GE AVIC Civil Avionics Systems Company Limited
 F74000-F74FFF     (base 16)		GE AVIC Civil Avionics Systems Company Limited
 				666 Zixing Road
 				Shanghai    200241
 				CN
 70-B3-D5   (hex)		EVCO SPA
 A80000-A80FFF     (base 16)		EVCO SPA
 				VIA FELTRE N. 81
@ -11207,12 +11189,6 @@ D0E000-D0EFFF     (base 16)		Labforge Inc.
 				Waterloo  Ontario  N2L 6B5
 				CA
 8C-1F-64   (hex)		OAS AG
 707000-707FFF     (base 16)		OAS AG
 				Caroline-Herschel-Straße 1
 				Bremen  Deutschland  28359
 				DE
 8C-1F-64   (hex)		Breas Medical AB
 D40000-D40FFF     (base 16)		Breas Medical AB
 				Företagsvägen 1
@ -11225,6 +11201,12 @@ D40000-D40FFF     (base 16)		Breas Medical AB
 				Castelfranco Veneto    31033
 				IT
 8C-1F-64   (hex)		OAS AG
 707000-707FFF     (base 16)		OAS AG
 				Caroline-Herschel-Straße 1
 				Bremen  Deutschland  28359
 				DE
 8C-1F-64   (hex)		Tongye lnnovation Science and Technology (Shenzhen) Co.,Ltd
 B8D000-B8DFFF     (base 16)		Tongye lnnovation Science and Technology (Shenzhen) Co.,Ltd
 				Room 7-004, 7 / F, Tianxia IC Industrial Park, 133 Yiyuan Road, Nanshan District, 
@ -11243,18 +11225,6 @@ B8D000-B8DFFF     (base 16)		Tongye lnnovation Science and Technology (Shenzhen)
 				Vernate  Milano  20080
 				IT
 8C-1F-64   (hex)		BELLCO TRADING COMPANY (PVT) LTD
 50A000-50AFFF     (base 16)		BELLCO TRADING COMPANY (PVT) LTD
 				DAR-U-SALAM ROAD NEAR ZXMCO MOTORCYCLES FACTORY, OFF RAIWAND ROAD,  23 KM FROM THOKAR NIAZ BAIG, LAHORE PAKISTAN
 				LAHORE  PUNJAB  55150
 				PK
 8C-1F-64   (hex)		ITS Teknik A/S
 E02000-E02FFF     (base 16)		ITS Teknik A/S
 				Skomagervej
 				Vejle    7100
 				DK
 70-B3-D5   (hex)		System West dba ICS Electronics
 E06000-E06FFF     (base 16)		System West dba ICS Electronics
 				7034 Commerce Circle Suite A
@ -16706,18 +16676,18 @@ B10000-B10FFF     (base 16)		MTU Aero Engines AG
 				München  Bavaria  80995
 				DE
 8C-1F-64   (hex)		Shenzhen INVT Electric Co.,Ltd
 F32000-F32FFF     (base 16)		Shenzhen INVT Electric Co.,Ltd
 				INVT Guangming Technology Building,Songbai Road
 				ShenZhen  Matian,Guangming District  518106  
 				CN
 8C-1F-64   (hex)		Hermes Network Inc
 8C4000-8C4FFF     (base 16)		Hermes Network Inc
 				1810 E Sahara Ave Ste 212-1354
 				Las Vegas  NV  89104-3707
 				US
 8C-1F-64   (hex)		Shenzhen INVT Electric Co.,Ltd
 F32000-F32FFF     (base 16)		Shenzhen INVT Electric Co.,Ltd
 				INVT Guangming Technology Building,Songbai Road
 				ShenZhen  Matian,Guangming District  518106  
 				CN
 8C-1F-64   (hex)		INSTITUTO DE GESTÃO, REDES TECNOLÓGICAS E NERGIAS
 9A6000-9A6FFF     (base 16)		INSTITUTO DE GESTÃO, REDES TECNOLÓGICAS E NERGIAS
 				Rua Martinho Rodrigues, 331 - FÁTIMA, , 60411-280
@ -16730,11 +16700,11 @@ F32000-F32FFF     (base 16)		Shenzhen INVT Electric Co.,Ltd
 				Eckental  Bavaria  90542
 				DE
-8C-1F-64   (hex)		Metroval Controle de Fluidos Ltda
+8C-1F-64   (hex)		MARIAN GmbH
-9FE000-9FEFFF     (base 16)		Metroval Controle de Fluidos Ltda
+FB0000-FB0FFF     (base 16)		MARIAN GmbH
-				RUA CHRISTIANO KILMEYERS, 819
+				Berggartenstr. 12
-				NOVA ODESSA  SP  13380-296
+				Leipzig    04155
-				BR
+				DE
 8C-1F-64   (hex)		IWS Global Pty Ltd
 4BB000-4BBFFF     (base 16)		IWS Global Pty Ltd
@ -16748,24 +16718,18 @@ F32000-F32FFF     (base 16)		Shenzhen INVT Electric Co.,Ltd
 				MALAGA  Western Australia  6944
 				AU
 8C-1F-64   (hex)		Metroval Controle de Fluidos Ltda
 9FE000-9FEFFF     (base 16)		Metroval Controle de Fluidos Ltda
 				RUA CHRISTIANO KILMEYERS, 819
 				NOVA ODESSA  SP  13380-296
 				BR
 8C-1F-64   (hex)		HM Systems A/S
 6FC000-6FCFFF     (base 16)		HM Systems A/S
 				Melskov Alle 6
 				Haderslev    6100
 				DK
 8C-1F-64   (hex)		MARIAN GmbH
 FB0000-FB0FFF     (base 16)		MARIAN GmbH
 				Berggartenstr. 12
 				Leipzig    04155
 				DE
 8C-1F-64   (hex)		Stange Elektronik GmbH
 E61000-E61FFF     (base 16)		Stange Elektronik GmbH
 				Gutenbergstrasse 3
 				Gummersbach    51645
 				DE
 70-B3-D5   (hex)		PHB Eletronica Ltda.
 904000-904FFF     (base 16)		PHB Eletronica Ltda.
 				12 Sao Bernardino
@ -16778,11 +16742,11 @@ E61000-E61FFF     (base 16)		Stange Elektronik GmbH
 				São Paulo  Parque Anhanguera  05120-050
 				BR
-8C-1F-64   (hex)		SORB ENGINEERING LLC
+8C-1F-64   (hex)		Stange Elektronik GmbH
-085000-085FFF     (base 16)		SORB ENGINEERING LLC
+E61000-E61FFF     (base 16)		Stange Elektronik GmbH
-				Grishina street 24/1 44
+				Gutenbergstrasse 3
-				Moscow    121354
+				Gummersbach    51645
-				RU
+				DE
 70-B3-D5   (hex)		Delta Solutions LLC
 0E5000-0E5FFF     (base 16)		Delta Solutions LLC
@ -16790,24 +16754,6 @@ E61000-E61FFF     (base 16)		Stange Elektronik GmbH
 				Lubertsy  Lubertsy City District, Moscow Region  140002
 				RU
 8C-1F-64   (hex)		Taiv
 09B000-09BFFF     (base 16)		Taiv
 				195 McPhillips St
 				Winnipeg  Manitoba  R3E 2K2
 				CA
 8C-1F-64   (hex)		AT-Automation Technology GmbH
 69E000-69EFFF     (base 16)		AT-Automation Technology GmbH
 				Hermann-Boessow-Str. 6-8
 				Bad Oldesloe    D-23843
 				DE
 8C-1F-64   (hex)		Corigine, Inc
 306000-306FFF     (base 16)		Corigine, Inc
 				4655 Old Ironsides Dr #270
 				Santa Clara  CA  95054
 				US
 70-B3-D5   (hex)		YUYAMA MFG Co.,Ltd
 BBB000-BBBFFF     (base 16)		YUYAMA MFG Co.,Ltd
 				3-3-1
@ -22400,24 +22346,6 @@ E7B000-E7BFFF     (base 16)		Dongguan Pengchen Earth Instrument CO. LT
 				Dongguan    523290
 				CN
 8C-1F-64   (hex)		Wavestream Corp
 3C6000-3C6FFF     (base 16)		Wavestream Corp
 				545 W Terrace Dr.
 				San Dimas  CA  91773
 				US
 8C-1F-64   (hex)		Fuku Energy Technology Co., Ltd.
 603000-603FFF     (base 16)		Fuku Energy Technology Co., Ltd.
 				1F., No. 176, Sec. 2, Muxin Rd., Wenshan Dist., Taipei City 116024, Taiwan (R.O.C.)
 				Taipei City  Taiwan (R.O.C.)  802
 				TW
 8C-1F-64   (hex)		Security&Best
 35D000-35DFFF     (base 16)		Security&Best
 				B-dong, #204, 17, Gosan-ro 148beon-gil
 				Gunpo-si  Gyeonggi-do  15850
 				KR
 8C-1F-64   (hex)		Guan Show Technologe Co., Ltd.
 A01000-A01FFF     (base 16)		Guan Show Technologe Co., Ltd.
 				No.127, Jianguo 1st Rd., Lingya Dist.
@ -22436,36 +22364,36 @@ A01000-A01FFF     (base 16)		Guan Show Technologe Co., Ltd.
 				Brooklyn Park  MN  55428
 				US
 8C-1F-64   (hex)		Security&Best
 35D000-35DFFF     (base 16)		Security&Best
 				B-dong, #204, 17, Gosan-ro 148beon-gil
 				Gunpo-si  Gyeonggi-do  15850
 				KR
 8C-1F-64   (hex)		STEAMIQ, Inc.
 EBF000-EBFFFF     (base 16)		STEAMIQ, Inc.
 				632 Main Street, 
 				HINGHAM  MA  02043
 				US
 8C-1F-64   (hex)		Wavestream Corp
 3C6000-3C6FFF     (base 16)		Wavestream Corp
 				545 W Terrace Dr.
 				San Dimas  CA  91773
 				US
 8C-1F-64   (hex)		Fuku Energy Technology Co., Ltd.
 603000-603FFF     (base 16)		Fuku Energy Technology Co., Ltd.
 				1F., No. 176, Sec. 2, Muxin Rd., Wenshan Dist., Taipei City 116024, Taiwan (R.O.C.)
 				Taipei City  Taiwan (R.O.C.)  802
 				TW
 8C-1F-64   (hex)		Enlaps
 7D2000-7D2FFF     (base 16)		Enlaps
 				29 chemin du vieux chene, Tarmac
 				MEYLAN    38240
 				FR
 8C-1F-64   (hex)		Delta Solutions LLC
 EB7000-EB7FFF     (base 16)		Delta Solutions LLC
 				Kolhoznaya str., 8A, Room 20, 2nd Floor
 				Lubertsy  Lubertsy City District, Moscow Region  140002
 				RU
 8C-1F-64   (hex)		WENet Vietnam Joint Stock company
 A2B000-A2BFFF     (base 16)		WENet Vietnam Joint Stock company
 				BT2-15, Trung Van New Urban Area, Trung Van Ward, Nam Tu Liem District, Hanoi, Vietnam
 				Hanoi  Hanoi  10000
 				VN
 8C-1F-64   (hex)		WARECUBE,INC
 EFB000-EFBFFF     (base 16)		WARECUBE,INC
 				#A-811, 142-10, Saneop-ro, 156beon-gil, Gwonseon-gu
 				Suwon-si    16648
 				KR
 70-B3-D5   (hex)		DISMUNTEL SAL
 92C000-92CFFF     (base 16)		DISMUNTEL SAL
 				Pol ind cotes
@ -27875,38 +27803,26 @@ C28000-C28FFF     (base 16)		Tornado Spectral Systems Inc.
 				Dinkelsbuehl  Bavaria  91550
 				DE
 8C-1F-64   (hex)		Arcvideo
 B56000-B56FFF     (base 16)		Arcvideo
 				16F, Building E, Tiantang Software Park, No3. Xidou
 				hangzhou  zhejiang  310012
 				CN
 8C-1F-64   (hex)		Signasystems Elektronik San. ve Tic. Ltd. Sti.
 A9A000-A9AFFF     (base 16)		Signasystems Elektronik San. ve Tic. Ltd. Sti.
 				Baskent OSB. 26. Cad. No:5 Malikoy
 				Ankara  Sincan  06909
 				TR
-8C-1F-64   (hex)		TIAMA
+8C-1F-64   (hex)		Arcvideo
-820000-820FFF     (base 16)		TIAMA
+B56000-B56FFF     (base 16)		Arcvideo
-				ZA des Plattes - 1 Chemin des Plattes
+				16F, Building E, Tiantang Software Park, No3. Xidou
-				VOURLES     69390 
+				hangzhou  zhejiang  310012
 				FR
 8C-1F-64   (hex)		AVD INNOVATION LIMITED
 0D6000-0D6FFF     (base 16)		AVD INNOVATION LIMITED
 				TuenMun
 				HongKong  HongKong  999077
 				CN
 8C-1F-64   (hex)		Lightworks GmbH
 61F000-61FFFF     (base 16)		Lightworks GmbH
 				Bahnhofplatz 2
 				Holzkirchen  Germany  83607
 				DE
 8C-1F-64   (hex)		Ossia Inc
 1BF000-1BFFFF     (base 16)		Ossia Inc
 				2683 151st Place NE
 				Redmond  WA  98052
 				US
 8C-1F-64   (hex)		TIAMA
 820000-820FFF     (base 16)		TIAMA
 				ZA des Plattes - 1 Chemin des Plattes
 				VOURLES     69390 
 				FR
--- a/hwdb.d/pci.ids
+++ b/hwdb.d/pci.ids
@ -1,8 +1,8 @@
 #
 #	List of PCI ID's
 #
-#	Version: 2021.12.15
+#	Version: 2021.12.07
-#	Date:    2021-12-15 03:15:02
+#	Date:    2021-12-07 03:15:02
 #
 #	Maintained by Albert Pool, Martin Mares, and other volunteers from
 #	the PCI ID Project at https://pci-ids.ucw.cz/.
@ -2763,7 +2763,7 @@
 		1849 5030  Phantom Gaming D Radeon RX580 8G OC
 		1da2 e353  Radeon RX 570 Pulse 4GB
 		1da2 e366  Nitro+ Radeon RX 570/580/590
-		1da2 e387  Radeon RX 580 Pulse 4GB
+		1da2 e387  Radeon RX 570 Pulse 4GB
 	67e0  Baffin [Radeon Pro WX 4170]
 		103c 8270  Radeon Pro WX 4170
 		103c 8272  Radeon Pro WX 4170
@ -3032,8 +3032,6 @@
 	687f  Vega 10 XL/XT [Radeon RX Vega 56/64]
 		1002 0b36  RX Vega64
 		1002 6b76  RX Vega64
 # ROG-STRIX-RXVEGA64-O8G-GAMING
 		1043 04c4  Radeon RX Vega 64
 		1458 230c  Radeon RX VEGA 56 GAMING OC 8G
 		1da2 e376  Radeon RX VEGA 56 Pulse 8GB OC HBM2
 	6880  Lexington [Radeon HD 6550M]
@ -10235,7 +10233,7 @@
 	0331  NV35 [GeForce FX 5900]
 		1043 8145  V9950GE
 	0332  NV35 [GeForce FX 5900XT]
-	0333  NV38 [GeForce FX 5950 Ultra]
+	0333  NV38 [GeForce FX 5950 Ultra / PCX 5950]
 	0334  NV35 [GeForce FX 5900ZT]
 		1462 9373  FX5900ZT-VTD128 (MS-8937)
 	0338  NV35GL [Quadro FX 3000]
@ -20791,12 +20789,12 @@
 	1979  MT2910 Family [ConnectX-7 PCIe Bridge]
 	197a  MT43162 Family [BlueField-3 Lx SoC PCIe Bridge]
 	197b  MT43244 Family [BlueField-3 SoC PCIe Bridge]
-	197c  ConnectX/BlueField Family mlx5Gen PCIe Bridge [PCIe Bridge]
+	197c  CX8 Family [ConnectX-8 PCIe Bridge]
 	2020  MT2892 Family [ConnectX-6 Dx Emulated PCIe Bridge]
 	2021  MT42822 Family [BlueField-2 SoC Emulated PCIe Bridge]
 	2023  MT2910 Family [ConnectX-7 Emulated PCIe Bridge]
 	2024  MT43244 Family [BlueField-3 SoC Emulated PCIe Bridge]
-	2025  ConnectX/BlueField Family mlx5Gen Emulated PCIe Bridge [Emulated PCIe Bridge]
+	2025  CX8 Family [ConnectX-8 Emulated PCIe Bridge]
 	4117  MT27712A0-FDCF-AE
 		1bd4 0039  SN10XMP2P25
 		1bd4 003a  25G SFP28 SP EO251FM9 Adapter
@ -24156,12 +24154,6 @@
 	1000  IO Memory Controller
 	2000  NoLoad Hardware Development Kit
 	3000  eBPF-based PCIe Accelerator
 1ded  Alibaba (China) Co., Ltd.
 	8000  M1 Root Port
 	8001  ACC-RCiEP
 	8002  RCiEP VF
 	8003  RCEC PF
 	8004  RCEC VF
 1dee  Biwin Storage Technology Co., Ltd.
 1def  Ampere Computing, LLC
 	e005  eMAG PCI Express Root Port 0
@ -24297,35 +24289,6 @@
 # https://www.medion.com/
 1e39  MEDION AG
 1e3b  Shenzhen DAPU Microelectronics Co., Ltd
 	0600  NVMe SSD Controller DPU600
 		1e3b 0030  Enterprise NVMe SSD U.2 3.84TB (J5100)
 		1e3b 0031  Enterprise NVMe SSD U.2 7.68TB (J5100)
 		1e3b 0032  Enterprise NVMe SSD U.2 15.36TB (J5100)
 		1e3b 0033  Enterprise NVMe SSD U.2 3.20TB (J5300)
 		1e3b 0034  Enterprise NVMe SSD U.2 6.40TB (J5300)
 		1e3b 0035  Enterprise NVMe SSD U.2 12.80TB (J5300)
 		1e3b 0036  Enterprise NVMe SSD AIC 7.68TB (J5110)
 		1e3b 0037  Enterprise NVMe SSD AIC 6.40TB (J5310)
 		1e3b 003e  Enterprise NVMe SSD AIC 3.84TB (J5110)
 		1e3b 003f  Enterprise NVMe SSD AIC 3.20TB (J5310)
 		1e3b 0050  Enterprise NVMe SSD U.2 3.84TB (R5100)
 		1e3b 0051  Enterprise NVMe SSD U.2 7.68TB (R5100)
 		1e3b 0052  Enterprise NVMe SSD U.2 15.36TB (R5100)
 		1e3b 0053  Enterprise NVMe SSD U.2 3.20TB (R5300)
 		1e3b 0054  Enterprise NVMe SSD U.2 6.40TB (R5300)
 		1e3b 0055  Enterprise NVMe SSD U.2 12.80TB (R5300)
 		1e3b 0056  Enterprise NVMe SSD U.2 3.84TB (R5101)
 		1e3b 0059  Enterprise NVMe SSD U.2 3.20TB (R5301)
 		1e3b 0060  Enterprise NVMe SSD U.2 3.84TB (R5100D)
 		1e3b 0061  Enterprise NVMe SSD U.2 7.68TB (R5100D)
 		1e3b 0063  Enterprise NVMe SSD U.2 3.20TB (R5300D)
 		1e3b 0064  Enterprise NVMe SSD U.2 6.40TB (R5300D)
 		1e3b 00f0  Enterprise NVMe SSD U.2 0.40TB (X2900)
 		1e3b 00f1  Enterprise NVMe SSD U.2 0.80TB (X2900)
 		1e3b 00f2  Enterprise NVMe SSD U.2 1.60TB (X2900)
 		1e3b 00f3  Enterprise NVMe SSD U.2 3.20TB (X2900)
 		1e3b 00f5  Enterprise NVMe SSD U.2 0.40TB (X2900P)
 		1e3b 00f6  Enterprise NVMe SSD U.2 0.80TB (X2900P)
 	1098  Haishen NVMe SSD
 		1e3b 0001  Enterprise NVMe SSD U.2 0.8TB (H2100)
 		1e3b 0002  Enterprise NVMe SSD U.2 0.96TB (H2200)
@ -27324,7 +27287,6 @@
 		1bd4 0042  10G SFP+ DP EP102Fi4 Adapter
 		1bd4 0056  Ethernet Network Adapter X710-BM2 for OCP NIC 3.0
 		1bd4 0065  F102IX710
 		1bd4 0074  Ethernet Network Adapter X710-BM2 for lldp
 		8086 0000  Ethernet Converged Network Adapter X710
 		8086 0001  Ethernet Converged Network Adapter X710-4
 		8086 0002  Ethernet Converged Network Adapter X710-4
--- a/hwdb.d/pnp_id_registry.html
+++ b/hwdb.d/pnp_id_registry.html
@ -2497,8 +2497,6 @@
 <tr class="odd"><td>Netvio Ltd.</td><td>NVO</td><td>09/21/2021</td> </tr>
 <tr class="even"><td>Beijing Guochengwantong Information Technology Co., Ltd.</td><td>STV</td><td>09/21/2021</td> </tr>
 <tr class="odd"><td>Kopin Corporation</td><td>KOP</td><td>10/01/2021</td> </tr>
 <tr class="even"><td>Anker Innovations Limited</td><td>AKR</td><td>12/10/2021</td> </tr>
 <tr class="odd"><td>SAMPO CORPORATION</td><td>SPO</td><td>12/10/2021</td> </tr>
      </tbody>
    </table>
  </body>
--- a/man/bootctl.xml
+++ b/man/bootctl.xml
@ -258,11 +258,14 @@
      </varlistentry>
      <varlistentry>
-        <term><option>--make-machine-id-directory=yes|no</option></term>
+        <term><option>--make-machine-id-directory=yes|no|auto</option></term>
        <listitem><para>Control creation and deletion of the top-level machine ID directory on the file
        system containing boot loader entries (i.e. beneath the file system returned by the
        <option>--print-boot-path</option> option, see above) during <option>install</option> and
-        <option>remove</option>, respectively. Defaults to <literal>no</literal>. See
+        <option>remove</option>, respectively.  <literal>auto</literal> is equivalent to
        <literal>yes</literal> if <filename>/etc/machine-id</filename> resides on a filesystem other than
        tmpfs and <literal>no</literal> otherwise (in the latter case the machine ID is likely transient and
        hence should not be used persistently in the ESP). Defaults to <literal>auto</literal>. See
        <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry> for
        details about the machine ID concept and file.</para>
--- a/man/custom-entities.ent.in
+++ b/man/custom-entities.ent.in
@ -13,7 +13,5 @@
 <!ENTITY DEBUGTTY "{{DEBUGTTY}}">
 <!ENTITY RC_LOCAL_PATH "{{RC_LOCAL_PATH}}">
 <!ENTITY HIGH_RLIMIT_NOFILE "{{HIGH_RLIMIT_NOFILE}}">
 <!ENTITY DEFAULT_DNSSEC_MODE "{{DEFAULT_DNSSEC_MODE_STR}}">
 <!ENTITY DEFAULT_DNS_OVER_TLS_MODE "{{DEFAULT_DNS_OVER_TLS_MODE_STR}}">
 <!ENTITY fedora_latest_version "35">
 <!ENTITY fedora_cloud_release "1.2">
--- a/man/nss-resolve.xml
+++ b/man/nss-resolve.xml
@ -64,20 +64,6 @@
    <filename>/run/systemd/resolve/io.systemd.Resolve</filename> <constant>AF_UNIX</constant> socket.</para>
  </refsect1>
  <refsect1>
    <title>Environment variables</title>
    <variablelist class='environment-variables'>
      <varlistentry>
        <term><varname>$SYSTEMD_NSS_RESOLVE_VALIDATE</varname></term>
        <listitem><para>Takes a boolean argument. When false, cryptographic validation of resource records
        via DNSSEC will be disabled. This may be useful for testing, or when system time is known to be
        unreliable.</para></listitem>
      </varlistentry>
    </variablelist>
  </refsect1>
  <refsect1>
    <title>Example</title>
@ -109,8 +95,7 @@ netgroup:       nis</programlisting>
      <citerefentry><refentrytitle>nss-systemd</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
      <citerefentry><refentrytitle>nss-myhostname</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
      <citerefentry><refentrytitle>nss-mymachines</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry project='man-pages'><refentrytitle>nsswitch.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry project='man-pages'><refentrytitle>nsswitch.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
      <citerefentry><refentrytitle>systemd.syntax</refentrytitle><manvolnum>5</manvolnum></citerefentry>
    </para>
  </refsect1>
--- a/man/org.freedesktop.resolve1.xml
+++ b/man/org.freedesktop.resolve1.xml
@ -450,20 +450,6 @@ node /org/freedesktop/resolve1 {
 #define SD_RESOLVED_NO_ADDRESS    (UINT64_C(1) &lt;&lt; 7)
 #define SD_RESOLVED_NO_SEARCH     (UINT64_C(1) &lt;&lt; 8)
 #define SD_RESOLVED_AUTHENTICATED (UINT64_C(1) &lt;&lt; 9)
 #define SD_RESOLVED_NO_VALIDATE       (UINT64_C(1) &lt;&lt; 10)
 #define SD_RESOLVED_NO_SYNTHESIZE     (UINT64_C(1) &lt;&lt; 11)
 #define SD_RESOLVED_NO_CACHE          (UINT64_C(1) &lt;&lt; 12)
 #define SD_RESOLVED_NO_ZONE           (UINT64_C(1) &lt;&lt; 13)
 #define SD_RESOLVED_NO_TRUST_ANCHOR   (UINT64_C(1) &lt;&lt; 14)
 #define SD_RESOLVED_NO_NETWORK        (UINT64_C(1) &lt;&lt; 15)
 #define SD_RESOLVED_REQUIRE_PRIMARY   (UINT64_C(1) &lt;&lt; 16)
 #define SD_RESOLVED_CLAMP_TTL         (UINT64_C(1) &lt;&lt; 17)
 #define SD_RESOLVED_CONFIDENTIAL      (UINT64_C(1) &lt;&lt; 18)
 #define SD_RESOLVED_SYNTHETIC         (UINT64_C(1) &lt;&lt; 19)
 #define SD_RESOLVED_FROM_CACHE        (UINT64_C(1) &lt;&lt; 20)
 #define SD_RESOLVED_FROM_ZONE         (UINT64_C(1) &lt;&lt; 21)
 #define SD_RESOLVED_FROM_TRUST_ANCHOR (UINT64_C(1) &lt;&lt; 22)
 #define SD_RESOLVED_FROM_NETWORK      (UINT64_C(1) &lt;&lt; 23)
        </programlisting>
        <para>On input, the first five flags control the protocols to use for the look-up. They refer to
@ -489,9 +475,9 @@ node /org/freedesktop/resolve1 {
        when the flag is off, CNAME/DNAME RRs are followed.</para>
        <para>The NO_TXT and NO_ADDRESS flags only influence operation of the
-        <function>ResolveService()</function> method. They are only defined for input, not output. If NO_TXT
+        <function>ResolveService()</function> method. They are only defined for input, not output. If
-        is set, the DNS-SD TXT RR look-up is not done in the same operation. If NO_ADDRESS is set, the
+        NO_TXT set, the DNS-SD TXT RR look-up is not done in the same operation. If NO_ADDRESS is specified,
-        discovered hostnames are not implicitly translated to their addresses.</para>
+        the hostnames discovered are not implicitly translated to their addresses.</para>
        <para>The NO_SEARCH flag turns off the search domain logic. It is only defined for input in
        <function>ResolveHostname()</function>. When specified, single-label hostnames are not qualified
@ -500,41 +486,15 @@ node /org/freedesktop/resolve1 {
        multi-label hostnames are never subject to search list expansion.</para>
        <para>The AUTHENTICATED bit is defined only in the output flags of the four functions. If set, the
-        returned data has been fully authenticated. Specifically, this bit is set for all DNSSEC-protected
+        returned data has been fully authenticated. Specifically, this bit is set for all DNSSEC-protected data
-        data for which a full trust chain may be established to a trusted domain anchor. It is also set for
+        for which a full trust chain may be established to a trusted domain anchor. It is also set for locally
-        locally synthesized data, such as <literal>localhost</literal> or data from
+        synthesized data, such as <literal>localhost</literal> or data from
-        <filename>/etc/hosts</filename>. Moreover, it is set for all LLMNR or mDNS RRs which originate from
+        <filename>/etc/hosts</filename>. Moreover, it is set for all LLMNR or mDNS RRs which originate from the
-        the local host. Applications that require authenticated RR data for operation should check this flag
+        local host. Applications that require authenticated RR data for operation should check this flag before
-        before trusting the data. Note that <filename>systemd-resolved</filename> will never return
+        trusting the data. Note that <filename>systemd-resolved</filename> will never return invalidated data, hence this flag
-        invalidated data, hence this flag simply allows to discern the cases where data is known to be
+        simply allows to discern the cases where data is known to be trustable, or where there is proof that
-        trusted, or where there is proof that the data is "rightfully" unauthenticated (which includes cases
+        the data is "rightfully" unauthenticated (which includes cases where the underlying protocol or server
-        where the underlying protocol or server does not support authenticating data).</para>
+        does not support authenticating data).</para>
        <para>NO_VALIDATE can be set to disable validation via DNSSEC even if it would normally be used.
        </para>
        <para>The next four flags allow disabling certain sources during resolution. NO_SYNTHESIZE disables
        synthetic records, e.g. the local host name, see section SYNTHETIC RECORDS in
        <citerefentry><refentrytitle>systemd-resolved.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
        for more information. NO_CACHE disables the use of the cache of previously resolved records. NO_ZONE
        disables answers using locally registered public LLMNR/mDNS resource records. NO_TRUST_ANCHOR
        disables answers using locally configured trust anchors. NO_NETWORK requires all answers to be
        provided without using the network, i.e. either from local sources or the cache.</para>
        <para>With REQUIRE_PRIMARY the request must be answered from a "primary" answer, i.e. not from
        resource records acquired as a side-effect of a previous transaction.</para>
        <para>With CLAMP_TTL, if reply is answered from cache, the TTLs will be adjusted by age of cache
        entry.</para>
        <para>The next six bits flags are used in output and provide information about the source of the answer.
        CONFIDENTIAL means the query was resolved via encrypted channels or never left this system.
        FROM_SYNTHETIC means the query was (at least partially) synthesized.
        FROM_CACHE means the query was answered (at least partially) using the cache.
        FROM_ZONE means the query was answered (at least partially) using LLMNR/mDNS.
        FROM_TRUST_ANCHOR means the query was answered (at least partially) using local trust anchors.
        FROM_NETWORK means the query was answered (at least partially) using the network.
        </para>
      </refsect3>
    </refsect2>
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.xml
@ -1,9 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!ENTITY % entities SYSTEM "custom-entities.ent" >
 %entities;
 ]>
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 <refentry id="resolved.conf" conditional='ENABLE_RESOLVE'
@ -202,7 +199,7 @@
        domains (TLDs) that are not known by the DNS root server. This
        logic does not work in all private zone setups.</para>
-        <para>Defaults to <literal>&DEFAULT_DNSSEC_MODE;</literal>.</para>
+        <para>Defaults to <literal>allow-downgrade</literal>.</para>
        </listitem>
      </varlistentry>
@ -242,7 +239,7 @@
        <varname>DNSOverTLS=</varname> setting is in effect. For per-link DNS servers the per-link setting is in effect, unless
        it is unset in which case the global setting is used instead.</para>
-        <para>Defaults to <literal>&DEFAULT_DNS_OVER_TLS_MODE;</literal>.</para>
+        <para>Defaults to off.</para>
        </listitem>
      </varlistentry>
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@ -19,7 +19,6 @@
 #include "dirent-util.h"
 #include "efi-loader.h"
 #include "efivars.h"
 #include "env-file.h"
 #include "env-util.h"
 #include "escape.h"
 #include "fd-util.h"
@ -41,7 +40,6 @@
 #include "sync-util.h"
 #include "terminal-util.h"
 #include "tmpfile-util.h"
 #include "tmpfile-util-label.h"
 #include "umask-util.h"
 #include "utf8.h"
 #include "util.h"
@ -55,13 +53,10 @@ static bool arg_print_dollar_boot_path = false;
 static bool arg_touch_variables = true;
 static PagerFlags arg_pager_flags = 0;
 static bool arg_graceful = false;
-static int arg_make_machine_id_directory = 0;
+static int arg_make_machine_id_directory = -1;
 static sd_id128_t arg_machine_id = SD_ID128_NULL;
 static char *arg_install_layout = NULL;
 STATIC_DESTRUCTOR_REGISTER(arg_esp_path, freep);
 STATIC_DESTRUCTOR_REGISTER(arg_xbootldr_path, freep);
 STATIC_DESTRUCTOR_REGISTER(arg_install_layout, freep);
 static const char *arg_dollar_boot_path(void) {
        /* $BOOT shall be the XBOOTLDR partition if it exists, and otherwise the ESP */
@ -124,69 +119,18 @@ static int acquire_xbootldr(bool unprivileged_mode, sd_id128_t *ret_uuid) {
        return 1;
 }
-static int load_install_machine_id_and_layout(void) {
+static void settle_make_machine_id_directory(void) {
        /* Figure out the right machine-id for operations. If KERNEL_INSTALL_MACHINE_ID is configured in
         * /etc/machine-info, let's use that. Otherwise, just use the real machine-id.
         *
         * Also load KERNEL_INSTALL_LAYOUT.
         */
        _cleanup_free_ char *s = NULL, *layout = NULL;
        int r;
-        r = parse_env_file(NULL, "/etc/machine-info",
+        if (arg_make_machine_id_directory >= 0)
-                           "KERNEL_INSTALL_LAYOUT", &layout,
+                return;
                           "KERNEL_INSTALL_MACHINE_ID", &s);
        if (r < 0 && r != -ENOENT)
                return log_error_errno(r, "Failed to parse /etc/machine-info: %m");
        if (isempty(s)) {
                r = sd_id128_get_machine(&arg_machine_id);
                if (r < 0)
                        return log_error_errno(r, "Failed to get machine-id: %m");
        } else {
                r = sd_id128_from_string(s, &arg_machine_id);
                if (r < 0)
                        return log_error_errno(r, "Failed to parse KERNEL_INSTALL_MACHINE_ID=%s in /etc/machine-info: %m", s);
        }
        log_debug("Using KERNEL_INSTALL_MACHINE_ID=%s from %s.",
                  SD_ID128_TO_STRING(arg_machine_id),
                  isempty(s) ? "/etc/machine_id" : "KERNEL_INSTALL_MACHINE_ID in /etc/machine-info");
        if (!isempty(layout)) {
                log_debug("KERNEL_INSTALL_LAYOUT=%s is specified in /etc/machine-info.", layout);
                arg_install_layout = TAKE_PTR(layout);
        }
        return 0;
 }
 static int settle_install_machine_id(void) {
        int r;
        r = load_install_machine_id_and_layout();
        if (r < 0)
                return r;
        bool layout_non_bls = arg_install_layout && !streq(arg_install_layout, "bls");
        if (arg_make_machine_id_directory < 0) {
                if (layout_non_bls)
                        arg_make_machine_id_directory = 0;
                else {
        r = path_is_temporary_fs("/etc/machine-id");
        if (r < 0)
-                                return log_debug_errno(r, "Couldn't determine whether /etc/machine-id is on a temporary file system: %m");
+                log_debug_errno(r, "Couldn't determine whether /etc/machine-id is on a temporary file system, assuming so.");
        arg_make_machine_id_directory = r == 0;
 }
        }
        if (arg_make_machine_id_directory > 0 && layout_non_bls)
                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                       "KERNEL_INSTALL_LAYOUT=%s is configured, but bls directory creation was requested.",
                                       arg_install_layout);
        return 0;
 }
 /* search for "#### LoaderInfo: systemd-boot 218 ####" string inside the binary */
 static int get_file_version(int fd, char **v) {
@ -980,14 +924,20 @@ static int remove_subdirs(const char *root, const char *const *subdirs) {
 }
 static int remove_machine_id_directory(const char *root) {
        sd_id128_t machine_id;
        int r;
        assert(root);
        assert(arg_make_machine_id_directory >= 0);
        assert(!sd_id128_is_null(arg_machine_id));
        if (!arg_make_machine_id_directory)
                return 0;
-        return rmdir_one(root, SD_ID128_TO_STRING(arg_machine_id));
+        r = sd_id128_get_machine(&machine_id);
        if (r < 0)
                return log_error_errno(r, "Failed to get machine id: %m");
        return rmdir_one(root, SD_ID128_TO_STRING(machine_id));
 }
 static int remove_binaries(const char *esp_path) {
@ -1097,8 +1047,13 @@ static int install_loader_config(const char *esp_path) {
                   "#console-mode keep\n");
        if (arg_make_machine_id_directory) {
-                assert(!sd_id128_is_null(arg_machine_id));
+                sd_id128_t machine_id;
-                fprintf(f, "default %s-*\n", SD_ID128_TO_STRING(arg_machine_id));
+
                r = sd_id128_get_machine(&machine_id);
                if (r < 0)
                        return log_error_errno(r, "Failed to get machine id: %m");
                fprintf(f, "default %s-*\n", SD_ID128_TO_STRING(machine_id));
        }
        r = fflush_sync_and_check(f);
@ -1116,100 +1071,20 @@ static int install_loader_config(const char *esp_path) {
 }
 static int install_machine_id_directory(const char *root) {
        sd_id128_t machine_id;
        int r;
        assert(root);
        assert(arg_make_machine_id_directory >= 0);
        if (!arg_make_machine_id_directory)
                return 0;
-        assert(!sd_id128_is_null(arg_machine_id));
+        r = sd_id128_get_machine(&machine_id);
        return mkdir_one(root, SD_ID128_TO_STRING(arg_machine_id));
 }
 static int install_machine_info_config(void) {
        _cleanup_free_ char *contents = NULL;
        size_t length;
        bool need_install_layout = true, need_machine_id;
        int r;
        assert(arg_make_machine_id_directory >= 0);
        /* We only want to save the machine-id if we created any directories using it. */
        need_machine_id = arg_make_machine_id_directory;
        _cleanup_fclose_ FILE *orig = fopen("/etc/machine-info", "re");
        if (!orig && errno != ENOENT)
                return log_error_errno(errno, "Failed to open /etc/machine-info: %m");
        if (orig) {
                _cleanup_free_ char *install_layout = NULL, *machine_id = NULL;
                r = parse_env_file(orig, "/etc/machine-info",
                                   "KERNEL_INSTALL_LAYOUT", &install_layout,
                                   "KERNEL_INSTALL_MACHINE_ID", &machine_id);
        if (r < 0)
-                        return log_error_errno(r, "Failed to parse /etc/machine-info: %m");
+                return log_error_errno(r, "Failed to get machine id: %m");
-                rewind(orig);
+        return mkdir_one(root, SD_ID128_TO_STRING(machine_id));
                if (!isempty(install_layout))
                        need_install_layout = false;
                if (!isempty(machine_id))
                        need_machine_id = false;
                if (!need_install_layout && !need_machine_id) {
                        log_debug("/etc/machine-info already has KERNEL_INSTALL_MACHINE_ID=%s and KERNEL_INSTALL_LAYOUT=%s.",
                                  machine_id, install_layout);
                        return 0;
                }
                r = read_full_stream(orig, &contents, &length);
                if (r < 0)
                        return log_error_errno(r, "Failed to read /etc/machine-info: %m");
        }
        _cleanup_(unlink_and_freep) char *dst_tmp = NULL;
        _cleanup_fclose_ FILE *dst = NULL;
        r = fopen_temporary_label("/etc/machine-info",   /* The path for which to the look up the label */
                                  "/etc/machine-info",   /* Where we want the file actually to end up */
                                  &dst,                  /* The temporary file we write to */
                                  &dst_tmp);
        if (r < 0)
                return log_debug_errno(r, "Failed to open temporary copy of /etc/machine-info: %m");
        if (contents)
                fwrite_unlocked(contents, 1, length, dst);
        bool no_newline = !contents || contents[length - 1] == '\n';
        if (need_install_layout) {
                const char *line = "\nKERNEL_INSTALL_LAYOUT=bls\n" + no_newline;
                fwrite_unlocked(line, 1, strlen(line), dst);
                no_newline = false;
        }
        const char *mid_string = SD_ID128_TO_STRING(arg_machine_id);
        if (need_machine_id)
                fprintf(dst, "%sKERNEL_INSTALL_MACHINE_ID=%s\n",
                        no_newline ? "" : "\n",
                        mid_string);
        r = fflush_and_check(dst);
        if (r < 0)
                return log_error_errno(r, "Failed to write temporary copy of /etc/machine-info: %m");
        if (fchmod(fileno(dst), 0644) < 0)
                return log_debug_errno(errno, "Failed to fchmod %s: %m", dst_tmp);
        if (rename(dst_tmp, "/etc/machine-info") < 0)
                return log_error_errno(errno, "Failed to replace /etc/machine-info: %m");
        log_info("%s /etc/machine-info with%s%s%s",
                 orig ? "Updated" : "Created",
                 need_install_layout ? " KERNEL_INSTALL_LAYOUT=bls" : "",
                 need_machine_id ? " KERNEL_INSTALL_MACHINE_ID=" : "",
                 need_machine_id ? mid_string : "");
        return 0;
 }
 static int help(int argc, char *argv[], void *userdata) {
@ -1347,8 +1222,8 @@ static int parse_argv(int argc, char *argv[]) {
                        break;
                case ARG_MAKE_MACHINE_ID_DIRECTORY:
-                        if (streq(optarg, "auto"))  /* retained for backwards compatibility */
+                        if (streq(optarg, "auto"))
-                                arg_make_machine_id_directory = -1; /* yes if machine-id is permanent */
+                                arg_make_machine_id_directory = -1;  /* default */
                        else {
                                r = parse_boolean_argument("--make-machine-id-directory=", optarg, &b);
                                if (r < 0)
@ -1762,9 +1637,7 @@ static int verb_install(int argc, char *argv[], void *userdata) {
        if (r < 0)
                return r;
-        r = settle_install_machine_id();
+        settle_make_machine_id_directory();
        if (r < 0)
                return r;
        RUN_WITH_UMASK(0002) {
                if (install) {
@ -1793,10 +1666,6 @@ static int verb_install(int argc, char *argv[], void *userdata) {
                        if (r < 0)
                                return r;
                        r = install_machine_info_config();
                        if (r < 0)
                                return r;
                        r = install_random_seed(arg_esp_path);
                        if (r < 0)
                                return r;
@ -1826,9 +1695,7 @@ static int verb_remove(int argc, char *argv[], void *userdata) {
        if (r < 0)
                return r;
-        r = settle_install_machine_id();
+        settle_make_machine_id_directory();
        if (r < 0)
                return r;
        r = remove_binaries(arg_esp_path);
--- a/src/journal-remote/journal-remote-main.c
+++ b/src/journal-remote/journal-remote-main.c
@ -319,7 +319,7 @@ static mhd_result request_handler(
                        /* When serialized, an entry of maximum size might be slightly larger,
                         * so this does not correspond exactly to the limit in journald. Oh well.
                         */
-                        return mhd_respondf(connection, 0, MHD_HTTP_CONTENT_TOO_LARGE,
+                        return mhd_respondf(connection, 0, MHD_HTTP_PAYLOAD_TOO_LARGE,
                                            "Payload larger than maximum size of %u bytes", ENTRY_SIZE_MAX);
        }
--- a/src/journal-remote/microhttpd-util.h
+++ b/src/journal-remote/microhttpd-util.h
@ -38,13 +38,9 @@
 #  define MHD_HTTP_NOT_ACCEPTABLE MHD_HTTP_METHOD_NOT_ACCEPTABLE
 #endif
-/* Renamed in µhttpd 0.9.74 (8c644fc1f4d498ea489add8d40a68f5d3e5899fa) */
+/* Renamed in µhttpd 0.9.53 */
-#ifndef MHD_HTTP_CONTENT_TOO_LARGE
+#ifndef MHD_HTTP_PAYLOAD_TOO_LARGE
-#  ifdef MHD_HTTP_PAYLOAD_TOO_LARGE
+#  define MHD_HTTP_PAYLOAD_TOO_LARGE MHD_HTTP_REQUEST_ENTITY_TOO_LARGE
 #    define MHD_HTTP_CONTENT_TOO_LARGE MHD_HTTP_PAYLOAD_TOO_LARGE /* 0.9.53 or newer */
 #  else
 #    define MHD_HTTP_CONTENT_TOO_LARGE MHD_HTTP_REQUEST_ENTITY_TOO_LARGE
 #  endif
 #endif
 #if MHD_VERSION < 0x00094203
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@ -2080,14 +2080,16 @@ static void context_bar_char_process_partition(
        from = p->offset;
        to = from + p->new_size;
-        assert(context->total > 0);
+        assert(context->end >= context->start);
-        total = context->total;
+        total = context->end - context->start;
-        assert(from <= total);
+        assert(from >= context->start);
-        x = from * n / total;
+        assert(from <= context->end);
        x = (from - context->start) * n / total;
-        assert(to <= total);
+        assert(to >= context->start);
-        y = to * n / total;
+        assert(to <= context->end);
        y = (to - context->start) * n / total;
        assert(x <= y);
        assert(y <= n);
--- a/src/resolve/resolved-def.h
+++ b/src/resolve/resolved-def.h
@ -39,7 +39,7 @@
 /* Input: Don't answer request from locally registered public LLMNR/mDNS RRs */
 #define SD_RESOLVED_NO_ZONE         (UINT64_C(1) << 13)
-/* Input: Don't answer request from locally configured trust anchors. */
+/* Input: Don't answer request from locally registered public LLMNR/mDNS RRs */
 #define SD_RESOLVED_NO_TRUST_ANCHOR (UINT64_C(1) << 14)
 /* Input: Don't go to network for this request */
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@ -271,8 +271,8 @@ static int make_backup(const char *target, const char *x) {
        r = fopen_temporary_label(
                        target,   /* The path for which to the lookup the label */
                        x,        /* Where we want the file actually to end up */
-                        &dst,     /* The temporary file we write to */
+                        &dst,
-                        &dst_tmp);
+                        &dst_tmp  /* The temporary file we write to */);
        if (r < 0)
                return r;