Merge pull request #19157 from keszybz/read-medium-sized-virtual-file

basic/fileio: fix reading of not-too-small virtual files
NEWS: prep release date
2025-10-06 12:14:46 +02:00 · 2021-03-30 22:59:02 +02:00 · 2021-03-30 22:00:11 +02:00 · 2021-03-30 21:58:59 +02:00 · 2021-03-30 21:56:22 +02:00 · 2021-03-30 19:01:01 +01:00
19 changed files with 1236 additions and 281 deletions
--- a/.mailmap
+++ b/.mailmap
@ -115,12 +115,14 @@ Michael Biebl <biebl@debian.org> <mbiebl@gmail.com>
 Michael Buesch <mbuesch@freenet.de>
 Michael Hoy <rimmington@gmail.com>
 Michael Olbrich <m.olbrich@pengutronix.de>
 Michael Trapp <michael.trapp@sap.com>
 Michal Soltys <soltys@ziu.info> <nozo@ziu.info>
 Michal Suchanek <msuchanek@suse.de>
 Michal Suchanek <msuchanek@suse.de> <hramrach@gmail.com>
 Michal Sekletár <msekleta@redhat.com>
 Michał Szczepański <skrzatu@hotmail.com> <skrzatu@gmail.com>
 Michel Kraus <github@demonsphere.de> <27o@users.noreply.github.com>
 Michele Guerini Rocco <rnhmjoj@inventati.org>
 Miklos Vajna <vmiklos@frugalware.org> <vmiklos@gmail.com>
 Milan Pässler <me@petabyteboy.de>
 Neil Brown <neil@brown.name>
--- a/72
+++ b/72
@ -440,41 +440,45 @@ CHANGES WITH 248:
        * 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,
+        Contributions from: Adam Nielsen, Adrian Vovk, AJ Jordan, Alan Perry,
-        Alastair Pharo, Alexander Batischev, Ali Abdallah, Andrew Balmos, Anita
+        Alastair Pharo, Alexander Batischev, Ali Abdallah, Andrew Balmos,
-        Zhang, Annika Wickert, Ansgar Burchardt, Antonius Frie, Ardy, Arian van
+        Anita Zhang, Annika Wickert, Ansgar Burchardt, Antonio Terceiro,
-        Putten, Ariel Fermani, Arnaud T, A S Alam, Bastien Nocera, Benjamin
+        Antonius Frie, Ardy, Arian van Putten, Ariel Fermani, Arnaud T,
-        Berg, Benjamin Robin, Björn Daase, caoxia, Carlo Wood, Charles Lee,
+        A S Alam, Bastien Nocera, Benjamin Berg, Benjamin Robin, Björn Daase,
-        ChopperRob, chri2, Christian Ehrhardt, Christian Hesse, Christopher
+        caoxia, Carlo Wood, Charles Lee, ChopperRob, chri2, Christian Ehrhardt,
-        Obbard, clayton craft, corvusnix, cprn, d032747, Daan De Meyer, Daniele
+        Christian Hesse, Christopher Obbard, clayton craft, corvusnix, cprn,
-        Medri, Daniel Rusek, Dan Sanders, Dan Streetman, Darren Ng, David
+        Daan De Meyer, Daniele Medri, Daniel Rusek, Dan Sanders, Dan Streetman,
-        Edmundson, Deepak Rawat, Devon Pringle, Dmitry Borodaenko, dropsignal,
+        Darren Ng, David Edmundson, David Tardon, Deepak Rawat, Devon Pringle,
-        Einsler Lee, Endre Szabo, Evgeny Vereshchagin, Fabian Affolter, Felipe
+        Dmitry Borodaenko, dropsignal, Einsler Lee, Endre Szabo,
-        Borges, feliperodriguesfr, Felix Stupp, Florian Hülsmann, Florian
+        Evgeny Vereshchagin, Fabian Affolter, Fangrui Song, Felipe Borges,
-        Klink, Florian Westphal, Franck Bui, Frantisek Sumsal, Gablegritule,
+        feliperodriguesfr, Felix Stupp, Florian Hülsmann, Florian Klink,
-        Gaël PORTAY, Gaurav, Giedrius Statkevičius, Greg Depoire--Ferrer,
+        Florian Westphal, Franck Bui, Frantisek Sumsal, Gablegritule,
-        Gustavo Costa, Hans de Goede, Hela Basa, heretoenhance, Iago López
+        Gaël PORTAY, Gaurav, Giedrius Statkevičius, Greg Depoire-Ferrer,
-        Galeiras, igo95862, Ilya Dmitrichenko, Jameer Pathan, Jan Tojnar,
+        Gustavo Costa, Hans de Goede, Hela Basa, heretoenhance, hide,
-        Jiehong, Jinyuan Si, Joerg Behrmann, John Slade, Jonathan G. Underwood,
+        Iago López Galeiras, igo95862, Ilya Dmitrichenko, Jameer Pathan,
-        Jonathan McDowell, Josh Triplett, Joshua Watt, Julia Cartwright, Julien
+        Jan Tojnar, Jiehong, Jinyuan Si, Joerg Behrmann, John Slade,
-        Humbert, Kairui Song, Karel Zak, Kevin Backhouse, Kevin P. Fleming,
+        Jonathan G. Underwood, Jonathan McDowell, Josh Triplett, Joshua Watt,
-        Khem Raj, Konomi, krissgjeng, l4gfcm, Lajos Veres, Lennart Poettering,
+        Julia Cartwright, Julien Humbert, Kairui Song, Karel Zak,
-        Luca Boccassi, Luca BRUNO, Lucas Werkmeister, Luka Kudra, Luna
+        Kevin Backhouse, Kevin P. Fleming, Khem Raj, Konomi, krissgjeng,
-        Jernberg, Marc-André Lureau, Martin Wilck, Matthias Klumpp, Matt
+        l4gfcm, Lajos Veres, Lennart Poettering, Lincoln Ramsay, Luca Boccassi,
-        Turner, Michael Marley, Michal Fabik, Michał Kopeć, Michal Koutný,
+        Luca BRUNO, Lucas Werkmeister, Luka Kudra, Luna Jernberg,
-        Michal Sekletár, Mike Gilbert, milovlad, moson-mo, Nick, nihilix-melix,
+        Marc-André Lureau, Martin Wilck, Matthias Klumpp, Matt Turner,
-        Oğuz Ersen, Ondrej Mosnacek, pali, Pavel Hrdina, Pavel Sapezhko, Perry
+        Michael Gisbers, Michael Marley, Michael Trapp, Michal Fabik,
-        Yuan, Peter Hutterer, Pierre Dubouilh, Piotr Drąg, Richard Laager,
+        Michał Kopeć, Michal Koutný, Michal Sekletár, Michele Guerini Rocco,
-        rnhmjoj, RussianNeuroMancer, Sebastiaan van Stijn, Sergey Bugaev,
+        Mike Gilbert, milovlad, moson-mo, Nick, nihilix-melix, Oğuz Ersen,
-        shenyangyang4, simmon, Simonas Kazlauskas, Slimane Selyan Amiri, Stefan
+        Ondrej Mosnacek, pali, Pavel Hrdina, Pavel Sapezhko, Perry Yuan,
-        Agner, Steve Ramage, Susant Sahani, Sven Mueller, Tad Fisher, Takashi
+        Peter Hutterer, Pierre Dubouilh, Piotr Drąg, Pjotr Vertaalt,
-        Iwai, Thomas Haller, Tom Shield, Topi Miettinen, Torsten Hilbrich,
+        Richard Laager, RussianNeuroMancer, Sam Lunt, Sebastiaan van Stijn,
-        Tyler Hicks, ulf-f, Ulrich Ölmann, Vincent Pelletier, Vinnie Magro,
+        Sergey Bugaev, shenyangyang4, simmon, Simonas Kazlauskas,
-        Vito Caputo, Vlad, walbit-de, Whired Planck, wouter bolsterlee, Xℹ
+        Slimane Selyan Amiri, Stefan Agner, Steve Ramage, Susant Sahani,
-        Ruoyao, Yuri Chornoivan, Yu Watanabe, Zach Smith, Zbigniew
+        Sven Mueller, Tad Fisher, Takashi Iwai, Thomas Haller, Tom Shield,
-        Jędrzejewski-Szmek, Zmicer Turok, Дамјан Георгиевски
+        Topi Miettinen, Torsten Hilbrich, tpgxyz, Tyler Hicks, ulf-f,
        Ulrich Ölmann, Vincent Pelletier, Vinnie Magro, Vito Caputo, Vlad,
        walbit-de, Whired Planck, wouter bolsterlee, Xℹ Ruoyao, Yangyang Shen,
        Yuri Chornoivan, Yu Watanabe, Zach Smith, Zbigniew Jędrzejewski-Szmek,
        Zmicer Turok, Дамјан Георгиевски
-        — Berlin, 2021-03-17
+        — Berlin, 2021-03-30
 CHANGES WITH 247:
--- a/hwdb.d/20-OUI.hwdb
+++ b/hwdb.d/20-OUI.hwdb
@ -2418,7 +2418,7 @@ OUI:000323*
 ID_OUI_FROM_DATABASE=Cornet Technology, Inc.
 OUI:000324*
- ID_OUI_FROM_DATABASE=SANYO Consumer Electronics Co., Ltd.
+ ID_OUI_FROM_DATABASE=SANYO Techno Solutions Tottori Co., Ltd.
 OUI:000325*
 ID_OUI_FROM_DATABASE=Arima Computer Corp.
@ -8544,7 +8544,7 @@ OUI:000B39*
 ID_OUI_FROM_DATABASE=Keisoku Giken Co.,Ltd.
 OUI:000B3A*
- ID_OUI_FROM_DATABASE=QuStream Corporation
+ ID_OUI_FROM_DATABASE=PESA
 OUI:000B3B*
 ID_OUI_FROM_DATABASE=devolo AG
@ -39431,6 +39431,9 @@ OUI:00FA21*
 OUI:00FA3B*
 ID_OUI_FROM_DATABASE=CLOOS ELECTRONIC GMBH
 OUI:00FAB6*
 ID_OUI_FROM_DATABASE=Kontakt Micro-Location Sp z o.o.
 OUI:00FC58*
 ID_OUI_FROM_DATABASE=WebSilicon Ltd.
@ -40418,6 +40421,9 @@ OUI:04EE03*
 OUI:04EE91*
 ID_OUI_FROM_DATABASE=x-fabric GmbH
 OUI:04EEEE*
 ID_OUI_FROM_DATABASE=Laplace System Co., Ltd.
 OUI:04F021*
 ID_OUI_FROM_DATABASE=Compex Systems Pte Ltd
@ -42014,6 +42020,9 @@ OUI:0C5CD8*
 OUI:0C5F35*
 ID_OUI_FROM_DATABASE=Niagara Video Corporation
 OUI:0C6046*
 ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 OUI:0C6076*
 ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
@ -43010,6 +43019,9 @@ OUI:105172*
 OUI:10521C*
 ID_OUI_FROM_DATABASE=Espressif Inc.
 OUI:105403*
 ID_OUI_FROM_DATABASE=INTARSO GmbH
 OUI:105611*
 ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
@ -43088,6 +43100,9 @@ OUI:10683F*
 OUI:106F3F*
 ID_OUI_FROM_DATABASE=BUFFALO.INC
 OUI:106FD9*
 ID_OUI_FROM_DATABASE=CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
 OUI:106FEF*
 ID_OUI_FROM_DATABASE=Ad-Sol Nissin Corp
@ -44897,6 +44912,21 @@ OUI:1871D5*
 OUI:18742E*
 ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 OUI:1874E21*
 ID_OUI_FROM_DATABASE=Sartorius Lab Instruments GmbH & Co. KG
 OUI:1874E25*
 ID_OUI_FROM_DATABASE=HANGZHOU ZHOUJU ELECTRONIC TECHNOLOGICAL CO.,LTD
 OUI:1874E27*
 ID_OUI_FROM_DATABASE=Sansec Technology Co.,Ltd
 OUI:1874E28*
 ID_OUI_FROM_DATABASE=Kano Computing Limited
 OUI:1874E2C*
 ID_OUI_FROM_DATABASE=NextGen RF Design, Inc.
 OUI:187532*
 ID_OUI_FROM_DATABASE=Sichuan Tianyi Comheart Telecom Co.,LTD
@ -47330,6 +47360,9 @@ OUI:20C047*
 OUI:20C06D*
 ID_OUI_FROM_DATABASE=SHENZHEN SPACETEK TECHNOLOGY CO.,LTD
 OUI:20C19B*
 ID_OUI_FROM_DATABASE=Intel Corporate
 OUI:20C1AF*
 ID_OUI_FROM_DATABASE=i Wit Digital Co., Limited
@ -47744,6 +47777,9 @@ OUI:24240E*
 OUI:242642*
 ID_OUI_FROM_DATABASE=SHARP Corporation.
 OUI:2428FD*
 ID_OUI_FROM_DATABASE=Hangzhou Hikvision Digital Technology Co.,Ltd.
 OUI:2429FE*
 ID_OUI_FROM_DATABASE=KYOCERA Corporation
@ -48137,6 +48173,9 @@ OUI:249504*
 OUI:2497ED*
 ID_OUI_FROM_DATABASE=Techvision Intelligent Technology Limited
 OUI:249AC8*
 ID_OUI_FROM_DATABASE=Shenzhen Skyworth  Digital  Technology  CO., Ltd
 OUI:249AD8*
 ID_OUI_FROM_DATABASE=YEALINK(XIAMEN) NETWORK TECHNOLOGY CO.,LTD.
@ -48488,6 +48527,9 @@ OUI:280E8B*
 OUI:280FC5*
 ID_OUI_FROM_DATABASE=Beijing Leadsec Technology Co., Ltd.
 OUI:280FEB*
 ID_OUI_FROM_DATABASE=LG Innotek
 OUI:28101B*
 ID_OUI_FROM_DATABASE=MagnaCom
@ -49232,6 +49274,9 @@ OUI:28DEE5*
 OUI:28DEF6*
 ID_OUI_FROM_DATABASE=bioMerieux Inc.
 OUI:28DFEB*
 ID_OUI_FROM_DATABASE=Intel Corporate
 OUI:28E02C*
 ID_OUI_FROM_DATABASE=Apple, Inc.
@ -49367,6 +49412,9 @@ OUI:28F537E*
 OUI:28F606*
 ID_OUI_FROM_DATABASE=Syes srl
 OUI:28FA19*
 ID_OUI_FROM_DATABASE=Shenzhen Jingxun Software Telecommunication Technology Co.,Ltd
 OUI:28FA7A*
 ID_OUI_FROM_DATABASE=Zhejiang Tmall Technology Co., Ltd.
@ -49874,6 +49922,9 @@ OUI:2C4835D*
 OUI:2C4835E*
 ID_OUI_FROM_DATABASE=IROOTECH TECHNOLOGY CO.,LTD
 OUI:2C4881*
 ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 OUI:2C4A11*
 ID_OUI_FROM_DATABASE=Ciena Corporation
@ -50051,6 +50102,9 @@ OUI:2C6B7D*
 OUI:2C6BF5*
 ID_OUI_FROM_DATABASE=Juniper Networks
 OUI:2C6DC1*
 ID_OUI_FROM_DATABASE=Intel Corporate
 OUI:2C6E85*
 ID_OUI_FROM_DATABASE=Intel Corporate
