2025-10-05 03:34:46 +02:00
31 changed files with 230 additions and 1532 deletions
--- a/.mailmap
+++ b/.mailmap
@ -209,4 +209,3 @@ Andrey Yashkin <38919268+AndreyYashkin@users.noreply.github.com>
 Ronald Tschalär <ronald@innovation.ch>
 Jay Burger <jay.burger@fujitsu.com> <root@new-host-3.home>
 Yi Gao <ymuemc@163.com>
 Weblate <noreply@weblate.org>
--- a/57
+++ b/57
@ -437,9 +437,6 @@ CHANGES WITH 248:
        * portablectl gained a new "reattach" verb for detaching/reattaching a
          portable service image, useful for updating images on-the-fly.
        * Intel SGX enclave device nodes (which expose a security feature of
          newer Intel CPUs) will now be owned by a new system group "sgx".
        Contributions from: Adam Nielsen, Adrian Vovk, AJ Jordan, Alan Perry,
        Alastair Pharo, Alexander Batischev, Ali Abdallah, Andrew Balmos, Anita
        Zhang, Annika Wickert, Ansgar Burchardt, Antonius Frie, Ardy, Arian van
@ -447,34 +444,34 @@ CHANGES WITH 248:
        Berg, Benjamin Robin, Björn Daase, caoxia, Carlo Wood, Charles Lee,
        ChopperRob, chri2, Christian Ehrhardt, Christian Hesse, Christopher
        Obbard, clayton craft, corvusnix, cprn, d032747, Daan De Meyer, Daniele
-        Medri, Daniel Rusek, Dan Sanders, Dan Streetman, Darren Ng, David
+        Medri, Daniel Rusek, Dan Streetman, Darren Ng, David Edmundson, Deepak
-        Edmundson, Deepak Rawat, Devon Pringle, Dmitry Borodaenko, dropsignal,
+        Rawat, Devon Pringle, Dmitry Borodaenko, dropsignal, Einsler Lee, Endre
-        Einsler Lee, Endre Szabo, Evgeny Vereshchagin, Fabian Affolter, Felipe
+        Szabo, Evgeny Vereshchagin, Fabian Affolter, Felipe Borges,
-        Borges, feliperodriguesfr, Felix Stupp, Florian Hülsmann, Florian
+        feliperodriguesfr, Felix Stupp, Florian Hülsmann, Florian Klink,
-        Klink, Florian Westphal, Franck Bui, Frantisek Sumsal, Gablegritule,
+        Florian Westphal, Franck Bui, Frantisek Sumsal, Gablegritule, Gaël
-        Gaël PORTAY, Gaurav, Giedrius Statkevičius, Greg Depoire--Ferrer,
+        PORTAY, Gaurav, Giedrius Statkevičius, Greg Depoire--Ferrer, Gustavo
-        Gustavo Costa, Hans de Goede, Hela Basa, heretoenhance, Iago López
+        Costa, Hans de Goede, Hela Basa, heretoenhance, Iago López Galeiras,
-        Galeiras, igo95862, Ilya Dmitrichenko, Jameer Pathan, Jan Tojnar,
+        igo95862, Ilya Dmitrichenko, Jameer Pathan, Jan Tojnar, Jiehong,
-        Jiehong, Jinyuan Si, Joerg Behrmann, John Slade, Jonathan G. Underwood,
+        Jinyuan Si, Joerg Behrmann, John Slade, Jonathan G. Underwood, Jonathan
-        Jonathan McDowell, Josh Triplett, Joshua Watt, Julia Cartwright, Julien
+        McDowell, Josh Triplett, Joshua Watt, Julia Cartwright, Julien Humbert,
-        Humbert, Kairui Song, Karel Zak, Kevin Backhouse, Kevin P. Fleming,
+        Kairui Song, Karel Zak, Kevin P. Fleming, Khem Raj, Konomi, krissgjeng,
-        Khem Raj, Konomi, krissgjeng, l4gfcm, Lajos Veres, Lennart Poettering,
+        l4gfcm, Lajos Veres, Lennart Poettering, Luca Boccassi, Luca BRUNO,
-        Luca Boccassi, Luca BRUNO, Lucas Werkmeister, Luka Kudra, Luna
+        Lucas Werkmeister, Luka Kudra, Luna Jernberg, Marc-André Lureau, Martin
-        Jernberg, Marc-André Lureau, Martin Wilck, Matthias Klumpp, Matt
+        Wilck, Matthias Klumpp, Matt Turner, Michael Marley, Michal Fabik,
-        Turner, Michael Marley, Michal Fabik, Michał Kopeć, Michal Koutný,
+        Michał Kopeć, Michal Koutný, Michal Sekletár, Mike Gilbert, milovlad,
-        Michal Sekletár, Mike Gilbert, milovlad, moson-mo, Nick, nihilix-melix,
+        moson-mo, Nick, nihilix-melix, Oğuz Ersen, Ondrej Mosnacek, pali, Pavel
-        Oğuz Ersen, Ondrej Mosnacek, pali, Pavel Hrdina, Pavel Sapezhko, Perry
+        Hrdina, Pavel Sapezhko, Perry Yuan, Peter Hutterer, Pierre Dubouilh,
-        Yuan, Peter Hutterer, Pierre Dubouilh, Piotr Drąg, Richard Laager,
+        Piotr Drąg, Richard Laager, rnhmjoj, RussianNeuroMancer, Sebastiaan van
-        rnhmjoj, RussianNeuroMancer, Sebastiaan van Stijn, Sergey Bugaev,
+        Stijn, Sergey Bugaev, shenyangyang4, simmon, Simonas Kazlauskas,
-        shenyangyang4, simmon, Simonas Kazlauskas, Slimane Selyan Amiri, Stefan
+        Slimane Selyan Amiri, Stefan Agner, Steve Ramage, Susant Sahani, Sven
-        Agner, Steve Ramage, Susant Sahani, Sven Mueller, Tad Fisher, Takashi
+        Mueller, Tad Fisher, Takashi Iwai, Thomas Haller, Tom Shield, Topi
-        Iwai, Thomas Haller, Tom Shield, Topi Miettinen, Torsten Hilbrich,
+        Miettinen, Torsten Hilbrich, Tyler Hicks, Ulrich Ölmann, Vincent
-        Tyler Hicks, ulf-f, Ulrich Ölmann, Vincent Pelletier, Vinnie Magro,
+        Pelletier, Vinnie Magro, Vito Caputo, Vlad, walbit-de, Weblate, Weblate
-        Vito Caputo, Vlad, walbit-de, Whired Planck, wouter bolsterlee, Xℹ
+        (bot), Whired Planck, wouter bolsterlee, Xℹ Ruoyao, Yuri Chornoivan, Yu
-        Ruoyao, Yuri Chornoivan, Yu Watanabe, Zach Smith, Zbigniew
+        Watanabe, Zach Smith, Zbigniew Jędrzejewski-Szmek, Zmicer Turok, Дамјан
-        Jędrzejewski-Szmek, Zmicer Turok, Дамјан Георгиевски
+        Георгиевски
-        — Berlin, 2021-03-17
+        — Warsaw, 2021-03-11
 CHANGES WITH 247:
--- a/4
+++ b/4
@ -22,10 +22,6 @@ Janitorial Clean-ups:
 Features:
 * move logind udev rules to top-level rule.d/ directory
 * move multiseat vid/pid matches from logind udev rule to hwdb
 * nspawn: default to 1:1 userns
 * Provide a reasonably bespoke solution for mounting host $HOME directories
--- a/hwdb.d/20-OUI.hwdb
+++ b/hwdb.d/20-OUI.hwdb
@ -39908,9 +39908,6 @@ OUI:04714BD*
 OUI:04714BE*
 ID_OUI_FROM_DATABASE=Gimso Mobile Ltd
 OUI:047153*
 ID_OUI_FROM_DATABASE=SERNET (SUZHOU) TECHNOLOGIES CORPORATION
 OUI:047295*
 ID_OUI_FROM_DATABASE=Apple, Inc.
@ -40106,9 +40103,6 @@ OUI:04B466*
 OUI:04B648*
 ID_OUI_FROM_DATABASE=ZENNER
 OUI:04B9E3*
 ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 OUI:04BA1C*
 ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
@ -40925,9 +40919,6 @@ OUI:080581*
 OUI:0805CD*
 ID_OUI_FROM_DATABASE=DongGuang EnMai Electronic Product Co.Ltd.
 OUI:0805E2*
 ID_OUI_FROM_DATABASE=Juniper Networks
 OUI:0808C2*
 ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
@ -41885,9 +41876,6 @@ OUI:0C41E9*
 OUI:0C42A1*
 ID_OUI_FROM_DATABASE=Mellanox Technologies, Inc.
 OUI:0C4314*
 ID_OUI_FROM_DATABASE=Silicon Laboratories
 OUI:0C45BA*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
@ -42254,9 +42242,6 @@ OUI:0C96E6*
 OUI:0C9838*
 ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 OUI:0C9A3C*
 ID_OUI_FROM_DATABASE=Intel Corporate
 OUI:0C9A42*
 ID_OUI_FROM_DATABASE=FN-LINK TECHNOLOGY LIMITED
@ -42752,9 +42737,6 @@ OUI:1008B1*
 OUI:10090C*
 ID_OUI_FROM_DATABASE=Janome Sewing Machine Co., Ltd.
 OUI:1009F9*
 ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 OUI:100BA9*
 ID_OUI_FROM_DATABASE=Intel Corporate
@ -44102,9 +44084,6 @@ OUI:1489FD*
 OUI:148A70*
 ID_OUI_FROM_DATABASE=ADS GmbH
 OUI:148C4A*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:148F21*
 ID_OUI_FROM_DATABASE=Garmin International
@ -45656,9 +45635,6 @@ OUI:1C3B8F*
 OUI:1C3BF3*
 ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 OUI:1C3CD4*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:1C3D2F*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
@ -46904,9 +46880,6 @@ OUI:203B69*
 OUI:203CAE*
 ID_OUI_FROM_DATABASE=Apple, Inc.
 OUI:203CC0*
 ID_OUI_FROM_DATABASE=Beijing Tosee Technology Co., Ltd.
 OUI:203D66*
 ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
@ -47411,9 +47384,6 @@ OUI:20CEC4*
 OUI:20CF30*
 ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
 OUI:20CFAE*
 ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 OUI:20D160*
 ID_OUI_FROM_DATABASE=Private
@ -47423,9 +47393,6 @@ OUI:20D21F*
 OUI:20D25F*
 ID_OUI_FROM_DATABASE=SmartCap Technologies
 OUI:20D276*
 ID_OUI_FROM_DATABASE=ITEL MOBILE LIMITED
 OUI:20D390*
 ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
@ -48345,7 +48312,7 @@ OUI:24DFA7*
 ID_OUI_FROM_DATABASE=Hangzhou BroadLink Technology Co.,Ltd
 OUI:24E124*
- ID_OUI_FROM_DATABASE=Xiamen Milesight IoT Co., Ltd.
+ ID_OUI_FROM_DATABASE=Xiamen Ursalink Technology Co., Ltd.
 OUI:24E271*
 ID_OUI_FROM_DATABASE=Qingdao Hisense Communications Co.,Ltd.
@ -48497,9 +48464,6 @@ OUI:28107B*
 OUI:2811A5*
 ID_OUI_FROM_DATABASE=Bose Corporation
 OUI:2811A8*
 ID_OUI_FROM_DATABASE=Intel Corporate
 OUI:2811EC*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
@ -49373,9 +49337,6 @@ OUI:28FA7A*
 OUI:28FAA0*
 ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 OUI:28FBAE*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:28FBD3*
 ID_OUI_FROM_DATABASE=Ragentek Technology Group
@ -50411,9 +50372,6 @@ OUI:2CDD95*
 OUI:2CDDA3*
 ID_OUI_FROM_DATABASE=Point Grey Research Inc.
 OUI:2CDDE9*
 ID_OUI_FROM_DATABASE=Arista Networks
 OUI:2CE2A8*
 ID_OUI_FROM_DATABASE=DeviceDesign
@ -51104,9 +51062,6 @@ OUI:309FFB*
 OUI:30A023*
 ID_OUI_FROM_DATABASE=ROCK PATH S.R.L
 OUI:30A176*
 ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 OUI:30A1FA*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
@ -55256,9 +55211,6 @@ OUI:40C245*
 OUI:40C3C6*
 ID_OUI_FROM_DATABASE=SnapRoute
 OUI:40C48C*
 ID_OUI_FROM_DATABASE=N-iTUS CO.,LTD.
 OUI:40C4D6*
 ID_OUI_FROM_DATABASE=ChongQing Camyu Technology Development Co.,Ltd.
@ -55832,9 +55784,6 @@ OUI:44599F*
 OUI:4459E3*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:445BED*
 ID_OUI_FROM_DATABASE=Aruba, a Hewlett Packard Enterprise Company
 OUI:445CE9*
 ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
@ -56558,9 +56507,6 @@ OUI:48210B*
 OUI:48216C*
 ID_OUI_FROM_DATABASE=China Mobile IOT Company Limited
 OUI:482218*
 ID_OUI_FROM_DATABASE=Shenzhen Yipingfang Network Technology Co., Ltd.
 OUI:482335*
 ID_OUI_FROM_DATABASE=Dialog Semiconductor Hellas SA
@ -57194,9 +57140,6 @@ OUI:48E695*
 OUI:48E6C0*
 ID_OUI_FROM_DATABASE=SIMCom Wireless Solutions Co.,Ltd.
 OUI:48E7DA*
 ID_OUI_FROM_DATABASE=AzureWave Technology Inc.
 OUI:48E9F1*
 ID_OUI_FROM_DATABASE=Apple, Inc.
@ -57260,9 +57203,6 @@ OUI:48F8DB*
 OUI:48F8E1*
 ID_OUI_FROM_DATABASE=Nokia
 OUI:48F8FF*
 ID_OUI_FROM_DATABASE=CHENGDU KT ELECTRONIC HI-TECH CO.,LTD
 OUI:48F925*
 ID_OUI_FROM_DATABASE=Maestronic
@ -57692,9 +57632,6 @@ OUI:4C710C*
 OUI:4C710D*
 ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 OUI:4C7167*
 ID_OUI_FROM_DATABASE=PoLabs d.o.o.
 OUI:4C72B9*
 ID_OUI_FROM_DATABASE=PEGATRON CORPORATION
@ -59519,9 +59456,6 @@ OUI:5435DF*
 OUI:54369B*
 ID_OUI_FROM_DATABASE=1Verge Internet Technology (Beijing) Co., Ltd.
 OUI:5437BB*
 ID_OUI_FROM_DATABASE=Taicang T&W Electronics
 OUI:543968*
 ID_OUI_FROM_DATABASE=Edgewater Networks Inc
@ -60821,9 +60755,6 @@ OUI:58D56E*
 OUI:58D67A*
 ID_OUI_FROM_DATABASE=TCPlink
 OUI:58D697*
 ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 OUI:58D6D3*
 ID_OUI_FROM_DATABASE=Dairy Cheq Inc
@ -61541,9 +61472,6 @@ OUI:5CA5BC*
 OUI:5CA62D*
 ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 OUI:5CA721*
 ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
 OUI:5CA86A*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
@ -62459,9 +62387,6 @@ OUI:609AC1*
 OUI:609B2D*
 ID_OUI_FROM_DATABASE=JMACS Japan Co., Ltd.
 OUI:609BB4*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:609BC8*
 ID_OUI_FROM_DATABASE=Hipad Intelligent Technology Co., Ltd.
@ -62543,9 +62468,6 @@ OUI:60B606*
 OUI:60B617*
 ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 OUI:60B6E1*
 ID_OUI_FROM_DATABASE=Texas Instruments
 OUI:60B76E*
 ID_OUI_FROM_DATABASE=Google, Inc.
@ -62714,9 +62636,6 @@ OUI:60DA23*
 OUI:60DA83*
 ID_OUI_FROM_DATABASE=Hangzhou H3C Technologies Co., Limited
 OUI:60DB15*
 ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
 OUI:60DB2A*
 ID_OUI_FROM_DATABASE=HNS
@ -62810,9 +62729,6 @@ OUI:60F677*
 OUI:60F81D*
 ID_OUI_FROM_DATABASE=Apple, Inc.
 OUI:60F8F2*
 ID_OUI_FROM_DATABASE=Synaptec
 OUI:60FA9D*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
@ -64775,9 +64691,6 @@ OUI:6C416A*
 OUI:6C42AB*
 ID_OUI_FROM_DATABASE=Subscriber Networks, Inc.
 OUI:6C433C*
 ID_OUI_FROM_DATABASE=TECNO MOBILE LIMITED
 OUI:6C4418*
 ID_OUI_FROM_DATABASE=Zappware
@ -64979,9 +64892,6 @@ OUI:6C7637*
 OUI:6C7660*
 ID_OUI_FROM_DATABASE=KYOCERA CORPORATION
 OUI:6C79B8*
 ID_OUI_FROM_DATABASE=Texas Instruments
 OUI:6C81FE*
 ID_OUI_FROM_DATABASE=Mitsuba Corporation
@ -66035,9 +65945,6 @@ OUI:709383*
 OUI:7093F8*
 ID_OUI_FROM_DATABASE=Space Monkey, Inc.
 OUI:709741*
 ID_OUI_FROM_DATABASE=Arcadyan Corporation
 OUI:709756*
 ID_OUI_FROM_DATABASE=Happyelectronics Co.,Ltd
@ -66083,9 +65990,6 @@ OUI:70A41C*
 OUI:70A66A*
 ID_OUI_FROM_DATABASE=Prox Dynamics AS
 OUI:70A6CC*
 ID_OUI_FROM_DATABASE=Intel Corporate
 OUI:70A84C*
 ID_OUI_FROM_DATABASE=MONAD., Inc.
@ -66287,6 +66191,9 @@ OUI:70B3D5034*
 OUI:70B3D5035*
 ID_OUI_FROM_DATABASE=HKW-Elektronik GmbH
 OUI:70B3D5036*
 ID_OUI_FROM_DATABASE=PARAGON ID
 OUI:70B3D5037*
 ID_OUI_FROM_DATABASE=EIFFAGE ENERGIE ELECTRONIQUE
@ -66980,9 +66887,6 @@ OUI:70B3D511C*
 OUI:70B3D511D*
 ID_OUI_FROM_DATABASE=Dakton Microlabs LLC
 OUI:70B3D511E*
 ID_OUI_FROM_DATABASE=KBPR LLC
 OUI:70B3D511F*
 ID_OUI_FROM_DATABASE=Geppetto Electronics
@ -67454,9 +67358,6 @@ OUI:70B3D51BA*
 OUI:70B3D51BB*
 ID_OUI_FROM_DATABASE=EFENTO T P SZYDŁOWSKI K ZARĘBA SPÓŁKA JAWNA
 OUI:70B3D51BC*
 ID_OUI_FROM_DATABASE=Flextronics International Kft
 OUI:70B3D51BD*
 ID_OUI_FROM_DATABASE=Shenzhen Siera Technology Ltd
@ -68468,9 +68369,6 @@ OUI:70B3D5313*
 OUI:70B3D5314*
 ID_OUI_FROM_DATABASE=Grau Elektronik GmbH
 OUI:70B3D5315*
 ID_OUI_FROM_DATABASE=Private
 OUI:70B3D5316*
 ID_OUI_FROM_DATABASE=Austco Marketing & Service (USA) ltd.
@ -68555,9 +68453,6 @@ OUI:70B3D5331*
 OUI:70B3D5332*
 ID_OUI_FROM_DATABASE=InnoSenT
 OUI:70B3D5333*
 ID_OUI_FROM_DATABASE=Orlaco Products B.V.
 OUI:70B3D5334*
 ID_OUI_FROM_DATABASE=Dokuen Co. Ltd.
@ -69773,9 +69668,6 @@ OUI:70B3D54CE*
 OUI:70B3D54CF*
 ID_OUI_FROM_DATABASE=GREEN HOUSE CO., LTD.
 OUI:70B3D54D0*
 ID_OUI_FROM_DATABASE=Codewerk GmbH
 OUI:70B3D54D1*
 ID_OUI_FROM_DATABASE=Contraves Advanced Devices Sdn. Bhd.