@ -50844,7 +50898,7 @@ OUI:304950C*
 ID_OUI_FROM_DATABASE=Anacove LLC
 OUI:304950D*
- ID_OUI_FROM_DATABASE=Xio Research, Inc
+ ID_OUI_FROM_DATABASE=Merlyn Mind, Inc.
 OUI:304950E*
 ID_OUI_FROM_DATABASE=IoTmaxx GmbH
@ -51170,6 +51224,9 @@ OUI:30B216*
 OUI:30B237*
 ID_OUI_FROM_DATABASE=GD Midea Air-Conditioning Equipment Co.,Ltd.
 OUI:30B346*
 ID_OUI_FROM_DATABASE=CJSC NORSI-TRANS
 OUI:30B3A2*
 ID_OUI_FROM_DATABASE=Shenzhen Heguang Measurement & Control Technology Co.,Ltd
@ -53273,6 +53330,9 @@ OUI:38E26E*
 OUI:38E2DD*
 ID_OUI_FROM_DATABASE=zte corporation
 OUI:38E39F*
 ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 OUI:38E3C5*
 ID_OUI_FROM_DATABASE=Taicang T&W Electronics
@ -55880,6 +55940,9 @@ OUI:4466FC*
 OUI:446747*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:446752*
 ID_OUI_FROM_DATABASE=Wistron INFOCOMM (Zhongshan) CORPORATION
 OUI:446755*
 ID_OUI_FROM_DATABASE=Orbit Irrigation
@ -56969,6 +57032,9 @@ OUI:489D24*
 OUI:489DD1*
 ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 OUI:489EBD*
 ID_OUI_FROM_DATABASE=HP Inc.
 OUI:48A0F8*
 ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
@ -58133,6 +58199,9 @@ OUI:4CD1A1*
 OUI:4CD3AF*
 ID_OUI_FROM_DATABASE=HMD Global Oy
 OUI:4CD577*
 ID_OUI_FROM_DATABASE=CHONGQING FUGUI ELECTRONICS CO.,LTD.
 OUI:4CD637*
 ID_OUI_FROM_DATABASE=Qsono Electronics Co., Ltd
@ -58334,6 +58403,9 @@ OUI:5006AB*
 OUI:500959*
 ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
 OUI:5009E5*
 ID_OUI_FROM_DATABASE=Drimsys,Inc
 OUI:500B32*
 ID_OUI_FROM_DATABASE=Foxda Technology Industrial(ShenZhen)Co.,LTD
@ -58781,6 +58853,9 @@ OUI:506F9A*
 OUI:507043*
 ID_OUI_FROM_DATABASE=BSkyB Ltd
 OUI:507097*
 ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
 OUI:5070E5*
 ID_OUI_FROM_DATABASE=He Shan World Fair Electronics Technology Limited
@ -59978,6 +60053,9 @@ OUI:54BEF7*
 OUI:54BF64*
 ID_OUI_FROM_DATABASE=Dell Inc.
 OUI:54C250*
 ID_OUI_FROM_DATABASE=Iskratel d.o.o.
 OUI:54C33E*
 ID_OUI_FROM_DATABASE=Ciena Corporation
@ -60404,6 +60482,9 @@ OUI:584C19*
 OUI:584CEE*
 ID_OUI_FROM_DATABASE=Digital One Technologies, Limited
 OUI:584D42*
 ID_OUI_FROM_DATABASE=Dragos, Inc.
 OUI:585076*
 ID_OUI_FROM_DATABASE=Linear Equipamentos Eletronicos SA
@ -61760,6 +61841,9 @@ OUI:5CE30E*
 OUI:5CE3B6*
 ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
 OUI:5CE42A*
 ID_OUI_FROM_DATABASE=Intel Corporate
 OUI:5CE50C*
 ID_OUI_FROM_DATABASE=Beijing Xiaomi Mobile Software Co., Ltd
@ -62069,6 +62153,9 @@ OUI:6023A4*
 OUI:6024C1*
 ID_OUI_FROM_DATABASE=Jiangsu Zhongxun Electronic Technology Co., Ltd
 OUI:6026EF*
 ID_OUI_FROM_DATABASE=Aruba, a Hewlett Packard Enterprise Company
 OUI:60271C*
 ID_OUI_FROM_DATABASE=VIDEOR E. Hartig GmbH
@ -62351,6 +62438,9 @@ OUI:6089B1*
 OUI:6089B7*
 ID_OUI_FROM_DATABASE=KAEL MÜHENDİSLİK ELEKTRONİK TİCARET SANAYİ LİMİTED ŞİRKETİ
 OUI:608A10*
 ID_OUI_FROM_DATABASE=Microchip Technology Inc.
 OUI:608B0E*
 ID_OUI_FROM_DATABASE=Apple, Inc.
@ -62495,6 +62585,9 @@ OUI:60A4B7*
 OUI:60A4D0*
 ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 OUI:60A5E2*
 ID_OUI_FROM_DATABASE=Intel Corporate
 OUI:60A730*
 ID_OUI_FROM_DATABASE=Shenzhen Yipinfang Internet Technology Co.,Ltd
@ -63473,6 +63566,9 @@ OUI:64B310*
 OUI:64B370*
 ID_OUI_FROM_DATABASE=PowerComm Solutions LLC
 OUI:64B379*
 ID_OUI_FROM_DATABASE=Private
 OUI:64B473*
 ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
@ -63552,7 +63648,7 @@ OUI:64CFD9*
 ID_OUI_FROM_DATABASE=Texas Instruments
 OUI:64D02D*
- ID_OUI_FROM_DATABASE=Next Generation Integration (NGI)
+ ID_OUI_FROM_DATABASE=NEXT GENERATION INTEGRATION LIMITED (NGI)
 OUI:64D154*
 ID_OUI_FROM_DATABASE=Routerboard.com
@ -64496,6 +64592,9 @@ OUI:68EBC5*
 OUI:68EC62*
 ID_OUI_FROM_DATABASE=YODO Technology Corp. Ltd.
 OUI:68EC8A*
 ID_OUI_FROM_DATABASE=Private
 OUI:68ECC5*
 ID_OUI_FROM_DATABASE=Intel Corporate
@ -64601,6 +64700,9 @@ OUI:6C0EE6*
 OUI:6C0F6A*
 ID_OUI_FROM_DATABASE=JDC Tech Co., Ltd.
 OUI:6C108B*
 ID_OUI_FROM_DATABASE=WeLink Communications
 OUI:6C13D5*
 ID_OUI_FROM_DATABASE=Cisco Systems, Inc
@ -66287,6 +66389,9 @@ OUI:70B3D5034*
 OUI:70B3D5035*
 ID_OUI_FROM_DATABASE=HKW-Elektronik GmbH
 OUI:70B3D5036*
 ID_OUI_FROM_DATABASE=Vema Venturi AB
 OUI:70B3D5037*
 ID_OUI_FROM_DATABASE=EIFFAGE ENERGIE ELECTRONIQUE
@ -67598,6 +67703,9 @@ OUI:70B3D51EA*
 OUI:70B3D51EB*
 ID_OUI_FROM_DATABASE=Xavant
 OUI:70B3D51ED*
 ID_OUI_FROM_DATABASE=SUS Corporation
 OUI:70B3D51EE*
 ID_OUI_FROM_DATABASE=MEGGITT
@ -67757,6 +67865,9 @@ OUI:70B3D5221*
 OUI:70B3D5222*
 ID_OUI_FROM_DATABASE=Marioff Corporation Oy
 OUI:70B3D5223*
 ID_OUI_FROM_DATABASE=Research Laboratory of Design Automation, Ltd.
 OUI:70B3D5224*
 ID_OUI_FROM_DATABASE=Urbana Smart Solutions Pte Ltd
@ -67985,6 +68096,9 @@ OUI:70B3D526F*
 OUI:70B3D5270*
 ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 OUI:70B3D5271*
 ID_OUI_FROM_DATABASE=Code Blue Corporation
 OUI:70B3D5272*
 ID_OUI_FROM_DATABASE=TELECOM SANTE
@ -68189,6 +68303,9 @@ OUI:70B3D52B4*
 OUI:70B3D52B5*
 ID_OUI_FROM_DATABASE=Dosepack India LLP
 OUI:70B3D52B6*
 ID_OUI_FROM_DATABASE=HLT Micro
 OUI:70B3D52B7*
 ID_OUI_FROM_DATABASE=Matrix Orbital Corporation
@ -68477,6 +68594,9 @@ OUI:70B3D5316*
 OUI:70B3D5317*
 ID_OUI_FROM_DATABASE=Iotopia Solutions
 OUI:70B3D5318*
 ID_OUI_FROM_DATABASE=Exemplar Medical, LLC
 OUI:70B3D5319*
 ID_OUI_FROM_DATABASE=ISO/TC 22/SC 31
@ -68945,6 +69065,9 @@ OUI:70B3D53B4*
 OUI:70B3D53B5*
 ID_OUI_FROM_DATABASE=Preston Industries dba PolyScience
 OUI:70B3D53B6*
 ID_OUI_FROM_DATABASE=MedRx, Inc
 OUI:70B3D53B7*
 ID_OUI_FROM_DATABASE=Paul Scherrer Institut (PSI)
@ -69761,6 +69884,9 @@ OUI:70B3D54C9*
 OUI:70B3D54CA*
 ID_OUI_FROM_DATABASE=PCB Piezotronics
 OUI:70B3D54CB*
 ID_OUI_FROM_DATABASE=Cucos Retail Systems GmbH
 OUI:70B3D54CC*
 ID_OUI_FROM_DATABASE=FRESENIUS MEDICAL CARE
@ -71138,6 +71264,9 @@ OUI:70B3D5696*
 OUI:70B3D5697*
 ID_OUI_FROM_DATABASE=Alazar Technologies Inc.
 OUI:70B3D5698*
 ID_OUI_FROM_DATABASE=ZIEHL-ABEGG SE
 OUI:70B3D5699*
 ID_OUI_FROM_DATABASE=Flextronics International Kft
@ -73622,6 +73751,9 @@ OUI:70B3D59D6*
 OUI:70B3D59D7*
 ID_OUI_FROM_DATABASE=KM OptoElektronik GmbH
 OUI:70B3D59D8*
 ID_OUI_FROM_DATABASE=JOLANYEE  Technology Co., Ltd.
 OUI:70B3D59D9*
 ID_OUI_FROM_DATABASE=ATX Networks Corp
@ -73775,6 +73907,9 @@ OUI:70B3D5A0A*
 OUI:70B3D5A0B*
 ID_OUI_FROM_DATABASE=ambiHome GmbH
 OUI:70B3D5A0C*
 ID_OUI_FROM_DATABASE=Lumiplan Duhamel
 OUI:70B3D5A0D*
 ID_OUI_FROM_DATABASE=Globalcom Engineering SPA
@ -74165,6 +74300,9 @@ OUI:70B3D5A8D*
 OUI:70B3D5A8E*
 ID_OUI_FROM_DATABASE=OMESH CITY GROUP
 OUI:70B3D5A8F*
 ID_OUI_FROM_DATABASE=VK Integrated Systems
 OUI:70B3D5A90*
 ID_OUI_FROM_DATABASE=ERA a.s.
@ -75227,6 +75365,9 @@ OUI:70B3D5BF5*
 OUI:70B3D5BF6*
 ID_OUI_FROM_DATABASE=comtac AG
 OUI:70B3D5BF7*
 ID_OUI_FROM_DATABASE=Fischer Connectors
 OUI:70B3D5BF8*
 ID_OUI_FROM_DATABASE=RCH ITALIA SPA
@ -76295,6 +76436,9 @@ OUI:70B3D5D5B*
 OUI:70B3D5D5C*
 ID_OUI_FROM_DATABASE=Critical Link LLC
 OUI:70B3D5D5D*
 ID_OUI_FROM_DATABASE=SEASONS 4 INC
 OUI:70B3D5D5E*
 ID_OUI_FROM_DATABASE=Barcelona Smart Technologies
@ -76823,6 +76967,9 @@ OUI:70B3D5E0C*
 OUI:70B3D5E0D*
 ID_OUI_FROM_DATABASE=Sigma Connectivity AB
 OUI:70B3D5E0E*
 ID_OUI_FROM_DATABASE=VulcanForms
 OUI:70B3D5E0F*
 ID_OUI_FROM_DATABASE=Vtron Pty Ltd
@ -77732,6 +77879,9 @@ OUI:70B3D5F3E*
 OUI:70B3D5F3F*
 ID_OUI_FROM_DATABASE=comtac AG
 OUI:70B3D5F40*
 ID_OUI_FROM_DATABASE=HORIZON.INC
 OUI:70B3D5F41*
 ID_OUI_FROM_DATABASE=DUEVI SRL
@ -79442,6 +79592,9 @@ OUI:74E19A*
 OUI:74E1B6*
 ID_OUI_FROM_DATABASE=Apple, Inc.
 OUI:74E20C*
 ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 OUI:74E277*
 ID_OUI_FROM_DATABASE=Vizmonet Pte Ltd
@ -80240,6 +80393,9 @@ OUI:78BAD0*
 OUI:78BAF9*
 ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 OUI:78BB88*
 ID_OUI_FROM_DATABASE=Maxio Technology (Hangzhou) Ltd.
 OUI:78BC1A*
 ID_OUI_FROM_DATABASE=Cisco Systems, Inc
@ -81206,6 +81362,9 @@ OUI:7C8274*
 OUI:7C8306*
 ID_OUI_FROM_DATABASE=Glen Dimplex Nordic as
 OUI:7C8530*
 ID_OUI_FROM_DATABASE=Nokia
 OUI:7C8956*
 ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
@ -82451,6 +82610,9 @@ OUI:80CA4B*
 OUI:80CC12*
 ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 OUI:80CC9C*
 ID_OUI_FROM_DATABASE=NETGEAR
 OUI:80CE62*
 ID_OUI_FROM_DATABASE=Hewlett Packard
@ -84335,6 +84497,9 @@ OUI:88AE07*
 OUI:88AE1D*
 ID_OUI_FROM_DATABASE=COMPAL INFORMATION (KUNSHAN) CO., LTD.
 OUI:88AEDD*
 ID_OUI_FROM_DATABASE=EliteGroup Computer Systems Co., LTD
 OUI:88B111*
 ID_OUI_FROM_DATABASE=Intel Corporate
@ -84617,6 +84782,9 @@ OUI:88F7C7*
 OUI:88F872*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:88FCA6*
 ID_OUI_FROM_DATABASE=devolo AG
 OUI:88FD15*
 ID_OUI_FROM_DATABASE=LINEEYE CO., LTD
@ -90329,6 +90497,9 @@ OUI:A0AFBD*
 OUI:A0B045*
 ID_OUI_FROM_DATABASE=Halong Mining
 OUI:A0B086*
 ID_OUI_FROM_DATABASE=Hirschmann Automation and Control GmbH
 OUI:A0B100*
 ID_OUI_FROM_DATABASE=ShenZhen Cando Electronics Co.,Ltd
@ -90593,6 +90764,9 @@ OUI:A0E617*
 OUI:A0E6F8*
 ID_OUI_FROM_DATABASE=Texas Instruments
 OUI:A0E70B*
 ID_OUI_FROM_DATABASE=Intel Corporate
 OUI:A0E9DB*
 ID_OUI_FROM_DATABASE=Ningbo FreeWings Technologies Co.,Ltd
@ -90848,6 +91022,9 @@ OUI:A42985*
 OUI:A429B7*
 ID_OUI_FROM_DATABASE=bluesky
 OUI:A42A71*
 ID_OUI_FROM_DATABASE=Sichuan Tianyi Comheart Telecom Co.,LTD
 OUI:A42B8C*
 ID_OUI_FROM_DATABASE=NETGEAR
@ -91604,6 +91781,9 @@ OUI:A4D4B2*
 OUI:A4D578*
 ID_OUI_FROM_DATABASE=Texas Instruments
 OUI:A4D73C*
 ID_OUI_FROM_DATABASE=Seiko Epson Corporation
 OUI:A4D795*
 ID_OUI_FROM_DATABASE=Wingtech Mobile Communications Co.,Ltd
@ -91910,6 +92090,9 @@ OUI:A81FAF*
 OUI:A82066*
 ID_OUI_FROM_DATABASE=Apple, Inc.
 OUI:A82316*
 ID_OUI_FROM_DATABASE=Nokia
 OUI:A823FE*
 ID_OUI_FROM_DATABASE=LG Electronics
@ -92076,7 +92259,7 @@ OUI:A854B2*
 ID_OUI_FROM_DATABASE=Wistron Neweb Corporation
 OUI:A8556A*
- ID_OUI_FROM_DATABASE=Pocketnet Technology Inc.
+ ID_OUI_FROM_DATABASE=3S System Technology Inc.
 OUI:A8574E*
 ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
@ -92135,6 +92318,9 @@ OUI:A863F2*
 OUI:A86405*
 ID_OUI_FROM_DATABASE=nimbus 9, Inc
 OUI:A864F1*
 ID_OUI_FROM_DATABASE=Intel Corporate
 OUI:A865B2*
 ID_OUI_FROM_DATABASE=DONGGUAN YISHANG ELECTRONIC TECHNOLOGY CO., LIMITED
@ -94271,6 +94457,9 @@ OUI:B0D7C5*
 OUI:B0D7CC*
 ID_OUI_FROM_DATABASE=Tridonic GmbH & Co KG
 OUI:B0D888*
 ID_OUI_FROM_DATABASE=Panasonic Corporation Automotive
 OUI:B0DA00*
 ID_OUI_FROM_DATABASE=CERA ELECTRONIQUE
@ -95798,6 +95987,9 @@ OUI:B89BE4*
 OUI:B89F09*
 ID_OUI_FROM_DATABASE=Wistron Neweb Corporation
 OUI:B8A14A*
 ID_OUI_FROM_DATABASE=Raisecom Technology CO.,LTD
 OUI:B8A175*
 ID_OUI_FROM_DATABASE=Roku, Inc.
@ -96818,6 +97010,9 @@ OUI:BCA042*
 OUI:BCA13A*
 ID_OUI_FROM_DATABASE=SES-imagotag
 OUI:BCA37F*
 ID_OUI_FROM_DATABASE=Rail-Mil Sp. z o.o. Sp. K.
 OUI:BCA4E1*
 ID_OUI_FROM_DATABASE=Nabto
@ -97232,6 +97427,9 @@ OUI:C0395A*
 OUI:C03B8F*
 ID_OUI_FROM_DATABASE=Minicom Digital Signage
 OUI:C03C04*
 ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 OUI:C03C59*
 ID_OUI_FROM_DATABASE=Intel Corporate
@ -100182,7 +100380,7 @@ OUI:CC3A61*
 ID_OUI_FROM_DATABASE=SAMSUNG ELECTRO MECHANICS CO., LTD.
 OUI:CC3ADF*
- ID_OUI_FROM_DATABASE=Private
+ ID_OUI_FROM_DATABASE=Neptune Technology Group Inc.
 OUI:CC3B27*
 ID_OUI_FROM_DATABASE=TECNO MOBILE LIMITED
@ -101087,6 +101285,9 @@ OUI:D015A6*
 OUI:D016B4*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 OUI:D01769*
 ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
 OUI:D0176A*
 ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
@ -101105,6 +101306,9 @@ OUI:D01C3C*
 OUI:D01CBB*
 ID_OUI_FROM_DATABASE=Beijing Ctimes Digital Technology Co., Ltd.
 OUI:D01E1D*
 ID_OUI_FROM_DATABASE=SaiNXT Technologies LLP
 OUI:D021AC*
 ID_OUI_FROM_DATABASE=Yo Labs LLC
@ -101627,12 +101831,51 @@ OUI:D09D0A*
 OUI:D09DAB*
 ID_OUI_FROM_DATABASE=TCT mobile ltd
 OUI:D09FD90*
 ID_OUI_FROM_DATABASE=Lemei Intelligent IOT (Shenzhen) Co., Ltd
 OUI:D09FD91*
 ID_OUI_FROM_DATABASE=elecgator bvba
 OUI:D09FD92*
 ID_OUI_FROM_DATABASE=Westar Display Technologies
 OUI:D09FD93*
 ID_OUI_FROM_DATABASE=Sanken-Densetsu Co.,LTD.
 OUI:D09FD94*
 ID_OUI_FROM_DATABASE=Poten (Shanghai) Technology Co.,Ltd.
 OUI:D09FD95*
 ID_OUI_FROM_DATABASE=Carbon Mobile GmbH
 OUI:D09FD96*
 ID_OUI_FROM_DATABASE=Elevoc Technology Co., Ltd.
 OUI:D09FD97*
 ID_OUI_FROM_DATABASE=Raymax Technology Ltd.
 OUI:D09FD98*
 ID_OUI_FROM_DATABASE=Queclink Wireless Solutions Co., Ltd.
 OUI:D09FD99*
 ID_OUI_FROM_DATABASE=ENTTEC Pty Ltd.
 OUI:D09FD9A*
 ID_OUI_FROM_DATABASE=Eurolan Ltd
 OUI:D09FD9B*
 ID_OUI_FROM_DATABASE=Cablewireless Laboratory Co., Ltd
 OUI:D09FD9C*
 ID_OUI_FROM_DATABASE=Fujian Newland Auto-ID Tech. Co,.Ltd.
 OUI:D09FD9D*
 ID_OUI_FROM_DATABASE=Shenzhen eloT Technology Co.,Ltd
 OUI:D09FD9E*
 ID_OUI_FROM_DATABASE=Minibems Ltd
 OUI:D0A0D6*
 ID_OUI_FROM_DATABASE=Chengdu TD Tech Ltd.
@ -102269,6 +102512,9 @@ OUI:D45383*
 OUI:D453AF*
 ID_OUI_FROM_DATABASE=VIGO System S.A.
 OUI:D4548B*
 ID_OUI_FROM_DATABASE=Intel Corporate
 OUI:D45556*
 ID_OUI_FROM_DATABASE=Fiber Mountain Inc.
@ -103418,6 +103664,9 @@ OUI:D89ED4*
 OUI:D89EF3*
 ID_OUI_FROM_DATABASE=Dell Inc.
 OUI:D8A011*
 ID_OUI_FROM_DATABASE=WiZ
 OUI:D8A01D*
 ID_OUI_FROM_DATABASE=Espressif Inc.
@ -104913,7 +105162,7 @@ OUI:E05A9F7*
 ID_OUI_FROM_DATABASE=OMB Guitars LLC
 OUI:E05A9F8*
- ID_OUI_FROM_DATABASE=Fujian Newland Auto-ID Tech. Co.,Ltd.
+ ID_OUI_FROM_DATABASE=Fujian Newland Auto-ID Tech. Co,.Ltd.
 OUI:E05A9F9*
 ID_OUI_FROM_DATABASE=Gemalto Document Readers
@ -107270,6 +107519,9 @@ OUI:EC0441*
 OUI:EC086B*
 ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 OUI:EC08E5*
 ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 OUI:EC0BAE*
 ID_OUI_FROM_DATABASE=Hangzhou BroadLink Technology Co.,Ltd
@ -108725,6 +108977,9 @@ OUI:F0C42F*
 OUI:F0C77F*
 ID_OUI_FROM_DATABASE=Texas Instruments
 OUI:F0C814*
 ID_OUI_FROM_DATABASE=SHENZHEN BILIAN ELECTRONIC CO.，LTD
 OUI:F0C850*
 ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
@ -109313,6 +109568,9 @@ OUI:F4631F*
 OUI:F46349*
 ID_OUI_FROM_DATABASE=Diffon Corporation
 OUI:F463E7*
 ID_OUI_FROM_DATABASE=Nanjing Maxon O.E. Tech. Co., LTD
 OUI:F4645D*
 ID_OUI_FROM_DATABASE=Toshiba
@ -110519,6 +110777,9 @@ OUI:F88DEF*
 OUI:F88E85*
 ID_OUI_FROM_DATABASE=Comtrend Corporation
 OUI:F88EA1*
 ID_OUI_FROM_DATABASE=Edgecore Networks Corporation
 OUI:F88F07*
 ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
--- a/hwdb.d/20-acpi-vendor.hwdb
+++ b/hwdb.d/20-acpi-vendor.hwdb
@ -96,6 +96,9 @@ acpi:ESSX*:
 acpi:EXAR*:
 ID_VENDOR_FROM_DATABASE=Exar Corporation
 acpi:FRMW*:
 ID_VENDOR_FROM_DATABASE=Framework Computer LLC
 acpi:FRSC*:
 ID_VENDOR_FROM_DATABASE=Freescale, Inc
@ -171,6 +174,9 @@ acpi:IP3T*:
 acpi:IPHI*:
 ID_VENDOR_FROM_DATABASE=Inphi Corporation
 acpi:JSYS*:
 ID_VENDOR_FROM_DATABASE=Juniper Systems, Inc.
 acpi:KIOX*:
 ID_VENDOR_FROM_DATABASE=Kionix, Inc.
@ -231,6 +237,9 @@ acpi:PHYT*:
 acpi:PIXA*:
 ID_VENDOR_FROM_DATABASE=PixArt imaging inc.
 acpi:PNSO*:
 ID_VENDOR_FROM_DATABASE=Pensando Systems, Inc.
 acpi:QCOM*:
 ID_VENDOR_FROM_DATABASE=Qualcomm Inc
@ -598,7 +607,7 @@ acpi:ALO*:
 ID_VENDOR_FROM_DATABASE=Algolith Inc.
 acpi:ALP*:
- ID_VENDOR_FROM_DATABASE=Alps Electric Company Ltd
+ ID_VENDOR_FROM_DATABASE=ALPS ALPINE CO., LTD.
 acpi:ALR*:
 ID_VENDOR_FROM_DATABASE=Advanced Logic
@ -724,7 +733,7 @@ acpi:APD*:
 ID_VENDOR_FROM_DATABASE=AppliAdata
 acpi:APE*:
- ID_VENDOR_FROM_DATABASE=Alpine Electronics, Inc.
+ ID_VENDOR_FROM_DATABASE=ALPS ALPINE CO., LTD.
 acpi:APG*:
 ID_VENDOR_FROM_DATABASE=Horner Electric Inc
@ -889,7 +898,7 @@ acpi:AUG*:
 ID_VENDOR_FROM_DATABASE=August Home, Inc.
 acpi:AUI*:
- ID_VENDOR_FROM_DATABASE=Alps Electric Inc
+ ID_VENDOR_FROM_DATABASE=ALPS ALPINE CO., LTD.
 acpi:AUO*:
 ID_VENDOR_FROM_DATABASE=AU Optronics
--- 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-30 13:03:54.632421502 +0200
-+++ 20-acpi-vendor.hwdb	2021-03-17 15:53:15.967773649 +0100
+++ 20-acpi-vendor.hwdb	2021-03-30 13:03:54.650421692 +0200
@@ -3,6 +3,8 @@
 # Data imported from:
 #     https://uefi.org/uefi-pnp-export
@ -19,7 +19,7 @@
 acpi:AMDI*:
  ID_VENDOR_FROM_DATABASE=AMD
-@@ -301,6 +300,9 @@
+@@ -310,6 +309,9 @@
 acpi:AAA*:
  ID_VENDOR_FROM_DATABASE=Avolites Ltd
@ -29,7 +29,7 @@
 acpi:AAE*:
  ID_VENDOR_FROM_DATABASE=Anatek Electronics Inc.
-@@ -328,6 +330,9 @@
+@@ -337,6 +339,9 @@
 acpi:ABO*:
  ID_VENDOR_FROM_DATABASE=D-Link Systems Inc
@ -39,7 +39,7 @@
 acpi:ABS*:
  ID_VENDOR_FROM_DATABASE=Abaco Systems, Inc.
-@@ -373,7 +378,7 @@
+@@ -382,7 +387,7 @@
 acpi:ACO*:
  ID_VENDOR_FROM_DATABASE=Allion Computer Inc.
@ -48,7 +48,7 @@
  ID_VENDOR_FROM_DATABASE=Aspen Tech Inc
 acpi:ACR*:
-@@ -646,6 +651,9 @@
+@@ -655,6 +660,9 @@
 acpi:AMT*:
  ID_VENDOR_FROM_DATABASE=AMT International Industry
@ -58,7 +58,7 @@
 acpi:AMX*:
  ID_VENDOR_FROM_DATABASE=AMX LLC
-@@ -694,6 +702,9 @@
+@@ -703,6 +711,9 @@
 acpi:AOA*:
  ID_VENDOR_FROM_DATABASE=AOpen Inc.
@ -68,7 +68,7 @@
 acpi:AOE*:
  ID_VENDOR_FROM_DATABASE=Advanced Optics Electronics, Inc.
-@@ -703,6 +714,9 @@
+@@ -712,6 +723,9 @@
 acpi:AOT*:
  ID_VENDOR_FROM_DATABASE=Alcatel
@ -78,8 +78,8 @@
 acpi:APC*:
  ID_VENDOR_FROM_DATABASE=American Power Conversion
-@@ -878,7 +892,7 @@
+@@ -887,7 +901,7 @@
-  ID_VENDOR_FROM_DATABASE=Alps Electric Inc
+  ID_VENDOR_FROM_DATABASE=ALPS ALPINE CO., LTD.
 acpi:AUO*:
 - ID_VENDOR_FROM_DATABASE=DO NOT USE - AUO
@ -87,7 +87,7 @@
 acpi:AUR*:
  ID_VENDOR_FROM_DATABASE=Aureal Semiconductor
-@@ -958,6 +972,9 @@
+@@ -967,6 +981,9 @@
 acpi:AXE*:
  ID_VENDOR_FROM_DATABASE=Axell Corporation
@ -97,7 +97,7 @@
 acpi:AXI*:
  ID_VENDOR_FROM_DATABASE=American Magnetics
-@@ -1108,6 +1125,9 @@
+@@ -1117,6 +1134,9 @@
 acpi:BML*:
  ID_VENDOR_FROM_DATABASE=BIOMED Lab
@ -107,7 +107,7 @@
 acpi:BMS*:
  ID_VENDOR_FROM_DATABASE=BIOMEDISYS