@ -71081,9 +70973,6 @@ OUI:70B3D5683*
 OUI:70B3D5684*
 ID_OUI_FROM_DATABASE=LECO Corporation
 OUI:70B3D5685*
 ID_OUI_FROM_DATABASE=LDA Audiotech
 OUI:70B3D5686*
 ID_OUI_FROM_DATABASE=Access Protocol Pty Ltd
@ -71145,7 +71034,7 @@ OUI:70B3D569A*
 ID_OUI_FROM_DATABASE=Altaneos
 OUI:70B3D569B*
- ID_OUI_FROM_DATABASE=HORIZON.INC
+ ID_OUI_FROM_DATABASE=Horizon Co., Ltd
 OUI:70B3D569C*
 ID_OUI_FROM_DATABASE=Keepen
@ -71540,9 +71429,6 @@ OUI:70B3D571D*
 OUI:70B3D571E*
 ID_OUI_FROM_DATABASE=Motec Pty Ltd
 OUI:70B3D571F*
 ID_OUI_FROM_DATABASE=Grayshift
 OUI:70B3D5720*
 ID_OUI_FROM_DATABASE=Jeio Tech
@ -72305,9 +72191,6 @@ OUI:70B3D581D*
 OUI:70B3D581E*
 ID_OUI_FROM_DATABASE=Novathings
 OUI:70B3D581F*
 ID_OUI_FROM_DATABASE=CAR-connect GmbH
 OUI:70B3D5820*
 ID_OUI_FROM_DATABASE=Becker Nachrichtentechnik GmbH
@ -73292,9 +73175,6 @@ OUI:70B3D5968*
 OUI:70B3D5969*
 ID_OUI_FROM_DATABASE=Emtel System Sp. z o.o.
 OUI:70B3D596A*
 ID_OUI_FROM_DATABASE=Anello Photonics
 OUI:70B3D596B*
 ID_OUI_FROM_DATABASE=FOCAL-JMLab
@ -73796,9 +73676,6 @@ OUI:70B3D5A12*
 OUI:70B3D5A13*
 ID_OUI_FROM_DATABASE=Uplevel Systems Inc
 OUI:70B3D5A14*
 ID_OUI_FROM_DATABASE=aelettronica group srl
 OUI:70B3D5A15*
 ID_OUI_FROM_DATABASE=Intercore GmbH
@ -74033,9 +73910,6 @@ OUI:70B3D5A61*
 OUI:70B3D5A62*
 ID_OUI_FROM_DATABASE=Environexus
 OUI:70B3D5A63*
 ID_OUI_FROM_DATABASE=DesignA Electronics Limited
 OUI:70B3D5A64*
 ID_OUI_FROM_DATABASE=Newshine
@ -74348,9 +74222,6 @@ OUI:70B3D5ACC*
 OUI:70B3D5ACD*
 ID_OUI_FROM_DATABASE=CRDE
 OUI:70B3D5ACE*
 ID_OUI_FROM_DATABASE=FARHO DOMOTICA SL
 OUI:70B3D5ACF*
 ID_OUI_FROM_DATABASE=APG Cash Drawer, LLC
@ -74489,9 +74360,6 @@ OUI:70B3D5AFB*
 OUI:70B3D5AFC*
 ID_OUI_FROM_DATABASE=BAE Systems
 OUI:70B3D5AFD*
 ID_OUI_FROM_DATABASE=dongsheng
 OUI:70B3D5AFE*
 ID_OUI_FROM_DATABASE=MESOTECHNIC
@ -75326,9 +75194,6 @@ OUI:70B3D5C17*
 OUI:70B3D5C18*
 ID_OUI_FROM_DATABASE=Sanmina Israel
 OUI:70B3D5C19*
 ID_OUI_FROM_DATABASE=Zumbach Electronic AG
 OUI:70B3D5C1A*
 ID_OUI_FROM_DATABASE=Xylon
@ -75590,9 +75455,6 @@ OUI:70B3D5C6F*
 OUI:70B3D5C70*
 ID_OUI_FROM_DATABASE=Magnetek
 OUI:70B3D5C71*
 ID_OUI_FROM_DATABASE=The Engineerix Group
 OUI:70B3D5C72*
 ID_OUI_FROM_DATABASE=Scharco Elektronik GmbH
@ -76790,15 +76652,9 @@ OUI:70B3D5E01*
 OUI:70B3D5E02*
 ID_OUI_FROM_DATABASE=YEHL & JORDAN LLC
 OUI:70B3D5E03*
 ID_OUI_FROM_DATABASE=MBJ
 OUI:70B3D5E04*
 ID_OUI_FROM_DATABASE=Combilent
 OUI:70B3D5E05*
 ID_OUI_FROM_DATABASE=Lobaro GmbH
 OUI:70B3D5E06*
 ID_OUI_FROM_DATABASE=System West dba ICS Electronics
@ -78314,9 +78170,6 @@ OUI:70B7E2*
 OUI:70B921*
 ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 OUI:70B950*
 ID_OUI_FROM_DATABASE=Texas Instruments
 OUI:70BAEF*
 ID_OUI_FROM_DATABASE=Hangzhou H3C Technologies Co., Limited
@ -78944,9 +78797,6 @@ OUI:745C4B*
 OUI:745C9F*
 ID_OUI_FROM_DATABASE=TCT mobile ltd
 OUI:745D68*
 ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 OUI:745E1C*
 ID_OUI_FROM_DATABASE=PIONEER CORPORATION
@ -79319,9 +79169,6 @@ OUI:74CD0C*
 OUI:74CE56*
 ID_OUI_FROM_DATABASE=Packet Force Technology Limited Company
 OUI:74CF00*
 ID_OUI_FROM_DATABASE=Shenzhen SuperElectron Technology Co.,Ltd.
 OUI:74D02B*
 ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
@ -80027,9 +79874,6 @@ OUI:7884EE*
 OUI:7885F4*
 ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 OUI:7886B6*
 ID_OUI_FROM_DATABASE=Shenzhen YOUHUA Technology Co., Ltd
 OUI:78870D*
 ID_OUI_FROM_DATABASE=Unifiedgateways India Private Limited
@ -80480,9 +80324,6 @@ OUI:78D66F*
 OUI:78D6B2*
 ID_OUI_FROM_DATABASE=Toshiba
 OUI:78D6DC*
 ID_OUI_FROM_DATABASE=Motorola (Wuhan) Mobility Technologies Communication Co., Ltd.
 OUI:78D6F0*
 ID_OUI_FROM_DATABASE=SAMSUNG ELECTRO MECHANICS CO., LTD.
@ -80828,9 +80669,6 @@ OUI:7C2634*
 OUI:7C2664*
 ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 OUI:7C27BC*
 ID_OUI_FROM_DATABASE=Hui Zhou Gaoshengda Technology Co.,LTD
 OUI:7C2A31*
 ID_OUI_FROM_DATABASE=Intel Corporate
@ -81143,9 +80981,6 @@ OUI:7C70BCE*
 OUI:7C70BCF*
 ID_OUI_FROM_DATABASE=Private
 OUI:7C70DB*
 ID_OUI_FROM_DATABASE=Intel Corporate
 OUI:7C7176*
 ID_OUI_FROM_DATABASE=Wuxi iData Technology Company Ltd.
@ -81689,9 +81524,6 @@ OUI:7CF31B*
 OUI:7CF429*
 ID_OUI_FROM_DATABASE=NUUO Inc.
 OUI:7CF462*
 ID_OUI_FROM_DATABASE=BEIJING HUAWOO TECHNOLOGIES CO.LTD
 OUI:7CF666*
 ID_OUI_FROM_DATABASE=Tuya Smart Inc.
@ -83612,9 +83444,6 @@ OUI:84EB18*
 OUI:84EB3E*
 ID_OUI_FROM_DATABASE=Vivint Smart Home
 OUI:84EBEF*
 ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 OUI:84ED33*
 ID_OUI_FROM_DATABASE=BBMC Co.,Ltd
@ -84242,9 +84071,6 @@ OUI:889FFA*
 OUI:88A084*
 ID_OUI_FROM_DATABASE=Formation Data Systems
 OUI:88A0BE*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:88A25E*
 ID_OUI_FROM_DATABASE=Juniper Networks
@ -85154,9 +84980,6 @@ OUI:8C640B*
 OUI:8C6422*
 ID_OUI_FROM_DATABASE=Sony Mobile Communications Inc
 OUI:8C64A2*
 ID_OUI_FROM_DATABASE=OnePlus Technology (Shenzhen) Co., Ltd
 OUI:8C64D4*
 ID_OUI_FROM_DATABASE=Hyeco Smart Tech Co.,Ltd
@ -85334,9 +85157,6 @@ OUI:8C9351*
 OUI:8C941F*
 ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 OUI:8C94CC*
 ID_OUI_FROM_DATABASE=SFR
 OUI:8C94CF*
 ID_OUI_FROM_DATABASE=Encell Technology, Inc.
@ -85358,9 +85178,6 @@ OUI:8CA048*
 OUI:8CA2FD*
 ID_OUI_FROM_DATABASE=Starry, Inc.
 OUI:8CA399*
 ID_OUI_FROM_DATABASE=SERVERCOM (INDIA) PRIVATE LIMITED
 OUI:8CA5A1*
 ID_OUI_FROM_DATABASE=Oregano Systems - Design & Consulting GmbH
@ -86108,9 +85925,6 @@ OUI:9067F3*
 OUI:9068C3*
 ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 OUI:906976*
 ID_OUI_FROM_DATABASE=Withrobot Inc.
 OUI:906CAC*
 ID_OUI_FROM_DATABASE=Fortinet, Inc.
@ -86186,9 +86000,6 @@ OUI:907EBA*
 OUI:907F61*
 ID_OUI_FROM_DATABASE=Chicony Electronics Co., Ltd.
 OUI:908060*
 ID_OUI_FROM_DATABASE=Nilfisk A/S
 OUI:90808F*
 ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
@ -87107,9 +86918,6 @@ OUI:948FCF*
 OUI:948FEE*
 ID_OUI_FROM_DATABASE=Verizon Telematics
 OUI:949010*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:949034*
 ID_OUI_FROM_DATABASE=SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LTD
@ -87185,9 +86993,6 @@ OUI:94A7B7*
 OUI:94A7BC*
 ID_OUI_FROM_DATABASE=BodyMedia, Inc.
 OUI:94AA0A*
 ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 OUI:94AAB8*
 ID_OUI_FROM_DATABASE=Joview(Beijing) Technology Co. Ltd.
@ -87947,9 +87752,6 @@ OUI:984265*
 OUI:9843DA*
 ID_OUI_FROM_DATABASE=INTERTECH
 OUI:9843FA*
 ID_OUI_FROM_DATABASE=Intel Corporate
 OUI:9844B6*
 ID_OUI_FROM_DATABASE=INFRANOR SAS
@ -87974,9 +87776,6 @@ OUI:984874*
 OUI:984914*
 ID_OUI_FROM_DATABASE=Wistron Neweb Corporation
 OUI:98499F*
 ID_OUI_FROM_DATABASE=Domo Tactical Communications
 OUI:9849E1*
 ID_OUI_FROM_DATABASE=Boeing Defence Australia
@ -88490,9 +88289,6 @@ OUI:98EF9B*
 OUI:98F058*
 ID_OUI_FROM_DATABASE=Lynxspring, Incl.
 OUI:98F083*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:98F0AB*
 ID_OUI_FROM_DATABASE=Apple, Inc.
@ -88505,9 +88301,6 @@ OUI:98F181*
 OUI:98F199*
 ID_OUI_FROM_DATABASE=NEC Platforms, Ltd.
 OUI:98F217*
 ID_OUI_FROM_DATABASE=Castlenet Technology Inc.
 OUI:98F2B3*
 ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
@ -91259,9 +91052,6 @@ OUI:A47758*
 OUI:A47760*
 ID_OUI_FROM_DATABASE=Nokia Corporation
 OUI:A47806*
 ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 OUI:A47886*
 ID_OUI_FROM_DATABASE=Avaya Inc
@ -91581,7 +91371,7 @@ OUI:A4CFD2*
 ID_OUI_FROM_DATABASE=Ubee Interactive Co., Limited
 OUI:A4D094*
- ID_OUI_FROM_DATABASE=VIVAVIS AG
+ ID_OUI_FROM_DATABASE=Erwin Peters Systemtechnik GmbH
 OUI:A4D18C*
 ID_OUI_FROM_DATABASE=Apple, Inc.
@ -93053,9 +92843,6 @@ OUI:AC7289*
 OUI:AC7409*
 ID_OUI_FROM_DATABASE=Hangzhou H3C Technologies Co., Limited
 OUI:AC74B1*
 ID_OUI_FROM_DATABASE=Intel Corporate
 OUI:AC74C4*
 ID_OUI_FROM_DATABASE=Maytronics Ltd.
@ -95984,9 +95771,6 @@ OUI:B8D50B*
 OUI:B8D526*
 ID_OUI_FROM_DATABASE=Zyxel Communications Corporation
 OUI:B8D56B*
 ID_OUI_FROM_DATABASE=Mirka Ltd.
 OUI:B8D6F6*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
@ -97142,9 +96926,6 @@ OUI:C0210D*
 OUI:C02250*
 ID_OUI_FROM_DATABASE=Koss Corporation
 OUI:C0238D*
 ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 OUI:C02506*
 ID_OUI_FROM_DATABASE=AVM GmbH
@ -97958,54 +97739,6 @@ OUI:C0F945*
 OUI:C0F991*
 ID_OUI_FROM_DATABASE=GME Standard Communications P/L
 OUI:C0F9B0*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:C0FBF90*
 ID_OUI_FROM_DATABASE=Xerox Corporation
 OUI:C0FBF91*
 ID_OUI_FROM_DATABASE=LIXIL Corporation
 OUI:C0FBF92*
 ID_OUI_FROM_DATABASE=Dongguan Chuan OptoElectronics Limited
 OUI:C0FBF93*
 ID_OUI_FROM_DATABASE=SHENZHEN HEQIANG ELECTRONICS LIMITED
 OUI:C0FBF94*
 ID_OUI_FROM_DATABASE=Minato Advanced Technologies inc
 OUI:C0FBF95*
 ID_OUI_FROM_DATABASE=HAGUENET
 OUI:C0FBF96*
 ID_OUI_FROM_DATABASE=IVT corporation
 OUI:C0FBF97*
 ID_OUI_FROM_DATABASE=LongSung Technology (Shanghai) Co.,Ltd.
 OUI:C0FBF98*
 ID_OUI_FROM_DATABASE=Dongmengling
 OUI:C0FBF99*
 ID_OUI_FROM_DATABASE=zxsolution
 OUI:C0FBF9A*
 ID_OUI_FROM_DATABASE=Tiandi(Changzhou) Automation Co., Ltd.
 OUI:C0FBF9B*
 ID_OUI_FROM_DATABASE=SHENZHEN COMIX HST CLOUD COMPUTING CO., LTD.
 OUI:C0FBF9C*
 ID_OUI_FROM_DATABASE=SHENZHEN ELSKY TECHNOLOGY CO., LTD
 OUI:C0FBF9D*
 ID_OUI_FROM_DATABASE=Dropbeats Technology Co., Ltd.
 OUI:C0FBF9E*
 ID_OUI_FROM_DATABASE=Navitas Digital Safety Ltd
 OUI:C0FD84*
 ID_OUI_FROM_DATABASE=zte corporation
@ -98345,9 +98078,6 @@ OUI:C45D83*
 OUI:C45DD8*
 ID_OUI_FROM_DATABASE=HDMI Forum
 OUI:C45E5C*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:C46044*
 ID_OUI_FROM_DATABASE=Everex Electronics Limited
@ -99821,12 +99551,6 @@ OUI:C8F5D60*
 OUI:C8F5D61*
 ID_OUI_FROM_DATABASE=Valeo Interior Controls (Shenzhen) Co.,Ltd
 OUI:C8F5D62*
 ID_OUI_FROM_DATABASE=Qbic Technology Co., Ltd
 OUI:C8F5D63*
 ID_OUI_FROM_DATABASE=BBPOS International Limited
 OUI:C8F5D64*
 ID_OUI_FROM_DATABASE=EVOTOR LLC
@ -99842,24 +99566,15 @@ OUI:C8F5D67*
 OUI:C8F5D68*
 ID_OUI_FROM_DATABASE=Yarward Electronics  Co., Ltd.
 OUI:C8F5D69*
 ID_OUI_FROM_DATABASE=Shanghai Mo xiang Network Technology CO.,Ltd
 OUI:C8F5D6A*
 ID_OUI_FROM_DATABASE=HENAN FOXSTAR DIGITAL DISPLAY Co.,Ltd.
 OUI:C8F5D6B*
 ID_OUI_FROM_DATABASE=United Barcode Systems
 OUI:C8F5D6C*
 ID_OUI_FROM_DATABASE=Eltako GmbH
 OUI:C8F5D6D*
 ID_OUI_FROM_DATABASE=Volansys technologies pvt ltd
 OUI:C8F5D6E*
 ID_OUI_FROM_DATABASE=HEITEC AG
 OUI:C8F650*
 ID_OUI_FROM_DATABASE=Apple, Inc.
@ -99980,9 +99695,6 @@ OUI:CC10A3*
 OUI:CC14A6*
 ID_OUI_FROM_DATABASE=Yichun MyEnergy Domain, Inc
 OUI:CC1531*
 ID_OUI_FROM_DATABASE=Intel Corporate
 OUI:CC167E*
 ID_OUI_FROM_DATABASE=Cisco Systems, Inc
@ -100610,9 +100322,6 @@ OUI:CCB3F8*
 OUI:CCB55A*
 ID_OUI_FROM_DATABASE=Fraunhofer ITWM
 OUI:CCB5D1*
 ID_OUI_FROM_DATABASE=Beijing Xiaomi Mobile Software Co., Ltd
 OUI:CCB691*
 ID_OUI_FROM_DATABASE=NECMagnusCommunications
@ -101231,9 +100940,6 @@ OUI:D03DC3*
 OUI:D03E5C*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:D03E7D*
 ID_OUI_FROM_DATABASE=CHIPSEA TECHNOLOGIES (SHENZHEN) CORP.
 OUI:D03FAA*
 ID_OUI_FROM_DATABASE=Apple, Inc.
@ -101288,9 +100994,6 @@ OUI:D05349*
 OUI:D0542D*
 ID_OUI_FROM_DATABASE=Cambridge Industries(Group) Co.,Ltd.
 OUI:D05475*
 ID_OUI_FROM_DATABASE=SAVI Controls
 OUI:D05509*
 ID_OUI_FROM_DATABASE=Nintendo Co.,Ltd
@ -101627,12 +101330,6 @@ OUI:D09D0A*
 OUI:D09DAB*
 ID_OUI_FROM_DATABASE=TCT mobile ltd
 OUI:D09FD94*
 ID_OUI_FROM_DATABASE=Poten (Shanghai) Technology Co.,Ltd.
 OUI:D09FD9D*
 ID_OUI_FROM_DATABASE=Shenzhen eloT Technology Co.,Ltd
 OUI:D0A0D6*
 ID_OUI_FROM_DATABASE=Chengdu TD Tech Ltd.
@ -103832,9 +103529,6 @@ OUI:DC1EA3*
 OUI:DC2008*
 ID_OUI_FROM_DATABASE=ASD Electronics Ltd
 OUI:DC2148*
 ID_OUI_FROM_DATABASE=Intel Corporate
 OUI:DC215C*
 ID_OUI_FROM_DATABASE=Intel Corporate
@ -105500,9 +105194,6 @@ OUI:E405F8*
 OUI:E408E7*
 ID_OUI_FROM_DATABASE=Quectel Wireless Solutions Co.,Ltd.
 OUI:E40CFD*
 ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 OUI:E40EEE*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