-@@ -1120,6 +1140,9 @@
+@@ -1129,6 +1149,9 @@
 acpi:BNO*:
  ID_VENDOR_FROM_DATABASE=Bang & Olufsen
@ -117,7 +117,7 @@
 acpi:BNS*:
  ID_VENDOR_FROM_DATABASE=Boulder Nonlinear Systems
-@@ -1363,6 +1386,9 @@
+@@ -1372,6 +1395,9 @@
 acpi:CHA*:
  ID_VENDOR_FROM_DATABASE=Chase Research PLC
@ -127,7 +127,7 @@
 acpi:CHD*:
  ID_VENDOR_FROM_DATABASE=ChangHong Electric Co.,Ltd
-@@ -1525,6 +1551,9 @@
+@@ -1534,6 +1560,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 @@
+@@ -1943,7 +1972,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 @@
+@@ -2275,6 +2304,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 @@
+@@ -2536,6 +2568,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 @@
+@@ -2909,7 +2944,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 @@
+@@ -3010,6 +3045,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 @@
+@@ -3139,6 +3177,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 @@
+@@ -3262,6 +3303,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 @@
+@@ -3358,6 +3402,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 @@
+@@ -3403,6 +3450,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 @@
+@@ -3913,6 +3963,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 @@
+@@ -3958,6 +4011,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 @@
+@@ -3973,6 +4029,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 @@
+@@ -4027,6 +4086,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 @@
+@@ -4061,7 +4123,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 @@
+@@ -4237,6 +4299,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 @@
+@@ -4477,6 +4542,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 @@
+@@ -4705,6 +4773,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 @@
+@@ -5215,6 +5286,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 @@
+@@ -5278,9 +5352,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 @@
+@@ -5368,9 +5439,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 @@
+@@ -5506,15 +5574,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 @@
+@@ -5830,9 +5892,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 @@
+@@ -5998,9 +6057,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 @@
+@@ -6460,6 +6516,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 @@
+@@ -6544,6 +6603,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 @@
+@@ -6634,6 +6696,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 @@
+@@ -6676,6 +6741,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 @@
+@@ -6796,9 +6864,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 @@
+@@ -7105,14 +7170,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 @@
+@@ -7147,6 +7212,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 @@
+@@ -7393,9 +7461,6 @@
 acpi:WAL*:
  ID_VENDOR_FROM_DATABASE=Wave Access
@ -461,7 +461,7 @@
 acpi:WAV*:
  ID_VENDOR_FROM_DATABASE=Wavephore
-@@ -7511,7 +7576,7 @@
+@@ -7520,7 +7585,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 @@
+@@ -7534,9 +7599,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 @@
+@@ -7567,9 +7629,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 @@
+@@ -7636,6 +7695,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
@ -2453,6 +2453,18 @@ pci:v00001000d000010E1sv00001D49sd0000060F*
 pci:v00001000d000010E2*
 ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS39xx
 pci:v00001000d000010E2sv00001000sd00004000*
 ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS39xx (MegaRAID 9560-16i)
 pci:v00001000d000010E2sv00001000sd00004010*
 ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS39xx (MegaRAID 9560-8i)
 pci:v00001000d000010E2sv00001000sd00004020*
 ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS39xx (MegaRAID 9580-8i8e)
 pci:v00001000d000010E2sv00001000sd000040B0*
 ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS39xx (MegaRAID 9562-16i)
 pci:v00001000d000010E2sv00001028sd00001AE0*
 ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS39xx (PERC H755 Adapter)
@ -5541,10 +5553,10 @@ pci:v00001002d00005F57*
 ID_MODEL_FROM_DATABASE=R423 [Radeon X800 XT]
 pci:v00001002d00006600*
- ID_MODEL_FROM_DATABASE=Mars [Radeon HD 8670A/8670M/8750M]
+ ID_MODEL_FROM_DATABASE=Mars [Radeon HD 8670A/8670M/8750M / R7 M370]
 pci:v00001002d00006600sv0000103Csd00001952*
- ID_MODEL_FROM_DATABASE=Mars [Radeon HD 8670A/8670M/8750M] (ProBook 455 G1)
+ ID_MODEL_FROM_DATABASE=Mars [Radeon HD 8670A/8670M/8750M / R7 M370] (ProBook 455 G1)
 pci:v00001002d00006601*
 ID_MODEL_FROM_DATABASE=Mars [Radeon HD 8730M]
@ -6534,61 +6546,79 @@ pci:v00001002d00006758sv00001787sd00002309*
 ID_MODEL_FROM_DATABASE=Turks XT [Radeon HD 6670/7670] (Radeon HD 6670)
 pci:v00001002d00006759*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550]
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230]
 pci:v00001002d00006759sv0000103Csd00003130*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550] (Radeon HD 6570)
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 6570)
 pci:v00001002d00006759sv00001043sd00000403*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550] (Radeon HD 6570)
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 6570)
 pci:v00001002d00006759sv00001462sd00002500*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550] (Radeon HD 6570)
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 6570)
 pci:v00001002d00006759sv00001462sd00002509*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550] (Radeon HD 7570)
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 7570)
 pci:v00001002d00006759sv0000148Csd00007570*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550] (Radeon HD 7570)
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 7570)
 pci:v00001002d00006759sv00001642sd00003A67*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550] (Radeon HD 6570)
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 6570)
 pci:v00001002d00006759sv00001682sd00003280*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550] (Radeon HD 7570)
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 7570)
 pci:v00001002d00006759sv00001682sd00003530*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550] (Radeon HD 8550)
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 8550)
 pci:v00001002d00006759sv00001682sd00005230*
 ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon R5 230 series)
 pci:v00001002d00006759sv00001682sd00006450*
 ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 6450 series)
 pci:v00001002d00006759sv0000174Bsd00007570*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550] (Radeon HD 7570)
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 7570)
 pci:v00001002d00006759sv0000174Bsd00008550*
 ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD8550 OEM)
 pci:v00001002d00006759sv0000174Bsd00008570*
 ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD8550 OEM)
 pci:v00001002d00006759sv0000174Bsd0000E142*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550] (Radeon HD 6570)
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 6570)
 pci:v00001002d00006759sv0000174Bsd0000E181*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550] (Radeon HD 6570)
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 6570)
 pci:v00001002d00006759sv00001787sd0000A230*
 ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon R5 230 series)
 pci:v00001002d00006759sv00001787sd0000A450*
 ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 6450 series)
 pci:v00001002d00006759sv00001B0Asd0000908F*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550] (Radeon HD 6570)
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 6570)
 pci:v00001002d00006759sv00001B0Asd00009090*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550] (Radeon HD 6570)
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 6570)
 pci:v00001002d00006759sv00001B0Asd00009091*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550] (Radeon HD 6570)
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 6570)
 pci:v00001002d00006759sv00001B0Asd00009092*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550] (Radeon HD 6570)
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 6570)
 pci:v00001002d00006759sv00001B0Asd0000909E*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550] (Radeon HD 6570)
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 6570)
 pci:v00001002d00006759sv00001B0Asd000090B5*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550] (Radeon HD 7570)
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 7570)
 pci:v00001002d00006759sv00001B0Asd000090B6*
- ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550] (Radeon HD 7570)
+ ID_MODEL_FROM_DATABASE=Turks PRO [Radeon HD 6570/7570/8550 / R5 230] (Radeon HD 7570)
 pci:v00001002d0000675B*
 ID_MODEL_FROM_DATABASE=Turks [Radeon HD 7600 Series]
@ -10655,6 +10685,9 @@ pci:v00001002d00007310*
 pci:v00001002d00007312*
 ID_MODEL_FROM_DATABASE=Navi 10 [Radeon Pro W5700]
 pci:v00001002d00007314*
 ID_MODEL_FROM_DATABASE=Navi 10 USB
 pci:v00001002d0000731F*
 ID_MODEL_FROM_DATABASE=Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT]
@ -10694,6 +10727,12 @@ pci:v00001002d0000738C*
 pci:v00001002d0000738E*
 ID_MODEL_FROM_DATABASE=Arcturus GL-XL
 pci:v00001002d000073A4*
 ID_MODEL_FROM_DATABASE=Navi 21 USB
 pci:v00001002d000073AF*
 ID_MODEL_FROM_DATABASE=Navi 21 [Radeon RX 6900 XT]
 pci:v00001002d000073BF*
 ID_MODEL_FROM_DATABASE=Navi 21 [Radeon RX 6800/6800 XT / 6900 XT]
@ -10703,8 +10742,11 @@ pci:v00001002d000073BFsv00001EAEsd00006701*
 pci:v00001002d000073C3*
 ID_MODEL_FROM_DATABASE=Navi 22
 pci:v00001002d000073C4*
 ID_MODEL_FROM_DATABASE=Navi 22 USB
 pci:v00001002d000073DF*
- ID_MODEL_FROM_DATABASE=Navi 22 [Radeon RX 6700/6700 XT]
+ ID_MODEL_FROM_DATABASE=Navi 22 [Radeon RX 6700/6700 XT / 6800M]
 pci:v00001002d000073E0*
 ID_MODEL_FROM_DATABASE=Navi 23
@ -10712,6 +10754,9 @@ pci:v00001002d000073E0*
 pci:v00001002d000073E1*
 ID_MODEL_FROM_DATABASE=Navi 23
 pci:v00001002d000073E4*
 ID_MODEL_FROM_DATABASE=Navi 23 USB
 pci:v00001002d000073FF*
 ID_MODEL_FROM_DATABASE=Navi 23 [Radeon RX 6600/6600 XT]
@ -42006,7 +42051,7 @@ pci:v00001134d0000000D*
 ID_MODEL_FROM_DATABASE=POET PSDMS Device
 pci:v00001135*
- ID_VENDOR_FROM_DATABASE=Fuji Xerox Co Ltd
+ ID_VENDOR_FROM_DATABASE=FUJIFILM Business Innovation Corp.
 pci:v00001135d00000001*
 ID_MODEL_FROM_DATABASE=Printer controller
@ -52238,6 +52283,9 @@ pci:v00001414d00000001*
 pci:v00001414d00000002*
 ID_MODEL_FROM_DATABASE=MN-130 (ADMtek Centaur-P based)
 pci:v00001414d0000008C*
 ID_MODEL_FROM_DATABASE=Basic Render Driver
 pci:v00001414d00005353*
 ID_MODEL_FROM_DATABASE=Hyper-V virtual VGA
@ -69719,6 +69767,12 @@ pci:v00001DF3d00000206sv00001DF3sd00000000*
 pci:v00001DF3d00000206sv00001DF3sd00000001*
 ID_MODEL_FROM_DATABASE=ACE-NIC200 Programmable Network Accelerator (ENA2200F)
 pci:v00001DF3d00000207*
 ID_MODEL_FROM_DATABASE=ACE-NIC50RN Programmable Network Accelerator
 pci:v00001DF3d00000208*
 ID_MODEL_FROM_DATABASE=ACE-NIC100RN Programmable Network Accelerator
 pci:v00001DF7*
 ID_VENDOR_FROM_DATABASE=opencpi.org
@ -78521,6 +78575,9 @@ pci:v00008086d00001592sv00008086sd0000000C*
 pci:v00008086d00001592sv00008086sd0000000D*
 ID_MODEL_FROM_DATABASE=Ethernet Controller E810-C for QSFP (Ethernet Network Adapter E810-L-Q2 for OCP 3.0)
 pci:v00008086d00001592sv00008086sd0000000E*
 ID_MODEL_FROM_DATABASE=Ethernet Controller E810-C for QSFP (Ethernet Network Adapter E810-2C-Q2)
 pci:v00008086d00001593*
 ID_MODEL_FROM_DATABASE=Ethernet Controller E810-C for SFP
@ -83210,6 +83267,9 @@ pci:v00008086d000024F0sv00001CB8sd00000003*
 pci:v00008086d000024F0sv00001CB8sd00000004*
 ID_MODEL_FROM_DATABASE=Omni-Path HFI Silicon 100 Series [discrete] (Omni-Path HFI Adapter 100 Series, 1 Port, PCIe x16, TC4600E QSFP28)
 pci:v00008086d000024F0sv0000434Esd00000001*
 ID_MODEL_FROM_DATABASE=Omni-Path HFI Silicon 100 Series [discrete] (Omni-Path HFI 100 Series, 1 Port, OCP 3.0 Adapter)
 pci:v00008086d000024F0sv00008086sd00002628*
 ID_MODEL_FROM_DATABASE=Omni-Path HFI Silicon 100 Series [discrete] (Omni-Path HFI Adapter 100 Series, 1 Port, PCIe x16)
@ -99005,6 +99065,9 @@ pci:v0000F1D0d0000EB24*
 pci:v0000F1D0d0000EB25*
 ID_MODEL_FROM_DATABASE=Corvid 44 12g
 pci:v0000F1D0d0000EB26*
 ID_MODEL_FROM_DATABASE=T-Tap Pro
 pci:v0000F1D0d0000EFAC*
 ID_MODEL_FROM_DATABASE=Xena SD-MM/SD-22-MM
--- a/hwdb.d/60-autosuspend-fingerprint-reader.hwdb
+++ b/hwdb.d/60-autosuspend-fingerprint-reader.hwdb
@ -147,7 +147,7 @@ usb:v06CBp00F9*
 usb:v06CBp00FC*
 usb:v06CBp00C2*
 usb:v06CBp00C9*
-usb:v06CBp00E7*
+usb:v06CBp0100*
 ID_AUTOSUSPEND=1
 # Supported by libfprint driver upeksonly
--- a/hwdb.d/acpi_id_registry.html
+++ b/hwdb.d/acpi_id_registry.html
@ -102,6 +102,9 @@
 <tr class="even"><td>Loongson Technology Corporation Limited</td><td>LOON</td><td>09/10/2020</td> </tr>
 <tr class="odd"><td>Seiko Epson Corporation</td><td>SECC</td><td>02/16/2021</td> </tr>
 <tr class="even"><td>Alibaba Co., Ltd.</td><td>BABA</td><td>02/02/2021</td> </tr>
 <tr class="odd"><td>Juniper Systems, Inc.</td><td>JSYS</td><td>03/18/2021</td> </tr>
 <tr class="even"><td>Framework Computer LLC</td><td>FRMW</td><td>03/22/2021</td> </tr>
 <tr class="odd"><td>Pensando Systems, Inc.</td><td>PNSO</td><td>03/24/2021</td> </tr>
      </tbody>
    </table>
  </body>
--- a/hwdb.d/ma-large.txt
+++ b/hwdb.d/ma-large.txt
@ -17741,12 +17741,6 @@ F8D756     (base 16)		Simm Tronic Limited
 				Dublin     12
 				IE
 64-D0-2D   (hex)		Next Generation Integration (NGI)
 64D02D     (base 16)		Next Generation Integration (NGI)
 				137 rue de Versailles
 				Le Chesnay    78150
 				FR
 90-51-3F   (hex)		Elettronica Santerno SpA
 90513F     (base 16)		Elettronica Santerno SpA
 				Via della Concia 7