@ -106667,9 +106358,6 @@ OUI:E85BB7*
 OUI:E85BF0*
 ID_OUI_FROM_DATABASE=Imaging Diagnostics
 OUI:E85C0A*
 ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 OUI:E85D6B*
 ID_OUI_FROM_DATABASE=Luminate Wireless
@ -107033,9 +106721,6 @@ OUI:E8C1B8*
 OUI:E8C1D7*
 ID_OUI_FROM_DATABASE=Philips
 OUI:E8C1E8*
 ID_OUI_FROM_DATABASE=Shenzhen Xiao Bi En Culture Education Technology Co.,Ltd.
 OUI:E8C229*
 ID_OUI_FROM_DATABASE=H-Displays (MSC) Bhd
@ -109298,9 +108983,6 @@ OUI:F45FF7*
 OUI:F4600D*
 ID_OUI_FROM_DATABASE=Panoptic Technology, Inc
 OUI:F46077*
 ID_OUI_FROM_DATABASE=Texas Instruments
 OUI:F460E2*
 ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
@ -109670,9 +109352,6 @@ OUI:F4BF80*
 OUI:F4BFA8*
 ID_OUI_FROM_DATABASE=Juniper Networks
 OUI:F4C02F*
 ID_OUI_FROM_DATABASE=BlueBite
 OUI:F4C114*
 ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
@ -109796,9 +109475,6 @@ OUI:F4E204*
 OUI:F4E3FB*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:F4E451*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:F4E4AD*
 ID_OUI_FROM_DATABASE=zte corporation
@ -111401,9 +111077,6 @@ OUI:FC9114*
 OUI:FC923B*
 ID_OUI_FROM_DATABASE=Nokia Corporation
 OUI:FC9257*
 ID_OUI_FROM_DATABASE=Renesas Electronics (Penang) Sdn. Bhd.
 OUI:FC9435*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
--- a/hwdb.d/20-acpi-vendor.hwdb
+++ b/hwdb.d/20-acpi-vendor.hwdb
@ -1530,9 +1530,6 @@ acpi:CNB*:
 acpi:CNC*:
 ID_VENDOR_FROM_DATABASE=Alvedon Computers Ltd
 acpi:CND*:
 ID_VENDOR_FROM_DATABASE=Micro-Star Int'l Co., Ltd.
 acpi:CNE*:
 ID_VENDOR_FROM_DATABASE=Cine-tal
@ -1632,9 +1629,6 @@ acpi:CRI*:
 acpi:CRL*:
 ID_VENDOR_FROM_DATABASE=Creative Logic
 acpi:CRM*:
 ID_VENDOR_FROM_DATABASE=CORSAIR MEMORY Inc.
 acpi:CRN*:
 ID_VENDOR_FROM_DATABASE=Cornerstone Imaging
@ -5004,9 +4998,6 @@ acpi:NVT*:
 acpi:NWC*:
 ID_VENDOR_FROM_DATABASE=NW Computer Engineering
 acpi:NWL*:
 ID_VENDOR_FROM_DATABASE=Newline Interactive Inc.
 acpi:NWP*:
 ID_VENDOR_FROM_DATABASE=NovaWeb Technologies Inc
--- 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-03-17 15:53:15.958772194 +0100
+--- 20-acpi-vendor.hwdb.base	2021-03-08 12:40:32.635298395 +0100
-+++ 20-acpi-vendor.hwdb	2021-03-17 15:53:15.967773649 +0100
+++ 20-acpi-vendor.hwdb	2021-03-08 12:40:32.673298742 +0100
@@ -3,6 +3,8 @@
 # Data imported from:
 #     https://uefi.org/uefi-pnp-export
@ -127,7 +127,7 @@
 acpi:CHD*:
  ID_VENDOR_FROM_DATABASE=ChangHong Electric Co.,Ltd
-@@ -1525,6 +1551,9 @@
+@@ -1522,6 +1548,9 @@
 acpi:COD*:
  ID_VENDOR_FROM_DATABASE=CODAN Pty. Ltd.
@ -137,7 +137,7 @@
 acpi:COI*:
  ID_VENDOR_FROM_DATABASE=Codec Inc.
-@@ -1934,7 +1963,7 @@
+@@ -1928,7 +1957,7 @@
  ID_VENDOR_FROM_DATABASE=Dragon Information Technology
 acpi:DJE*:
@ -146,7 +146,7 @@
 acpi:DJP*:
  ID_VENDOR_FROM_DATABASE=Maygay Machines, Ltd
-@@ -2266,6 +2295,9 @@
+@@ -2260,6 +2289,9 @@
 acpi:EIN*:
  ID_VENDOR_FROM_DATABASE=Elegant Invention
@ -156,7 +156,7 @@
 acpi:EKA*:
  ID_VENDOR_FROM_DATABASE=MagTek Inc.
-@@ -2527,6 +2559,9 @@
+@@ -2521,6 +2553,9 @@
 acpi:FCG*:
  ID_VENDOR_FROM_DATABASE=First International Computer Ltd
@ -166,7 +166,7 @@
 acpi:FCS*:
  ID_VENDOR_FROM_DATABASE=Focus Enhancements, Inc.
-@@ -2900,7 +2935,7 @@
+@@ -2894,7 +2929,7 @@
  ID_VENDOR_FROM_DATABASE=General Standards Corporation
 acpi:GSM*:
@ -175,7 +175,7 @@
 acpi:GSN*:
  ID_VENDOR_FROM_DATABASE=Grandstream Networks, Inc.
-@@ -3001,6 +3036,9 @@
+@@ -2995,6 +3030,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
-@@ -3130,6 +3168,9 @@
+@@ -3124,6 +3162,9 @@
 acpi:HSD*:
  ID_VENDOR_FROM_DATABASE=HannStar Display Corp
@ -195,7 +195,7 @@
 acpi:HSM*:
  ID_VENDOR_FROM_DATABASE=AT&T Microelectronics
-@@ -3253,6 +3294,9 @@
+@@ -3247,6 +3288,9 @@
 acpi:ICI*:
  ID_VENDOR_FROM_DATABASE=Infotek Communication Inc
@ -205,7 +205,7 @@
 acpi:ICM*:
  ID_VENDOR_FROM_DATABASE=Intracom SA
-@@ -3349,6 +3393,9 @@
+@@ -3343,6 +3387,9 @@
 acpi:IKE*:
  ID_VENDOR_FROM_DATABASE=Ikegami Tsushinki Co. Ltd.
@ -215,7 +215,7 @@
 acpi:IKS*:
  ID_VENDOR_FROM_DATABASE=Ikos Systems Inc
-@@ -3394,6 +3441,9 @@
+@@ -3388,6 +3435,9 @@
 acpi:IMT*:
  ID_VENDOR_FROM_DATABASE=Inmax Technology Corporation
@ -225,7 +225,7 @@
 acpi:INA*:
  ID_VENDOR_FROM_DATABASE=Inventec Corporation
-@@ -3904,6 +3954,9 @@
+@@ -3898,6 +3948,9 @@
 acpi:LAN*:
  ID_VENDOR_FROM_DATABASE=Sodeman Lancom Inc
@ -235,7 +235,7 @@
 acpi:LAS*:
  ID_VENDOR_FROM_DATABASE=LASAT Comm. A/S
-@@ -3949,6 +4002,9 @@
+@@ -3943,6 +3996,9 @@
 acpi:LED*:
  ID_VENDOR_FROM_DATABASE=Long Engineering Design Inc
@ -245,7 +245,7 @@
 acpi:LEG*:
  ID_VENDOR_FROM_DATABASE=Legerity, Inc
-@@ -3964,6 +4020,9 @@
+@@ -3958,6 +4014,9 @@
 acpi:LGC*:
  ID_VENDOR_FROM_DATABASE=Logic Ltd
@ -255,7 +255,7 @@
 acpi:LGI*:
  ID_VENDOR_FROM_DATABASE=Logitech Inc
-@@ -4018,6 +4077,9 @@
+@@ -4012,6 +4071,9 @@
 acpi:LND*:
  ID_VENDOR_FROM_DATABASE=Land Computer Company Ltd
@ -265,7 +265,7 @@
 acpi:LNK*:
  ID_VENDOR_FROM_DATABASE=Link Tech Inc
-@@ -4052,7 +4114,7 @@
+@@ -4046,7 +4108,7 @@
  ID_VENDOR_FROM_DATABASE=Design Technology
 acpi:LPL*:
@ -274,7 +274,7 @@
 acpi:LSC*:
  ID_VENDOR_FROM_DATABASE=LifeSize Communications
-@@ -4228,6 +4290,9 @@
+@@ -4222,6 +4284,9 @@
 acpi:MCX*:
  ID_VENDOR_FROM_DATABASE=Millson Custom Solutions Inc.
@ -284,7 +284,7 @@
 acpi:MDA*:
  ID_VENDOR_FROM_DATABASE=Media4 Inc
-@@ -4468,6 +4533,9 @@
+@@ -4462,6 +4527,9 @@
 acpi:MOM*:
  ID_VENDOR_FROM_DATABASE=Momentum Data Systems
@ -294,7 +294,7 @@
 acpi:MOS*:
  ID_VENDOR_FROM_DATABASE=Moses Corporation
-@@ -4696,6 +4764,9 @@
+@@ -4690,6 +4758,9 @@
 acpi:NAL*:
  ID_VENDOR_FROM_DATABASE=Network Alchemy
@ -304,7 +304,7 @@
 acpi:NAT*:
  ID_VENDOR_FROM_DATABASE=NaturalPoint Inc.
-@@ -5206,6 +5277,9 @@
+@@ -5197,6 +5268,9 @@
 acpi:PCX*:
  ID_VENDOR_FROM_DATABASE=PC Xperten
@ -314,7 +314,7 @@
 acpi:PDM*:
  ID_VENDOR_FROM_DATABASE=Psion Dacom Plc.
-@@ -5269,9 +5343,6 @@
+@@ -5260,9 +5334,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
-@@ -5359,9 +5430,6 @@
+@@ -5350,9 +5421,6 @@
 acpi:PNL*:
  ID_VENDOR_FROM_DATABASE=Panelview, Inc.
@ -334,7 +334,7 @@
 acpi:PNR*:
  ID_VENDOR_FROM_DATABASE=Planar Systems, Inc.
-@@ -5497,15 +5565,9 @@
+@@ -5488,15 +5556,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
-@@ -5821,9 +5883,6 @@
+@@ -5812,9 +5874,6 @@
 acpi:RTI*:
  ID_VENDOR_FROM_DATABASE=Rancho Tech Inc
@ -360,7 +360,7 @@
 acpi:RTL*:
  ID_VENDOR_FROM_DATABASE=Realtek Semiconductor Company Ltd
-@@ -5989,9 +6048,6 @@
+@@ -5980,9 +6039,6 @@
 acpi:SEE*:
  ID_VENDOR_FROM_DATABASE=SeeColor Corporation
@ -370,7 +370,7 @@
 acpi:SEI*:
  ID_VENDOR_FROM_DATABASE=Seitz & Associates Inc
-@@ -6451,6 +6507,9 @@
+@@ -6442,6 +6498,9 @@
 acpi:SVD*:
  ID_VENDOR_FROM_DATABASE=SVD Computer
@ -380,7 +380,7 @@
 acpi:SVI*:
  ID_VENDOR_FROM_DATABASE=Sun Microsystems
-@@ -6535,6 +6594,9 @@
+@@ -6526,6 +6585,9 @@
 acpi:SZM*:
  ID_VENDOR_FROM_DATABASE=Shenzhen MTC Co., Ltd
@ -390,7 +390,7 @@
 acpi:TAA*:
  ID_VENDOR_FROM_DATABASE=Tandberg
-@@ -6625,6 +6687,9 @@
+@@ -6616,6 +6678,9 @@
 acpi:TDG*:
  ID_VENDOR_FROM_DATABASE=Six15 Technologies
@ -400,7 +400,7 @@
 acpi:TDM*:
  ID_VENDOR_FROM_DATABASE=Tandem Computer Europe Inc
-@@ -6667,6 +6732,9 @@
+@@ -6658,6 +6723,9 @@
 acpi:TEV*:
  ID_VENDOR_FROM_DATABASE=Televés, S.A.
@ -410,7 +410,7 @@
 acpi:TEZ*:
  ID_VENDOR_FROM_DATABASE=Tech Source Inc.
-@@ -6787,9 +6855,6 @@
+@@ -6778,9 +6846,6 @@
 acpi:TNC*:
  ID_VENDOR_FROM_DATABASE=TNC Industrial Company Ltd
@ -420,7 +420,7 @@
 acpi:TNM*:
  ID_VENDOR_FROM_DATABASE=TECNIMAGEN SA
-@@ -7096,14 +7161,14 @@
+@@ -7087,14 +7152,14 @@
 acpi:UNC*:
  ID_VENDOR_FROM_DATABASE=Unisys Corporation
@ -441,7 +441,7 @@
 acpi:UNI*:
  ID_VENDOR_FROM_DATABASE=Uniform Industry Corp.
-@@ -7138,6 +7203,9 @@
+@@ -7129,6 +7194,9 @@
 acpi:USA*:
  ID_VENDOR_FROM_DATABASE=Utimaco Safeware AG
@ -451,7 +451,7 @@
 acpi:USD*:
  ID_VENDOR_FROM_DATABASE=U.S. Digital Corporation
-@@ -7384,9 +7452,6 @@
+@@ -7375,9 +7443,6 @@
 acpi:WAL*:
  ID_VENDOR_FROM_DATABASE=Wave Access
@ -461,7 +461,7 @@
 acpi:WAV*:
  ID_VENDOR_FROM_DATABASE=Wavephore
-@@ -7511,7 +7576,7 @@
+@@ -7502,7 +7567,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.
-@@ -7525,9 +7590,6 @@
+@@ -7516,9 +7581,6 @@
 acpi:XDM*:
  ID_VENDOR_FROM_DATABASE=XDM Ltd.
@ -480,7 +480,7 @@
 acpi:XES*:
  ID_VENDOR_FROM_DATABASE=Extreme Engineering Solutions, Inc.
-@@ -7558,9 +7620,6 @@
+@@ -7549,9 +7611,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
-@@ -7627,6 +7686,9 @@
+@@ -7618,6 +7677,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
@ -2708,9 +2708,6 @@ pci:v00001002d000015D8*
 pci:v00001002d000015D8sv0000103Csd00008615*
 ID_MODEL_FROM_DATABASE=Picasso (Pavilion Laptop 15-cw1xxx)
 pci:v00001002d000015D8sv000017AAsd00003181*
 ID_MODEL_FROM_DATABASE=Picasso (ThinkCentre M75n IoT)
 pci:v00001002d000015D8sv000017AAsd00005124*
 ID_MODEL_FROM_DATABASE=Picasso (ThinkPad E595)
@ -10709,9 +10706,6 @@ pci:v00001002d000073DF*
 pci:v00001002d000073E0*
 ID_MODEL_FROM_DATABASE=Navi 23
 pci:v00001002d000073E1*
 ID_MODEL_FROM_DATABASE=Navi 23
 pci:v00001002d000073FF*
 ID_MODEL_FROM_DATABASE=Navi 23 [Radeon RX 6600/6600 XT]
@ -20453,9 +20447,6 @@ pci:v0000106Bd00000004*
 pci:v0000106Bd00000007*
 ID_MODEL_FROM_DATABASE=O'Hare I/O
 pci:v0000106Bd0000000B*
 ID_MODEL_FROM_DATABASE=Apple Camera
 pci:v0000106Bd0000000C*
 ID_MODEL_FROM_DATABASE=DOS on Mac
@ -36203,14 +36194,11 @@ pci:v000010DEd000021C4*
 pci:v000010DEd000021D1*
 ID_MODEL_FROM_DATABASE=TU116BM [GeForce GTX 1660 Ti Mobile]
 pci:v000010DEd00002200*
 ID_MODEL_FROM_DATABASE=GA102
 pci:v000010DEd00002204*
 ID_MODEL_FROM_DATABASE=GA102 [GeForce RTX 3090]
 pci:v000010DEd00002205*
- ID_MODEL_FROM_DATABASE=GA102 [GeForce RTX 3080 20GB]
+ ID_MODEL_FROM_DATABASE=GA102 [GeForce RTX 3080 Ti]
 pci:v000010DEd00002206*
 ID_MODEL_FROM_DATABASE=GA102 [GeForce RTX 3080]
@ -36236,27 +36224,18 @@ pci:v000010DEd0000222F*
 pci:v000010DEd00002230*
 ID_MODEL_FROM_DATABASE=GA102GL [RTX A6000]
 pci:v000010DEd00002231*
 ID_MODEL_FROM_DATABASE=GA102GL
 pci:v000010DEd00002235*
 ID_MODEL_FROM_DATABASE=GA102GL [RTX A40]
 pci:v000010DEd00002236*
 ID_MODEL_FROM_DATABASE=GA102GL
 pci:v000010DEd00002237*
 ID_MODEL_FROM_DATABASE=GA102GL
 pci:v000010DEd0000223F*
 ID_MODEL_FROM_DATABASE=GA102GL
 pci:v000010DEd0000228B*
 ID_MODEL_FROM_DATABASE=GA104 High Definition Audio Controller
 pci:v000010DEd00002302*
 ID_MODEL_FROM_DATABASE=GA103
 pci:v000010DEd00002321*
 ID_MODEL_FROM_DATABASE=GA103
@ -56205,34 +56184,34 @@ pci:v000014E4d0000165Esv000010CFsd00001279*
 ID_MODEL_FROM_DATABASE=NetXtreme BCM5705M_2 Gigabit Ethernet (LifeBook E8010D)
 pci:v000014E4d0000165F*
- ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 Gigabit Ethernet PCIe
+ ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
 pci:v000014E4d0000165Fsv00001028sd000004F7*
- ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 Gigabit Ethernet PCIe (PowerEdge R320 server)
+ ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 2-port Gigabit Ethernet PCIe (PowerEdge R320 server)
 pci:v000014E4d0000165Fsv00001028sd000008FD*
- ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 Gigabit Ethernet PCIe (PowerEdge R6515/R7515 LOM)
+ ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 2-port Gigabit Ethernet PCIe (PowerEdge R6515/R7515 LOM)
 pci:v000014E4d0000165Fsv00001028sd000008FF*
- ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 Gigabit Ethernet PCIe (PowerEdge Rx5xx LOM Board)
+ ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 2-port Gigabit Ethernet PCIe (PowerEdge Rx5xx LOM Board)
 pci:v000014E4d0000165Fsv00001028sd00000900*
- ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 Gigabit Ethernet PCIe (PowerEdge C6525 LOM)
+ ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 2-port Gigabit Ethernet PCIe (PowerEdge C6525 LOM)
 pci:v000014E4d0000165Fsv0000103Csd00001786*
- ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 Gigabit Ethernet PCIe (NC332T Adapter)
+ ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 2-port Gigabit Ethernet PCIe (NC332T Adapter)
 pci:v000014E4d0000165Fsv0000103Csd0000193D*
- ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 Gigabit Ethernet PCIe (NC332i Adapter)
+ ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 2-port Gigabit Ethernet PCIe (NC332i Adapter)
 pci:v000014E4d0000165Fsv0000103Csd00002133*
- ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 Gigabit Ethernet PCIe (NC332i Adapter)
+ ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 2-port Gigabit Ethernet PCIe (NC332i Adapter)
 pci:v000014E4d0000165Fsv0000103Csd000022E8*
- ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 Gigabit Ethernet PCIe (NC332i Adapter)
+ ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 2-port Gigabit Ethernet PCIe (NC332i Adapter)
 pci:v000014E4d0000165Fsv0000103Csd000022EB*
- ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 Gigabit Ethernet PCIe (NC332i Adapter)
+ ID_MODEL_FROM_DATABASE=NetXtreme BCM5720 2-port Gigabit Ethernet PCIe (NC332i Adapter)
 pci:v000014E4d00001662*
 ID_MODEL_FROM_DATABASE=NetXtreme II BCM57712 10 Gigabit Ethernet
@ -56906,9 +56885,6 @@ pci:v000014E4d000016D5*
 pci:v000014E4d000016D6*
 ID_MODEL_FROM_DATABASE=BCM57412 NetXtreme-E 10Gb RDMA Ethernet Controller
 pci:v000014E4d000016D6sv000014E4sd00001202*
 ID_MODEL_FROM_DATABASE=BCM57412 NetXtreme-E 10Gb RDMA Ethernet Controller (BCM957412M4122C OCP 1x25G Type1 wRoCE)
 pci:v000014E4d000016D6sv000014E4sd00004120*
 ID_MODEL_FROM_DATABASE=BCM57412 NetXtreme-E 10Gb RDMA Ethernet Controller (NetXtreme E-Series Advanced Dual-port 10Gb SFP+ Ethernet Network Daughter Card)
@ -56924,6 +56900,9 @@ pci:v000014E4d000016D6sv0000152Dsd00008B22*
 pci:v000014E4d000016D7*
 ID_MODEL_FROM_DATABASE=BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller
 pci:v000014E4d000016D7sv000014E4sd00001202*
 ID_MODEL_FROM_DATABASE=BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller (BCM957412M4122C OCP 1x25G Type1 wRoCE)
 pci:v000014E4d000016D7sv000014E4sd00001402*
 ID_MODEL_FROM_DATABASE=BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller (BCM957414A4142CC 10Gb/25Gb Ethernet PCIe)
@ -59417,9 +59396,6 @@ pci:v00001542d00009271*
 pci:v00001542d00009272*
 ID_MODEL_FROM_DATABASE=Pulse Width Modulator Card
 pci:v00001542d00009273*
 ID_MODEL_FROM_DATABASE=RCIM-IV Real-Time Clock & Interrupt Module (PCIe)
 pci:v00001542d00009277*
 ID_MODEL_FROM_DATABASE=5 Volt Delta Sigma Converter Card
@ -60284,18 +60260,9 @@ pci:v000015B3d00001015sv000015B3sd00000025*
 pci:v000015B3d00001015sv0000193Dsd0000100A*
 ID_MODEL_FROM_DATABASE=MT27710 Family [ConnectX-4 Lx] (620F-B)
 pci:v000015B3d00001015sv0000193Dsd00001023*
 ID_MODEL_FROM_DATABASE=MT27710 Family [ConnectX-4 Lx] (NIC-ETH540F-LP-2P)
 pci:v000015B3d00001015sv0000193Dsd00001031*
 ID_MODEL_FROM_DATABASE=MT27710 Family [ConnectX-4 Lx] (NIC-ETH640i-Mb-2x25G)
 pci:v000015B3d00001015sv0000193Dsd00001083*
 ID_MODEL_FROM_DATABASE=MT27710 Family [ConnectX-4 Lx] (NIC-ETH640F-3S-2P)
 pci:v000015B3d00001015sv0000193Dsd00001084*
 ID_MODEL_FROM_DATABASE=MT27710 Family [ConnectX-4 Lx] (NIC-ETH540F-3S-2P)
 pci:v000015B3d00001016*
 ID_MODEL_FROM_DATABASE=MT27710 Family [ConnectX-4 Lx Virtual Function]
@ -63578,9 +63545,6 @@ pci:v000017A0d0000E763*
 pci:v000017AA*
 ID_VENDOR_FROM_DATABASE=Lenovo
 pci:v000017AAd00003181*
 ID_MODEL_FROM_DATABASE=ThinkCentre M75n IoT
 pci:v000017AAd0000402B*
 ID_MODEL_FROM_DATABASE=Intel 82599ES 10Gb 2-port Server Adapter X520-2
@ -68147,18 +68111,6 @@ pci:v00001BD0d00001004*
 pci:v00001BD0d00001005*
 ID_MODEL_FROM_DATABASE=PE1000 (Multi-Protocol PCIe/104 Interface Card)
 pci:v00001BD0d00001006*
 ID_MODEL_FROM_DATABASE=webCS Wireless Aircraft Communications Server
 pci:v00001BD0d00001007*
 ID_MODEL_FROM_DATABASE=AB3000 Series Rugged Computer (Series N)
 pci:v00001BD0d00001008*
 ID_MODEL_FROM_DATABASE=ME1000 mPCIe Avionics Interface Card
 pci:v00001BD0d0000100A*
 ID_MODEL_FROM_DATABASE=NG1 Series Avionics Converter
 pci:v00001BD0d00001101*
 ID_MODEL_FROM_DATABASE=OmniBus II PCIe Multi-Protocol Interface Card
@ -68168,18 +68120,6 @@ pci:v00001BD0d00001102*
 pci:v00001BD0d00001103*
 ID_MODEL_FROM_DATABASE=OmniBus II cPCIe/PXIe Multi-Protocol Interface Card
 pci:v00001BD0d00001200*
 ID_MODEL_FROM_DATABASE=NG3 Series Mil-Std-1553 Interface
 pci:v00001BD0d00001201*
 ID_MODEL_FROM_DATABASE=NG3 Series ARINC 429 Interface
 pci:v00001BD0d00001202*
 ID_MODEL_FROM_DATABASE=NG3 Series Avionics Discrete & Serial Interface
 pci:v00001BD0d00001203*
 ID_MODEL_FROM_DATABASE=NG3 Series Avionics Discrete Interface
 pci:v00001BD4*
 ID_VENDOR_FROM_DATABASE=Inspur Electronic Information Industry Co., Ltd.
@ -68276,9 +68216,6 @@ pci:v00001C1Fd0000001C*
 pci:v00001C1Fd0000001D*
 ID_MODEL_FROM_DATABASE=Vega
 pci:v00001C1Fd0000001F*
 ID_MODEL_FROM_DATABASE=FD940
 pci:v00001C28*
 ID_VENDOR_FROM_DATABASE=Lite-On IT Corp. / Plextor
@ -68699,9 +68636,6 @@ pci:v00001CE4d0000000A*
 pci:v00001CE4d0000000B*
 ID_MODEL_FROM_DATABASE=ExaNIC V9P
 pci:v00001CE4d0000000C*
 ID_MODEL_FROM_DATABASE=ExaNIC V9P-3
 pci:v00001CE4d00000100*
 ID_MODEL_FROM_DATABASE=ExaDISK FX1
@ -70800,7 +70734,7 @@ pci:v00004348d00007173*
 ID_MODEL_FROM_DATABASE=CH355 PCI Quad Serial Port Controller
 pci:v0000434E*
- ID_VENDOR_FROM_DATABASE=Cornelis Networks
+ ID_VENDOR_FROM_DATABASE=CAST Navigation LLC
 pci:v000043BC*
 ID_VENDOR_FROM_DATABASE=Tiger Lake-H PCIe Root Port #5