@ -35747,6 +35741,96 @@ F46077     (base 16)		Texas Instruments
 				Dallas  TX  75243
 				US
 24-9A-C8   (hex)		Shenzhen Skyworth  Digital  Technology  CO., Ltd
 249AC8     (base 16)		Shenzhen Skyworth  Digital  Technology  CO., Ltd
 				4F,Block A, Skyworth?Building,
 				Shenzhen  Guangdong  518057
 				CN
 C0-3C-04   (hex)		Sagemcom Broadband SAS
 C03C04     (base 16)		Sagemcom Broadband SAS
 				250, route de l'Empereur
 				Rueil Malmaison Cedex  hauts de seine  92848
 				FR
 A4-D7-3C   (hex)		Seiko Epson Corporation
 A4D73C     (base 16)		Seiko Epson Corporation
 				2070 Kotobuki Koaka
 				Matsumoto-shi  Nagano-ken  399-8702
 				JP
 2C-48-81   (hex)		vivo Mobile Communication Co., Ltd.
 2C4881     (base 16)		vivo Mobile Communication Co., Ltd.
 				#283,BBK Road
 				Wusha,Chang'An  DongGuan City,Guangdong,  523860
 				CN
 60-26-EF   (hex)		Aruba, a Hewlett Packard Enterprise Company
 6026EF     (base 16)		Aruba, a Hewlett Packard Enterprise Company
 				3333 Scott Blvd
 				Santa Clara  CA  95054
 				US
 F8-8E-A1   (hex)		Edgecore Networks Corporation
 F88EA1     (base 16)		Edgecore Networks Corporation
 				1 Creation RD 3.
 				Hsinchu    30077
 				TW
 7C-85-30   (hex)		Nokia
 7C8530     (base 16)		Nokia
 				600 March Road
 				Kanata  Ontario  K2K 2E6
 				CA
 64-D0-2D   (hex)		NEXT GENERATION INTEGRATION LIMITED (NGI)
 64D02D     (base 16)		NEXT GENERATION INTEGRATION LIMITED (NGI)
 				Unit 1102, 11 / F, 29 Austin Road, TSIM SHA TSUI
 				KOWLOON  Hong Kong  999077
 				HK
 24-28-FD   (hex)		Hangzhou Hikvision Digital Technology Co.,Ltd.
 2428FD     (base 16)		Hangzhou Hikvision Digital Technology Co.,Ltd.
 				No.555 Qianmo Road
 				Hangzhou  Zhejiang  310052
 				CN
 88-AE-DD   (hex)		EliteGroup Computer Systems Co., LTD
 88AEDD     (base 16)		EliteGroup Computer Systems Co., LTD
 				No. 239, Sec. 2, Ti ding Blvd.
 				Taipei City    11493
 				TW
 A0-E7-0B   (hex)		Intel Corporate
 A0E70B     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
 				Kulim  Kedah  09000
 				MY
 B0-D8-88   (hex)		Panasonic Corporation Automotive
 B0D888     (base 16)		Panasonic Corporation Automotive
 				5652
 				Matsumoto City  Nagano  399-8730
 				JP
 F4-63-E7   (hex)		Nanjing Maxon O.E. Tech. Co., LTD
 F463E7     (base 16)		Nanjing Maxon O.E. Tech. Co., LTD
 				6/F, Building A3, Zidong International Creative Park, Zidong Road, Qixia District, Nanjing
 				NAN JING  JIANG SU  210000
 				CN
 04-EE-EE   (hex)		Laplace System Co., Ltd.
 04EEEE     (base 16)		Laplace System Co., Ltd.
 				1-245 Kyo-machi
 				Fushimi, Kyoto  Kyoto  6128083
 				JP
 6C-10-8B   (hex)		WeLink Communications
 6C108B     (base 16)		WeLink Communications
 				4186 N Red Maple Court
 				Lehi  UT  84043
 				US
 9C-FF-C2   (hex)		AVI Systems GmbH
 9CFFC2     (base 16)		AVI Systems GmbH
 				Dr. Franz Wilhelmstraße 2A
@ -62327,12 +62411,6 @@ D4AAFF     (base 16)		MICRO WORLD
 				KR
 00-03-24   (hex)		SANYO Consumer Electronics Co., Ltd.
 000324     (base 16)		SANYO Consumer Electronics Co., Ltd.
 				7-101 Tachikawa-cho
 				Tottori City    680-8634
 				JP
 00-02-BF   (hex)		dotRocket, Inc.
 0002BF     (base 16)		dotRocket, Inc.
 				1901 S. Bascom, Suite 300
@ -70979,12 +71057,18 @@ E408E7     (base 16)		Quectel Wireless Solutions Co.,Ltd.
 				Broendby     2605
 				DK
-60-B6-E1   (hex)		Texas Instruments
+10-09-F9   (hex)		Amazon Technologies Inc.
-60B6E1     (base 16)		Texas Instruments
+1009F9     (base 16)		Amazon Technologies Inc.
-				12500 TI Blvd
+				P.O Box 8102 
-				Dallas  TX  75243
+				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
 6C-79-B8   (hex)		Texas Instruments
 6C79B8     (base 16)		Texas Instruments
 				12500 TI Blvd
@ -71003,11 +71087,17 @@ A4D094     (base 16)		VIVAVIS AG
 				NEW DELHI    NA
 				IN
-90-69-76   (hex)		Withrobot Inc.
+D4-54-8B   (hex)		Intel Corporate
-906976     (base 16)		Withrobot Inc.
+D4548B     (base 16)		Intel Corporate
-				#1001, Seoul Forest M-tower, 31, Ttukseom-ro 1-gil, Seongdong-gu
+				Lot 8, Jalan Hi-Tech 2/3  
-				Seoul  Seoul  04778
+				Kulim  Kedah  09000
-				KR
+				MY
 60-A5-E2   (hex)		Intel Corporate
 60A5E2     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
 				Kulim  Kedah  09000
 				MY
 FC-92-57   (hex)		Renesas Electronics (Penang) Sdn. Bhd.
 FC9257     (base 16)		Renesas Electronics (Penang) Sdn. Bhd.
@ -71015,18 +71105,84 @@ FC9257     (base 16)		Renesas Electronics (Penang) Sdn. Bhd.
 				Bayan Lepas  Penang  11900
 				MY
-10-09-F9   (hex)		Amazon Technologies Inc.
+90-69-76   (hex)		Withrobot Inc.
-1009F9     (base 16)		Amazon Technologies Inc.
+906976     (base 16)		Withrobot Inc.
-				P.O Box 8102 
+				#1001, Seoul Forest M-tower, 31, Ttukseom-ro 1-gil, Seongdong-gu
-				Reno  NV  89507
+				Seoul  Seoul  04778
 				KR
 60-B6-E1   (hex)		Texas Instruments
 60B6E1     (base 16)		Texas Instruments
 				12500 TI Blvd
 				Dallas  TX  75243
 				US
-D0-3E-7D   (hex)		CHIPSEA TECHNOLOGIES (SHENZHEN) CORP.
+D0-1E-1D   (hex)		SaiNXT Technologies LLP
-D03E7D     (base 16)		CHIPSEA TECHNOLOGIES (SHENZHEN) CORP.
+D01E1D     (base 16)		SaiNXT Technologies LLP
-				9F,BLOCK A,GARDEN CITY DIGITAL BUILDING,NO.1079 NANHAI ROAD,NANSHAN DISTRICT
+				Shop No. 7, Sonawala Building, 1st Floor, Proctor Road, Grant Road (E)
-				SHEN ZHEN  GUANG DONG  518000
+				Mumbai  Maharashtra  400007
 				IN
 A8-23-16   (hex)		Nokia
 A82316     (base 16)		Nokia
 				600 March Road
 				Kanata  Ontario  K2K 2E6
 				CA
 38-E3-9F   (hex)		Motorola Mobility LLC, a Lenovo Company
 38E39F     (base 16)		Motorola Mobility LLC, a Lenovo Company
 				222 West Merchandise Mart Plaza
 				Chicago  IL  60654
 				US
 A4-2A-71   (hex)		Sichuan Tianyi Comheart Telecom Co.,LTD
 A42A71     (base 16)		Sichuan Tianyi Comheart Telecom Co.,LTD
 				No.198,First Section,Snow Mountain Avenue, Jinyuan Town, Dayi County
 				Chengdu  Sichuan  611330
 				CN
 44-67-52   (hex)		Wistron INFOCOMM (Zhongshan) CORPORATION
 446752     (base 16)		Wistron INFOCOMM (Zhongshan) CORPORATION
 				15 Cuiwei Road, Cuiheng New District
 				zhongshan  Guangdong  528400
 				CN
 78-BB-88   (hex)		Maxio Technology (Hangzhou) Ltd.
 78BB88     (base 16)		Maxio Technology (Hangzhou) Ltd.
 				6F, Building C, No.459 Qianmo Road, Juguang Center
 				Hangzhou  Zhejiang  310051
 				CN
 A8-64-F1   (hex)		Intel Corporate
 A864F1     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
 				Kulim  Kedah  09000
 				MY
 58-4D-42   (hex)		Dragos, Inc.
 584D42     (base 16)		Dragos, Inc.
 				1745 Dorsey Rd, Suite R
 				Hanover  MD  21076
 				US
 60-8A-10   (hex)		Microchip Technology Inc.
 608A10     (base 16)		Microchip Technology Inc.
 				2355 W. Chandler Blvd.
 				Chandler  AZ  85224
 				US
 10-6F-D9   (hex)		CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
 106FD9     (base 16)		CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.
 				B22 Building,NO.51 Tongle Road, Shajing Town, Jiangnan District, Nanning, Guangxi Province, China
 				Nanning  Guangxi  530007
 				CN
 00-03-24   (hex)		SANYO Techno Solutions Tottori Co., Ltd.
 000324     (base 16)		SANYO Techno Solutions Tottori Co., Ltd.
 				7-101 Tachikawa-cho
 				Tottori City    680-8634
 				JP
 84-80-94   (hex)		Meter, Inc.
 848094     (base 16)		Meter, Inc.
 				148 Townsend St
@ -71474,9 +71630,6 @@ FCBCD1     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				Dongguan     523808
 				CN
 CC-3A-DF   (hex)		Private
 CC3ADF     (base 16)		Private
 38-EF-E3   (hex)		 INGENICO TERMINALS SAS
 38EFE3     (base 16)		 INGENICO TERMINALS SAS
 				28-32 BOULEVARD DE GRENELLE
@ -88364,12 +88517,6 @@ C8A1B6     (base 16)		Shenzhen Longway Technologies Co., Ltd
 				Shenzhen  Guangdong  518057
 				CN
 A8-55-6A   (hex)		Pocketnet Technology Inc.
 A8556A     (base 16)		Pocketnet Technology Inc.
 				Suite B, 7F., No. 550, Ruie Kwang Rd., Neihu District,
 				Taipei    11429
 				TW
 B4-C8-10   (hex)		UMPI Elettronica
 B4C810     (base 16)		UMPI Elettronica
 				Via Respighi, 15
@ -95774,12 +95921,6 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 				Yokohama  Kanagawa  224-0037
 				JP
 00-0B-3A   (hex)		QuStream Corporation
 000B3A     (base 16)		QuStream Corporation
 				3305 Breckinridge Blvd.
 				Duluth  Georgia  30096
 				US
 00-0B-33   (hex)		Vivato Technologies
 000B33     (base 16)		Vivato Technologies
 				444 Cedros Ave
@ -106685,6 +106826,87 @@ D09FD9     (base 16)		IEEE Registration Authority
 				Piscataway  NJ  08554
 				US
 A0-B0-86   (hex)		Hirschmann Automation and Control GmbH
 A0B086     (base 16)		Hirschmann Automation and Control GmbH
 				Stuttgarter Straße 45-51
 				Neckartenzlingen    D-72654
 				DE
 30-B3-46   (hex)		CJSC NORSI-TRANS
 30B346     (base 16)		CJSC NORSI-TRANS
 				B.Novodmitrovskaya, 12/15 floor 2 r. 36
 				Moscow  MOSCOW  127015
 				RU
 20-C1-9B   (hex)		Intel Corporate
 20C19B     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
 				Kulim  Kedah  09000
 				MY
 2C-6D-C1   (hex)		Intel Corporate
 2C6DC1     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
 				Kulim  Kedah  09000
 				MY
 00-FA-B6   (hex)		Kontakt Micro-Location Sp z o.o.
 00FAB6     (base 16)		Kontakt Micro-Location Sp z o.o.
 				Stoczniowcow 3
 				Krakow    30-709
 				PL
 54-C2-50   (hex)		Iskratel d.o.o.
 54C250     (base 16)		Iskratel d.o.o.
 				Ljubljanska cesta 24a
 				Kranj    4000
 				SI
 00-0B-3A   (hex)		PESA
 000B3A     (base 16)		PESA
 				103 Quality Circle, Suite 210
 				Huntsville  AL  35806
 				US
 5C-E4-2A   (hex)		Intel Corporate
 5CE42A     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
 				Kulim  Kedah  09000
 				MY
 18-74-E2   (hex)		IEEE Registration Authority
 1874E2     (base 16)		IEEE Registration Authority
 				445 Hoes Lane
 				Piscataway  NJ  08554
 				US
 F0-C8-14   (hex)		SHENZHEN BILIAN ELECTRONIC CO.，LTD
 F0C814     (base 16)		SHENZHEN BILIAN ELECTRONIC CO.，LTD
 				NO.268? Fuqian Rd, Jutang community, Guanlan Town, Longhua New district
 				shenzhen  guangdong  518000
 				CN
 D0-17-69   (hex)		Murata Manufacturing Co., Ltd.
 D01769     (base 16)		Murata Manufacturing Co., Ltd.
 				1-10-1, Higashikotari
 				Nagaokakyo-shi  Kyoto  617-8555
 				JP
 CC-3A-DF   (hex)		Neptune Technology Group Inc.
 CC3ADF     (base 16)		Neptune Technology Group Inc.
 				1600 AL Highway 229 S
 				Tallassee  AL  36078
 				US
 A8-55-6A   (hex)		3S System Technology Inc.
 A8556A     (base 16)		3S System Technology Inc.
 				6F, No. 5, Ln. 16, Sec. 2, Sichuan Rd., Banqiao Dist.,
 				New Taipei City    220620
 				TW
 68-EC-8A   (hex)		Private
 68EC8A     (base 16)		Private
 F8-D0-27   (hex)		Seiko Epson Corporation
 F8D027     (base 16)		Seiko Epson Corporation
 				2070 Kotobuki Koaka
@ -130997,12 +131219,6 @@ A07332     (base 16)		Cashmaster International Limited
 				Palo Alto  CA  94303
 				US
 00-0C-04   (hex)		Tecnova
 000C04     (base 16)		Tecnova
 				1486 St. Paul Ave.
 				Gurnee  Illinois  60031
 				US
 00-0C-01   (hex)		Abatron AG
 000C01     (base 16)		Abatron AG
 				Lettenstrasse 9
@ -142145,12 +142361,42 @@ C0FBF9     (base 16)		IEEE Registration Authority
 				Piscataway  NJ  08554
 				US
 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
 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
 EC-08-E5   (hex)		Motorola Mobility LLC, a Lenovo Company
 EC08E5     (base 16)		Motorola Mobility LLC, a Lenovo Company
 				222 West Merchandise Mart Plaza
 				Chicago  IL  60654
 				US
 80-CC-9C   (hex)		NETGEAR
 80CC9C     (base 16)		NETGEAR
 				350 East Plumeria Drive
 				San Jose  CA  95134
 				US
 0C-60-46   (hex)		vivo Mobile Communication Co., Ltd.
 0C6046     (base 16)		vivo Mobile Communication Co., Ltd.
 				#283,BBK Road
 				Wusha,Chang'An  DongGuan City,Guangdong,  523860
 				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