@ -74228,12 +74162,6 @@ pci:v00008086d00000B60sv00001028sd00002104*
 pci:v00008086d00000B60sv00008086sd00008008*
 ID_MODEL_FROM_DATABASE=NVMe DC SSD [3DNAND, Sentinel Rock Controller] (NVMe Datacenter SSD [3DNAND] SE 2.5" U.2 (P5510))
 pci:v00008086d00000B60sv00008086sd00008D08*
 ID_MODEL_FROM_DATABASE=NVMe DC SSD [3DNAND, Sentinel Rock Controller] (NVMe Datacenter SSD [3DNAND] VE 2.5" U.2 (P5316))
 pci:v00008086d00000B60sv00008086sd00008D1D*
 ID_MODEL_FROM_DATABASE=NVMe DC SSD [3DNAND, Sentinel Rock Controller] (NVMe Datacenter SSD [3DNAND] VE E1.L 9.5/18mm (P5316))
 pci:v00008086d00000BE0*
 ID_MODEL_FROM_DATABASE=Atom Processor D2xxx/N2xxx Integrated Graphics Controller
@ -77594,9 +77522,6 @@ pci:v00008086d00001521sv0000193Dsd00001005*
 pci:v00008086d00001521sv0000193Dsd00001007*
 ID_MODEL_FROM_DATABASE=I350 Gigabit Network Connection (360T-L)
 pci:v00008086d00001521sv0000193Dsd00001080*
 ID_MODEL_FROM_DATABASE=I350 Gigabit Network Connection (NIC-ETH360T-3S-4P)
 pci:v00008086d00001521sv00001BD4sd0000001D*
 ID_MODEL_FROM_DATABASE=I350 Gigabit Network Connection (1G base-T QP EP014Ti1 Adapter)
@ -78116,9 +78041,6 @@ pci:v00008086d00001572sv0000193Dsd00001020*
 pci:v00008086d00001572sv0000193Dsd00001021*
 ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (NIC-ETH561F-sL-2x10G)
 pci:v00008086d00001572sv0000193Dsd00001081*
 ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (NIC-ETH561F-3S-2P)
 pci:v00008086d00001572sv000019E5sd0000D11C*
 ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet 2-port X710 10Gb SFP+ Adapter SP330)
@ -78869,9 +78791,6 @@ pci:v00008086d000015FFsv00001137sd000002D9*
 pci:v00008086d000015FFsv00001137sd000002DA*
 ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GBASE-T (Ethernet Network Adapter X710-T4L OCP 3.0)
 pci:v00008086d000015FFsv0000193Dsd00001082*
 ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GBASE-T (NIC-ETH565T-3S-2P)
 pci:v00008086d000015FFsv00008086sd00000000*
 ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GBASE-T (Ethernet Network Adapter X710-TL)
@ -91898,9 +91817,6 @@ pci:v00008086d000043ED*
 pci:v00008086d000043EF*
 ID_MODEL_FROM_DATABASE=Tiger Lake-H Shared SRAM
 pci:v00008086d000043F0*
 ID_MODEL_FROM_DATABASE=Wi-Fi 6 AX201
 pci:v00008086d0000444E*
 ID_MODEL_FROM_DATABASE=Turbo Memory Controller
@ -94158,7 +94074,7 @@ pci:v00008086d000096A1*
 ID_MODEL_FROM_DATABASE=Integrated RAID
 pci:v00008086d00009A01*
- ID_MODEL_FROM_DATABASE=11th Gen Core Processor PCIe Controller #1
+ ID_MODEL_FROM_DATABASE=11th Gen Core Processor PCIe Controller
 pci:v00008086d00009A03*
 ID_MODEL_FROM_DATABASE=TigerLake-LP Dynamic Tuning Processor Participant
@ -94172,9 +94088,6 @@ pci:v00008086d00009A0B*
 pci:v00008086d00009A0D*
 ID_MODEL_FROM_DATABASE=Tiger Lake-LP Telemetry Aggregator
 pci:v00008086d00009A0F*
 ID_MODEL_FROM_DATABASE=11th Gen Core Processor PCIe Controller #0
 pci:v00008086d00009A11*
 ID_MODEL_FROM_DATABASE=GNA Scoring Accelerator module
@ -95981,9 +95894,6 @@ pci:v00008086d0000A324sv00001028sd00000869*
 pci:v00008086d0000A328*
 ID_MODEL_FROM_DATABASE=Cannon Lake PCH Serial IO UART Host Controller
 pci:v00008086d0000A32B*
 ID_MODEL_FROM_DATABASE=Cannon Lake PCH SPI Host Controller
 pci:v00008086d0000A32C*
 ID_MODEL_FROM_DATABASE=Cannon Lake PCH PCI Express Root Port #21
--- a/hwdb.d/60-autosuspend-fingerprint-reader.hwdb
+++ b/hwdb.d/60-autosuspend-fingerprint-reader.hwdb
@ -199,10 +199,6 @@ usb:v138Ap0017*
 usb:v138Ap0018*
 ID_AUTOSUSPEND=1
 # Supported by libfprint driver vfs7552
 usb:v138Ap0091*
 ID_AUTOSUSPEND=1
 # Known unsupported devices
 usb:v04F3p036B*
 usb:v04F3p0C00*
@ -241,6 +237,7 @@ usb:v138Ap003C*
 usb:v138Ap003D*
 usb:v138Ap003F*
 usb:v138Ap0090*
 usb:v138Ap0091*
 usb:v138Ap0092*
 usb:v138Ap0094*
 usb:v138Ap0097*
--- a/hwdb.d/ma-large.txt
+++ b/hwdb.d/ma-large.txt
@ -35663,90 +35663,6 @@ A45590     (base 16)		Xiaomi Communications Co Ltd
 				Seongnam-si  Gyeonggi-do  13590
 				KR
 4C-71-67   (hex)		PoLabs d.o.o.
 4C7167     (base 16)		PoLabs d.o.o.
 				Volavlje 30
 				Ljubljana    1000
 				SI
 04-71-53   (hex)		SERNET (SUZHOU) TECHNOLOGIES CORPORATION
 047153     (base 16)		SERNET (SUZHOU) TECHNOLOGIES CORPORATION
 				NO.8 Tangzhuang Road,Suzhou Industrial Park,Su ZhouCity,JiangSu Province,China
 				Suzhou    215021
 				CN
 48-E7-DA   (hex)		AzureWave Technology Inc.
 48E7DA     (base 16)		AzureWave Technology Inc.
 				8F., No. 94, Baozhong Rd.
 				New Taipei City  Taiwan  231
 				TW
 40-C4-8C   (hex)		N-iTUS CO.,LTD.
 40C48C     (base 16)		N-iTUS CO.,LTD.
 				NiTUS 85, Deokcheon-ro
 				Anyang-si  Gyeonggi-do, Korea  14086
 				KR
 48-22-18   (hex)		Shenzhen Yipingfang Network Technology Co., Ltd.
 482218     (base 16)		Shenzhen Yipingfang Network Technology Co., Ltd.
 				21 / F, Kangjia R & D building, No.28, Keji South 12th Road, Nanshan District, Shenzhen City, Guangdong Province, China
 				Shenzhen  Nanshan District  518000
 				CN
 E4-0C-FD   (hex)		GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 E40CFD     (base 16)		GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 				NO.18 HAIBIN ROAD,
 				DONG GUAN  GUANG DONG  523860
 				CN
 58-D6-97   (hex)		GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 58D697     (base 16)		GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 				NO.18 HAIBIN ROAD,
 				DONG GUAN  GUANG DONG  523860
 				CN
 54-37-BB   (hex)		Taicang T&W Electronics
 5437BB     (base 16)		Taicang T&W Electronics
 				89# Jiang Nan RD
 				Suzhou  Jiangsu  215412
 				CN
 60-F8-F2   (hex)		Synaptec
 60F8F2     (base 16)		Synaptec
 				204 George Street
 				Glasgow    G1 1XW
 				GB
 AC-74-B1   (hex)		Intel Corporate
 AC74B1     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
 				Kulim  Kedah  09000
 				MY
 30-A1-76   (hex)		Fiberhome Telecommunication Technologies Co.,LTD
 30A176     (base 16)		Fiberhome Telecommunication Technologies Co.,LTD
 				No.5 DongXin Road
 				Wuhan  Hubei  430074
 				CN
 F4-E4-51   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
 F4E451     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
 				Dongguan    523808
 				CN
 1C-3C-D4   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
 1C3CD4     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
 				Dongguan    523808
 				CN
 F4-60-77   (hex)		Texas Instruments
 F46077     (base 16)		Texas Instruments
 				12500 TI Blvd
 				Dallas  TX  75243
 				US
 9C-FF-C2   (hex)		AVI Systems GmbH
 9CFFC2     (base 16)		AVI Systems GmbH
 				Dr. Franz Wilhelmstraße 2A
@ -49082,6 +48998,12 @@ F48139     (base 16)		CANON INC.
 				Olathe  KS  66061
 				US
 A4-D0-94   (hex)		Erwin Peters Systemtechnik GmbH
 A4D094     (base 16)		Erwin Peters Systemtechnik GmbH
 				Josef Baumann Strasse 37
 				Bochum    D44805
 				DE
 88-23-64   (hex)		Watchnet DVR Inc
 882364     (base 16)		Watchnet DVR Inc
 				Unit 5 - 351 Ferrier St.
@ -70871,30 +70793,6 @@ B027CF     (base 16)		Extreme Networks, Inc.
 				Mountain View  CA  94043
 				US
 48-F8-FF   (hex)		CHENGDU KT ELECTRONIC HI-TECH CO.,LTD
 48F8FF     (base 16)		CHENGDU KT ELECTRONIC HI-TECH CO.,LTD
 				No.9, 3rd Wuke Road, Wuhou District
 				Chengdu  Sichuan Province  610045
 				CN
 E8-C1-E8   (hex)		Shenzhen Xiao Bi En Culture Education Technology Co.,Ltd.
 E8C1E8     (base 16)		Shenzhen Xiao Bi En Culture Education Technology Co.,Ltd.
 				4GH Unit,Block D,Central Avenue,Intersection of Xixiang Avenue and Baoyuan Road,Labor Community,Xixiang Street,Baoan District
 				Shenzhen  China  518102
 				CN
 2C-DD-E9   (hex)		Arista Networks
 2CDDE9     (base 16)		Arista Networks
 				5453 Great America Parkway
 				Santa Clara  CA  95054
 				US
 70-97-41   (hex)		Arcadyan Corporation
 709741     (base 16)		Arcadyan Corporation
 				No.8, Sec.2, Guangfu Rd.
 				Hsinchu City  Hsinchu  30071
 				TW
 C4-FF-22   (hex)		Huawei Device Co., Ltd.
 C4FF22     (base 16)		Huawei Device Co., Ltd.
 				No.2 of Xincheng Road, Songshan Lake Zone
@ -70919,114 +70817,6 @@ E408E7     (base 16)		Quectel Wireless Solutions Co.,Ltd.
 				Shanghai    200233
 				CN
 7C-70-DB   (hex)		Intel Corporate
 7C70DB     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
 				Kulim  Kedah  09000
 				MY
 8C-94-CC   (hex)		SFR
 8C94CC     (base 16)		SFR
 				12 rue jean-philippe Rameau CS 80001
 				La plaine saint denis   FRANCE  93634
 				FR
 60-DB-15   (hex)		New H3C Technologies Co., Ltd
 60DB15     (base 16)		New H3C Technologies Co., Ltd
 				466 Changhe Road, Binjiang District
 				Hangzhou  Zhejiang  310052
 				CN
 5C-A7-21   (hex)		New H3C Technologies Co., Ltd
 5CA721     (base 16)		New H3C Technologies Co., Ltd
 				466 Changhe Road, Binjiang District
 				Hangzhou  Zhejiang  310052
 				CN
 98-F2-17   (hex)		Castlenet Technology Inc.
 98F217     (base 16)		Castlenet Technology Inc.
 				5F., No. 10, Daye Rd., Beitou Dist.
 				Taipei City    112030
 				TW
 6C-43-3C   (hex)		TECNO MOBILE LIMITED
 6C433C     (base 16)		TECNO MOBILE LIMITED
 				ROOMS 05-15, 13A/F., SOUTH TOWER, WORLD FINANCE CENTRE, HARBOUR CITY, 17 CANTON ROAD, TSIM SHA TSUI, KOWLOON, HONG KONG
 				Hong Kong  Hong Kong  999077
 				HK
 44-5B-ED   (hex)		Aruba, a Hewlett Packard Enterprise Company
 445BED     (base 16)		Aruba, a Hewlett Packard Enterprise Company
 				3333 Scott Blvd
 				Santa Clara  CA  95054
 				US
 70-A6-CC   (hex)		Intel Corporate
 70A6CC     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
 				Kulim  Kedah  09000
 				MY
 84-EB-EF   (hex)		Cisco Systems, Inc
 84EBEF     (base 16)		Cisco Systems, Inc
 				80 West Tasman Drive
 				San Jose  CA  94568
 				US
 90-80-60   (hex)		Nilfisk A/S
 908060     (base 16)		Nilfisk A/S
 				Kornmarksvej 1
 				Broendby     2605
 				DK
 60-B6-E1   (hex)		Texas Instruments
 60B6E1     (base 16)		Texas Instruments
 				12500 TI Blvd
 				Dallas  TX  75243
 				US
 6C-79-B8   (hex)		Texas Instruments
 6C79B8     (base 16)		Texas Instruments
 				12500 TI Blvd
 				Dallas  TX  75243
 				US
 A4-D0-94   (hex)		VIVAVIS AG
 A4D094     (base 16)		VIVAVIS AG
 				Nobelstr. 18
 				Ettlingen    D-76375
 				DE
 8C-A3-99   (hex)		SERVERCOM (INDIA) PRIVATE LIMITED
 8CA399     (base 16)		SERVERCOM (INDIA) PRIVATE LIMITED
 				E-43/1 OKHLA INDUSTRIAL AREA PHASE-II NEW DELHI SOUTH DELHI
 				NEW DELHI    NA
 				IN
 90-69-76   (hex)		Withrobot Inc.
 906976     (base 16)		Withrobot Inc.
 				#1001, Seoul Forest M-tower, 31, Ttukseom-ro 1-gil, Seongdong-gu
 				Seoul  Seoul  04778
 				KR
 FC-92-57   (hex)		Renesas Electronics (Penang) Sdn. Bhd.
 FC9257     (base 16)		Renesas Electronics (Penang) Sdn. Bhd.
 				Phase 3, Bayan Lepas FIZ
 				Bayan Lepas  Penang  11900
 				MY
 10-09-F9   (hex)		Amazon Technologies Inc.
 1009F9     (base 16)		Amazon Technologies Inc.
 				P.O Box 8102 
 				Reno  NV  89507
 				US
 D0-3E-7D   (hex)		CHIPSEA TECHNOLOGIES (SHENZHEN) CORP.
 D03E7D     (base 16)		CHIPSEA TECHNOLOGIES (SHENZHEN) CORP.
 				9F,BLOCK A,GARDEN CITY DIGITAL BUILDING,NO.1079 NANHAI ROAD,NANSHAN DISTRICT
 				SHEN ZHEN  GUANG DONG  518000
 				CN
 84-80-94   (hex)		Meter, Inc.
 848094     (base 16)		Meter, Inc.
 				148 Townsend St
@ -106601,89 +106391,35 @@ B0A7B9     (base 16)		TP-Link Corporation Limited
 				Mountain View  CA  94043
 				US
 B8-25-B5   (hex)		Trakm8 Ltd
 B825B5     (base 16)		Trakm8 Ltd
 				4 Roman Park, Roman Way
 				Coleshill   West Midlands  B46 1HG
 				GB
 20-D2-76   (hex)		ITEL MOBILE LIMITED
 20D276     (base 16)		ITEL MOBILE LIMITED
 				RM B3 & B4 BLOCK B, KO FAI INDUSTRIAL BUILDING  NO.7 KO FAI ROAD, YAU TONG, KLN, H.K
 				Hong Kong  KOWLOON  999077
 				HK
 08-A8-42   (hex)		Huawei Device Co., Ltd.
 08A842     (base 16)		Huawei Device Co., Ltd.
 				No.2 of Xincheng Road, Songshan Lake Zone
 				Dongguan  Guangdong  523808
 				CN
 C8-F5-D6   (hex)		IEEE Registration Authority
 C8F5D6     (base 16)		IEEE Registration Authority
 				445 Hoes Lane
 				Piscataway  NJ  08554
 				US
 40-58-99   (hex)		Logitech Far East
 405899     (base 16)		Logitech Far East
 				#2 Creation Rd. 4,
 				Hsinchu    300
 				TW
 8C-4D-EA   (hex)		Cerio Corporation
 8C4DEA     (base 16)		Cerio Corporation
 				4F.-3., No.192, Sec. 2, Zhongxing Rd., Xindian Dist.
 				New Taipei City    231
 				TW
-98-43-FA   (hex)		Intel Corporate
+B8-25-B5   (hex)		Trakm8 Ltd
-9843FA     (base 16)		Intel Corporate
+B825B5     (base 16)		Trakm8 Ltd
-				Lot 8, Jalan Hi-Tech 2/3  
+				4 Roman Park, Roman Way
-				Kulim  Kedah  09000
+				Coleshill   West Midlands  B46 1HG
-				MY
+				GB
-94-AA-0A   (hex)		Fiberhome Telecommunication Technologies Co.,LTD
+08-A8-42   (hex)		Huawei Device Co., Ltd.
-94AA0A     (base 16)		Fiberhome Telecommunication Technologies Co.,LTD
+08A842     (base 16)		Huawei Device Co., Ltd.
-				No.5 DongXin Road
+				No.2 of Xincheng Road, Songshan Lake Zone
-				Wuhan  Hubei  430074
+				Dongguan  Guangdong  523808
 				CN
-7C-F4-62   (hex)		BEIJING HUAWOO TECHNOLOGIES CO.LTD
+40-58-99   (hex)		Logitech Far East
-7CF462     (base 16)		BEIJING HUAWOO TECHNOLOGIES CO.LTD
+405899     (base 16)		Logitech Far East
-				A411-3, floor 3, block A, 9 Shangdi 3rd Street, Haidian District, Beijing
+				#2 Creation Rd. 4,
-				beijing    100094
+				Hsinchu    300
-				CN
+				TW
 04-B9-E3   (hex)		Samsung Electronics Co.,Ltd
 04B9E3     (base 16)		Samsung Electronics Co.,Ltd
 				129, Samsung-ro, Youngtongl-Gu
 				Suwon  Gyeonggi-Do  16677
 				KR
 C4-5E-5C   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
 C45E5C     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
 				Dongguan    523808
 				CN
 E8-5C-0A   (hex)		Cisco Systems, Inc
 E85C0A     (base 16)		Cisco Systems, Inc
 				80 West Tasman Drive
 				San Jose  CA  94568
 				US
 70-B9-50   (hex)		Texas Instruments
 70B950     (base 16)		Texas Instruments
 				12500 TI Blvd
 				Dallas  TX  75243
 				US
 D0-9F-D9   (hex)		IEEE Registration Authority
 D09FD9     (base 16)		IEEE Registration Authority
 				445 Hoes Lane
 				Piscataway  NJ  08554
 				US
 F8-D0-27   (hex)		Seiko Epson Corporation
 F8D027     (base 16)		Seiko Epson Corporation
@ -142049,6 +141785,30 @@ B81332     (base 16)		AMPAK Technology,Inc.
 				Beijing    100053
 				CN
 AC-97-6C   (hex)		Greenliant
 AC976C     (base 16)		Greenliant
 				3970 Freedom Circle, Suite 100
 				Santa Clara  CA  95054
 				US
 2C-EA-DC   (hex)		ASKEY COMPUTER CORP
 2CEADC     (base 16)		ASKEY COMPUTER CORP
 				10F,No.119,JIANKANG RD,ZHONGHE DIST
 				NEW TAIPEI  TAIWAN  23585
 				TW
 38-14-28   (hex)		Dell Inc.
 381428     (base 16)		Dell Inc.
 				One Dell Way
 				Round Rock  TX  78682
 				US
 AC-E1-4F   (hex)		Autonomic Controls, Inc.
 ACE14F     (base 16)		Autonomic Controls, Inc.
 				28 Kaysal Ct
 				ARMONK  NY  10504
 				US
 44-DB-60   (hex)		Nanjing Baihezhengliu Technology Co., Ltd
 44DB60     (base 16)		Nanjing Baihezhengliu Technology Co., Ltd
 				Science and technology innovation center, Shiqiu street, Lishui District
@ -142073,114 +141833,6 @@ C478A2     (base 16)		Huawei Device Co., Ltd.
 				Dongguan  Guangdong  523808
 				CN
 0C-9A-3C   (hex)		Intel Corporate
 0C9A3C     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
 				Kulim  Kedah  09000
 				MY
 DC-21-48   (hex)		Intel Corporate
 DC2148     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
 				Kulim  Kedah  09000
 				MY
 74-CF-00   (hex)		Shenzhen SuperElectron Technology Co.,Ltd.
 74CF00     (base 16)		Shenzhen SuperElectron Technology Co.,Ltd.
 				1213-1214, haosheng business center, dongbin road, nanshan street, nanshan district, shenzhen city
 				Shenzhen  Guangdong  518000
 				CN
 2C-EA-DC   (hex)		ASKEY COMPUTER CORP
 2CEADC     (base 16)		ASKEY COMPUTER CORP
 				10F,No.119,JIANKANG RD,ZHONGHE DIST
 				NEW TAIPEI  TAIWAN  23585
 				TW
 AC-E1-4F   (hex)		Autonomic Controls, Inc.
 ACE14F     (base 16)		Autonomic Controls, Inc.
 				28 Kaysal Ct
 				ARMONK  NY  10504
 				US
 AC-97-6C   (hex)		Greenliant
 AC976C     (base 16)		Greenliant
 				3970 Freedom Circle, Suite 100
 				Santa Clara  CA  95054
 				US
 38-14-28   (hex)		Dell Inc.
 381428     (base 16)		Dell Inc.
 				One Dell Way
 				Round Rock  TX  78682
 				US
 98-49-9F   (hex)		Domo Tactical Communications
 98499F     (base 16)		Domo Tactical Communications
 				DTC Fusion 2, 1100 Parkway
 				Whiteley  Hampshire  PO15 7AB
 				GB
 C0-23-8D   (hex)		Samsung Electronics Co.,Ltd
 C0238D     (base 16)		Samsung Electronics Co.,Ltd
 				129, Samsung-ro, Youngtongl-Gu
 				Suwon  Gyeonggi-Do  16677
 				KR
 28-11-A8   (hex)		Intel Corporate
 2811A8     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
 				Kulim  Kedah  09000
 				MY
 20-CF-AE   (hex)		Cisco Systems, Inc
 20CFAE     (base 16)		Cisco Systems, Inc
 				80 West Tasman Drive
 				San Jose  CA  94568
 				US
 C0-FB-F9   (hex)		IEEE Registration Authority
 C0FBF9     (base 16)		IEEE Registration Authority
 				445 Hoes Lane
 				Piscataway  NJ  08554
 				US
 74-5D-68   (hex)		Fiberhome Telecommunication Technologies Co.,LTD
 745D68     (base 16)		Fiberhome Telecommunication Technologies Co.,LTD
 				No.5 DongXin Road
 				Wuhan  Hubei  430074
 				CN
 C0-F9-B0   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
 C0F9B0     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
 				Dongguan    523808
 				CN
 14-8C-4A   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
 148C4A     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
 				Dongguan    523808
 				CN
 60-9B-B4   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
 609BB4     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
 				Dongguan    523808
 				CN
 7C-27-BC   (hex)		Hui Zhou Gaoshengda Technology Co.,LTD
 7C27BC     (base 16)		Hui Zhou Gaoshengda Technology Co.,LTD
 				No.75,Zhongkai High-Tech Development District,Huizhou
 				Hui Zhou  Guangdong  516006
 				CN
 CC-15-31   (hex)		Intel Corporate
 CC1531     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
 				Kulim  Kedah  09000
 				MY
 7C-8A-E1   (hex)		COMPAL INFORMATION (KUNSHAN) CO., LTD. 
 7C8AE1     (base 16)		COMPAL INFORMATION (KUNSHAN) CO., LTD. 
 				NO. 25, THE 3RD Street KUNSHAN EXPORT PROCESSING ZONE 
@ -174809,6 +174461,12 @@ CCAB2C     (base 16)		HUMAX Co., Ltd.
 				Takarazuka  Hyogo  665-0051
 				JP
 24-E1-24   (hex)		 Xiamen Ursalink Technology Co., Ltd.
 24E124     (base 16)		 Xiamen Ursalink Technology Co., Ltd.
 				4/F, No. 63-2 Wanghai Road, 2nd Software Park
 				Xiamen  Fujian  361008
 				CN
 24-43-E2   (hex)		DASAN Network Solutions
 2443E2     (base 16)		DASAN Network Solutions
 				DASAN Tower 8F, 49 Daewangpangyo-ro644beon-gil Bundang-gu
@ -177580,99 +177238,3 @@ E8DA00     (base 16)		Kivo Technology, Inc.
 				218 Main Street, Suite #724
 				Kirkland    98033
 				US
 78-D6-DC   (hex)		Motorola (Wuhan) Mobility Technologies Communication Co., Ltd.
 78D6DC     (base 16)		Motorola (Wuhan) Mobility Technologies Communication Co., Ltd.
 				No.19, Gaoxin 4th Road, Wuhan East Lake High-tech Zone, Wuhan
 				Wuhan  Hubei  430000
 				CN
 0C-43-14   (hex)		Silicon Laboratories
 0C4314     (base 16)		Silicon Laboratories
 				400 West Cesar Chavez Street
 				Austin  TX  78701
 				US
 F4-C0-2F   (hex)		BlueBite
 F4C02F     (base 16)		BlueBite
 				230, Simin-daero
 				Anyang-si  Gyeonggi-do  14067
 				KR
 78-86-B6   (hex)		Shenzhen YOUHUA Technology Co., Ltd
 7886B6     (base 16)		Shenzhen YOUHUA Technology Co., Ltd
 				Room 407 Shenzhen University-town Business Park,Lishan Road,Taoyuan Street,Nanshan District
 				Shenzhen  Guangdong  518055
 				CN
 CC-B5-D1   (hex)		Beijing Xiaomi Mobile Software Co., Ltd
 CCB5D1     (base 16)		Beijing Xiaomi Mobile Software Co., Ltd
 				The Rainbow City Office Building, 68 Qinghe Middle Street Haidian District
 				Beijing  Beijing  100085
 				CN
 24-E1-24   (hex)		Xiamen Milesight IoT Co., Ltd.
 24E124     (base 16)		Xiamen Milesight IoT Co., Ltd.
 				4/F, No. 63-2 Wanghai Road, 2nd Software Park
 				Xiamen  Fujian  361008
 				CN
 28-FB-AE   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
 28FBAE     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
 				Dongguan    523808
 				CN
 88-A0-BE   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
 88A0BE     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
 				Dongguan    523808
 				CN
 A4-78-06   (hex)		Cisco Systems, Inc
 A47806     (base 16)		Cisco Systems, Inc
 				80 West Tasman Drive
 				San Jose  CA  94568
 				US
 D0-54-75   (hex)		SAVI Controls
 D05475     (base 16)		SAVI Controls
 				2420 Tarpley Rd, Suite 205
 				Carrollton  TX  75006
 				US
 08-05-E2   (hex)		Juniper Networks
 0805E2     (base 16)		Juniper Networks
 				1133 Innovation Way
 				Sunnyvale  CA  94089
 				US
 B8-D5-6B   (hex)		Mirka Ltd.
 B8D56B     (base 16)		Mirka Ltd.
 				Pensalavägen 210
 				Jeppo    66850
 				FI
 94-90-10   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
 949010     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
 				Dongguan    523808
 				CN
 98-F0-83   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
 98F083     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
 				Dongguan    523808
 				CN
 8C-64-A2   (hex)		OnePlus Technology (Shenzhen) Co., Ltd
 8C64A2     (base 16)		OnePlus Technology (Shenzhen) Co., Ltd
 				18C02, 18C03, 18C04 ,18C05,TAIRAN BUILDING,
 				Shenzhen  Guangdong  518000
 				CN
 20-3C-C0   (hex)		Beijing Tosee Technology Co., Ltd.
 203CC0     (base 16)		Beijing Tosee Technology Co., Ltd.
 				Room S125, 1st Floor, Building 1, No. 9, Keyuan Road, Economic Development Zone, Daxing District
 				beijing    102600 
 				CN
--- a/hwdb.d/ma-medium.txt
+++ b/hwdb.d/ma-medium.txt
@ -4421,36 +4421,12 @@ C8-F5-D6   (hex)		Valeo Interior Controls (Shenzhen) Co.,Ltd
 				Shenzhen  Guangzhong  518103
 				CN
 C0-FB-F9   (hex)		Dongmengling
 800000-8FFFFF     (base 16)		Dongmengling
 				Floor 1, pool-side building, Villa district, Jiuwei Xiange Musical Instrument Co. , Ltd. , Jiuwei community, Hangcheng Street, Bao 'an district
 				Shenzhen  Guangdong  518000
 				CN
 C8-F5-D6   (hex)		Qbic Technology Co., Ltd
 200000-2FFFFF     (base 16)		Qbic Technology Co., Ltd
 				26F.-12, No.99, Sec. 1, Xintai 5th Rd., Xizhi Dist.,
 				New Taipei     22175
 				TW
 C8-F5-D6   (hex)		EVOTOR LLC
 400000-4FFFFF     (base 16)		EVOTOR LLC
 				Timura Frunze Str., 24
 				Moscow    119021
 				RU
 C0-FB-F9   (hex)		IVT corporation
 600000-6FFFFF     (base 16)		IVT corporation
 				5/F, Zhongguancun Fazhan Building, No 12, Shangdi Xinxi Road, Haidian District, Beijing, 100085, P.R. CHINA
 				Beijing    100085
 				CN
 C0-FB-F9   (hex)		Dongguan Chuan OptoElectronics Limited
 200000-2FFFFF     (base 16)		Dongguan Chuan OptoElectronics Limited
 				No.43 Songshui Road,Songmushan Village, Dalang Town
 				Dongguan  Guangdong  523795
 				CN
 4C-4B-F9   (hex)		Shenzhen dingsheng technology co., LTD
 400000-4FFFFF     (base 16)		Shenzhen dingsheng technology co., LTD
 				Floor 3, building 5, kaijeda industrial zone, no.97, huaxing road, langkou community, dalang street, longhua district
@ -8531,30 +8507,6 @@ C8-F5-D6   (hex)		Pinmicro K K
 				Chiyoda Ku  Tokyo  1010051
 				JP
 D0-9F-D9   (hex)		Shenzhen eloT Technology Co.,Ltd
 D00000-DFFFFF     (base 16)		Shenzhen eloT Technology Co.,Ltd
 				North Wing of 2/F, Block 2, Viseen Technology & Business Park, No.43 Gaoxin South Ring Road
 				Shenzhen  Guangdong  518000
 				CN
 C0-FB-F9   (hex)		Tiandi(Changzhou) Automation Co., Ltd.
 A00000-AFFFFF     (base 16)		Tiandi(Changzhou) Automation Co., Ltd.
 				Tiandi(Changzhou) Automation Co., Ltd.
 				Changzhou  Jiangsu  213015
 				CN
 C0-FB-F9   (hex)		Navitas Digital Safety Ltd
 E00000-EFFFFF     (base 16)		Navitas Digital Safety Ltd
 				1ST FLOOR, 13  PHOENIX PARK 
 				COALVILLE  Leicestershire  LE673HB
 				GB
 D0-9F-D9   (hex)		Poten (Shanghai) Technology Co.,Ltd.
 400000-4FFFFF     (base 16)		Poten (Shanghai) Technology Co.,Ltd.
 				Rm.B,6th Fl., No.5, Caoxi Rd.251
 				Shanghai  Shanghai  200235
 				CN
 20-85-93   (hex)		UNILUMIN GROUP CO.,LTD
 300000-3FFFFF     (base 16)		UNILUMIN GROUP CO.,LTD
 				No.112 Yongfu Rd.,BaoanDistrict,
@ -12812,30 +12764,6 @@ D00000-DFFFFF     (base 16)		Volansys technologies pvt ltd
 				Ahmedabad  Gujarat  380015
 				IN
 C0-FB-F9   (hex)		HAGUENET
 500000-5FFFFF     (base 16)		HAGUENET
 				 Nieuwe Parklaan 17
 				The Hague    2597 LA
 				NL
 C0-FB-F9   (hex)		LIXIL Corporation
 100000-1FFFFF     (base 16)		LIXIL Corporation
 				2-1-1 Ojima, Koto-ku
 				Tokyo  Select Stat  136-8535
 				JP
 C0-FB-F9   (hex)		SHENZHEN COMIX HST CLOUD COMPUTING CO., LTD.
 B00000-BFFFFF     (base 16)		SHENZHEN COMIX HST CLOUD COMPUTING CO., LTD.
 				1408? Qiancheng Commercial Center, No. 5 Haicheng Road, Mabu Community, Xixiang Sub-district, Bao'an District
 				Shenzhen  Guangdong  518000
 				CN
 C0-FB-F9   (hex)		SHENZHEN HEQIANG ELECTRONICS LIMITED
 300000-3FFFFF     (base 16)		SHENZHEN HEQIANG ELECTRONICS LIMITED
 				ROOM F7, 6TH FLOOR, A1 BUILDING, RED BOX LOFT, NO. 3 SOUTH HUANCHENG ROAD, LONGGANG DISTRICT,
 				SHENZHEN  GUANGDONG  518129
 				CN
 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
@ -17024,30 +16952,6 @@ B00000-BFFFFF     (base 16)		United Barcode Systems
 				Vilassar de Mar  Barcelona  08340
 				ES
 C8-F5-D6   (hex)		Eltako GmbH
 C00000-CFFFFF     (base 16)		Eltako GmbH
 				Hofener Straße 54
 				Fellbach  BW  70736
 				DE
 C8-F5-D6   (hex)		Shanghai Mo xiang Network Technology CO.,Ltd
 900000-9FFFFF     (base 16)		Shanghai Mo xiang Network Technology CO.,Ltd
 				Room#418-421, ShaHeXiLi, 2-2 XiLi North Road, LiCheng Community, Xili Street, NanShan District
 				Shenzhen  Guangdong  518071
 				CN
 C0-FB-F9   (hex)		SHENZHEN ELSKY TECHNOLOGY CO., LTD
 C00000-CFFFFF     (base 16)		SHENZHEN ELSKY TECHNOLOGY CO., LTD
 				1F BUILDING 2# ASIA INDUSTIAL PARK BANTIAN STREET LONGGANG DISTRICT 
 				SHENZHEN  GUANGDONG  518000
 				CN
 C0-FB-F9   (hex)		Dropbeats Technology Co., Ltd.
 D00000-DFFFFF     (base 16)		Dropbeats Technology Co., Ltd.
 				Room 304, Building 4?Juli Road ? Pudong New District
 				Shanghai  Shanghai  201203
 				CN
 20-85-93   (hex)		Great Lite International
 700000-7FFFFF     (base 16)		Great Lite International
 				11F., No.207-2, Sec. 3, Beixin Rd., Xindian Dist.,
@ -21353,44 +21257,8 @@ C8-F5-D6   (hex)		MEIRYO TECHNICA CORPORATION
 				Owariasahi-city  Aichi  488-0052
 				JP
 C0-FB-F9   (hex)		 LongSung Technology (Shanghai) Co.,Ltd.   
 700000-7FFFFF     (base 16)		 LongSung Technology (Shanghai) Co.,Ltd.   
 				 Room 606, Block B, Bldg. 1, No. 3000 Longdong Avenue., Zhangjiang Hi-Tech Park, Pudong District
 				ShangHai    201203
 				CN
 C8-F5-D6   (hex)		HEITEC AG
 E00000-EFFFFF     (base 16)		HEITEC AG
 				Güterbahnhofstrasse 5
 				Erlangen  Please select state  91052
 				DE
 C8-F5-D6   (hex)		BBPOS International Limited
 300000-3FFFFF     (base 16)		BBPOS International Limited
 				Suite 1602, Tower 2, Nina Tower, 8 Yeung Uk Road, Tsuen Wan, NT
 				Hong Kong  China  00000
 				HK
 C0-FB-F9   (hex)		Minato Advanced Technologies inc
 400000-4FFFFF     (base 16)		Minato Advanced Technologies inc
 				4105, Minami Yamata-cho, Tsuzuki-ku,
 				YOKOHAMA  Kanagawa  224-0026
 				JP
 88-C9-B3   (hex)		Fortive Setra-ICG(Tianjin)Co.,Ltd
 300000-3FFFFF     (base 16)		Fortive Setra-ICG(Tianjin)Co.,Ltd
 				28 weiwu Road,Micro-electronics Industrial Park,Xiqing District Tianjin,P,R,China
 				Tianjin    300380
 				CN
 C0-FB-F9   (hex)		Xerox Corporation
 000000-0FFFFF     (base 16)		Xerox Corporation
 				800 Phillips Rd, Mailstop 0207-2Z
 				Webster  NY  14580
 				US
 C0-FB-F9   (hex)		zxsolution
 900000-9FFFFF     (base 16)		zxsolution
 				nanshan shenzhen
 				shenzhen    518000
 				CN
--- a/hwdb.d/ma-small.txt
+++ b/hwdb.d/ma-small.txt
@ -4967,6 +4967,12 @@ B70000-B70FFF     (base 16)		Torion Plasma Corporation
 				Ellicott City  MD  21043
 				US
 70-B3-D5   (hex)		Horizon Co., Ltd
 69B000-69BFFF     (base 16)		Horizon Co., Ltd
 				1600 Aza-Shironoshita Asahi
 				Shin Asahi-cho  Takashima, Shiga  520-1501
 				JP
 70-B3-D5   (hex)		Smart Systems LLC
 746000-746FFF     (base 16)		Smart Systems LLC
 				Flat 1, building 7, Izmalkova street
@ -5099,36 +5105,6 @@ EC0000-EC0FFF     (base 16)		ProtoConvert Pty Ltd
 				Hayward  CA  94545
 				US
 70-B3-D5   (hex)		Zumbach Electronic AG
 C19000-C19FFF     (base 16)		Zumbach Electronic AG
 				Hauptstrasse 93
 				Orpund  Bern  2552
 				CH
 70-B3-D5   (hex)		Lobaro GmbH
 E05000-E05FFF     (base 16)		Lobaro GmbH
 				Stadtdeich 7
 				Hamburg      20097
 				DE
 70-B3-D5   (hex)		LDA Audiotech
 685000-685FFF     (base 16)		LDA Audiotech
 				C/Severo Ochoa, 31
 				Malaga  Malaga  29590
 				ES
 70-B3-D5   (hex)		HORIZON.INC
 69B000-69BFFF     (base 16)		HORIZON.INC
 				1600 Aza-Shironoshita Asahi
 				Shin Asahi-cho  Takashima, Shiga  520-1501
 				JP
 70-B3-D5   (hex)		aelettronica group srl
 A14000-A14FFF     (base 16)		aelettronica group srl
 				via matteotti,22
 				gaggiano  milano  20083
 				IT
 70-B3-D5   (hex)		EVCO SPA
 A80000-A80FFF     (base 16)		EVCO SPA
 				VIA FELTRE N. 81
@ -10199,18 +10175,6 @@ F74000-F74FFF     (base 16)		TESSA AGRITECH SRL
 				Trento  Trento  38123
 				IT
 70-B3-D5   (hex)		CAR-connect GmbH
 81F000-81FFFF     (base 16)		CAR-connect GmbH
 				Am Egelingsberg 8
 				Leiferde  Niedersachsen  38542
 				DE
 70-B3-D5   (hex)		MBJ
 E03000-E03FFF     (base 16)		MBJ
 				Jochim-Klindt-Straße 7
 				Ahrensburg  Schleswig Holstein  22926
 				DE
 70-B3-D5   (hex)		System West dba ICS Electronics
 E06000-E06FFF     (base 16)		System West dba ICS Electronics
 				7034 Commerce Circle Suite A
@ -15212,24 +15176,6 @@ ED6000-ED6FFF     (base 16)		Metrasens Limited
 				Shenzhen City  Guangdong  518129
 				CN
 70-B3-D5   (hex)		DesignA Electronics Limited
 A63000-A63FFF     (base 16)		DesignA Electronics Limited
 				Unit 6
 				Christchurch  New Zealand  8011
 				NZ
 70-B3-D5   (hex)		Grayshift
 71F000-71FFFF     (base 16)		Grayshift
 				931 Monroe Dr NE, Suite A102-340
 				Atlanta  GA  30308
 				US
 70-B3-D5   (hex)		dongsheng
 AFD000-AFDFFF     (base 16)		dongsheng
 				No. 2, Sec. 2, Beiyi Rd., Xindian Dist.,
 				New Taipei City    231067
 				TW
 70-B3-D5   (hex)		YUYAMA MFG Co.,Ltd
 BBB000-BBBFFF     (base 16)		YUYAMA MFG Co.,Ltd
 				3-3-1
@ -20423,27 +20369,6 @@ B33000-B33FFF     (base 16)		Aplex Technology Inc.
 				Shenzhen City  Guangdong  518129
 				CN
 70-B3-D5   (hex)		FARHO DOMOTICA SL
 ACE000-ACEFFF     (base 16)		FARHO DOMOTICA SL
 				POLIGONO DE TABAZA II, NAVES 9-13
 				TABAZA  ASTURIAS  33439
 				ES
 70-B3-D5   (hex)		The Engineerix Group
 C71000-C71FFF     (base 16)		The Engineerix Group
 				1418 Beech Ave 119A
 				McAllen  TX  78501
 				US
 70-B3-D5   (hex)		Flextronics International Kft
 1BC000-1BCFFF     (base 16)		Flextronics International Kft
 				38. Zrinyi Str.
 				Zalaegerszeg  Zala  8900
 				HU
 70-B3-D5   (hex)		Private
 315000-315FFF     (base 16)		Private
 70-B3-D5   (hex)		DISMUNTEL SAL
 92C000-92CFFF     (base 16)		DISMUNTEL SAL
 				Pol ind cotes
@ -25394,6 +25319,12 @@ DEF000-DEFFFF     (base 16)		ISG Nordic AB
 				Seattle  WA  98104
 				US
 70-B3-D5   (hex)		PARAGON ID
 036000-036FFF     (base 16)		PARAGON ID
 				Les Aubépins
 				ARGENT SUR SAULDRE  CHER  18410
 				FR
 70-B3-D5   (hex)		Deep Secure Limited
 DD0000-DD0FFF     (base 16)		Deep Secure Limited
 				1 Nimrod House, Sandys Road
@ -25430,32 +25361,8 @@ EAA000-EAAFFF     (base 16)		Druck Ltd.
 				Neuilly sur Marne  Ile-de-France  93330
 				FR
 70-B3-D5   (hex)		Codewerk GmbH
 4D0000-4D0FFF     (base 16)		Codewerk GmbH
 				Siemensallee 75
 				Karlsruhe    76187 
 				DE
 70-B3-D5   (hex)		Orlaco Products B.V.
 333000-333FFF     (base 16)		Orlaco Products B.V.
 				Albert Plesmanstraat 42
 				Barneveld    3772MN
 				NL
 70-B3-D5   (hex)		ScopeSensor Oy
 DF7000-DF7FFF     (base 16)		ScopeSensor Oy
 				Teollisuustie 1
 				Haukipudas    90830
 				FI
 70-B3-D5   (hex)		KBPR LLC
 11E000-11EFFF     (base 16)		KBPR LLC
 				Raketny bulvar street 16
 				Moscow  Select State  129164
 				RU
 70-B3-D5   (hex)		Anello Photonics
 96A000-96AFFF     (base 16)		Anello Photonics
 				3964 Rivermark Plaza, Suite 144
 				Santa Clara  CA  95054
 				US
--- a/hwdb.d/pci.ids
+++ b/hwdb.d/pci.ids
@ -1,8 +1,8 @@
 #
 #	List of PCI ID's
 #
-#	Version: 2021.03.16
+#	Version: 2021.03.06
-#	Date:    2021-03-16 03:15:02
+#	Date:    2021-03-06 03:15:02
 #
 #	Maintained by Albert Pool, Martin Mares, and other volunteers from
 #	the PCI ID Project at https://pci-ids.ucw.cz/.
@ -960,7 +960,6 @@
 	1561  Anubis
 	15d8  Picasso
 		103c 8615  Pavilion Laptop 15-cw1xxx
 		17aa 3181  ThinkCentre M75n IoT
 		17aa 5124  ThinkPad E595
 		ea50 cc10  RXi2-BP
 	15dd  Raven Ridge [Radeon Vega Series / Radeon Vega Mobile Series]
@ -3644,7 +3643,6 @@
 	73c3  Navi 22
 	73df  Navi 22 [Radeon RX 6700/6700 XT]
 	73e0  Navi 23
 	73e1  Navi 23
 	73ff  Navi 23 [Radeon RX 6600/6600 XT]
 	7833  RS350 Host Bridge
 	7834  RS350 [Radeon 9100 PRO/XT IGP]
@ -6922,7 +6920,6 @@
 	0003  Control Video
 	0004  PlanB Video-In
 	0007  O'Hare I/O
 	000b  Apple Camera
 	000c  DOS on Mac
 	000e  Hydra Mac I/O
 	0010  Heathrow Mac I/O
@ -12217,9 +12214,8 @@
 	21c2  TU116
 	21c4  TU116 [GeForce GTX 1660 SUPER]
 	21d1  TU116BM [GeForce GTX 1660 Ti Mobile]
 	2200  GA102
 	2204  GA102 [GeForce RTX 3090]
-	2205  GA102 [GeForce RTX 3080 20GB]
+	2205  GA102 [GeForce RTX 3080 Ti]
 	2206  GA102 [GeForce RTX 3080]
 		10de 1467  GA102 [GeForce RTX 3080]
 		10de 146d  GA102 [GeForce RTX 3080 20GB]
@ -12228,13 +12224,10 @@
 	222b  GA102 [GeForce RTX 3090 Engineering Sample]
 	222f  GA102 [GeForce RTX 3080 11GB / 12GB Engineering Sample]
 	2230  GA102GL [RTX A6000]
 	2231  GA102GL
 	2235  GA102GL [RTX A40]
 	2236  GA102GL
 	2237  GA102GL
 	223f  GA102GL
 	228b  GA104 High Definition Audio Controller
 	2302  GA103
 	2321  GA103
 	2482  GA104 [GeForce RTX 3070 Ti]
 	2484  GA104 [GeForce RTX 3070]
@ -18971,7 +18964,7 @@
 		103c 0890  NC6000 laptop
 		103c 099c  NX6110/NC6120
 		10cf 1279  LifeBook E8010D
-	165f  NetXtreme BCM5720 Gigabit Ethernet PCIe
+	165f  NetXtreme BCM5720 2-port Gigabit Ethernet PCIe
 		1028 04f7  PowerEdge R320 server
 		1028 08fd  PowerEdge R6515/R7515 LOM
 		1028 08ff  PowerEdge Rx5xx LOM Board
@ -19208,12 +19201,12 @@
 	16d4  BCM57402 NetXtreme-E Ethernet Partition
 	16d5  BCM57407 NetXtreme-E 10GBase-T Ethernet Controller
 	16d6  BCM57412 NetXtreme-E 10Gb RDMA Ethernet Controller
 		14e4 1202  BCM957412M4122C OCP 1x25G Type1 wRoCE
 		14e4 4120  NetXtreme E-Series Advanced Dual-port 10Gb SFP+ Ethernet Network Daughter Card
 		14e4 4126  NetXtreme-E Dual-port 10G SFP+ Ethernet OCP 3.0 Adapter (BCM957412N4120C)
 		152d 8b20  BCM57412 NetXtreme-E 10Gb RDMA Ethernet Controller
 		152d 8b22  BCM57412 NetXtreme-E 25Gb RDMA Ethernet Controller
 	16d7  BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller
 		14e4 1202  BCM957412M4122C OCP 1x25G Type1 wRoCE
 		14e4 1402  BCM957414A4142CC 10Gb/25Gb Ethernet PCIe
 		14e4 1404  BCM957414M4142C OCP 2x25G Type1 wRoCE
 		14e4 4140  NetXtreme E-Series Advanced Dual-port 25Gb SFP28 Network Daughter Card
@ -20057,7 +20050,6 @@
 	9260  RCIM-II Real-Time Clock & Interrupt Module
 	9271  RCIM-III Real-Time Clock & Interrupt Module (PCIe)
 	9272  Pulse Width Modulator Card
 	9273  RCIM-IV Real-Time Clock & Interrupt Module (PCIe)
 	9277  5 Volt Delta Sigma Converter Card
 	9278  10 Volt Delta Sigma Converter Card
 	9287  Analog Output Card
@ -20349,13 +20341,7 @@
 		15b3 0021  MCX4421A-ACQN ConnectX-4 Lx EN OCP,2x25G
 		15b3 0025  ConnectX-4 Lx 25 GbE Dual Port SFP28 rNDC
 		193d 100a  620F-B
 # NIC-ETH540F-LP-2P SFP+ Ethernet Card
 		193d 1023  NIC-ETH540F-LP-2P
 		193d 1031  NIC-ETH640i-Mb-2x25G
 # NIC-ETH640F-3S-2P OCP3.0 Card
 		193d 1083  NIC-ETH640F-3S-2P
 # NIC-ETH540F-3S-2P OCP3.0 2x10G Card
 		193d 1084  NIC-ETH540F-3S-2P
 	1016  MT27710 Family [ConnectX-4 Lx Virtual Function]
 	1017  MT27800 Family [ConnectX-5]
 		15b3 0006  ConnectX®-5 EN network interface card, 100GbE single-port QSFP28, PCIe3.0 x16, tall bracket; MCX515A-CCAT
@ -21478,7 +21464,6 @@
 	9750  GL9750 SD Host Controller
 	e763  GL9763E eMMC Controller
 17aa  Lenovo
 	3181  ThinkCentre M75n IoT
 	402b  Intel 82599ES 10Gb 2-port Server Adapter X520-2
 17ab  Phillips Components
 17af  Hightech Information System Ltd.
@ -23111,17 +23096,9 @@
 	1002  PM1553-5 (PC/104+ MIL-STD-1553 Interface Card)
 	1004  AB3000 Series Rugged Computer
 	1005  PE1000 (Multi-Protocol PCIe/104 Interface Card)
 	1006  webCS Wireless Aircraft Communications Server
 	1007  AB3000 Series Rugged Computer (Series N)
 	1008  ME1000 mPCIe Avionics Interface Card
 	100a  NG1 Series Avionics Converter
 	1101  OmniBus II PCIe Multi-Protocol Interface Card
 	1102  OmniBusBox II Multi-Protocol Interface Core
 	1103  OmniBus II cPCIe/PXIe Multi-Protocol Interface Card
 	1200  NG3 Series Mil-Std-1553 Interface
 	1201  NG3 Series ARINC 429 Interface
 	1202  NG3 Series Avionics Discrete & Serial Interface
 	1203  NG3 Series Avionics Discrete Interface
 1bd4  Inspur Electronic Information Industry Co., Ltd.
 	0911  Arria10_PCIe_F10A1150
 1bee  IXXAT Automation GmbH
@ -23154,7 +23131,6 @@
 	001b  FD720
 	001c  FD922
 	001d  Vega
 	001f  FD940
 1c28  Lite-On IT Corp. / Plextor
 	0122  M6e PCI Express SSD [Marvell 88SS9183]
 # previously Fiberblaze
@ -23307,7 +23283,6 @@
 	0009  ExaNIC X25
 	000a  ExaNIC X100
 	000b  ExaNIC V9P
 	000c  ExaNIC V9P-3
 	0100  ExaDISK FX1
 1cf0  Akitio
 1cf7  Subspace Dynamics
@ -24040,7 +24015,7 @@
 	7053  CH353 PCI Dual Serial and Parallel Ports Controller
 	7073  CH356 PCI Quad Serial and Parallel Ports Controller
 	7173  CH355 PCI Quad Serial Port Controller
-434e  Cornelis Networks
+434e  CAST Navigation LLC
 43bc  Tiger Lake-H PCIe Root Port #5
 4444  Internext Compression Inc
 	0016  iTVC16 (CX23416) Video Decoder
@ -25329,8 +25304,6 @@
 		1028 2103  NVMe RI U.2 3.84TB (P5500)
 		1028 2104  NVMe RI U.2 7.68TB (P5500)
 		8086 8008  NVMe Datacenter SSD [3DNAND] SE 2.5" U.2 (P5510)
 		8086 8d08  NVMe Datacenter SSD [3DNAND] VE 2.5" U.2 (P5316)
 		8086 8d1d  NVMe Datacenter SSD [3DNAND] VE E1.L 9.5/18mm (P5316)
 	0be0  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
 	0be1  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
 		105b 0d7c  D270S/D250S Motherboard
@ -26452,8 +26425,6 @@
 		18d4 0c07  I350 1Gb 2-port RJ45 OCP Mezz Card MOP41-I-1GT2
 		193d 1005  360T-B
 		193d 1007  360T-L
 # NIC-ETH360T-3S-4P OCP3.0 4x1G Base-T Card
 		193d 1080  NIC-ETH360T-3S-4P
 		1bd4 001d  1G base-T QP EP014Ti1 Adapter
 		1bd4 0035  1G base-T QP EP014Ti1 Adapter
 		8086 0001  Ethernet Server Adapter I350-T4
@ -26627,8 +26598,6 @@
 		17aa 4002  ThinkServer X710-2 AnyFabric for 10GbE SFP+
 		193d 1020  NIC-ETH561F-sL-4x10G
 		193d 1021  NIC-ETH561F-sL-2x10G
 # NIC-ETH561F-3S-2P OCP3.0 2x10G SFP+ Card
 		193d 1081  NIC-ETH561F-3S-2P
 		19e5 d11c  Ethernet 2-port X710 10Gb SFP+ Adapter SP330
 		1bd4 0042  10G SFP+ DP EP102Fi4 Adapter
 		1bd4 0056  Ethernet Network Adapter X710-BM2 for OCP NIC 3.0
@ -26887,8 +26856,6 @@
 		1137 02c2  X710T4LG 4x10 GbE RJ45 PCIe NIC
 		1137 02d9  Ethernet Network Adapter X710-T2L OCP 3.0
 		1137 02da  Ethernet Network Adapter X710-T4L OCP 3.0
 # NIC-ETH565T-3S-2P OCP3.0 2x10G Base-T Card
 		193d 1082  NIC-ETH565T-3S-2P
 		8086 0000  Ethernet Network Adapter X710-TL
 		8086 0001  Ethernet Network Adapter X710-T4L
 		8086 0002  Ethernet Network Adapter X710-T4L
@ -31240,7 +31207,6 @@
 	43e8  Tiger Lake-H Serial IO I2C Controller #0
 	43ed  Tiger Lake-H USB 3.2 Gen 2x1 xHCI Host Controller
 	43ef  Tiger Lake-H Shared SRAM
 	43f0  Wi-Fi 6 AX201
 	444e  Turbo Memory Controller
 	467f  Volume Management Device NVMe RAID Controller
 	4680  AlderLake-S GT1
@ -31993,12 +31959,11 @@
 	9622  Integrated RAID
 	9641  Integrated RAID
 	96a1  Integrated RAID
-	9a01  11th Gen Core Processor PCIe Controller #1
+	9a01  11th Gen Core Processor PCIe Controller
 	9a03  TigerLake-LP Dynamic Tuning Processor Participant
 	9a09  11th Gen Core Processor PCIe Controller
 	9a0b  Volume Management Device NVMe RAID Controller
 	9a0d  Tiger Lake-LP Telemetry Aggregator
 	9a0f  11th Gen Core Processor PCIe Controller #0
 	9a11  GNA Scoring Accelerator module
 	9a13  Tiger Lake-LP Thunderbolt 4 USB Controller
 	9a14  11th Gen Core Processor Host Bridge/DRAM Registers
@ -32601,7 +32566,6 @@
 	a324  Cannon Lake PCH SPI Controller
 		1028 0869  Vostro 3470
 	a328  Cannon Lake PCH Serial IO UART Host Controller
 	a32b  Cannon Lake PCH SPI Host Controller
 	a32c  Cannon Lake PCH PCI Express Root Port #21
 	a32d  Cannon Lake PCH PCI Express Root Port #22
 	a32e  Cannon Lake PCH PCI Express Root Port #23
--- a/hwdb.d/pnp_id_registry.html
+++ b/hwdb.d/pnp_id_registry.html
@ -2469,9 +2469,6 @@
 <tr class="odd"><td>Clover Electronics</td><td>CLR</td><td>02/02/2021</td> </tr>
 <tr class="even"><td>Kyokko Communication System Co., Ltd.</td><td>KTS</td><td>02/18/2021</td> </tr>
 <tr class="odd"><td>Terumo Corporation</td><td>TMO</td><td>02/02/2021</td> </tr>
 <tr class="even"><td>Micro-Star Int&#039;l Co., Ltd.</td><td>CND</td><td>02/17/2021</td> </tr>
 <tr class="odd"><td>Newline Interactive Inc.</td><td>NWL</td><td>12/03/2020</td> </tr>
 <tr class="even"><td>CORSAIR MEMORY Inc.</td><td>CRM</td><td>02/05/2021</td> </tr>
      </tbody>
    </table>
  </body>
--- a/meson.build
+++ b/meson.build
@ -14,7 +14,7 @@ project('systemd', 'c',
       )
 libsystemd_version = '0.31.0'
-libudev_version = '1.7.1'
+libudev_version = '1.7.0'
 # We need the same data in two different formats, ugh!
 # Also, for hysterical reasons, we use different variable
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@ -100,7 +100,7 @@ int cg_read_event(
        if (r < 0)
                return r;
-        r = read_full_virtual_file(events, &content, NULL);
+        r = read_full_file(events, &content, NULL);
        if (r < 0)
                return r;
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@ -368,6 +368,7 @@ int read_full_virtual_file(const char *filename, char **ret_contents, size_t *re
        struct stat st;
        size_t n, size;
        int n_retries;
        char *p;
        assert(ret_contents);
@ -404,21 +405,18 @@ int read_full_virtual_file(const char *filename, char **ret_contents, size_t *re
                /* Be prepared for files from /proc which generally report a file size of 0. */
                if (st.st_size > 0) {
                        if (st.st_size > SSIZE_MAX) /* safety check in case off_t is 64bit and size_t 32bit */
                                return -E2BIG;
                        size = st.st_size;
                        n_retries--;
                } else
-                        /* Double the buffer size (saturate in case of overflow) */
+                        size = size * 2;
                        size = size > SSIZE_MAX / 2 ? SSIZE_MAX : size * 2;
                if (size > READ_FULL_BYTES_MAX)
                        return -E2BIG;
-                buf = malloc(size + 1);
+                p = realloc(buf, size + 1);
-                if (!buf)
+                if (!p)
                        return -ENOMEM;
                buf = TAKE_PTR(p);
                for (;;) {
                        ssize_t k;
@ -447,18 +445,12 @@ int read_full_virtual_file(const char *filename, char **ret_contents, size_t *re
                if (lseek(fd, 0, SEEK_SET) < 0)
                        return -errno;
                buf = mfree(buf);
        }
        if (n < size) {
                char *p;
                /* Return rest of the buffer to libc */
                p = realloc(buf, n + 1);
                if (!p)
                        return -ENOMEM;
                buf = TAKE_PTR(p);
        }
--- a/src/basic/mountpoint-util.c
+++ b/src/basic/mountpoint-util.c
@ -114,7 +114,7 @@ static int fd_fdinfo_mnt_id(int fd, const char *filename, int flags, int *ret_mn
                xsprintf(path, "/proc/self/fdinfo/%i", subfd);
        }
-        r = read_full_virtual_file(path, &fdinfo, NULL);
+        r = read_full_file(path, &fdinfo, NULL);
        if (r == -ENOENT) /* The fdinfo directory is a relatively new addition */
                return -EOPNOTSUPP;
        if (r < 0)
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@ -1548,7 +1548,7 @@ int pidfd_get_pid(int fd, pid_t *ret) {
        xsprintf(path, "/proc/self/fdinfo/%i", fd);
-        r = read_full_virtual_file(path, &fdinfo, NULL);
+        r = read_full_file(path, &fdinfo, NULL);
        if (r == -ENOENT) /* if fdinfo doesn't exist we assume the process does not exist */
                return -ESRCH;
        if (r < 0)
--- a/src/coredump/coredump.c
+++ b/src/coredump/coredump.c
@ -1125,23 +1125,23 @@ static int gather_pid_metadata(struct iovec_wrapper *iovw, Context *context) {
                (void) iovw_put_string_field_free(iovw, "COREDUMP_OPEN_FDS=", t);
        p = procfs_file_alloca(pid, "status");
-        if (read_full_virtual_file(p, &t, NULL) >= 0)
+        if (read_full_file(p, &t, NULL) >= 0)
                (void) iovw_put_string_field_free(iovw, "COREDUMP_PROC_STATUS=", t);
        p = procfs_file_alloca(pid, "maps");
-        if (read_full_virtual_file(p, &t, NULL) >= 0)
+        if (read_full_file(p, &t, NULL) >= 0)
                (void) iovw_put_string_field_free(iovw, "COREDUMP_PROC_MAPS=", t);
        p = procfs_file_alloca(pid, "limits");
-        if (read_full_virtual_file(p, &t, NULL) >= 0)
+        if (read_full_file(p, &t, NULL) >= 0)
                (void) iovw_put_string_field_free(iovw, "COREDUMP_PROC_LIMITS=", t);
        p = procfs_file_alloca(pid, "cgroup");
-        if (read_full_virtual_file(p, &t, NULL) >=0)
+        if (read_full_file(p, &t, NULL) >=0)
                (void) iovw_put_string_field_free(iovw, "COREDUMP_PROC_CGROUP=", t);
        p = procfs_file_alloca(pid, "mountinfo");
-        if (read_full_virtual_file(p, &t, NULL) >=0)
+        if (read_full_file(p, &t, NULL) >=0)
                (void) iovw_put_string_field_free(iovw, "COREDUMP_PROC_MOUNTINFO=", t);
        if (get_process_cwd(pid, &t) >= 0)
--- a/src/libsystemd/sd-bus/bus-creds.c
+++ b/src/libsystemd/sd-bus/bus-creds.c
@ -1002,7 +1002,7 @@ int bus_creds_add_more(sd_bus_creds *c, uint64_t mask, pid_t pid, pid_t tid) {
                const char *p;
                p = procfs_file_alloca(pid, "cmdline");
-                r = read_full_virtual_file(p, &c->cmdline, &c->cmdline_size);
+                r = read_full_file(p, &c->cmdline, &c->cmdline_size);
                if (r == -ENOENT)
                        return -ESRCH;
                if (r < 0) {
--- a/src/libsystemd/sd-device/sd-device.c
+++ b/src/libsystemd/sd-device/sd-device.c
@ -513,7 +513,7 @@ int device_read_uevent_file(sd_device *device) {
        path = strjoina(syspath, "/uevent");
-        r = read_full_virtual_file(path, &uevent, &uevent_len);
+        r = read_full_file(path, &uevent, &uevent_len);
        if (r == -EACCES) {
                /* empty uevent files may be write-only */
                device->uevent_loaded = true;
--- a/src/oom/oomd-manager.c
+++ b/src/oom/oomd-manager.c
@ -117,8 +117,6 @@ static int process_managed_oom_reply(
                        r = ret;
                        goto finish;
                }
                if (ret < 0 && ret != -EEXIST)
                        log_debug_errno(ret, "Failed to insert reply, ignoring: %m");
                /* Always update the limit in case it was changed. For non-memory pressure detection the value is
                 * ignored so always updating it here is not a problem. */
@ -158,11 +156,7 @@ static int recursively_get_cgroup_context(Hashmap *new_h, const char *path) {
                return r;
        else if (r == 0) { /* No subgroups? We're a leaf node */
                r = oomd_insert_cgroup_context(NULL, new_h, path);
-                if (r == -ENOMEM)
+                return (r == -ENOMEM) ? r : 0;
                        return r;
                if (r < 0)
                        log_debug_errno(r, "Failed to insert context for %s, ignoring: %m", path);
                return 0;
        }
        do {
@ -177,12 +171,8 @@ static int recursively_get_cgroup_context(Hashmap *new_h, const char *path) {
                r = cg_get_attribute_as_bool("memory", cg_path, "memory.oom.group", &oom_group);
                /* The cgroup might be gone. Skip it as a candidate since we can't get information on it. */
-                if (r == -ENOMEM)
+                if (r < 0)
-                        return r;
+                        return (r == -ENOMEM) ? r : 0;
                if (r < 0) {
                        log_debug_errno(r, "Failed to read memory.oom.group from %s, ignoring: %m", cg_path);
                        return 0;
                }
                if (oom_group)
                        r = oomd_insert_cgroup_context(NULL, new_h, cg_path);
@ -190,8 +180,6 @@ static int recursively_get_cgroup_context(Hashmap *new_h, const char *path) {
                        r = recursively_get_cgroup_context(new_h, cg_path);
                if (r == -ENOMEM)
                        return r;
                if (r < 0)
                        log_debug_errno(r, "Failed to insert or recursively get from %s, ignoring: %m", cg_path);
        } while ((r = cg_read_subgroup(d, &subpath)) > 0);
        return 0;
@ -213,8 +201,6 @@ static int update_monitored_cgroup_contexts(Hashmap **monitored_cgroups) {
                r = oomd_insert_cgroup_context(*monitored_cgroups, new_base, ctx->path);
                if (r == -ENOMEM)
                        return r;
                if (r < 0 && !IN_SET(r, -EEXIST, -ENOENT))
                        log_debug_errno(r, "Failed to insert context for %s, ignoring: %m", ctx->path);
        }
        hashmap_free(*monitored_cgroups);
@ -239,8 +225,6 @@ static int get_monitored_cgroup_contexts_candidates(Hashmap *monitored_cgroups,
                r = recursively_get_cgroup_context(candidates, ctx->path);
                if (r == -ENOMEM)
                        return r;
                if (r < 0)
                        log_debug_errno(r, "Failed to recursively get contexts for %s, ignoring: %m", ctx->path);
        }
        *ret_candidates = TAKE_PTR(candidates);
@ -248,26 +232,6 @@ static int get_monitored_cgroup_contexts_candidates(Hashmap *monitored_cgroups,
        return 0;
 }
 static int update_monitored_cgroup_contexts_candidates(Hashmap *monitored_cgroups, Hashmap **candidates) {
        _cleanup_hashmap_free_ Hashmap *new_candidates = NULL;
        int r;
        assert(monitored_cgroups);
        assert(candidates);
        assert(*candidates);
        r = get_monitored_cgroup_contexts_candidates(monitored_cgroups, &new_candidates);
        if (r < 0)
                return log_debug_errno(r, "Failed to get candidate contexts: %m");
        oomd_update_cgroup_contexts_between_hashmaps(*candidates, new_candidates);
        hashmap_free(*candidates);
        *candidates = TAKE_PTR(new_candidates);
        return 0;
 }
 static int acquire_managed_oom_connect(Manager *m) {
        _cleanup_(varlink_close_unrefp) Varlink *link = NULL;
        int r;
@ -311,44 +275,33 @@ static int monitor_cgroup_contexts_handler(sd_event_source *s, uint64_t usec, vo
        /* Reset timer */
        r = sd_event_now(sd_event_source_get_event(s), CLOCK_MONOTONIC, &usec_now);
        if (r < 0)
-                return log_error_errno(r, "Failed to reset event timer: %m");
+                return log_error_errno(r, "Failed to reset event timer");
        r = sd_event_source_set_time_relative(s, INTERVAL_USEC);
        if (r < 0)
-                return log_error_errno(r, "Failed to set relative time for timer: %m");
+                return log_error_errno(r, "Failed to set relative time for timer");
        /* Reconnect if our connection dropped */
        if (!m->varlink) {
                r = acquire_managed_oom_connect(m);
                if (r < 0)
-                        return log_error_errno(r, "Failed to acquire varlink connection: %m");
+                        return log_error_errno(r, "Failed to acquire varlink connection");
        }
        /* Update the cgroups used for detection/action */
        r = update_monitored_cgroup_contexts(&m->monitored_swap_cgroup_contexts);
        if (r == -ENOMEM)
-                return log_oom();
+                return log_error_errno(r, "Failed to update monitored swap cgroup contexts");
        if (r < 0)
                log_debug_errno(r, "Failed to update monitored swap cgroup contexts, ignoring: %m");
        r = update_monitored_cgroup_contexts(&m->monitored_mem_pressure_cgroup_contexts);
        if (r == -ENOMEM)
-                return log_oom();
+                return log_error_errno(r, "Failed to update monitored memory pressure cgroup contexts");
        if (r < 0)
                log_debug_errno(r, "Failed to update monitored memory pressure cgroup contexts, ignoring: %m");
        r = update_monitored_cgroup_contexts_candidates(
                        m->monitored_mem_pressure_cgroup_contexts, &m->monitored_mem_pressure_cgroup_contexts_candidates);
        if (r == -ENOMEM)
                return log_oom();
        if (r < 0)
                log_debug_errno(r, "Failed to update monitored memory pressure candidate cgroup contexts, ignoring: %m");
        r = oomd_system_context_acquire("/proc/swaps", &m->system_context);
        /* If there aren't units depending on swap actions, the only error we exit on is ENOMEM.
         * Allow ENOENT in the event that swap is disabled on the system. */
        if (r == -ENOMEM || (r < 0 && r != -ENOENT && !hashmap_isempty(m->monitored_swap_cgroup_contexts)))
-                return log_error_errno(r, "Failed to acquire system context: %m");
+                return log_error_errno(r, "Failed to acquire system context");
        else if (r == -ENOENT)
                zero(m->system_context);
@ -365,9 +318,7 @@ static int monitor_cgroup_contexts_handler(sd_event_source *s, uint64_t usec, vo
        r = oomd_pressure_above(m->monitored_mem_pressure_cgroup_contexts, m->default_mem_pressure_duration_usec, &targets);
        if (r == -ENOMEM)
-                return log_oom();
+                return log_error_errno(r, "Failed to check if memory pressure exceeded limits");
        if (r < 0)
                log_debug_errno(r, "Failed to check if memory pressure exceeded limits, ignoring: %m");
        else if (r == 1) {
                /* Check if there was reclaim activity in the given interval. The concern is the following case:
                 * Pressure climbed, a lot of high-frequency pages were reclaimed, and we killed the offending
@ -375,17 +326,22 @@ static int monitor_cgroup_contexts_handler(sd_event_source *s, uint64_t usec, vo
                 * this will cause pressure to remain high. Thus if there isn't any reclaim pressure, no need
                 * to kill something (it won't help anyways). */
                if ((usec_now - m->last_reclaim_at) <= RECLAIM_DURATION_USEC) {
                        _cleanup_hashmap_free_ Hashmap *candidates = NULL;
                        OomdCGroupContext *t;
                        r = get_monitored_cgroup_contexts_candidates(m->monitored_mem_pressure_cgroup_contexts, &candidates);
                        if (r == -ENOMEM)
                                return log_error_errno(r, "Failed to get monitored memory pressure cgroup candidates");
                        SET_FOREACH(t, targets) {
                                log_notice("Memory pressure for %s is greater than %lu for more than %"PRIu64" seconds and there was reclaim activity",
                                        t->path, LOAD_INT(t->mem_pressure_limit), m->default_mem_pressure_duration_usec / USEC_PER_SEC);
-                                r = oomd_kill_by_pgscan_rate(m->monitored_mem_pressure_cgroup_contexts_candidates, t->path, m->dry_run);
+                                r = oomd_kill_by_pgscan(candidates, t->path, m->dry_run);
                                if (r == -ENOMEM)
-                                        return log_oom();
+                                        return log_error_errno(r, "Failed to kill cgroup processes by pgscan");
                                if (r < 0)
-                                        log_notice_errno(r, "Failed to kill any cgroup(s) under %s based on pressure: %m", t->path);
+                                        log_info("Failed to kill any cgroup(s) under %s based on pressure", t->path);
                                else {
                                        /* Don't act on all the high pressure cgroups at once; return as soon as we kill one */
                                        m->post_action_delay_start = usec_now;
@ -403,15 +359,13 @@ static int monitor_cgroup_contexts_handler(sd_event_source *s, uint64_t usec, vo
                r = get_monitored_cgroup_contexts_candidates(m->monitored_swap_cgroup_contexts, &candidates);
                if (r == -ENOMEM)
-                        return log_oom();
+                        return log_error_errno(r, "Failed to get monitored swap cgroup candidates");
                if (r < 0)
                        log_debug_errno(r, "Failed to get monitored swap cgroup candidates, ignoring: %m");
                r = oomd_kill_by_swap_usage(candidates, m->dry_run);
                if (r == -ENOMEM)
-                        return log_oom();
+                        return log_error_errno(r, "Failed to kill cgroup processes by swap usage");
                if (r < 0)
-                        log_notice_errno(r, "Failed to kill any cgroup(s) based on swap: %m");
+                        log_info("Failed to kill any cgroup(s) based on swap");
                else {
                        m->post_action_delay_start = usec_now;
                        return 0;
@ -458,7 +412,6 @@ Manager* manager_free(Manager *m) {
        hashmap_free(m->monitored_swap_cgroup_contexts);
        hashmap_free(m->monitored_mem_pressure_cgroup_contexts);
        hashmap_free(m->monitored_mem_pressure_cgroup_contexts_candidates);
        return mfree(m);
 }
@ -495,10 +448,6 @@ int manager_new(Manager **ret) {
        if (!m->monitored_mem_pressure_cgroup_contexts)
                return -ENOMEM;
        m->monitored_mem_pressure_cgroup_contexts_candidates = hashmap_new(&oomd_cgroup_ctx_hash_ops);
        if (!m->monitored_mem_pressure_cgroup_contexts_candidates)
                return -ENOMEM;
        *ret = TAKE_PTR(m);
        return 0;
 }
--- a/src/oom/oomd-manager.h
+++ b/src/oom/oomd-manager.h
@ -40,7 +40,6 @@ struct Manager {
         * Used to detect when to take action. */
        Hashmap *monitored_swap_cgroup_contexts;
        Hashmap *monitored_mem_pressure_cgroup_contexts;
        Hashmap *monitored_mem_pressure_cgroup_contexts_candidates;
        OomdSystemContext system_context;
--- a/src/oom/oomd-util.c
+++ b/src/oom/oomd-util.c
@ -208,13 +208,13 @@ int oomd_cgroup_kill(const char *path, bool recurse, bool dry_run) {
        return set_size(pids_killed) != 0;
 }
-int oomd_kill_by_pgscan_rate(Hashmap *h, const char *prefix, bool dry_run) {
+int oomd_kill_by_pgscan(Hashmap *h, const char *prefix, bool dry_run) {
        _cleanup_free_ OomdCGroupContext **sorted = NULL;
        int r;
        assert(h);
-        r = oomd_sort_cgroup_contexts(h, compare_pgscan_rate_and_memory_usage, prefix, &sorted);
+        r = oomd_sort_cgroup_contexts(h, compare_pgscan_and_memory_usage, prefix, &sorted);
        if (r < 0)
                return r;
@ -413,25 +413,6 @@ int oomd_insert_cgroup_context(Hashmap *old_h, Hashmap *new_h, const char *path)
        return 0;
 }
 void oomd_update_cgroup_contexts_between_hashmaps(Hashmap *old_h, Hashmap *curr_h) {
        OomdCGroupContext *ctx;
        assert(old_h);
        assert(curr_h);
        HASHMAP_FOREACH(ctx, curr_h) {
                OomdCGroupContext *old_ctx;
                old_ctx = hashmap_get(old_h, ctx->path);
                if (!old_ctx)
                        continue;
                ctx->last_pgscan = old_ctx->pgscan;
                ctx->mem_pressure_limit = old_ctx->mem_pressure_limit;
                ctx->last_hit_mem_pressure_limit = old_ctx->last_hit_mem_pressure_limit;
        }
 }
 void oomd_dump_swap_cgroup_context(const OomdCGroupContext *ctx, FILE *f, const char *prefix) {
        char swap[FORMAT_BYTES_MAX];
@ -477,12 +458,10 @@ void oomd_dump_memory_pressure_cgroup_context(const OomdCGroupContext *ctx, FILE
                fprintf(f,
                        "%s\tMemory Min: %s\n"
                        "%s\tMemory Low: %s\n"
-                        "%s\tPgscan: %" PRIu64 "\n"
+                        "%s\tPgscan: %" PRIu64 "\n",
                        "%s\tLast Pgscan: %" PRIu64 "\n",
                        strempty(prefix), format_bytes_cgroup_protection(mem_min, sizeof(mem_min), ctx->memory_min),
                        strempty(prefix), format_bytes_cgroup_protection(mem_low, sizeof(mem_low), ctx->memory_low),
-                        strempty(prefix), ctx->pgscan,
+                        strempty(prefix), ctx->pgscan);
                        strempty(prefix), ctx->last_pgscan);
 }
 void oomd_dump_system_context(const OomdSystemContext *ctx, FILE *f, const char *prefix) {
--- a/src/oom/oomd-util.h
+++ b/src/oom/oomd-util.h
@ -66,8 +66,7 @@ bool oomd_swap_free_below(const OomdSystemContext *ctx, int threshold_permyriad)
 /* The compare functions will sort from largest to smallest, putting all the contexts with "avoid" at the end
 * (after the smallest values). */
-static inline int compare_pgscan_rate_and_memory_usage(OomdCGroupContext * const *c1, OomdCGroupContext * const *c2) {
+static inline int compare_pgscan_and_memory_usage(OomdCGroupContext * const *c1, OomdCGroupContext * const *c2) {
        uint64_t last1, last2;
        int r;
        assert(c1);
@ -77,22 +76,7 @@ static inline int compare_pgscan_rate_and_memory_usage(OomdCGroupContext * const
        if (r != 0)
                return r;
-        /* If last_pgscan > pgscan, assume the cgroup was recreated and reset last_pgscan to zero. */
+        r = CMP((*c2)->pgscan, (*c1)->pgscan);
        last2 = (*c2)->last_pgscan;
        if ((*c2)->last_pgscan > (*c2)->pgscan) {
                log_info("Last pgscan %" PRIu64 "greater than current pgscan %" PRIu64 "for %s. Using last pgscan of zero.",
                                (*c2)->last_pgscan, (*c2)->pgscan, (*c2)->path);
                last2 = 0;
        }
        last1 = (*c1)->last_pgscan;
        if ((*c1)->last_pgscan > (*c1)->pgscan) {
                log_info("Last pgscan %" PRIu64 "greater than current pgscan %" PRIu64 "for %s. Using last pgscan of zero.",
                                (*c1)->last_pgscan, (*c1)->pgscan, (*c1)->path);
                last1 = 0;
        }
        r = CMP((*c2)->pgscan - last2, (*c1)->pgscan - last1);
        if (r != 0)
                return r;
@ -123,7 +107,7 @@ int oomd_cgroup_kill(const char *path, bool recurse, bool dry_run);
 /* The following oomd_kill_by_* functions return 1 if processes were killed, or negative otherwise. */
 /* If `prefix` is supplied, only cgroups whose paths start with `prefix` are eligible candidates. Otherwise,
 * everything in `h` is a candidate. */
-int oomd_kill_by_pgscan_rate(Hashmap *h, const char *prefix, bool dry_run);
+int oomd_kill_by_pgscan(Hashmap *h, const char *prefix, bool dry_run);
 int oomd_kill_by_swap_usage(Hashmap *h, bool dry_run);
 int oomd_cgroup_context_acquire(const char *path, OomdCGroupContext **ret);
@ -135,9 +119,6 @@ int oomd_system_context_acquire(const char *proc_swaps_path, OomdSystemContext *
 * was no prior data to reference. */
 int oomd_insert_cgroup_context(Hashmap *old_h, Hashmap *new_h, const char *path);
 /* Update each OomdCGroupContext in `curr_h` with prior interval information from `old_h`. */
 void oomd_update_cgroup_contexts_between_hashmaps(Hashmap *old_h, Hashmap *curr_h);
 void oomd_dump_swap_cgroup_context(const OomdCGroupContext *ctx, FILE *f, const char *prefix);
 void oomd_dump_memory_pressure_cgroup_context(const OomdCGroupContext *ctx, FILE *f, const char *prefix);
 void oomd_dump_system_context(const OomdSystemContext *ctx, FILE *f, const char *prefix);
--- a/src/oom/test-oomd-util.c
+++ b/src/oom/test-oomd-util.c
@ -176,53 +176,6 @@ static void test_oomd_cgroup_context_acquire_and_insert(void) {
        }
 }
 static void test_oomd_update_cgroup_contexts_between_hashmaps(void) {
        _cleanup_hashmap_free_ Hashmap *h_old = NULL, *h_new = NULL;
        OomdCGroupContext *c_old, *c_new;
        char **paths = STRV_MAKE("/0.slice",
                                 "/1.slice");
        OomdCGroupContext ctx_old[3] = {
                { .path = paths[0],
                  .mem_pressure_limit = 5,
                  .last_hit_mem_pressure_limit = 777,
                  .pgscan = 57 },
                { .path = paths[1],
                  .mem_pressure_limit = 6,
                  .last_hit_mem_pressure_limit = 888,
                  .pgscan = 42 },
        };
        OomdCGroupContext ctx_new[3] = {
                { .path = paths[0],
                  .pgscan = 100 },
                { .path = paths[1],
                  .pgscan = 101 },
        };
        assert_se(h_old = hashmap_new(&string_hash_ops));
        assert_se(hashmap_put(h_old, paths[0], &ctx_old[0]) >= 0);
        assert_se(hashmap_put(h_old, paths[1], &ctx_old[1]) >= 0);
        assert_se(h_new = hashmap_new(&string_hash_ops));
        assert_se(hashmap_put(h_new, paths[0], &ctx_new[0]) >= 0);
        assert_se(hashmap_put(h_new, paths[1], &ctx_new[1]) >= 0);
        oomd_update_cgroup_contexts_between_hashmaps(h_old, h_new);
        assert_se(c_old = hashmap_get(h_old, "/0.slice"));
        assert_se(c_new = hashmap_get(h_new, "/0.slice"));
        assert_se(c_old->pgscan == c_new->last_pgscan);
        assert_se(c_old->mem_pressure_limit == c_new->mem_pressure_limit);
        assert_se(c_old->last_hit_mem_pressure_limit == c_new->last_hit_mem_pressure_limit);
        assert_se(c_old = hashmap_get(h_old, "/1.slice"));
        assert_se(c_new = hashmap_get(h_new, "/1.slice"));
        assert_se(c_old->pgscan == c_new->last_pgscan);
        assert_se(c_old->mem_pressure_limit == c_new->mem_pressure_limit);
        assert_se(c_old->last_hit_mem_pressure_limit == c_new->last_hit_mem_pressure_limit);
 }
 static void test_oomd_system_context_acquire(void) {
        _cleanup_(unlink_tempfilep) char path[] = "/oomdgetsysctxtestXXXXXX";
        OomdSystemContext ctx;
@ -372,45 +325,33 @@ static void test_oomd_sort_cgroups(void) {
                                 "/herp.slice/derp.scope",
                                 "/herp.slice/derp.scope/sheep.service",
                                 "/zupa.slice",
                                 "/boop.slice",
                                 "/omitted.slice",
                                 "/avoid.slice");
-        OomdCGroupContext ctx[7] = {
+        OomdCGroupContext ctx[6] = {
                { .path = paths[0],
                  .swap_usage = 20,
-                  .last_pgscan = 0,
+                  .pgscan = 60,
                  .pgscan = 33,
                  .current_memory_usage = 10 },
                { .path = paths[1],
                  .swap_usage = 60,
-                  .last_pgscan = 33,
+                  .pgscan = 40,
                  .pgscan = 1,
                  .current_memory_usage = 20 },
                { .path = paths[2],
                  .swap_usage = 40,
-                  .last_pgscan = 1,
+                  .pgscan = 40,
                  .pgscan = 33,
                  .current_memory_usage = 40 },
                { .path = paths[3],
                  .swap_usage = 10,
-                  .last_pgscan = 33,
+                  .pgscan = 80,
                  .pgscan = 2,
                  .current_memory_usage = 10 },
                { .path = paths[4],
                  .swap_usage = 11,
                  .last_pgscan = 33,
                  .pgscan = 33,
                  .current_memory_usage = 10 },
                { .path = paths[5],
                  .swap_usage = 90,
-                  .last_pgscan = 0,
+                  .pgscan = 100,
                  .pgscan = UINT64_MAX,
                  .preference = MANAGED_OOM_PREFERENCE_OMIT },
-                { .path = paths[6],
+                { .path = paths[5],
                  .swap_usage = 99,
-                  .last_pgscan = 0,
+                  .pgscan = 200,
                  .pgscan = UINT64_MAX,
                  .preference = MANAGED_OOM_PREFERENCE_AVOID },
        };
@ -420,36 +361,32 @@ static void test_oomd_sort_cgroups(void) {
        assert_se(hashmap_put(h, "/herp.slice/derp.scope", &ctx[1]) >= 0);
        assert_se(hashmap_put(h, "/herp.slice/derp.scope/sheep.service", &ctx[2]) >= 0);
        assert_se(hashmap_put(h, "/zupa.slice", &ctx[3]) >= 0);
-        assert_se(hashmap_put(h, "/boop.slice", &ctx[4]) >= 0);
+        assert_se(hashmap_put(h, "/omitted.slice", &ctx[4]) >= 0);
-        assert_se(hashmap_put(h, "/omitted.slice", &ctx[5]) >= 0);
+        assert_se(hashmap_put(h, "/avoid.slice", &ctx[5]) >= 0);
        assert_se(hashmap_put(h, "/avoid.slice", &ctx[6]) >= 0);
-        assert_se(oomd_sort_cgroup_contexts(h, compare_swap_usage, NULL, &sorted_cgroups) == 6);
+        assert_se(oomd_sort_cgroup_contexts(h, compare_swap_usage, NULL, &sorted_cgroups) == 5);
        assert_se(sorted_cgroups[0] == &ctx[1]);
        assert_se(sorted_cgroups[1] == &ctx[2]);
        assert_se(sorted_cgroups[2] == &ctx[0]);
-        assert_se(sorted_cgroups[3] == &ctx[4]);
+        assert_se(sorted_cgroups[3] == &ctx[3]);
-        assert_se(sorted_cgroups[4] == &ctx[3]);
+        assert_se(sorted_cgroups[4] == &ctx[5]);
        assert_se(sorted_cgroups[5] == &ctx[6]);
        sorted_cgroups = mfree(sorted_cgroups);
-        assert_se(oomd_sort_cgroup_contexts(h, compare_pgscan_rate_and_memory_usage, NULL, &sorted_cgroups) == 6);
+        assert_se(oomd_sort_cgroup_contexts(h, compare_pgscan_and_memory_usage, NULL, &sorted_cgroups) == 5);
-        assert_se(sorted_cgroups[0] == &ctx[0]);
+        assert_se(sorted_cgroups[0] == &ctx[3]);
-        assert_se(sorted_cgroups[1] == &ctx[2]);
+        assert_se(sorted_cgroups[1] == &ctx[0]);
-        assert_se(sorted_cgroups[2] == &ctx[3]);
+        assert_se(sorted_cgroups[2] == &ctx[2]);
        assert_se(sorted_cgroups[3] == &ctx[1]);
-        assert_se(sorted_cgroups[4] == &ctx[4]);
+        assert_se(sorted_cgroups[4] == &ctx[5]);
        assert_se(sorted_cgroups[5] == &ctx[6]);
        sorted_cgroups = mfree(sorted_cgroups);
-        assert_se(oomd_sort_cgroup_contexts(h, compare_pgscan_rate_and_memory_usage, "/herp.slice/derp.scope", &sorted_cgroups) == 2);
+        assert_se(oomd_sort_cgroup_contexts(h, compare_pgscan_and_memory_usage, "/herp.slice/derp.scope", &sorted_cgroups) == 2);
        assert_se(sorted_cgroups[0] == &ctx[2]);
        assert_se(sorted_cgroups[1] == &ctx[1]);
        assert_se(sorted_cgroups[2] == 0);
        assert_se(sorted_cgroups[3] == 0);
        assert_se(sorted_cgroups[4] == 0);
        assert_se(sorted_cgroups[5] == 0);
        assert_se(sorted_cgroups[6] == 0);
        sorted_cgroups = mfree(sorted_cgroups);
 }
@ -458,7 +395,6 @@ int main(void) {
        test_setup_logging(LOG_DEBUG);
        test_oomd_update_cgroup_contexts_between_hashmaps();
        test_oomd_system_context_acquire();
        test_oomd_pressure_above();
        test_oomd_memory_reclaim();
--- a/src/pstore/pstore.c
+++ b/src/pstore/pstore.c
@ -342,7 +342,7 @@ static int list_files(PStoreList *list, const char *sourcepath) {
                size_t buf_size;
                /* Now read contents of pstore file */
-                r = read_full_virtual_file(ifd_path, &buf, &buf_size);
+                r = read_full_file(ifd_path, &buf, &buf_size);
                if (r < 0) {
                        log_warning_errno(r, "Failed to read file %s, skipping: %m", ifd_path);
                        continue;
--- a/src/resolve/resolved-dns-cache.c
+++ b/src/resolve/resolved-dns-cache.c
@ -439,7 +439,9 @@ static int dns_cache_put_positive(
        /* Determine the minimal TTL of all RRs in the answer plus the one by the main RR we are supposed to
         * cache. Since we cache whole answers to questions we should never return answers where only some
         * RRs are still valid, hence find the lowest here */
-        min_ttl = MIN(dns_answer_min_ttl(answer), rr->ttl);
+        min_ttl = dns_answer_min_ttl(answer);
        if (rr)
                min_ttl = MIN(min_ttl, rr->ttl);
        /* New TTL is 0? Delete this specific entry... */
        if (min_ttl <= 0) {
--- a/src/shared/acpi-fpdt.c
+++ b/src/shared/acpi-fpdt.c
@ -72,7 +72,7 @@ int acpi_get_boot_usec(usec_t *loader_start, usec_t *loader_exit) {
        struct acpi_fpdt_boot_header hbrec;
        struct acpi_fpdt_boot brec;
-        r = read_full_virtual_file("/sys/firmware/acpi/tables/FPDT", &buf, &l);
+        r = read_full_file("/sys/firmware/acpi/tables/FPDT", &buf, &l);
        if (r < 0)
                return r;
--- a/src/systemctl/systemctl-edit.c
+++ b/src/systemctl/systemctl-edit.c
@ -146,6 +146,7 @@ static int create_edit_temp_file(const char *new_path, const char *original_path
                _cleanup_free_ char *new_contents = NULL;
                _cleanup_fclose_ FILE *f = NULL;
                char **path;
                size_t size;
                r = mac_selinux_create_file_prepare(new_path, S_IFREG);
                if (r < 0)
@ -160,7 +161,7 @@ static int create_edit_temp_file(const char *new_path, const char *original_path
                if (r < 0)
                        return log_error_errno(errno, "Failed to change mode of \"%s\": %m", t);
-                r = read_full_file(new_path, &new_contents, NULL);
+                r = read_full_file(new_path, &new_contents, &size);
                if (r < 0 && r != -ENOENT)
                        return log_error_errno(r, "Failed to read \"%s\": %m", new_path);
@ -181,7 +182,7 @@ static int create_edit_temp_file(const char *new_path, const char *original_path
                        if (path_equal(*path, new_path))
                                continue;
-                        r = read_full_file(*path, &contents, NULL);
+                        r = read_full_file(*path, &contents, &size);
                        if (r < 0)
                                return log_error_errno(r, "Failed to read \"%s\": %m", *path);
@ -467,12 +468,10 @@ static int trim_edit_markers(const char *path) {
        int r;
        /* Trim out the lines between the two markers */
-        r = read_full_file(path, &contents, NULL);
+        r = read_full_file(path, &contents, &size);
        if (r < 0)
                return log_error_errno(r, "Failed to read temporary file \"%s\": %m", path);
        size = strlen(contents);
        contents_start = strstr(contents, EDIT_MARKER_START);
        if (contents_start)
                contents_start += strlen(EDIT_MARKER_START);
--- a/tools/git-contrib.sh
+++ b/tools/git-contrib.sh
@ -2,6 +2,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -eu
-git shortlog --author=noreply@weblate.org --invert-grep -s `git describe --abbrev=0 --match 'v[0-9][0-9][0-9]'`.. | \
+git shortlog -s `git describe --abbrev=0 --match 'v[0-9][0-9][0-9]'`.. | \
    awk '{ $1=""; print $0 "," }' | \
    sort -u