@ -142163,16 +142409,10 @@ C0F9B0     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 				Dongguan    523808
 				CN
-60-9B-B4   (hex)		HUAWEI TECHNOLOGIES CO.,LTD
+50-70-97   (hex)		China Mobile Group Device Co.,Ltd.
-609BB4     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
+507097     (base 16)		China Mobile Group Device Co.,Ltd.
-				No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park
+				32 Xuanwumen West Street,Xicheng District
-				Dongguan    523808
+				Beijing    100053
 				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
@ -142181,6 +142421,36 @@ CC1531     (base 16)		Intel Corporate
 				Kulim  Kedah  09000
 				MY
 28-0F-EB   (hex)		LG Innotek
 280FEB     (base 16)		LG Innotek
 				26, Hanamsandan 5beon-ro
 				Gwangju  Gwangsan-gu  506-731
 				KR
 4C-D5-77   (hex)		CHONGQING FUGUI ELECTRONICS CO.,LTD.
 4CD577     (base 16)		CHONGQING FUGUI ELECTRONICS CO.,LTD.
 				Building D21,No.1, East Zone 1st Road,Xiyong Town,Shapingba District
 				Chongqing  Chongqing  401332
 				CN
 74-E2-0C   (hex)		Amazon Technologies Inc.
 74E20C     (base 16)		Amazon Technologies Inc.
 				P.O Box 8102 
 				Reno  NV  89507
 				US
 00-0C-04   (hex)		Tecnova
 000C04     (base 16)		Tecnova
 				2383 N Delany Rd
 				Waukegan  IL  60087-1836
 				US
 10-54-03   (hex)		INTARSO GmbH
 105403     (base 16)		INTARSO GmbH
 				Schuchardstr. 3
 				Düsseldorf  NRW  40595
 				DE
 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 
@ -157439,12 +157709,6 @@ F40F9B     (base 16)		WAVELINK
 				Middleton  WI  53562
 				US
 AC-7A-42   (hex)		iConnectivity
 AC7A42     (base 16)		iConnectivity
 				#21, 1725 30th Ave NE
 				Calgary  Alberta  T2E 7P6
 				CA
 70-0B-C0   (hex)		Dewav Technology Company
 700BC0     (base 16)		Dewav Technology Company
 				Room 1408, Real Estate Mansion
@ -167936,12 +168200,6 @@ EC6C9F     (base 16)		Chengdu Volans Technology CO.,LTD
 				    224-0034
 				JP
 00-08-18   (hex)		Pixelworks, Inc.
 000818     (base 16)		Pixelworks, Inc.
 				7700 SW Mohawk Street
 				Tualatin  OR  97062
 				US
 00-08-2A   (hex)		Powerwallz Network Security
 00082A     (base 16)		Powerwallz Network Security
 				120-13160 Vanier Place,
@ -177653,6 +177911,24 @@ B8D56B     (base 16)		Mirka Ltd.
 				Jeppo    66850
 				FI
 B8-A1-4A   (hex)		Raisecom Technology CO.,LTD
 B8A14A     (base 16)		Raisecom Technology CO.,LTD
 				No. 11, East Area, No. 10 Block, East Xibeiwang Road
 				Beijing    100094
 				CN
 BC-A3-7F   (hex)		Rail-Mil Sp. z o.o. Sp. K.
 BCA37F     (base 16)		Rail-Mil Sp. z o.o. Sp. K.
 				Kosmatki 82
 				Warsaw    03-982
 				PL
 00-08-18   (hex)		Pixelworks, Inc.
 000818     (base 16)		Pixelworks, Inc.
 				226 Airport Parkway, Suite 595
 				San Jose  CA  95110
 				US
 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
@ -177671,8 +177947,53 @@ B8D56B     (base 16)		Mirka Ltd.
 				Shenzhen  Guangdong  518000
 				CN
 28-FA-19   (hex)		Shenzhen Jingxun Software Telecommunication Technology Co.,Ltd
 28FA19     (base 16)		Shenzhen Jingxun Software Telecommunication Technology Co.,Ltd
 				3/F,A5 Building Zhiyuan Community No.1001,Xueyuan Road Nanshan District
 				Shenzhen  Guangdong  518055
 				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
 D8-A0-11   (hex)		WiZ
 D8A011     (base 16)		WiZ
 				Unit 1203-5, 12/F, Tower 1, Enterprise Square, 9 Sheung Yuet Road
 				Kowloon Bay  Hong Kong  0000
 				HK
 50-09-E5   (hex)		Drimsys,Inc
 5009E5     (base 16)		Drimsys,Inc
 				147, Baumoe-ro
 				Seocho-gu  Seoul  06752
 				KR
 64-B3-79   (hex)		Private
 64B379     (base 16)		Private
 28-DF-EB   (hex)		Intel Corporate
 28DFEB     (base 16)		Intel Corporate
 				Lot 8, Jalan Hi-Tech 2/3  
 				Kulim  Kedah  09000
 				MY
 88-FC-A6   (hex)		devolo AG
 88FCA6     (base 16)		devolo AG
 				Charlottenburger Allee 67
 				Aachen  NRW  52068
 				DE
 AC-7A-42   (hex)		iConnectivity
 AC7A42     (base 16)		iConnectivity
 				4620 Manilla Road SE, Unit 58
 				Calgary  Alberta  T2G 4B7
 				CA
 48-9E-BD   (hex)		HP Inc.
 489EBD     (base 16)		HP Inc.
 				10300 Energy Dr
 				Spring  TX  77389
 				US
--- a/hwdb.d/ma-medium.txt
+++ b/hwdb.d/ma-medium.txt
@ -4439,16 +4439,22 @@ C8-F5-D6   (hex)		EVOTOR LLC
 				Moscow    119021
 				RU
 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
 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
+18-74-E2   (hex)		HANGZHOU ZHOUJU ELECTRONIC TECHNOLOGICAL CO.,LTD 
-200000-2FFFFF     (base 16)		Dongguan Chuan OptoElectronics Limited
+500000-5FFFFF     (base 16)		HANGZHOU ZHOUJU ELECTRONIC TECHNOLOGICAL CO.,LTD 
-				No.43 Songshui Road,Songmushan Village, Dalang Town
+				Floor 6,A Building, Xianxing Road NO.32,Xianlin Town,Yuhang District
-				Dongguan  Guangdong  523795
+				Hangzhou  Zhejiang  311122
 				CN
 4C-4B-F9   (hex)		Shenzhen dingsheng technology co., LTD
@ -8555,6 +8561,36 @@ D0-9F-D9   (hex)		Poten (Shanghai) Technology Co.,Ltd.
 				Shanghai  Shanghai  200235
 				CN
 D0-9F-D9   (hex)		Raymax Technology Ltd.
 700000-7FFFFF     (base 16)		Raymax Technology Ltd.
 				604, Building D, No.1001 Wen Yi Xi Road
 				Hangzhou  China  310012
 				CN
 D0-9F-D9   (hex)		Queclink Wireless Solutions Co., Ltd.
 800000-8FFFFF     (base 16)		Queclink Wireless Solutions Co., Ltd.
 				No.30, Lane 500, Xinlong Road, Minhang District
 				Shanghai    201101
 				CN
 D0-9F-D9   (hex)		Fujian Newland Auto-ID Tech. Co,.Ltd.
 C00000-CFFFFF     (base 16)		Fujian Newland Auto-ID Tech. Co,.Ltd.
 				Newland Science & Technology Park, No.1 Rujiang West Rd,Mawei,Fuzhou, P.R.China
 				Fuzhou    350015
 				CN
 D0-9F-D9   (hex)		Lemei Intelligent IOT (Shenzhen) Co., Ltd
 000000-0FFFFF     (base 16)		Lemei Intelligent IOT (Shenzhen) Co., Ltd
 				#1101, Building #1, Yishang Sanwei Inductry Park, Zhongwu, Hangcheng Street, Baoan District
 				Shenzhen  Guangdong  518000
 				CN
 18-74-E2   (hex)		Kano Computing Limited
 800000-8FFFFF     (base 16)		Kano Computing Limited
 				Unit 12.1 - 12.2, 11-29 Fashion Street
 				London    E1 6PX
 				GB
 20-85-93   (hex)		UNILUMIN GROUP CO.,LTD
 300000-3FFFFF     (base 16)		UNILUMIN GROUP CO.,LTD
 				No.112 Yongfu Rd.,BaoanDistrict,
@ -12218,12 +12254,6 @@ D0-14-11   (hex)		Video Security, Inc.
 				Kaohsiung, Taiwan, R.O.C.  Kaohsiung City  807
 				TW
 30-49-50   (hex)		Xio Research, Inc
 D00000-DFFFFF     (base 16)		Xio Research, Inc
 				405 Lexington Avenue, Suite 3504
 				New York  NY  10174
 				US
 D0-14-11   (hex)		Realwave Inc.
 700000-7FFFFF     (base 16)		Realwave Inc.
 				5857 Owens Avenue, Suite 300
@ -12836,6 +12866,36 @@ C0-FB-F9   (hex)		SHENZHEN HEQIANG ELECTRONICS LIMITED
 				SHENZHEN  GUANGDONG  518129
 				CN
 D0-9F-D9   (hex)		Carbon Mobile GmbH
 500000-5FFFFF     (base 16)		Carbon Mobile GmbH
 				Winterfeldtstr. 21
 				Berlin    10781
 				DE
 D0-9F-D9   (hex)		ENTTEC Pty Ltd.
 900000-9FFFFF     (base 16)		ENTTEC Pty Ltd.
 				po box 4051
 				ringwood  vic  3134
 				AU
 D0-9F-D9   (hex)		elecgator bvba
 100000-1FFFFF     (base 16)		elecgator bvba
 				Heerbaan, 308
 				Beringen  Limburg  3582
 				BE
 D0-9F-D9   (hex)		Minibems Ltd
 E00000-EFFFFF     (base 16)		Minibems Ltd
 				Oxford Point, 19 Oxford Road
 				Bournemouth    BH88GS
 				GB
 30-49-50   (hex)		Merlyn Mind, Inc.
 D00000-DFFFFF     (base 16)		Merlyn Mind, Inc.
 				405 Lexington Avenue, Suite 3504
 				New York  NY  10174
 				US
 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
@ -13397,12 +13457,6 @@ D00000-DFFFFF     (base 16)		Elink Technology (Shenzhen) Co., Limited
 				Shenzhen  Guangdong  518101
 				CN
 E0-5A-9F   (hex)		Fujian Newland Auto-ID Tech. Co.,Ltd.
 800000-8FFFFF     (base 16)		Fujian Newland Auto-ID Tech. Co.,Ltd.
 				Newland Science & Technology Park, No.1 Rujiang West Rd,Mawei,Fuzhou, P.R.China
 				Fuzhou  Fujian  350015
 				CN
 4C-BC-98   (hex)		Charge-Amps AB
 000000-0FFFFF     (base 16)		Charge-Amps AB
 				GUSTAV III:S BOULEVARD 42, 8TR
@ -17018,6 +17072,12 @@ D00000-DFFFFF     (base 16)		Origins Technology Limited
 				Beijing    100027
 				CN
 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
 C8-F5-D6   (hex)		United Barcode Systems
 B00000-BFFFFF     (base 16)		United Barcode Systems
 				Av. Progres 56, Pol. Ind. els Garrofers
@ -17030,12 +17090,6 @@ C00000-CFFFFF     (base 16)		Eltako GmbH
 				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 
@ -17048,6 +17102,42 @@ D00000-DFFFFF     (base 16)		Dropbeats Technology Co., Ltd.
 				Shanghai  Shanghai  201203
 				CN
 D0-9F-D9   (hex)		Elevoc Technology Co., Ltd.
 600000-6FFFFF     (base 16)		Elevoc Technology Co., Ltd.
 				5/F,Unit B,Block12,ShenZhenwan Science and Technology Ecological Garden,Nanshan Dist.
 				Shenzhen  Guangdong  518000
 				CN
 D0-9F-D9   (hex)		Eurolan Ltd
 A00000-AFFFFF     (base 16)		Eurolan Ltd
 				jk. Drujba 1, ul. 5028, do bl. 15
 				Sofia  Sofia (stolitsa)  1592
 				BG
 E0-5A-9F   (hex)		Fujian Newland Auto-ID Tech. Co,.Ltd.
 800000-8FFFFF     (base 16)		Fujian Newland Auto-ID Tech. Co,.Ltd.
 				Newland Science & Technology Park, No.1 Rujiang West Rd,Mawei,Fuzhou, P.R.China
 				Fuzhou  Fujian  350015
 				CN
 18-74-E2   (hex)		NextGen RF Design, Inc.
 C00000-CFFFFF     (base 16)		NextGen RF Design, Inc.
 				2130 Howard Dr W
 				North Mankato  MN  56003
 				US
 18-74-E2   (hex)		Sartorius Lab Instruments GmbH & Co. KG
 100000-1FFFFF     (base 16)		Sartorius Lab Instruments GmbH & Co. KG
 				Otto-Brenner-Straße 20
 				Goettingen    37079
 				DE
 D0-9F-D9   (hex)		Sanken-Densetsu Co.,LTD.
 300000-3FFFFF     (base 16)		Sanken-Densetsu Co.,LTD.
 				677 Shimoakasaka-Ohnohara
 				Kawagoe-Shi  Saitama  350-1155
 				JP
 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,6 +21443,12 @@ C8-F5-D6   (hex)		MEIRYO TECHNICA CORPORATION
 				Owariasahi-city  Aichi  488-0052
 				JP
 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
 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
@ -21371,12 +21467,6 @@ C8-F5-D6   (hex)		BBPOS International Limited
 				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
@ -21394,3 +21484,21 @@ C0-FB-F9   (hex)		zxsolution
 				nanshan shenzhen
 				shenzhen    518000
 				CN
 D0-9F-D9   (hex)		Westar Display Technologies
 200000-2FFFFF     (base 16)		Westar Display Technologies
 				4 Research Park Dr
 				St Charles  MO  63304
 				US
 18-74-E2   (hex)		Sansec Technology Co.,Ltd
 700000-7FFFFF     (base 16)		Sansec Technology Co.,Ltd
 				Bejing Chaoyang District Guangshun North Street Hostpital No.16 No.2 building 14 room 1406
 				Bejing   Bejing   100102
 				CN
 D0-9F-D9   (hex)		Cablewireless Laboratory Co., Ltd
 B00000-BFFFFF     (base 16)		Cablewireless Laboratory Co., Ltd
 				Room 218,  Block E1, Yuanchenxin Building, 12 Yumin Road, Chaoyang District
 				Beijing    100029
 				CN
--- a/hwdb.d/ma-small.txt
+++ b/hwdb.d/ma-small.txt
@ -5129,6 +5129,24 @@ A14000-A14FFF     (base 16)		aelettronica group srl
 				gaggiano  milano  20083
 				IT
 70-B3-D5   (hex)		MedRx, Inc
 3B6000-3B6FFF     (base 16)		MedRx, Inc
 				1200 Starkey Rd Ste.105
 				Largo  FL  33771
 				US
 70-B3-D5   (hex)		ZIEHL-ABEGG SE
 698000-698FFF     (base 16)		ZIEHL-ABEGG SE
 				Heinz-Ziehl-Strasse 1
 				Kuenzelsau    74653
 				DE
 70-B3-D5   (hex)		Vema Venturi AB
 036000-036FFF     (base 16)		Vema Venturi AB
 				Johan på gårdas gata 5A
 				Gothenburg  Västra Götaland  41250
 				SE
 70-B3-D5   (hex)		EVCO SPA
 A80000-A80FFF     (base 16)		EVCO SPA
 				VIA FELTRE N. 81
@ -10211,6 +10229,24 @@ E03000-E03FFF     (base 16)		MBJ
 				Ahrensburg  Schleswig Holstein  22926
 				DE
 70-B3-D5   (hex)		Code Blue Corporation 
 271000-271FFF     (base 16)		Code Blue Corporation 
 				259 Hedcor Street
 				Holland  MI  49423
 				US
 70-B3-D5   (hex)		Fischer Connectors
 BF7000-BF7FFF     (base 16)		Fischer Connectors
 				11 Waterberry drive
 				Waterlooville  Hampshire  PO7 7YH
 				GB
 70-B3-D5   (hex)		VK Integrated Systems
 A8F000-A8FFFF     (base 16)		VK Integrated Systems
 				810 Crossland Ave
 				Clarksville  TN  37040
 				US
 70-B3-D5   (hex)		System West dba ICS Electronics
 E06000-E06FFF     (base 16)		System West dba ICS Electronics
 				7034 Commerce Circle Suite A
@ -15230,6 +15266,24 @@ AFD000-AFDFFF     (base 16)		dongsheng
 				New Taipei City    231067
 				TW
 70-B3-D5   (hex)		Exemplar Medical, LLC
 318000-318FFF     (base 16)		Exemplar Medical, LLC
 				4521 Wornall Road, #106
 				Kansas City  MO  64111
 				US
 70-B3-D5   (hex)		HLT Micro 
 2B6000-2B6FFF     (base 16)		HLT Micro 
 				Bld 6, 4th Park, Xitian, GM Distinct
 				shenzhen    511088
 				CN
 70-B3-D5   (hex)		Cucos Retail Systems GmbH
 4CB000-4CBFFF     (base 16)		Cucos Retail Systems GmbH
 				Detmolder Straße 7
 				Soest    59494
 				DE
 70-B3-D5   (hex)		YUYAMA MFG Co.,Ltd
 BBB000-BBBFFF     (base 16)		YUYAMA MFG Co.,Ltd
 				3-3-1
@ -20441,9 +20495,33 @@ C71000-C71FFF     (base 16)		The Engineerix Group
 				Zalaegerszeg  Zala  8900
 				HU
 70-B3-D5   (hex)		Research Laboratory of Design Automation, Ltd.
 223000-223FFF     (base 16)		Research Laboratory of Design Automation, Ltd.
 				8 Birzhevoy Spusk
 				Taganrog    347900
 				RU
 70-B3-D5   (hex)		Private
 315000-315FFF     (base 16)		Private
 70-B3-D5   (hex)		JOLANYEE  Technology Co., Ltd.
 9D8000-9D8FFF     (base 16)		JOLANYEE  Technology Co., Ltd.
 				2F., No. 13, Sec. 1, Yonghe Rd.
 				Yonghe Dist., New Taipei City    234014
 				TW
 70-B3-D5   (hex)		SEASONS 4 INC
 D5D000-D5DFFF     (base 16)		SEASONS 4 INC
 				3601 LA GRANGE PKWY, SUITE 500
 				TOANO  VA  23168
 				US
 70-B3-D5   (hex)		VulcanForms
 E0E000-E0EFFF     (base 16)		VulcanForms
 				20 North Ave.
 				Burlington  MA  01803
 				US
 70-B3-D5   (hex)		DISMUNTEL SAL
 92C000-92CFFF     (base 16)		DISMUNTEL SAL
 				Pol ind cotes
@ -25459,3 +25537,21 @@ DF7000-DF7FFF     (base 16)		ScopeSensor Oy
 				3964 Rivermark Plaza, Suite 144
 				Santa Clara  CA  95054
 				US
 70-B3-D5   (hex)		HORIZON.INC
 F40000-F40FFF     (base 16)		HORIZON.INC
 				1600 Aza-Shironoshita Asahi
 				Shin Asahi-cho  Takashima, Shiga  520-1501
 				JP
 70-B3-D5   (hex)		SUS Corporation
 1ED000-1EDFFF     (base 16)		SUS Corporation
 				6F, S-patio Bldg. 14-25 Minami-cho, Suruga-ku,
 				Shizuoka city,  Shizuoka  422-8067
 				JP
 70-B3-D5   (hex)		Lumiplan Duhamel
 A0C000-A0CFFF     (base 16)		Lumiplan Duhamel
 				2 rue de l'industrie
 				Domène  Isère  38420
 				FR
--- 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.22
-#	Date:    2021-03-16 03:15:02
+#	Date:    2021-03-22 03:15:01
 #
 #	Maintained by Albert Pool, Martin Mares, and other volunteers from
 #	the PCI ID Project at https://pci-ids.ucw.cz/.
@ -874,6 +874,14 @@
 		1d49 060e  ThinkSystem RAID 940-32i 8GB Flash PCIe Gen4 12Gb Adapter
 		1d49 060f  ThinkSystem RAID 940-8e 4GB Flash PCIe Gen4 12Gb Adapter
 	10e2  MegaRAID 12GSAS/PCIe Secure SAS39xx
 # 9560 16 internal port RAID controller
 		1000 4000  MegaRAID 9560-16i
 # 9560 8 internal port RAID controller
 		1000 4010  MegaRAID 9560-8i
 # 9580 8 internal & 8 external port RAID controller
 		1000 4020  MegaRAID 9580-8i8e
 # MegaRAID 9562-16i 9562 16 internal port RAID controller
 		1000 40b0  MegaRAID 9562-16i
 		1028 1ae0  PERC H755 Adapter
 		1028 1ae1  PERC H755 Front
 		1028 1ae2  PERC H755N Front
@ -1906,7 +1914,7 @@
 	5e6d  RV410 [Radeon X700] (Secondary)
 		148c 2117  Bravo X700 (Secondary)
 	5f57  R423 [Radeon X800 XT]
-	6600  Mars [Radeon HD 8670A/8670M/8750M]
+	6600  Mars [Radeon HD 8670A/8670M/8750M / R7 M370]
 		103c 1952  ProBook 455 G1
 	6601  Mars [Radeon HD 8730M]
 		103c 2100  FirePro M4100
@ -2244,7 +2252,7 @@
 		174b 7670  Radeon HD 7670
 		174b e181  Radeon HD 6670
 		1787 2309  Radeon HD 6670
-	6759  Turks PRO [Radeon HD 6570/7570/8550]
+	6759  Turks PRO [Radeon HD 6570/7570/8550 / R5 230]
 		103c 3130  Radeon HD 6570
 		1043 0403  Radeon HD 6570
 		1462 2500  Radeon HD 6570
@ -2253,9 +2261,15 @@
 		1642 3a67  Radeon HD 6570
 		1682 3280  Radeon HD 7570
 		1682 3530  Radeon HD 8550
 		1682 5230  Radeon R5 230 series
 		1682 6450  Radeon HD 6450 series
 		174b 7570  Radeon HD 7570
 		174b 8550  Radeon HD8550 OEM
 		174b 8570  Radeon HD8550 OEM
 		174b e142  Radeon HD 6570
 		174b e181  Radeon HD 6570
 		1787 a230  Radeon R5 230 series
 		1787 a450  Radeon HD 6450 series
 		1b0a 908f  Radeon HD 6570
 		1b0a 9090  Radeon HD 6570
 		1b0a 9091  Radeon HD 6570
@ -3626,6 +3640,7 @@
 		174b e329  Radeon R9 FURY
 	7310  Navi 10 [Radeon Pro W5700X]
 	7312  Navi 10 [Radeon Pro W5700]
 	7314  Navi 10 USB
 	731f  Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT]
 		1458 2313  Radeon RX 5700 XT Gaming OC
 		1682 5701  RX 5700 XT RAW II
@ -3639,12 +3654,16 @@
 	7388  Arcturus GL-XL
 	738c  Arcturus GL-XL [AMD Instinct MI100]
 	738e  Arcturus GL-XL
 	73a4  Navi 21 USB
 	73af  Navi 21 [Radeon RX 6900 XT]
 	73bf  Navi 21 [Radeon RX 6800/6800 XT / 6900 XT]
 		1eae 6701  XFX Speedster MERC 319 AMD Radeon RX 6800 XT Black
 	73c3  Navi 22
-	73df  Navi 22 [Radeon RX 6700/6700 XT]
+	73c4  Navi 22 USB
 	73df  Navi 22 [Radeon RX 6700/6700 XT / 6800M]
 	73e0  Navi 23
 	73e1  Navi 23
 	73e4  Navi 23 USB
 	73ff  Navi 23 [Radeon RX 6600/6600 XT]
 	7833  RS350 Host Bridge
 	7834  RS350 [Radeon 9100 PRO/XT IGP]
@ -14181,7 +14200,7 @@
 	0002  Dual PCI to RapidIO Bridge
 	000b  POET Serial RapidIO Bridge
 	000d  POET PSDMS Device
-1135  Fuji Xerox Co Ltd
+1135  FUJIFILM Business Innovation Corp.
 	0001  Printer controller
 1136  Momentum Data Systems
 	0002  PCI-JTAG
@ -17636,6 +17655,8 @@
 1414  Microsoft Corporation
 	0001  MN-120 (ADMtek Centaur-C based)
 	0002  MN-130 (ADMtek Centaur-P based)
 # Virtual Video Card Device for Windows Remote Desktop (RDP)
 	008c  Basic Render Driver
 	5353  Hyper-V virtual VGA
 	5801  XMA Decoder (Xenon)
 	5802  SATA Controller - CdRom (Xenon)
@ -23670,6 +23691,8 @@
 	0206  ACE-NIC200 Programmable Network Accelerator
 		1df3 0000  Maintenance Mode
 		1df3 0001  ENA2200F
 	0207  ACE-NIC50RN Programmable Network Accelerator
 	0208  ACE-NIC100RN Programmable Network Accelerator
 1df7  opencpi.org
 	0001  ml605
 	0002  alst4
@ -26771,6 +26794,7 @@
 		8086 000b  Ethernet 100G 2P E810-C Adapter
 		8086 000c  Ethernet 100G 2P E810-C OCP
 		8086 000d  Ethernet Network Adapter E810-L-Q2 for OCP 3.0
 		8086 000e  Ethernet Network Adapter E810-2C-Q2
 	1593  Ethernet Controller E810-C for SFP
 		1137 02c3  E810XXVDA4 4x25/10 GbE SFP28 PCIe NIC
 		8086 0002  Ethernet Network Adapter E810-L-2
@ -28338,6 +28362,7 @@
 		1cb8 0002  Omni-Path HFI Adapter 100 Series, 1 Port, PCIe x16, TC6600 Fixed Port
 		1cb8 0003  Omni-Path HFI Adapter 100 Series, 2 Port, 2 PCIe x16, Earth Simulation QSFP28
 		1cb8 0004  Omni-Path HFI Adapter 100 Series, 1 Port, PCIe x16, TC4600E QSFP28
 		434e 0001  Omni-Path HFI 100 Series, 1 Port, OCP 3.0 Adapter
 		8086 2628  Omni-Path HFI Adapter 100 Series, 1 Port, PCIe x16
 		8086 2629  Omni-Path HFI Adapter 100 Series, 1 Port, PCIe x8
 		8086 262a  Omni-Path HFI Adapter 100 Series, 2 Ports, Split PCIe x16
@ -33631,6 +33656,7 @@ f1d0  AJA Video
 	eb23  Kona 1
 	eb24  Kona HDMI
 	eb25  Corvid 44 12g
 	eb26  T-Tap Pro
 	efac  Xena SD-MM/SD-22-MM
 	facd  Xena HD-MM
 f5f5  F5 Networks, Inc.
--- a/hwdb.d/pnp_id_registry.html
+++ b/hwdb.d/pnp_id_registry.html
@ -108,9 +108,9 @@
 <tr class="even"><td>Alpha Telecom Inc</td><td>ATD</td><td>09/26/1997</td> </tr>
 <tr class="odd"><td>Alpha-Top Corporation</td><td>ATP</td><td>12/04/1996</td> </tr>
 <tr class="even"><td>AlphaView LCD</td><td>ALV</td><td>11/01/2008</td> </tr>
- <tr class="odd"><td>Alpine Electronics, Inc.</td><td>APE</td><td>01/22/2013</td> </tr>
+ <tr class="odd"><td>ALPS ALPINE CO., LTD.</td><td>APE</td><td>01/22/2013</td> </tr>
- <tr class="even"><td>Alps Electric Company Ltd</td><td>ALP</td><td>11/29/1996</td> </tr>
+ <tr class="even"><td>ALPS ALPINE CO., LTD.</td><td>ALP</td><td>11/29/1996</td> </tr>
- <tr class="odd"><td>Alps Electric Inc</td><td>AUI</td><td>11/29/1996</td> </tr>
+ <tr class="odd"><td>ALPS ALPINE CO., LTD.</td><td>AUI</td><td>11/29/1996</td> </tr>
 <tr class="even"><td>Alta Research Corporation</td><td>ARC</td><td>11/29/1996</td> </tr>
 <tr class="odd"><td>Altec Corporation</td><td>ALC</td><td>08/04/1998</td> </tr>
 <tr class="even"><td>Altec Lansing</td><td>ALJ</td><td>01/13/2000</td> </tr>
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@ -385,20 +385,10 @@ int read_full_virtual_file(const char *filename, char **ret_contents, size_t *re
        if (fd < 0)
                return -errno;
        /* Start size for files in /proc/ which usually report a file size of 0. (Files in /sys/ report a
         * file size of 4K, which is probably OK for sizing our initial buffer, and sysfs attributes can't be
         * larger anyway.)
         *
         * It's one less than 4k, so that the malloc() below allocates exactly 4k. */
        size = 4095;
        /* Limit the number of attempts to read the number of bytes returned by fstat(). */
        n_retries = 3;
        for (;;) {
                if (n_retries <= 0)
                        return -EIO;
                if (fstat(fd, &st) < 0)
                        return -errno;
@ -409,24 +399,20 @@ int read_full_virtual_file(const char *filename, char **ret_contents, size_t *re
                assert_cc(READ_FULL_BYTES_MAX < SSIZE_MAX);
                if (st.st_size > 0) {
                        if (st.st_size > READ_FULL_BYTES_MAX)
-                                return -E2BIG;
+                                return -EFBIG;
                        size = st.st_size;
                        n_retries--;
                } else {
-                        /* Double the buffer size */
+                        size = READ_FULL_BYTES_MAX;
-                        if (size >= READ_FULL_BYTES_MAX)
+                        n_retries = 0;
                                return -E2BIG;
                        if (size > READ_FULL_BYTES_MAX / 2 - 1)
                                size = READ_FULL_BYTES_MAX; /* clamp to max */
                        else
                                size = size * 2 + 1; /* Stay always one less than page size, so we malloc evenly */
                }
                buf = malloc(size + 1);
                if (!buf)
                        return -ENOMEM;
-                size = malloc_usable_size(buf) - 1; /* Use a bigger allocation if we got it anyway */
+                /* Use a bigger allocation if we got it anyway, but not more than the limit. */
                size = MIN(malloc_usable_size(buf) - 1, READ_FULL_BYTES_MAX);
                for (;;) {
                        ssize_t k;
@ -453,6 +439,9 @@ int read_full_virtual_file(const char *filename, char **ret_contents, size_t *re
                 * processing, let's try again either with a bigger guessed size or the new
                 * file size. */
                if (n_retries <= 0)
                        return st.st_size > 0 ? -EIO : -EFBIG;
                if (lseek(fd, 0, SEEK_SET) < 0)
                        return -errno;
@ -466,8 +455,7 @@ int read_full_virtual_file(const char *filename, char **ret_contents, size_t *re
                p = realloc(buf, n + 1);
                if (!p)
                        return -ENOMEM;
-
+                buf = p;
                buf = TAKE_PTR(p);
        }
        if (ret_size)
--- a/src/oom/oomd-manager.c
+++ b/src/oom/oomd-manager.c
@ -378,10 +378,18 @@ static int monitor_cgroup_contexts_handler(sd_event_source *s, uint64_t usec, vo
                        OomdCGroupContext *t;
                        SET_FOREACH(t, targets) {
-                                log_notice("Memory pressure for %s is greater than %lu for more than %"PRIu64" seconds and there was reclaim activity",
+                                _cleanup_free_ char *selected = NULL;
-                                        t->path, LOAD_INT(t->mem_pressure_limit), m->default_mem_pressure_duration_usec / USEC_PER_SEC);
+                                char ts[FORMAT_TIMESPAN_MAX];
-                                r = oomd_kill_by_pgscan_rate(m->monitored_mem_pressure_cgroup_contexts_candidates, t->path, m->dry_run);
+                                log_debug("Memory pressure for %s is %lu.%02lu%% > %lu.%02lu%% for > %s with reclaim activity",
                                          t->path,
                                          LOAD_INT(t->memory_pressure.avg10), LOAD_FRAC(t->memory_pressure.avg10),
                                          LOAD_INT(t->mem_pressure_limit), LOAD_FRAC(t->mem_pressure_limit),
                                          format_timespan(ts, sizeof ts,
                                                          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, &selected);
                                if (r == -ENOMEM)
                                        return log_oom();
                                if (r < 0)
@ -389,6 +397,15 @@ static int monitor_cgroup_contexts_handler(sd_event_source *s, uint64_t usec, vo
                                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;
                                        if (selected)
                                                log_notice("Killed %s due to memory pressure for %s being %lu.%02lu%% > %lu.%02lu%%"
                                                           " for > %s with reclaim activity",
                                                           selected, t->path,
                                                           LOAD_INT(t->memory_pressure.avg10), LOAD_FRAC(t->memory_pressure.avg10),
                                                           LOAD_INT(t->mem_pressure_limit), LOAD_FRAC(t->mem_pressure_limit),
                                                           format_timespan(ts, sizeof ts,
                                                                           m->default_mem_pressure_duration_usec,
                                                                           USEC_PER_SEC));
                                        return 0;
                                }
                        }
@ -397,9 +414,11 @@ static int monitor_cgroup_contexts_handler(sd_event_source *s, uint64_t usec, vo
        if (oomd_swap_free_below(&m->system_context, 10000 - m->swap_used_limit_permyriad)) {
                _cleanup_hashmap_free_ Hashmap *candidates = NULL;
                _cleanup_free_ char *selected = NULL;
-                log_notice("Swap used (%"PRIu64") / total (%"PRIu64") is more than " PERMYRIAD_AS_PERCENT_FORMAT_STR,
+                log_debug("Swap used (%"PRIu64") / total (%"PRIu64") is more than " PERMYRIAD_AS_PERCENT_FORMAT_STR,
-                           m->system_context.swap_used, m->system_context.swap_total, PERMYRIAD_AS_PERCENT_FORMAT_VAL(m->swap_used_limit_permyriad));
+                          m->system_context.swap_used, m->system_context.swap_total,
                          PERMYRIAD_AS_PERCENT_FORMAT_VAL(m->swap_used_limit_permyriad));
                r = get_monitored_cgroup_contexts_candidates(m->monitored_swap_cgroup_contexts, &candidates);
                if (r == -ENOMEM)
@ -407,13 +426,18 @@ static int monitor_cgroup_contexts_handler(sd_event_source *s, uint64_t usec, vo
                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);
+                r = oomd_kill_by_swap_usage(candidates, m->dry_run, &selected);
                if (r == -ENOMEM)
                        return log_oom();
                if (r < 0)
                        log_notice_errno(r, "Failed to kill any cgroup(s) based on swap: %m");
                else {
                        m->post_action_delay_start = usec_now;
                        if (selected)
                                log_notice("Killed %s due to swap used (%"PRIu64") / total (%"PRIu64") being more than "
                                           PERMYRIAD_AS_PERCENT_FORMAT_STR,
                                           selected, m->system_context.swap_used, m->system_context.swap_total,
                                           PERMYRIAD_AS_PERCENT_FORMAT_VAL(m->swap_used_limit_permyriad));
                        return 0;
                }
        }
--- a/src/oom/oomd-util.c
+++ b/src/oom/oomd-util.c
@ -208,54 +208,82 @@ 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_rate(Hashmap *h, const char *prefix, bool dry_run, char **ret_selected) {
        _cleanup_free_ OomdCGroupContext **sorted = NULL;
-        int r;
+        int n, r, ret = 0;
        assert(h);
        assert(ret_selected);
-        r = oomd_sort_cgroup_contexts(h, compare_pgscan_rate_and_memory_usage, prefix, &sorted);
+        n = oomd_sort_cgroup_contexts(h, compare_pgscan_rate_and_memory_usage, prefix, &sorted);
-        if (r < 0)
+        if (n < 0)
-                return r;
+                return n;
-        for (int i = 0; i < r; i++) {
+        for (int i = 0; i < n; i++) {
-                /* Skip cgroups with no reclaim and memory usage; it won't alleviate pressure. */
+                /* Skip cgroups with no reclaim and memory usage; it won't alleviate pressure.
-                /* Don't break since there might be "avoid" cgroups at the end. */
+                 * Continue since there might be "avoid" cgroups at the end. */
                if (sorted[i]->pgscan == 0 && sorted[i]->current_memory_usage == 0)
                        continue;
                r = oomd_cgroup_kill(sorted[i]->path, true, dry_run);
-                if (r > 0 || r == -ENOMEM)
+                if (r == 0)
-                        break;
+                        continue; /* We didn't find anything to kill */
                if (r == -ENOMEM)
                        return r; /* Treat oom as a hard error */
                if (r < 0) {
                        if (ret == 0)
                                ret = r;
                        continue; /* Try to find something else to kill */
                }
                char *selected = strdup(sorted[i]->path);
                if (!selected)
                        return -ENOMEM;
                *ret_selected = selected;
                return 1;
        }
-        return r;
+        return ret;
 }
-int oomd_kill_by_swap_usage(Hashmap *h, bool dry_run) {
+int oomd_kill_by_swap_usage(Hashmap *h, bool dry_run, char **ret_selected) {
        _cleanup_free_ OomdCGroupContext **sorted = NULL;
-        int r;
+        int n, r, ret = 0;
        assert(h);
        assert(ret_selected);
-        r = oomd_sort_cgroup_contexts(h, compare_swap_usage, NULL, &sorted);
+        n = oomd_sort_cgroup_contexts(h, compare_swap_usage, NULL, &sorted);
-        if (r < 0)
+        if (n < 0)
-                return r;
+                return n;
        /* Try to kill cgroups with non-zero swap usage until we either succeed in
         * killing or we get to a cgroup with no swap usage. */
-        for (int i = 0; i < r; i++) {
+        for (int i = 0; i < n; i++) {
-                /* Skip over cgroups with no resource usage. Don't break since there might be "avoid"
+                /* Skip over cgroups with no resource usage.
-                 * cgroups at the end. */
+                 * Continue break since there might be "avoid" cgroups at the end. */
                if (sorted[i]->swap_usage == 0)
                        continue;
                r = oomd_cgroup_kill(sorted[i]->path, true, dry_run);
-                if (r > 0 || r == -ENOMEM)
+                if (r == 0)
-                        break;
+                        continue; /* We didn't find anything to kill */
                if (r == -ENOMEM)
                        return r; /* Treat oom as a hard error */
                if (r < 0) {
                        if (ret == 0)
                                ret = r;
                        continue; /* Try to find something else to kill */
                }
                char *selected = strdup(sorted[i]->path);
                if (!selected)
                        return -ENOMEM;
                *ret_selected = selected;
                return 1;
        }
-        return r;
+        return ret;
 }
 int oomd_cgroup_context_acquire(const char *path, OomdCGroupContext **ret) {
--- a/src/oom/oomd-util.h
+++ b/src/oom/oomd-util.h
@ -122,9 +122,10 @@ 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. */
+ * everything in `h` is a candidate.
-int oomd_kill_by_pgscan_rate(Hashmap *h, const char *prefix, bool dry_run);
+ * Returns the killed cgroup in ret_selected. */
-int oomd_kill_by_swap_usage(Hashmap *h, bool dry_run);
+int oomd_kill_by_pgscan_rate(Hashmap *h, const char *prefix, bool dry_run, char **ret_selected);
 int oomd_kill_by_swap_usage(Hashmap *h, bool dry_run, char **ret_selected);
 int oomd_cgroup_context_acquire(const char *path, OomdCGroupContext **ret);
 int oomd_system_context_acquire(const char *proc_swaps_path, OomdSystemContext *ret);
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@ -9,6 +9,7 @@
 #include "ctype.h"
 #include "env-file.h"
 #include "env-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
@ -964,6 +965,24 @@ static void test_read_full_file_offset_size(void) {
        rbuf = mfree(rbuf);
 }
 static void test_read_full_virtual_file(void) {
        const char *filename;
        int r;
        FOREACH_STRING(filename,
                       "/proc/1/cmdline",
                       "/etc/nsswitch.conf",
                       "/sys/kernel/uevent_seqnum") {
                _cleanup_free_ char *buf = NULL;
                size_t size = 0;
                r = read_full_virtual_file(filename, &buf, &size);
                log_info_errno(r, "read_full_virtual_file(\"%s\"): %m (%zu bytes)", filename, size);
                assert_se(r == 0 || ERRNO_IS_PRIVILEGE(r) || r == -ENOENT);
        }
 }
 int main(int argc, char *argv[]) {
        test_setup_logging(LOG_DEBUG);
@ -991,6 +1010,7 @@ int main(int argc, char *argv[]) {
        test_read_nul_string();
        test_read_full_file_socket();
        test_read_full_file_offset_size();
        test_read_full_virtual_file();
        return 0;
 }
--- a/tools/git-contrib.sh
+++ b/tools/git-contrib.sh
@ -2,6 +2,7 @@
 # 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]'`.. | \
+tag="$(git describe --abbrev=0 --match 'v[0-9][0-9][0-9]')"
-    awk '{ $1=""; print $0 "," }' | \
+git log --pretty=tformat:%aN --author=noreply@weblate.org --invert-grep -s "${tag}.." | \
    sed 's/ / /g; s/--/-/g; s/.*/        \0,/' |
    sort -u
Author	SHA1	Message	Date
Lennart Poettering	938bdfc0fa	Merge pull request #19157 from keszybz/read-medium-sized-virtual-file basic/fileio: fix reading of not-too-small virtual files	2021-03-30 22:59:02 +02:00
Lennart Poettering	9ca34cf5a4	NEWS: prep release date	2021-03-30 22:00:11 +02:00
Zbigniew Jędrzejewski-Szmek	bca895c4f4	test-fileio: test for read_full_virtual_file() It was already called through other places, but indirectly. Let's add some direct invocations.	2021-03-30 21:58:59 +02:00
Zbigniew Jędrzejewski-Szmek	2ac67221bb	basic/fileio: fix reading of not-too-small virtual files This code is trying to do two things: when reading a file with working st.st_size, detect when the file size changes between the fstat() and our allocation of the buffer based on the returned size, and the subsequent read(). When reading a file without st.st_size, read up to READ_FULL_BYTES_MAX. But this second scenario was partially broken: we'd start with size = 4095, and double the size up to three times, i.e. up to 32767. But we want to read up to READ_FULL_BYTES_MAX. So let's listentangle the two cases a bit: if a file returns non-zero st._size, proceed as before. But if we don't know the size, let's immediately allocate the buffer of maximum size of READ_FULL_BYTES_MAX. I think that allocating 4MB and 1MB is going to take pretty much the same time as long as the memory is not written to, so by allocating 1MB, 2MB, and 4MB, we wouldn't really be saving anything internally, but wasting time on repeated reads, if the file is long enough. Also, don't do the seek if we know we're going to return an error immediately after. This should fix reading of any files in /proc, which all have size == 0. In particular, various files read by coredump might be larger than 32767. What about /sys? The file there return a fake value, usually 4096. So we'll allocate a small buffer and read that.	2021-03-30 21:56:22 +02:00
Luca Boccassi	ae63987fac	Merge pull request #19149 from anitazha/oomdlogging oomd: make it more clear when a kill happens	2021-03-30 19:01:01 +01:00
Luca Boccassi	c71bb61e8d	Merge pull request #19155 from keszybz/hwdb-contrib-v248 hwdb update + contrib list	2021-03-30 18:13:16 +01:00
Zbigniew Jędrzejewski-Szmek	f94a80ab59	oomd: fix iteration over candidates to kill	2021-03-30 14:45:22 +02:00
Anita Zhang	37a7e15968	oomd: make it more clear when a kill happens Improve the logging to only print if systemd-oomd killed something. And also print which cgroup was targeted. Demote general swap above/pressure above messages to debug. [zjs: fix some issuelets found in review]	2021-03-30 14:44:09 +02:00
Zbigniew Jędrzejewski-Szmek	f8a6e1e523	hwdb: update fingerprint autosuspend rules	2021-03-30 13:17:59 +02:00
Zbigniew Jędrzejewski-Szmek	a22c7690d4	hwdb: update for v248 As usual, it seems to be additions and updates, no major removals.	2021-03-30 13:17:59 +02:00
Zbigniew Jędrzejewski-Szmek	8ce2255178	NEWS: update contributor list for v248 final	2021-03-30 13:17:59 +02:00
Zbigniew Jędrzejewski-Szmek	b242d2dec9	git-contrib: use non-breaking spaces in names Some people have initials or abbreviated parts in the name and looks strange when a line break occurs in the middle. Let's keep each name in one line.	2021-03-30 13:17:59 +02:00
Zbigniew Jędrzejewski-Szmek	75e53df7e3	mailmap: two more names	2021-03-30 13:17:58 +02:00