New upstream version 249~rc2

.github/workflows/mkosi.yml

@@ -51,14 +51,8 @@ jobs:
     - name: Show ${{ matrix.distro }} image summary
       run: sudo python3 -m mkosi --password= --qemu-headless summary
 
-    # Ugly workaround for systemd/systemd#19442 where systemd-nspawn
-    # occasionally fails with 'Failed to dissect image xxx: Connection timed out
-    - name: Retry the build if necessary
-      if: ${{ matrix.distro == 'arch' }}
-      run: echo "BUILD_RETRY_MAX=3" >> $GITHUB_ENV
-
     - name: Boot ${{ matrix.distro }} systemd-nspawn
-      run: sudo -E bash +e -x -c 'for _ in $(seq 1 ${BUILD_RETRY_MAX:-1}); do ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --qemu-headless boot && break; done'
+      run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --qemu-headless boot
 
     - name: Boot ${{ matrix.distro }} QEMU
       run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --qemu-headless qemu

NEWS

@@ -61,8 +61,8 @@ CHANGES WITH 249 in spe:
           included in the image. For example, a disk image that contains a
           root, /home/, and /var/ partitions, may set MakeDirectories=yes to
           create /home/ and /var/ as empty directories in the root file system
-          on its creation, so that the resulting image can mounted immediately,
+          on its creation, so that the resulting image can be mounted
-          even in read-only mode.
+          immediately, even in read-only mode.
 
         * systemd-repart's CopyBlocks= setting gained support for the special
           value "auto". If used, a suitable matching partition on the booted OS
@@ -104,6 +104,24 @@ CHANGES WITH 249 in spe:
         * A new udev hardware database has been added for FireWire devices
           (IEEE 1394).
 
+        * The "net_id" built-in of udev has been updated with three
+          backwards-incompatible changes:
+
+          - PCI hotplug slot names on s390 systems are now parsed as
+            hexadecimal numbers. They were incorrectly parsed as decimal
+            previously, or ignored if the name was not a valid decimal
+            number.
+
+          - PCI onboard indices up to 65535 are allowed. Previously, numbers
+            above 16383 were rejected. This primarily impacts s390 systems,
+            where values up to 65535 are used.
+
+          - Invalid characters in interface names are replaced with "_".
+
+          The new version of the net naming scheme is "v249". The previous
+          scheme can be selected via the "net.naming-scheme=v247" kernel
+          command line parameter.
+
         * sd-bus' sd_bus_is_ready() and sd_bus_is_open() calls now accept a
           NULL bus object, for which they will return false. Or in other words,
           an unallocated bus connection is neither ready nor open.
@@ -134,7 +152,7 @@ CHANGES WITH 249 in spe:
         * The native Journal protocol has been documented. Clients may talk
           this as alternative to the classic BSD syslog protocol for locally
           delivering log records to the Journal. The protocol has been stable
-          since a long time and in fact been implemented already in a variety
+          for a long time and in fact been implemented already in a variety
           of alternative client libraries. This documentation makes the support
           for that official:
 
@@ -226,10 +244,10 @@ CHANGES WITH 249 in spe:
           that matters most, to the point where this is defined.
 
         * The Discoverable Partition Specification has been updated with a new
-          GPT partition flag "growsfs" defined for its partition types.
+          GPT partition flag "grow-file-system" defined for its partition
-          Whenever partitions with this flag set are automatically mounted
+          types. Whenever partitions with this flag set are automatically
-          (i.e. via systemd-gpt-auto-generator or the --image= switch of
+          mounted (i.e. via systemd-gpt-auto-generator or the --image= switch
-          systemd-nspawn or other tools; and as opposed to explicit mounting
+          of systemd-nspawn or other tools; and as opposed to explicit mounting
           via /etc/fstab), the file system within the partition is
           automatically grown to the full size of the partition. If the file
           system size already matches the partition size this flag has no
@@ -256,10 +274,17 @@ CHANGES WITH 249 in spe:
           sockets created by the service may be bound to. This is implemented
           via BPF.
 
-        * A new ConditionFirmware= condition type has been added to unit files.
+        * A new ConditionFirmware= setting has been added to unit files to
-          It may be used to detect certain firmware features. At the moment it
+          conditionalize on certain firmware features. At the moment it may
-          may check whether running on an UEFI system, a device.tree system, or
+          check whether running on an UEFI system, a device.tree system, or if
-          if the system is compatible with some specified device-tree feature.
+          the system is compatible with some specified device-tree feature.
+
+        * A new ConditionOSRelease= setting has been added to unit files to
+          check os-release(5) fields. The "=", "!=", "<", "<=", ">=", ">"
+          operators may be used to check if some field has some specific value
+          or do a aphanumerical comparison. Equality comparisons are useful for
+          fields like ID, but relative comparisons for fields like VERSION_ID
+          or IMAGE_VERSION.
 
         * hostnamed gained a new Describe() D-Bus method that returns a JSON
           serialization of the host data it exposes. This is exposed via
@@ -476,35 +501,41 @@ CHANGES WITH 249 in spe:
         * systemd-journald-upload gained a new NetworkTimeoutSec= option for
           setting a network timeout time.
 
+        * If a system service is running in a new mount namespace (RootDirectory=
+          and friends), all file systems will be mounted with MS_NOSUID by
+          default, unless the system is running with SELinux enabled.
+
         Contributions from: Aakash Singh, adrian5, Alexander Sverdlin,
-        alexlzhu, Allen Webb, Alvin Šipraga, Alyssa Ross, Anita Zhang, asavah,
+        alexlzhu, Allen Webb, Alvin Šipraga, Alyssa Ross, Anders Wenhaug,
-        Balint Reczey, Bertrand Jacquin, borna-blazevic, caoxia2008cxx,
+        Andrea Pappacoda, Anita Zhang, asavah, Balint Reczey, Bertrand Jacquin,
-        Carlo Teubner, Christian Göttsche, Christian Hesse, Daniel Schaefer,
+        borna-blazevic, caoxia2008cxx, Carlo Teubner, Christian Göttsche,
-        Dan Streetman, David Santamaría Rogado, David Tardon, Deepak Rawat,
+        Christian Hesse, Daniel Schaefer, Dan Streetman,
+        David Santamaría Rogado, David Tardon, Deepak Rawat,
         Dimitri John Ledkov, ei-ke, Emilio Herrera, Emil Renner Berthing,
-        Flos Lonicerae, Franck Bui, Francois Gervais, Frantisek Sumsal,
+        Eric Cook, Flos Lonicerae, Franck Bui, Francois Gervais,
-        Gibeom Gwon, gitm0, Hans de Goede, Harsh Barsaiyan, Henri Chain,
+        Frantisek Sumsal, Gibeom Gwon, gitm0, Hans de Goede, Harsh Barsaiyan,
-        Igor Zhbanov, imayoda, Jakub Warczarek, James Buren, Jan Janssen,
+        Henri Chain, Hristo Venev, Igor Zhbanov, imayoda, Jakub Warczarek,
-        Jan Synacek, Jason Francis, Jayanth Ananthapadmanaban,
+        James Buren, Jan Janssen, Jan Macku, Jan Synacek, Jason Francis,
-        Jérôme Carretero, jiangchuangang, Joerg Behrmann,
+        Jayanth Ananthapadmanaban, Jeremy Szu, Jérôme Carretero,
-        Jóhann B. Guðmundsson, Jörg Deckert, Jörg Thalheim, Julia Kartseva,
+        Jesse Stricker, jiangchuangang, Joerg Behrmann, Jóhann B. Guðmundsson,
+        Jörg Deckert, Jörg Thalheim, Juergen Hoetzel, Julia Kartseva,
         Kai-Heng Feng, Khem Raj, KoyamaSohei, Lennart Poettering,
         LetzteInstanz, Luca Adrian L, Luca Boccassi, Lucas Magasweran,
         Mantas Mikulėnas, Marco Antonio Mauro, Mark Wielaard, Masahiro Matsuya,
         Matt Johnston, Michael Catanzaro, Michal Koutný, Michal Sekletár,
-        Mike Kazantsev, Milan, Miroslav Suchý, Morten Linderud, nerdopolis,
+        Mike Crowe, Mike Kazantsev, Milan, Miroslav Suchý, Morten Linderud,
-        nl6720, Noah Meyerhans, Oleg Popov, Olle Lundberg, Ondrej Kozina,
+        nerdopolis, nl6720, Noah Meyerhans, Oleg Popov, Olle Lundberg,
-        Perry.Yuan, Peter Hutterer, Peter Kjellerstedt, Peter Morrow,
+        Ondrej Kozina, Perry.Yuan, Peter Hutterer, Peter Kjellerstedt,
-        Phaedrus Leeds, Roman Beranek, Roshan Shariff, Ryan Hendrickson,
+        Peter Morrow, Phaedrus Leeds, plattrap, Roman Beranek, Roshan Shariff,
-        Samuel BF, scootergrisen, Sebastian Blunt, Seong-ho Cho, Sergey Bugaev,
+        Ryan Hendrickson, Samuel BF, scootergrisen, Sebastian Blunt,
-        Sevan Janiyan, Sibo Dong, simmon, Simon Watts, Srinidhi Kaushik,
+        Seong-ho Cho, Sergey Bugaev, Sevan Janiyan, Sibo Dong, simmon,
-        Štěpán Němec, Steve Bonds, Susant Sahani, sverdlin, syyhao1994,
+        Simon Watts, Srinidhi Kaushik, Štěpán Němec, Steve Bonds,
-        Takashi Sakamoto, Topi Miettinen, tramsay, Uwe Kleine-König,
+        Susant Sahani, sverdlin, syyhao1994, Takashi Sakamoto, Topi Miettinen,
-        Viktor Mihajlovski, Vincent Dechenaux, Vito Caputo,
+        tramsay, Uwe Kleine-König, Viktor Mihajlovski, Vincent Dechenaux,
-        William A. Kennington III, Yangyang Shen, Yegor Alexeyev, Yi Gao,
+        Vito Caputo, William A. Kennington III, Yangyang Shen, Yegor Alexeyev,
-        Yu Watanabe, Zbigniew Jędrzejewski-Szmek, zsien, наб
+        Yi Gao, Yu Watanabe, Zbigniew Jędrzejewski-Szmek, zsien, наб
 
-        — Berlin, 2021-06-15
+        — Warsaw, 2021-06-25
 
 CHANGES WITH 248:
 

README

@@ -85,7 +85,7 @@ REQUIREMENTS:
 
         Optional but strongly recommended:
           CONFIG_IPV6
-          CONFIG_AUTOFS4_FS
+          CONFIG_AUTOFS_FS
           CONFIG_TMPFS_XATTR
           CONFIG_{TMPFS,EXT4_FS,XFS,BTRFS_FS,...}_POSIX_ACL
           CONFIG_SECCOMP

TODO

@@ -26,6 +26,11 @@ Janitorial Clean-ups:
 
 Features:
 
+* firstboot: allow provisioning of /etc/hosts entries, so that we can via the
+  credentials logic insert host name to resolve into containers/hosts. Usecase:
+  fork a container, and make it ping some specific address which is defined by
+  the host on invocation
+
 * in sd-id128: also parse UUIDs in RFC4122 URN syntax (i.e. chop off urn:uuid: prefix)
 
 * ability to insert trusted configuration and secrets into the boot parameters
@@ -880,6 +885,10 @@ Features:
 
 * fstab-generator: default to tmpfs-as-root if only usr= is specified on the kernel cmdline
 
+* initrd-parse-etc.service: can we skip daemon-reload if /sysroot/etc/fstab is missing?
+  Note that we start initrd-fs.target and initrd-cleanup.target there, so a straightforward
+  ConditionPathExists= is not enough.
+
 * docs: bring http://www.freedesktop.org/wiki/Software/systemd/MyServiceCantGetRealtime up to date
 
 * add a job mode that will fail if a transaction would mean stopping

docs/.gitignore

@@ -1 +1,2 @@
-_site
+/_site/
+/.jekyll-cache/

docs/BOOT_LOADER_SPECIFICATION.md

@@ -210,7 +210,7 @@ Note that these configurations snippets do not need to be the only configuration
 
 To make this explicitly clear: this specification is designed with "free" operating systems in mind, starting Windows or macOS is out of focus with these configuration snippets, use boot-loader specific solutions for that. In the text above, if we say "OS" we hence imply "free", i.e. primarily Linux (though this could be easily be extended to the BSDs and whatnot).
 
-Note that all paths used in the configuration snippets use a Unix-style "/" as path separator. This needs to be converted to an EFI-style "\" separator in EFI boot loaders.
+Note that all paths used in the configuration snippets use a Unix-style "/" as path separator. This needs to be converted to an EFI-style "\\" separator in EFI boot loaders.
 
 
 ## Logic

docs/CODING_STYLE.md

@@ -69,6 +69,14 @@ layout: default
   ```
 
 - Do not write `foo ()`, write `foo()`.
+- `else` blocks should generally start on the same line as the closing `}`:
+  ```c
+  if (foobar) {
+          find();
+          waldo();
+  } else
+          dont_find_waldo();
+  ```
 
 ## Code Organization and Semantics
 

hwdb.d/20-OUI.hwdb

@@ -34812,7 +34812,7 @@ OUI:0080E6*
  ID_OUI_FROM_DATABASE=PEER NETWORKS, INC.
 
 OUI:0080E7*
- ID_OUI_FROM_DATABASE=Leonardo Tactical Systems.
+ ID_OUI_FROM_DATABASE=Leonardo UK Ltd
 
 OUI:0080E8*
  ID_OUI_FROM_DATABASE=CUMULUS CORPORATIION
@@ -34919,6 +34919,9 @@ OUI:0088BA*
 OUI:008A55*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
+OUI:008A76*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:008A96*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -39374,6 +39377,9 @@ OUI:00E6D3*
 OUI:00E6E8*
  ID_OUI_FROM_DATABASE=Netzin Technology Corporation,.Ltd.
 
+OUI:00E7E3*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:00E8AB*
  ID_OUI_FROM_DATABASE=Meggitt Training Systems, Inc.
 
@@ -40349,6 +40355,9 @@ OUI:04D3CF*
 OUI:04D437*
  ID_OUI_FROM_DATABASE=ZNV
 
+OUI:04D442*
+ ID_OUI_FROM_DATABASE=GUANGDONG GENIUS TECHNOLOGY CO., LTD.
+
 OUI:04D4C4*
  ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
 
@@ -41186,6 +41195,9 @@ OUI:0840F3*
 OUI:084296*
  ID_OUI_FROM_DATABASE=Mobile Technology Solutions LLC
 
+OUI:0845D1*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:084656*
  ID_OUI_FROM_DATABASE=VEO-LABS
 
@@ -41408,6 +41420,9 @@ OUI:088DC8*
 OUI:088E4F*
  ID_OUI_FROM_DATABASE=SF Software Solutions
 
+OUI:088EDC*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:088F2C*
  ID_OUI_FROM_DATABASE=Amber Technology Ltd.
 
@@ -41459,6 +41474,9 @@ OUI:089E01*
 OUI:089E08*
  ID_OUI_FROM_DATABASE=Google, Inc.
 
+OUI:089E84*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:089F97*
  ID_OUI_FROM_DATABASE=LEROY AUTOMATION
 
@@ -42251,6 +42269,9 @@ OUI:0C839A*
 OUI:0C83CC*
  ID_OUI_FROM_DATABASE=Alpha Networks Inc.
 
+OUI:0C8408*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:0C8411*
  ID_OUI_FROM_DATABASE=A.O. Smith Water Products
 
@@ -42380,6 +42401,9 @@ OUI:0CA694*
 OUI:0CA8A7*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:0CAAEE*
+ ID_OUI_FROM_DATABASE=Ansjer Electronics Co., Ltd.
+
 OUI:0CAC05*
  ID_OUI_FROM_DATABASE=Unitend Technologies Inc.
 
@@ -42755,6 +42779,9 @@ OUI:0CFE5DE*
 OUI:100000*
  ID_OUI_FROM_DATABASE=Private
 
+OUI:100020*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:10005A*
  ID_OUI_FROM_DATABASE=IBM Corp
 
@@ -42857,6 +42884,9 @@ OUI:100BA9*
 OUI:100C24*
  ID_OUI_FROM_DATABASE=pomdevices, LLC
 
+OUI:100C29*
+ ID_OUI_FROM_DATABASE=Shenzhen NORCO lntelligent Technology Co.,Ltd
+
 OUI:100C6B*
  ID_OUI_FROM_DATABASE=NETGEAR
 
@@ -42995,6 +43025,9 @@ OUI:103034*
 OUI:103047*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:10321D*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:10327E*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -43265,6 +43298,9 @@ OUI:1081B4*
 OUI:108286*
  ID_OUI_FROM_DATABASE=Luxshare Precision Industry Co.,Ltd
 
+OUI:1082D7*
+ ID_OUI_FROM_DATABASE=Realme Chongqing Mobile Telecommunications Corp.,Ltd.
+
 OUI:1083D2*
  ID_OUI_FROM_DATABASE=Microseven Systems, LLC
 
@@ -47087,6 +47123,9 @@ OUI:203233*
 OUI:20326C*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:2032C6*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:2034FB*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
@@ -47099,6 +47138,9 @@ OUI:2036D7*
 OUI:203706*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:2037A5*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:2037BC*
  ID_OUI_FROM_DATABASE=Kuipers Electronic Engineering BV
 
@@ -47420,6 +47462,9 @@ OUI:208986*
 OUI:208B37*
  ID_OUI_FROM_DATABASE=Skyworth Digital Technology(Shenzhen) Co.,Ltd
 
+OUI:208C47*
+ ID_OUI_FROM_DATABASE=Tenstorrent Inc
+
 OUI:20906F*
  ID_OUI_FROM_DATABASE=Shenzhen Tencent Computer System Co., Ltd.
 
@@ -48017,6 +48062,9 @@ OUI:24336C*
 OUI:2435CC*
  ID_OUI_FROM_DATABASE=Zhongshan Scinan Internet of Things Co.,Ltd.
 
+OUI:2436DA*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:24374C*
  ID_OUI_FROM_DATABASE=Cisco SPVTG
 
@@ -48569,6 +48617,9 @@ OUI:24D51C*
 OUI:24D76B*
  ID_OUI_FROM_DATABASE=Syntronic AB
 
+OUI:24D7EB*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:24D921*
  ID_OUI_FROM_DATABASE=Avaya Inc
 
@@ -48911,9 +48962,51 @@ OUI:2834A2*
 OUI:283545*
  ID_OUI_FROM_DATABASE=SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LTD
 
+OUI:2836130*
+ ID_OUI_FROM_DATABASE=Shandong SIASUN Industrial Software Research Institute Co., Ltd
+
+OUI:2836131*
+ ID_OUI_FROM_DATABASE=Hi-p (Suzhou) Electronics Co,Ltd
+
 OUI:2836132*
  ID_OUI_FROM_DATABASE=Shenzhen HQVT TECHNOLOGY Co.,LTD
 
+OUI:2836133*
+ ID_OUI_FROM_DATABASE=Linear Computing Inc.
+
+OUI:2836134*
+ ID_OUI_FROM_DATABASE=Elytone Electronic Co., Ltd.
+
+OUI:2836135*
+ ID_OUI_FROM_DATABASE=Turing Video
+
+OUI:2836136*
+ ID_OUI_FROM_DATABASE=ESI Ventures, LLC
+
+OUI:2836137*
+ ID_OUI_FROM_DATABASE=shenzhen technology limited
+
+OUI:2836138*
+ ID_OUI_FROM_DATABASE=Fuzhou Lesi Intelligent Technology Co., Ltd
+
+OUI:2836139*
+ ID_OUI_FROM_DATABASE=Qingdao Airpoint Electronics Co.,Ltd.
+
+OUI:283613A*
+ ID_OUI_FROM_DATABASE=MAKEEN Energy
+
+OUI:283613B*
+ ID_OUI_FROM_DATABASE=Qorvo, Inc.
+
+OUI:283613C*
+ ID_OUI_FROM_DATABASE=midBit Technologies, LLC
+
+OUI:283613D*
+ ID_OUI_FROM_DATABASE=AVYCON
+
+OUI:283613E*
+ ID_OUI_FROM_DATABASE=EGMedical, s.r.o.
+
 OUI:2836380*
  ID_OUI_FROM_DATABASE=Knowles Electronics LLC
 
@@ -49479,7 +49572,7 @@ OUI:28D1B7*
  ID_OUI_FROM_DATABASE=Shenzhen YOUHUA Technology Co., Ltd
 
 OUI:28D244*
- ID_OUI_FROM_DATABASE=LCFC(HeFei) Electronics Technology Co., Ltd.
+ ID_OUI_FROM_DATABASE=LCFC(HeFei) Electronics Technology co., ltd
 
 OUI:28D3EA*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
@@ -51239,6 +51332,9 @@ OUI:305D38*
 OUI:305DA6*
  ID_OUI_FROM_DATABASE=ADVALY SYSTEM Inc.
 
+OUI:305F77*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:306023*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
@@ -52007,6 +52103,9 @@ OUI:342FBD*
 OUI:343111*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:34317F*
+ ID_OUI_FROM_DATABASE=Panasonic Appliances Company
+
 OUI:34318F*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -53804,6 +53903,9 @@ OUI:38FB14*
 OUI:38FC98*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:38FDF8*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:38FDFE0*
  ID_OUI_FROM_DATABASE=Edge I&D Co., Ltd.
 
@@ -54554,6 +54656,9 @@ OUI:3C9D56*
 OUI:3C9F81*
  ID_OUI_FROM_DATABASE=Shenzhen CATIC Bit Communications Technology Co.,Ltd
 
+OUI:3C9FC3*
+ ID_OUI_FROM_DATABASE=Beijing Sinead Technology Co., Ltd.
+
 OUI:3CA067*
  ID_OUI_FROM_DATABASE=Liteon Technology Corporation
 
@@ -56852,6 +56957,9 @@ OUI:44EA4B*
 OUI:44EAD8*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:44EB2E*
+ ID_OUI_FROM_DATABASE=ALPSALPINE CO .,LTD
+
 OUI:44ECCE*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
@@ -57344,6 +57452,9 @@ OUI:487604*
 OUI:487746*
  ID_OUI_FROM_DATABASE=Calix Inc.
 
+OUI:4877BD*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
 OUI:48785E*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 
@@ -58757,6 +58868,9 @@ OUI:4CEB42*
 OUI:4CEBBD*
  ID_OUI_FROM_DATABASE=CHONGQING FUGUI ELECTRONICS CO.,LTD.
 
+OUI:4CEBD6*
+ ID_OUI_FROM_DATABASE=Espressif Inc.
+
 OUI:4CECEF*
  ID_OUI_FROM_DATABASE=Soraa, Inc.
 
@@ -60125,6 +60239,9 @@ OUI:544249*
 OUI:544408*
  ID_OUI_FROM_DATABASE=Nokia Corporation
 
+OUI:5444A3*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:544617*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -60794,6 +60911,9 @@ OUI:5809E5*
 OUI:580A20*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:580AD4*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:58108C*
  ID_OUI_FROM_DATABASE=Intelbras
 
@@ -61895,6 +62015,9 @@ OUI:5C5188*
 OUI:5C521E*
  ID_OUI_FROM_DATABASE=Nintendo Co.,Ltd
 
+OUI:5C5230*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:5C546D*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -63893,6 +64016,9 @@ OUI:6459F8*
 OUI:645A04*
  ID_OUI_FROM_DATABASE=Chicony Electronics Co., Ltd.
 
+OUI:645A36*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:645AED*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -64245,7 +64371,7 @@ OUI:64B5C6*
  ID_OUI_FROM_DATABASE=Nintendo Co.,Ltd
 
 OUI:64B623*
- ID_OUI_FROM_DATABASE=CCS Care Communication Solutions GmbH
+ ID_OUI_FROM_DATABASE=Schrack Seconet Care Communication GmbH
 
 OUI:64B64A*
  ID_OUI_FROM_DATABASE=ViVOtech, Inc.
@@ -65765,6 +65891,9 @@ OUI:6C710D*
 OUI:6C71BD*
  ID_OUI_FROM_DATABASE=EZELINK TELECOM
 
+OUI:6C71D2*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:6C71D9*
  ID_OUI_FROM_DATABASE=AzureWave Technology Inc.
 
@@ -80912,6 +81041,9 @@ OUI:785C72*
 OUI:785DC8*
  ID_OUI_FROM_DATABASE=LG Electronics
 
+OUI:785EE8A*
+ ID_OUI_FROM_DATABASE=Yake (Tianjin) Technology Co.,Ltd.
+
 OUI:785F36*
  ID_OUI_FROM_DATABASE=Shenzhen Skyworth  Digital  Technology  CO., Ltd
 
@@ -81605,6 +81737,9 @@ OUI:78E8B6*
 OUI:78E980*
  ID_OUI_FROM_DATABASE=RainUs Co.,Ltd
 
+OUI:78E9CF*
+ ID_OUI_FROM_DATABASE=TELLESCOM INDUSTRIA E COMERCIO EM TELECOMUNICACAO
+
 OUI:78EB14*
  ID_OUI_FROM_DATABASE=SHENZHEN FAST TECHNOLOGIES CO.,LTD
 
@@ -81818,6 +81953,9 @@ OUI:7C2302*
 OUI:7C240C*
  ID_OUI_FROM_DATABASE=Telechips, Inc.
 
+OUI:7C2499*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:7C2586*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
@@ -82742,6 +82880,9 @@ OUI:7CF9A0*
 OUI:7CFADF*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:7CFC16*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:7CFC3C*
  ID_OUI_FROM_DATABASE=Visteon Corporation
 
@@ -83873,6 +84014,9 @@ OUI:84267A*
 OUI:842690*
  ID_OUI_FROM_DATABASE=BEIJING THOUGHT SCIENCE CO.,LTD.
 
+OUI:8427B6*
+ ID_OUI_FROM_DATABASE=China Mobile IOT Company Limited
+
 OUI:8427CE*
  ID_OUI_FROM_DATABASE=Corporation of the Presiding Bishop of The Church of Jesus Christ of Latter-day Saints
 
@@ -84398,6 +84542,9 @@ OUI:84A788*
 OUI:84A8E4*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:84A938*
+ ID_OUI_FROM_DATABASE=LCFC(HeFei) Electronics Technology co., ltd
+
 OUI:84A93E*
  ID_OUI_FROM_DATABASE=Hewlett Packard
 
@@ -85445,6 +85592,9 @@ OUI:88B6EE*
 OUI:88B8D0*
  ID_OUI_FROM_DATABASE=Dongguan Koppo Electronic Co.,Ltd
 
+OUI:88B945*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:88BA7F*
  ID_OUI_FROM_DATABASE=Qfiednet Co., Ltd.
 
@@ -86021,6 +86171,9 @@ OUI:8C1F64372*
 OUI:8C1F64391*
  ID_OUI_FROM_DATABASE=CPC (UK)
 
+OUI:8C1F64397*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:8C1F643A4*
  ID_OUI_FROM_DATABASE=QLM Technology Ltd
 
@@ -86030,6 +86183,9 @@ OUI:8C1F643B5*
 OUI:8C1F643C4*
  ID_OUI_FROM_DATABASE=NavSys Technology Inc.
 
+OUI:8C1F643E0*
+ ID_OUI_FROM_DATABASE=YPP Corporation
+
 OUI:8C1F643E8*
  ID_OUI_FROM_DATABASE=Ruichuangte
 
@@ -86060,6 +86216,12 @@ OUI:8C1F644DD*
 OUI:8C1F644FA*
  ID_OUI_FROM_DATABASE=Sanskruti
 
+OUI:8C1F6453D*
+ ID_OUI_FROM_DATABASE=NEXCONTECH
+
+OUI:8C1F64542*
+ ID_OUI_FROM_DATABASE=Landis+Gyr Equipamentos de Medição Ltda
+
 OUI:8C1F64549*
  ID_OUI_FROM_DATABASE=Brad Technology
 
@@ -86072,6 +86234,9 @@ OUI:8C1F64575*
 OUI:8C1F64611*
  ID_OUI_FROM_DATABASE=Siemens Industry Software Inc.
 
+OUI:8C1F64712*
+ ID_OUI_FROM_DATABASE=Nexion Data Systems P/L
+
 OUI:8C1F64726*
  ID_OUI_FROM_DATABASE=DAVE SRL
 
@@ -86090,6 +86255,9 @@ OUI:8C1F64768*
 OUI:8C1F6479D*
  ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
 
+OUI:8C1F6479E*
+ ID_OUI_FROM_DATABASE=Accemic Technologies GmbH
+
 OUI:8C1F647A6*
  ID_OUI_FROM_DATABASE=OTMetric
 
@@ -86129,9 +86297,15 @@ OUI:8C1F64947*
 OUI:8C1F6495A*
  ID_OUI_FROM_DATABASE=Shenzhen Longyun Lighting Electric Appliances Co., Ltd
 
+OUI:8C1F64984*
+ ID_OUI_FROM_DATABASE=Abacus Peripherals Pvt Ltd
+
 OUI:8C1F64991*
  ID_OUI_FROM_DATABASE=DB Systel GmbH
 
+OUI:8C1F64998*
+ ID_OUI_FROM_DATABASE=EVLO Stockage Énergie
+
 OUI:8C1F649C1*
  ID_OUI_FROM_DATABASE=RealWear
 
@@ -86162,12 +86336,18 @@ OUI:8C1F64AAB*
 OUI:8C1F64AB5*
  ID_OUI_FROM_DATABASE=JUSTMORPH PTE. LTD.
 
+OUI:8C1F64ACE*
+ ID_OUI_FROM_DATABASE=Rayhaan Networks
+
 OUI:8C1F64AE1*
  ID_OUI_FROM_DATABASE=YUYAMA MFG Co.,Ltd
 
 OUI:8C1F64AED*
  ID_OUI_FROM_DATABASE=MB connect line GmbH Fernwartungssysteme
 
+OUI:8C1F64AF7*
+ ID_OUI_FROM_DATABASE=ard sa
+
 OUI:8C1F64B03*
  ID_OUI_FROM_DATABASE=Shenzhen Pisoftware Technology Co.,Ltd.
 
@@ -86213,6 +86393,9 @@ OUI:8C1F64D3C*
 OUI:8C1F64D4A*
  ID_OUI_FROM_DATABASE=Caproc Oy
 
+OUI:8C1F64D54*
+ ID_OUI_FROM_DATABASE=Grupo Epelsa S.L.
+
 OUI:8C1F64D7E*
  ID_OUI_FROM_DATABASE=Thales Belgium
 
@@ -86222,6 +86405,9 @@ OUI:8C1F64DBD*
 OUI:8C1F64DC9*
  ID_OUI_FROM_DATABASE=Peter Huber Kaeltemaschinenbau AG
 
+OUI:8C1F64E43*
+ ID_OUI_FROM_DATABASE=Daedalean AG
+
 OUI:8C1F64E5C*
  ID_OUI_FROM_DATABASE=Scientific Lightning Solutions
 
@@ -86231,6 +86417,12 @@ OUI:8C1F64EAC*
 OUI:8C1F64EE8*
  ID_OUI_FROM_DATABASE=Global Organ Group B.V.
 
+OUI:8C1F64EEF*
+ ID_OUI_FROM_DATABASE=AiUnion Co.,Ltd
+
+OUI:8C1F64EF1*
+ ID_OUI_FROM_DATABASE=BIOTAGE GB LTD
+
 OUI:8C1F64F41*
  ID_OUI_FROM_DATABASE=AUTOMATIZACION Y CONECTIVIDAD SA DE CV
 
@@ -86627,6 +86819,12 @@ OUI:8C79F5*
 OUI:8C7A15*
  ID_OUI_FROM_DATABASE=Ruckus Wireless
 
+OUI:8C7A3D*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
+OUI:8C7AAA*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:8C7B9D*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -87170,6 +87368,9 @@ OUI:900628*
 OUI:900917*
  ID_OUI_FROM_DATABASE=Far-sighted mobile
 
+OUI:9009D0*
+ ID_OUI_FROM_DATABASE=Synology Incorporated
+
 OUI:900A1A*
  ID_OUI_FROM_DATABASE=Taicang T&W Electronics
 
@@ -87533,6 +87734,9 @@ OUI:9068C3*
 OUI:906976*
  ID_OUI_FROM_DATABASE=Withrobot Inc.
 
+OUI:906A94*
+ ID_OUI_FROM_DATABASE=hangzhou huacheng network technology co., ltd
+
 OUI:906CAC*
  ID_OUI_FROM_DATABASE=Fortinet, Inc.
 
@@ -88445,6 +88649,9 @@ OUI:946372*
 OUI:9463D1*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:946424*
+ ID_OUI_FROM_DATABASE=Aruba, a Hewlett Packard Enterprise Company
+
 OUI:94652D*
  ID_OUI_FROM_DATABASE=OnePlus Technology (Shenzhen) Co., Ltd
 
@@ -89453,6 +89660,9 @@ OUI:984E97*
 OUI:984FEE*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:98502E*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:98523D*
  ID_OUI_FROM_DATABASE=Sunitec Enterprise Co.,Ltd
 
@@ -89612,6 +89822,9 @@ OUI:987E46*
 OUI:987ECA*
  ID_OUI_FROM_DATABASE=Inventus Power Eletronica do Brasil LTDA
 
+OUI:987EE3*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
 OUI:9880EE*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -90284,6 +90497,9 @@ OUI:9C3DCF*
 OUI:9C3EAA*
  ID_OUI_FROM_DATABASE=EnvyLogic Co.,Ltd.
 
+OUI:9C40CD*
+ ID_OUI_FROM_DATABASE=Synclayer Inc.
+
 OUI:9C417C*
  ID_OUI_FROM_DATABASE=Hame  Technology Co.,  Limited
 
@@ -90386,6 +90602,9 @@ OUI:9C53CD*
 OUI:9C541C*
  ID_OUI_FROM_DATABASE=Shenzhen My-power Technology Co.,Ltd
 
+OUI:9C54C2*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:9C54CA*
  ID_OUI_FROM_DATABASE=Zhengzhou VCOM Science and Technology Co.,Ltd
 
@@ -91763,6 +91982,9 @@ OUI:A09E1A*
 OUI:A09F10*
  ID_OUI_FROM_DATABASE=SHENZHEN BILIAN ELECTRONIC CO.，LTD
 
+OUI:A09F7A*
+ ID_OUI_FROM_DATABASE=D-Link Middle East FZCO
+
 OUI:A0A0DC*
  ID_OUI_FROM_DATABASE=Huawei Device Co., Ltd.
 
@@ -91997,6 +92219,9 @@ OUI:A0CF5B*
 OUI:A0CFF5*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:A0D05B*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:A0D0DC*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 
@@ -92756,6 +92981,9 @@ OUI:A47758*
 OUI:A47760*
  ID_OUI_FROM_DATABASE=Nokia Corporation
 
+OUI:A477F3*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:A47806*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -93572,6 +93800,9 @@ OUI:A8494D*
 OUI:A849A5*
  ID_OUI_FROM_DATABASE=Lisantech Co., Ltd.
 
+OUI:A84A28*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:A84A63*
  ID_OUI_FROM_DATABASE=TPV Display Technology(Xiamen) Co.,Ltd.
 
@@ -95735,6 +95966,9 @@ OUI:B0BDA1*
 OUI:B0BE76*
  ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
 
+OUI:B0BE83*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:B0BF99*
  ID_OUI_FROM_DATABASE=WIZITDONGDO
 
@@ -96134,6 +96368,9 @@ OUI:B41D2B*
 OUI:B41DEF*
  ID_OUI_FROM_DATABASE=Internet Laboratories, Inc.
 
+OUI:B42046*
+ ID_OUI_FROM_DATABASE=eero inc.
+
 OUI:B4211D*
  ID_OUI_FROM_DATABASE=Beijing GuangXin Technology Co., Ltd
 
@@ -97103,6 +97340,9 @@ OUI:B83241*
 OUI:B836D8*
  ID_OUI_FROM_DATABASE=Videoswitch
 
+OUI:B8374A*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:B83765*
  ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
 
@@ -97175,6 +97415,9 @@ OUI:B853AC*
 OUI:B85510*
  ID_OUI_FROM_DATABASE=Zioncom Electronics (Shenzhen) Ltd.
 
+OUI:B85600*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:B856BD*
  ID_OUI_FROM_DATABASE=ITT LLC
 
@@ -97349,6 +97592,9 @@ OUI:B88A60*
 OUI:B88AEC*
  ID_OUI_FROM_DATABASE=Nintendo Co.,Ltd
 
+OUI:B88C29*
+ ID_OUI_FROM_DATABASE=GD Midea Air-Conditioning Equipment Co.,Ltd.
+
 OUI:B88D12*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -97889,6 +98135,9 @@ OUI:BC1AE4*
 OUI:BC1C81*
  ID_OUI_FROM_DATABASE=Sichuan iLink Technology Co., Ltd.
 
+OUI:BC1E85*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:BC20A4*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -98246,6 +98495,9 @@ OUI:BC6A2F*
 OUI:BC6A44*
  ID_OUI_FROM_DATABASE=Commend International GmbH
 
+OUI:BC6AD1*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:BC6B4D*
  ID_OUI_FROM_DATABASE=Nokia
 
@@ -101909,6 +102161,9 @@ OUI:CC3E5F*
 OUI:CC3F1D*
  ID_OUI_FROM_DATABASE=Intesis Software SL
 
+OUI:CC3F8A*
+ ID_OUI_FROM_DATABASE=KOMATSU LTD.
+
 OUI:CC3FEA*
  ID_OUI_FROM_DATABASE=BAE Systems, Inc
 
@@ -102338,6 +102593,9 @@ OUI:CCB8F1*
 OUI:CCBBFE*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:CCBCE3*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:CCBD35*
  ID_OUI_FROM_DATABASE=Steinel GmbH
 
@@ -105062,6 +105320,9 @@ OUI:D87533*
 OUI:D8760A*
  ID_OUI_FROM_DATABASE=Escort, Inc.
 
+OUI:D876AE*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:D8778B*
  ID_OUI_FROM_DATABASE=Intelbras
 
@@ -105344,6 +105605,9 @@ OUI:D8BBC1*
 OUI:D8BC59*
  ID_OUI_FROM_DATABASE=Shenzhen DAPU Microelectronics Co., Ltd
 
+OUI:D8BE1F*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:D8BE65*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 
@@ -106181,6 +106445,9 @@ OUI:DCB4AC*
 OUI:DCB4C4*
  ID_OUI_FROM_DATABASE=Microsoft XCG
 
+OUI:DCB54F*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:DCB72E*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
@@ -106433,6 +106700,9 @@ OUI:DCF110*
 OUI:DCF401*
  ID_OUI_FROM_DATABASE=Dell Inc.
 
+OUI:DCF4CA*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
 OUI:DCF505*
  ID_OUI_FROM_DATABASE=AzureWave Technology Inc.
 
@@ -106853,6 +107123,9 @@ OUI:E0693A*
 OUI:E06995*
  ID_OUI_FROM_DATABASE=PEGATRON CORPORATION
 
+OUI:E069BA*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:E06C4E*
  ID_OUI_FROM_DATABASE=Shenzhen TINNO Mobile Technology Corp.
 
@@ -107885,6 +108158,9 @@ OUI:E492E7*
 OUI:E492FB*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:E4936A*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
 OUI:E4956E0*
  ID_OUI_FROM_DATABASE=SMC Networks, Inc
 
@@ -108671,6 +108947,9 @@ OUI:E86DCB*
 OUI:E86DE9*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:E86E44*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:E86F38*
  ID_OUI_FROM_DATABASE=CHONGQING FUGUI ELECTRONICS CO.,LTD.
 
@@ -109529,6 +109808,9 @@ OUI:EC7949*
 OUI:EC79F2*
  ID_OUI_FROM_DATABASE=Startel
 
+OUI:EC7C2C*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:EC7C74*
  ID_OUI_FROM_DATABASE=Justone Technologies Co., Ltd.
 
@@ -111905,6 +112187,9 @@ OUI:F4EC38*
 OUI:F4ED5F*
  ID_OUI_FROM_DATABASE=SHENZHEN KTC TECHNOLOGY GROUP
 
+OUI:F4EE08*
+ ID_OUI_FROM_DATABASE=Dell Inc.
+
 OUI:F4EE14*
  ID_OUI_FROM_DATABASE=MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.
 
@@ -111962,6 +112247,9 @@ OUI:F4FD2B*
 OUI:F4FEFB*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:F800A1*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
 OUI:F80113*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -112364,6 +112652,9 @@ OUI:F854B8*
 OUI:F855CD*
  ID_OUI_FROM_DATABASE=Visteon Corporation
 
+OUI:F856C3*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:F8572E*
  ID_OUI_FROM_DATABASE=Core Brands, LLC
 
@@ -113153,6 +113444,9 @@ OUI:FC1BFF*
 OUI:FC1CA1*
  ID_OUI_FROM_DATABASE=Nokia
 
+OUI:FC1D2A*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
 OUI:FC1D43*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -113612,6 +113906,9 @@ OUI:FCA5D0*
 OUI:FCA621*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:FCA64C*
+ ID_OUI_FROM_DATABASE=Alibaba cloud computing Co., Ltd
+
 OUI:FCA667*
  ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
 

hwdb.d/20-acpi-vendor.hwdb

@@ -3207,6 +3207,9 @@ acpi:HSL*:
 acpi:HSM*:
  ID_VENDOR_FROM_DATABASE=AT&T Microelectronics
 
+acpi:HSN*:
+ ID_VENDOR_FROM_DATABASE=Hansung Co., Ltd
+
 acpi:HSP*:
  ID_VENDOR_FROM_DATABASE=HannStar Display Corp
 
@@ -4089,6 +4092,9 @@ acpi:LIN*:
 acpi:LIP*:
  ID_VENDOR_FROM_DATABASE=Linked IP GmbH
 
+acpi:LIS*:
+ ID_VENDOR_FROM_DATABASE=Life is Style Inc.
+
 acpi:LIT*:
  ID_VENDOR_FROM_DATABASE=Lithics Silicon Technology
 
@@ -4797,6 +4803,9 @@ acpi:NAC*:
 acpi:NAD*:
  ID_VENDOR_FROM_DATABASE=NAD Electronics
 
+acpi:NAF*:
+ ID_VENDOR_FROM_DATABASE=NAFASAE INDIA Pvt. Ltd
+
 acpi:NAK*:
  ID_VENDOR_FROM_DATABASE=Nakano Engineering Co.,Ltd.
 
@@ -5253,6 +5262,9 @@ acpi:PAC*:
 acpi:PAD*:
  ID_VENDOR_FROM_DATABASE=Promotion and Display Technology Ltd.
 
+acpi:PAE*:
+ ID_VENDOR_FROM_DATABASE=PreSonus Audio Electronics
+
 acpi:PAK*:
  ID_VENDOR_FROM_DATABASE=Many CNC System Co., Ltd.
 
@@ -5409,6 +5421,9 @@ acpi:PIM*:
 acpi:PIO*:
  ID_VENDOR_FROM_DATABASE=Pioneer Electronic Corporation
 
+acpi:PIR*:
+ ID_VENDOR_FROM_DATABASE=Pico Technology Inc.
+
 acpi:PIS*:
  ID_VENDOR_FROM_DATABASE=TECNART CO.,LTD.
 
@@ -7077,6 +7092,9 @@ acpi:TTL*:
 acpi:TTP*:
  ID_VENDOR_FROM_DATABASE=Toshiba Corporation
 
+acpi:TTR*:
+ ID_VENDOR_FROM_DATABASE=Hubei Century Joint Innovation Technology Co.Ltd
+
 acpi:TTS*:
  ID_VENDOR_FROM_DATABASE=TechnoTrend Systemtechnik GmbH
 
@@ -7371,6 +7389,9 @@ acpi:VIM*:
 acpi:VIN*:
  ID_VENDOR_FROM_DATABASE=Vine Micros Ltd
 
+acpi:VIO*:
+ ID_VENDOR_FROM_DATABASE=Zake IP Holdings LLC (3B tech)
+
 acpi:VIR*:
  ID_VENDOR_FROM_DATABASE=Visual Interface, Inc
 

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

@@ -1,5 +1,5 @@
---- 20-acpi-vendor.hwdb.base	2021-06-15 21:57:03.178869619 +0200
+--- 20-acpi-vendor.hwdb.base	2021-06-25 14:20:43.637315960 +0200
-+++ 20-acpi-vendor.hwdb	2021-06-15 21:57:03.185869634 +0200
++++ 20-acpi-vendor.hwdb	2021-06-25 14:20:43.655316147 +0200
 @@ -3,6 +3,8 @@
  # Data imported from:
  #     https://uefi.org/uefi-pnp-export
@@ -195,7 +195,7 @@
  acpi:HSM*:
   ID_VENDOR_FROM_DATABASE=AT&T Microelectronics
  
-@@ -3286,6 +3327,9 @@
+@@ -3289,6 +3330,9 @@
  acpi:ICI*:
   ID_VENDOR_FROM_DATABASE=Infotek Communication Inc
  
@@ -205,7 +205,7 @@
  acpi:ICM*:
   ID_VENDOR_FROM_DATABASE=Intracom SA
  
-@@ -3382,6 +3426,9 @@
+@@ -3385,6 +3429,9 @@
  acpi:IKE*:
   ID_VENDOR_FROM_DATABASE=Ikegami Tsushinki Co. Ltd.
  
@@ -215,7 +215,7 @@
  acpi:IKS*:
   ID_VENDOR_FROM_DATABASE=Ikos Systems Inc
  
-@@ -3427,6 +3474,9 @@
+@@ -3430,6 +3477,9 @@
  acpi:IMT*:
   ID_VENDOR_FROM_DATABASE=Inmax Technology Corporation
  
@@ -225,7 +225,7 @@
  acpi:INA*:
   ID_VENDOR_FROM_DATABASE=Inventec Corporation
  
-@@ -3940,6 +3990,9 @@
+@@ -3943,6 +3993,9 @@
  acpi:LAN*:
   ID_VENDOR_FROM_DATABASE=Sodeman Lancom Inc
  
@@ -235,7 +235,7 @@
  acpi:LAS*:
   ID_VENDOR_FROM_DATABASE=LASAT Comm. A/S
  
-@@ -3988,6 +4041,9 @@
+@@ -3991,6 +4044,9 @@
  acpi:LED*:
   ID_VENDOR_FROM_DATABASE=Long Engineering Design Inc
  
@@ -245,7 +245,7 @@
  acpi:LEG*:
   ID_VENDOR_FROM_DATABASE=Legerity, Inc
  
-@@ -4003,6 +4059,9 @@
+@@ -4006,6 +4062,9 @@
  acpi:LGC*:
   ID_VENDOR_FROM_DATABASE=Logic Ltd
  
@@ -255,7 +255,7 @@
  acpi:LGI*:
   ID_VENDOR_FROM_DATABASE=Logitech Inc
  
-@@ -4057,6 +4116,9 @@
+@@ -4063,6 +4122,9 @@
  acpi:LND*:
   ID_VENDOR_FROM_DATABASE=Land Computer Company Ltd
  
@@ -265,7 +265,7 @@
  acpi:LNK*:
   ID_VENDOR_FROM_DATABASE=Link Tech Inc
  
-@@ -4091,7 +4153,7 @@
+@@ -4097,7 +4159,7 @@
   ID_VENDOR_FROM_DATABASE=Design Technology
  
  acpi:LPL*:
@@ -274,7 +274,7 @@
  
  acpi:LSC*:
   ID_VENDOR_FROM_DATABASE=LifeSize Communications
-@@ -4267,6 +4329,9 @@
+@@ -4273,6 +4335,9 @@
  acpi:MCX*:
   ID_VENDOR_FROM_DATABASE=Millson Custom Solutions Inc.
  
@@ -284,7 +284,7 @@
  acpi:MDA*:
   ID_VENDOR_FROM_DATABASE=Media4 Inc
  
-@@ -4507,6 +4572,9 @@
+@@ -4513,6 +4578,9 @@
  acpi:MOM*:
   ID_VENDOR_FROM_DATABASE=Momentum Data Systems
  
@@ -294,7 +294,7 @@
  acpi:MOS*:
   ID_VENDOR_FROM_DATABASE=Moses Corporation
  
-@@ -4735,6 +4803,9 @@
+@@ -4744,6 +4812,9 @@
  acpi:NAL*:
   ID_VENDOR_FROM_DATABASE=Network Alchemy
  
@@ -304,7 +304,7 @@
  acpi:NAT*:
   ID_VENDOR_FROM_DATABASE=NaturalPoint Inc.
  
-@@ -5248,6 +5319,9 @@
+@@ -5260,6 +5331,9 @@
  acpi:PCX*:
   ID_VENDOR_FROM_DATABASE=PC Xperten
  
@@ -314,7 +314,7 @@
  acpi:PDM*:
   ID_VENDOR_FROM_DATABASE=Psion Dacom Plc.
  
-@@ -5311,9 +5385,6 @@
+@@ -5323,9 +5397,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
  
-@@ -5401,9 +5472,6 @@
+@@ -5416,9 +5487,6 @@
  acpi:PNL*:
   ID_VENDOR_FROM_DATABASE=Panelview, Inc.
  
@@ -334,7 +334,7 @@
  acpi:PNR*:
   ID_VENDOR_FROM_DATABASE=Planar Systems, Inc.
  
-@@ -5539,15 +5607,9 @@
+@@ -5554,15 +5622,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
  
-@@ -5863,9 +5925,6 @@
+@@ -5878,9 +5940,6 @@
  acpi:RTI*:
   ID_VENDOR_FROM_DATABASE=Rancho Tech Inc
  
@@ -360,7 +360,7 @@
  acpi:RTL*:
   ID_VENDOR_FROM_DATABASE=Realtek Semiconductor Company Ltd
  
-@@ -6034,9 +6093,6 @@
+@@ -6049,9 +6108,6 @@
  acpi:SEE*:
   ID_VENDOR_FROM_DATABASE=SeeColor Corporation
  
@@ -370,7 +370,7 @@
  acpi:SEI*:
   ID_VENDOR_FROM_DATABASE=Seitz & Associates Inc
  
-@@ -6499,6 +6555,9 @@
+@@ -6514,6 +6570,9 @@
  acpi:SVD*:
   ID_VENDOR_FROM_DATABASE=SVD Computer
  
@@ -380,7 +380,7 @@
  acpi:SVI*:
   ID_VENDOR_FROM_DATABASE=Sun Microsystems
  
-@@ -6583,6 +6642,9 @@
+@@ -6598,6 +6657,9 @@
  acpi:SZM*:
   ID_VENDOR_FROM_DATABASE=Shenzhen MTC Co., Ltd
  
@@ -390,7 +390,7 @@
  acpi:TAA*:
   ID_VENDOR_FROM_DATABASE=Tandberg
  
-@@ -6673,6 +6735,9 @@
+@@ -6688,6 +6750,9 @@
  acpi:TDG*:
   ID_VENDOR_FROM_DATABASE=Six15 Technologies
  
@@ -400,7 +400,7 @@
  acpi:TDM*:
   ID_VENDOR_FROM_DATABASE=Tandem Computer Europe Inc
  
-@@ -6715,6 +6780,9 @@
+@@ -6730,6 +6795,9 @@
  acpi:TEV*:
   ID_VENDOR_FROM_DATABASE=Televés, S.A.
  
@@ -410,7 +410,7 @@
  acpi:TEZ*:
   ID_VENDOR_FROM_DATABASE=Tech Source Inc.
  
-@@ -6838,9 +6906,6 @@
+@@ -6853,9 +6921,6 @@
  acpi:TNC*:
   ID_VENDOR_FROM_DATABASE=TNC Industrial Company Ltd
  
@@ -420,7 +420,7 @@
  acpi:TNM*:
   ID_VENDOR_FROM_DATABASE=TECNIMAGEN SA
  
-@@ -7147,14 +7212,14 @@
+@@ -7165,14 +7230,14 @@
  acpi:UNC*:
   ID_VENDOR_FROM_DATABASE=Unisys Corporation
  
@@ -441,7 +441,7 @@
  
  acpi:UNI*:
   ID_VENDOR_FROM_DATABASE=Uniform Industry Corp.
-@@ -7189,6 +7254,9 @@
+@@ -7207,6 +7272,9 @@
  acpi:USA*:
   ID_VENDOR_FROM_DATABASE=Utimaco Safeware AG
  
@@ -451,7 +451,7 @@
  acpi:USD*:
   ID_VENDOR_FROM_DATABASE=U.S. Digital Corporation
  
-@@ -7438,9 +7506,6 @@
+@@ -7459,9 +7527,6 @@
  acpi:WAL*:
   ID_VENDOR_FROM_DATABASE=Wave Access
  
@@ -461,7 +461,7 @@
  acpi:WAV*:
   ID_VENDOR_FROM_DATABASE=Wavephore
  
-@@ -7565,7 +7630,7 @@
+@@ -7586,7 +7651,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.
-@@ -7579,9 +7644,6 @@
+@@ -7600,9 +7665,6 @@
  acpi:XDM*:
   ID_VENDOR_FROM_DATABASE=XDM Ltd.
  
@@ -480,7 +480,7 @@
  acpi:XES*:
   ID_VENDOR_FROM_DATABASE=Extreme Engineering Solutions, Inc.
  
-@@ -7612,9 +7674,6 @@
+@@ -7633,9 +7695,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
  
-@@ -7681,6 +7740,9 @@
+@@ -7702,6 +7761,9 @@
  acpi:ZBX*:
   ID_VENDOR_FROM_DATABASE=Zebax Technologies
  

hwdb.d/20-pci-vendor-model.hwdb

@@ -1943,6 +1943,48 @@ pci:v00001000d00000097sv00001BD4sd00000027*
 pci:v00001000d00000097sv00001BD4sd00000028*
  ID_MODEL_FROM_DATABASE=SAS3008 PCI-Express Fusion-MPT SAS-3 (12G SAS3008IR RACK)
 
+pci:v00001000d000000A5*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx
+
+pci:v00001000d000000A5sv00001000sd00004600*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx (MegaRAID 9670W-16i Tri-Mode Storage Adapter)
+
+pci:v00001000d000000A5sv00001000sd00004610*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx (MegaRAID 9670-24i Tri-Mode Storage Adapter)
+
+pci:v00001000d000000A5sv00001000sd00004620*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx (MegaRAID 9660-16i Tri-Mode Storage Adapter)
+
+pci:v00001000d000000A5sv00001000sd00004630*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx (MegaRAID 9660-8i8e Tri-Mode Storage Adapter)
+
+pci:v00001000d000000A5sv00001000sd00004640*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx (eHBA 9600W-16i Tri-Mode Storage Adapter)
+
+pci:v00001000d000000A5sv00001000sd00004650*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx (eHBA 9600W-16e Tri-Mode Storage Adapter)
+
+pci:v00001000d000000A5sv00001000sd00004660*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx (eHBA 9600-24i Tri-Mode Storage Adapter)
+
+pci:v00001000d000000A5sv00001000sd00004670*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx (eHBA 9600-16i Tri-Mode Storage Adapter)
+
+pci:v00001000d000000A5sv00001000sd00004680*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx (eHBA 9600-16e Tri-Mode Storage Adapter)
+
+pci:v00001000d000000A5sv00001000sd00004690*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx (eHBA 9620-16i Tri-Mode Storage Adapter)
+
+pci:v00001000d000000A5sv00001000sd000046A0*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx (MegaRAID 9660-24i Tri-Mode Storage Adapter)
+
+pci:v00001000d000000A5sv00001000sd000046B0*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx (MegaRAID 9665W-16i Tri-Mode Storage Adapter)
+
+pci:v00001000d000000A5sv00001000sd000046C0*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 24GSAS/PCIe SAS40xx (MegaRAID 9680W-16e Tri-Mode Storage Adapter)
+
 pci:v00001000d000000AB*
  ID_MODEL_FROM_DATABASE=SAS3516 Fusion-MPT Tri-Mode RAID On Chip (ROC)
 
@@ -2162,6 +2204,12 @@ pci:v00001000d000000E6sv00001D49sd00000205*
 pci:v00001000d000000E6sv00001D49sd00000206*
  ID_MODEL_FROM_DATABASE=Fusion-MPT 12GSAS/PCIe Secure SAS38xx (ThinkSystem 440-16e SAS/SATA PCIe Gen4 12Gb HBA)
 
+pci:v00001000d000000E6sv00001D49sd00000207*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 12GSAS/PCIe Secure SAS38xx (ThinkSystem 440-8i SAS/SATA PCIe Gen4 12Gb HBA)
+
+pci:v00001000d000000E6sv00001D49sd00000208*
+ ID_MODEL_FROM_DATABASE=Fusion-MPT 12GSAS/PCIe Secure SAS38xx (ThinkSystem 440-16i SAS/SATA PCIe Gen4 12Gb HBA)
+
 pci:v00001000d000000E7*
  ID_MODEL_FROM_DATABASE=Fusion-MPT 12GSAS/PCIe Unsupported SAS38xx
 
@@ -2495,6 +2543,9 @@ pci:v00001000d000010E2sv00001D49sd0000060E*
 pci:v00001000d000010E2sv00001D49sd0000060F*
  ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS39xx (ThinkSystem RAID 940-8e 4GB Flash PCIe Gen4 12Gb Adapter)
 
+pci:v00001000d000010E2sv00001D49sd00000610*
+ ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS39xx (ThinkSystem RAID 940-16i 4GB Flash PCIe Gen4 12Gb Adapter)
+
 pci:v00001000d000010E3*
  ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Unsupported SAS39xx
 
@@ -2519,6 +2570,12 @@ pci:v00001000d000010E5*
 pci:v00001000d000010E6*
  ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS38xx
 
+pci:v00001000d000010E6sv00001D49sd00000505*
+ ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS38xx (ThinkSystem RAID 540-8i PCIe Gen4 12Gb Adapter)
+
+pci:v00001000d000010E6sv00001D49sd00000506*
+ ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Secure SAS38xx (ThinkSystem RAID 540-16i PCIe Gen4 12Gb Adapter)
+
 pci:v00001000d000010E7*
  ID_MODEL_FROM_DATABASE=MegaRAID 12GSAS/PCIe Unsupported SAS38xx
 
@@ -2780,6 +2837,9 @@ pci:v00001002d00001607*
 pci:v00001002d00001636*
  ID_MODEL_FROM_DATABASE=Renoir
 
+pci:v00001002d00001637*
+ ID_MODEL_FROM_DATABASE=Renoir Radeon High Definition Audio Controller
+
 pci:v00001002d00001638*
  ID_MODEL_FROM_DATABASE=Cezanne
 
@@ -11253,7 +11313,7 @@ pci:v00001002d00009555sv0000103Csd00001411*
  ID_MODEL_FROM_DATABASE=RV710/M92 [Mobility Radeon HD 4350/4550] (ProBook 4720s GPU (Mobility Radeon HD 4350))
 
 pci:v00001002d00009557*
- ID_MODEL_FROM_DATABASE=RV711 GL [FirePro RG220]
+ ID_MODEL_FROM_DATABASE=RV711/M93 GL [FirePro RG220]
 
 pci:v00001002d0000955F*
  ID_MODEL_FROM_DATABASE=RV710/M92 [Mobility Radeon HD 4330]
@@ -14528,6 +14588,21 @@ pci:v00001022d00001637*
 pci:v00001022d00001639*
  ID_MODEL_FROM_DATABASE=Renoir USB 3.1
 
+pci:v00001022d0000163A*
+ ID_MODEL_FROM_DATABASE=VanGogh USB0
+
+pci:v00001022d0000163B*
+ ID_MODEL_FROM_DATABASE=VanGogh USB1
+
+pci:v00001022d0000163C*
+ ID_MODEL_FROM_DATABASE=VanGogh SecUSB
+
+pci:v00001022d0000163D*
+ ID_MODEL_FROM_DATABASE=VanGogh SecureFunction
+
+pci:v00001022d0000163E*
+ ID_MODEL_FROM_DATABASE=VanGogh HSP
+
 pci:v00001022d00001641*
  ID_MODEL_FROM_DATABASE=Renoir 10GbE Controller Port 0 (XGBE0/1)
 
@@ -35534,6 +35609,18 @@ pci:v000010DEd000017F1*
 pci:v000010DEd000017FD*
  ID_MODEL_FROM_DATABASE=GM200GL [Tesla M40]
 
+pci:v000010DEd00001AD0*
+ ID_MODEL_FROM_DATABASE=Tegra PCIe x8 Endpoint
+
+pci:v000010DEd00001AD1*
+ ID_MODEL_FROM_DATABASE=Tegra PCIe x4/x8 Endpoint/Root Complex
+
+pci:v000010DEd00001AD2*
+ ID_MODEL_FROM_DATABASE=Tegra PCIe x1 Root Complex
+
+pci:v000010DEd00001AD3*
+ ID_MODEL_FROM_DATABASE=Xavier SATA Controller
+
 pci:v000010DEd00001AD6*
  ID_MODEL_FROM_DATABASE=TU102 USB 3.1 Host Controller
 
@@ -36216,7 +36303,7 @@ pci:v000010DEd00001FB0*
  ID_MODEL_FROM_DATABASE=TU117GLM [Quadro T1000 Mobile]
 
 pci:v000010DEd00001FB1*
- ID_MODEL_FROM_DATABASE=TU117GLM [Quadro T600 Mobile]
+ ID_MODEL_FROM_DATABASE=TU117GL [T600]
 
 pci:v000010DEd00001FB2*
  ID_MODEL_FROM_DATABASE=TU117GLM [Quadro T400 Mobile]
@@ -36227,6 +36314,9 @@ pci:v000010DEd00001FB8*
 pci:v000010DEd00001FB9*
  ID_MODEL_FROM_DATABASE=TU117GLM [Quadro T1000 Mobile]
 
+pci:v000010DEd00001FBA*
+ ID_MODEL_FROM_DATABASE=TU117GLM [T600 Mobile]
+
 pci:v000010DEd00001FBB*
  ID_MODEL_FROM_DATABASE=TU117GLM [Quadro T500 Mobile]
 
@@ -36332,6 +36422,9 @@ pci:v000010DEd00002208*
 pci:v000010DEd0000220D*
  ID_MODEL_FROM_DATABASE=GA102 [GeForce RTX 3080 Lite Hash Rate]
 
+pci:v000010DEd00002216*
+ ID_MODEL_FROM_DATABASE=GA102 [GeForce RTX 3080 Lite Hash Rate]
+
 pci:v000010DEd0000222B*
  ID_MODEL_FROM_DATABASE=GA102 [GeForce RTX 3090 Engineering Sample]
 
@@ -36359,6 +36452,9 @@ pci:v000010DEd0000223F*
 pci:v000010DEd0000228B*
  ID_MODEL_FROM_DATABASE=GA104 High Definition Audio Controller
 
+pci:v000010DEd00002296*
+ ID_MODEL_FROM_DATABASE=Tegra PCIe Endpoint Virtual Network
+
 pci:v000010DEd00002302*
  ID_MODEL_FROM_DATABASE=GA103
 
@@ -36383,6 +36479,12 @@ pci:v000010DEd00002484sv000010DEsd000014AE*
 pci:v000010DEd00002486*
  ID_MODEL_FROM_DATABASE=GA104 [GeForce RTX 3060 Ti]
 
+pci:v000010DEd00002488*
+ ID_MODEL_FROM_DATABASE=GA104 [GeForce RTX 3070 Lite Hash Rate]
+
+pci:v000010DEd00002489*
+ ID_MODEL_FROM_DATABASE=GA104 [GeForce RTX 3060 Ti Lite Hash Rate]
+
 pci:v000010DEd0000249C*
  ID_MODEL_FROM_DATABASE=GA104M [GeForce RTX 3080 Mobile / Max-Q 8GB/16GB]
 
@@ -37628,6 +37730,9 @@ pci:v000010ECd0000816D*
 pci:v000010ECd0000816Dsv0000EA50sd0000CE19*
  ID_MODEL_FROM_DATABASE=RTL811x EHCI host controller (mCOM10-L1900)
 
+pci:v000010ECd0000816E*
+ ID_MODEL_FROM_DATABASE=Realtek RealManage BMC
+
 pci:v000010ECd00008171*
  ID_MODEL_FROM_DATABASE=RTL8191SEvA Wireless LAN Controller
 
@@ -43832,6 +43937,15 @@ pci:v0000117Cd000000BBsv0000117Csd000000BD*
 pci:v0000117Cd000000BBsv0000117Csd000000BE*
  ID_MODEL_FROM_DATABASE=Celerity FC 32/64Gb/s Gen 7 Fibre Channel HBA (Celerity FC-324P)
 
+pci:v0000117Cd000000C5*
+ ID_MODEL_FROM_DATABASE=ExpressNVM PCIe Gen4 Switch
+
+pci:v0000117Cd000000C5sv0000117Csd000000C6*
+ ID_MODEL_FROM_DATABASE=ExpressNVM PCIe Gen4 Switch (ExpressNVM S48F PCIe Gen4)
+
+pci:v0000117Cd000000C5sv0000117Csd000000C7*
+ ID_MODEL_FROM_DATABASE=ExpressNVM PCIe Gen4 Switch (ExpressNVM S468 PCIe Gen4)
+
 pci:v0000117Cd000000E6*
  ID_MODEL_FROM_DATABASE=ExpressSAS GT 12Gb/s SAS/SATA HBA
 
@@ -44702,6 +44816,9 @@ pci:v000011AB*
 pci:v000011ABd00000100*
  ID_MODEL_FROM_DATABASE=88F3700 [Armada 3700 Family] ARM SoC
 
+pci:v000011ABd00000110*
+ ID_MODEL_FROM_DATABASE=88F8040 PCI Express controller
+
 pci:v000011ABd00000146*
  ID_MODEL_FROM_DATABASE=GT-64010/64010A System Controller
 
@@ -46329,7 +46446,22 @@ pci:v000011F8d00008073*
  ID_MODEL_FROM_DATABASE=PM8073 Tachyon SPCve 12G 16-port SAS/SATA controller
 
 pci:v000011F8d00008531*
- ID_MODEL_FROM_DATABASE=PM8531 PFX 24xG3 Fanout PCIe Switches
+ ID_MODEL_FROM_DATABASE=PM8531 PFX 24xG3 PCIe Fanout Switch
+
+pci:v000011F8d00008532*
+ ID_MODEL_FROM_DATABASE=PM8532 PFX 32xG3 PCIe Fanout Switch
+
+pci:v000011F8d00008533*
+ ID_MODEL_FROM_DATABASE=PM8533 PFX 48xG3 PCIe Fanout Switch
+
+pci:v000011F8d00008534*
+ ID_MODEL_FROM_DATABASE=PM8534 PFX 64xG3 PCIe Fanout Switch
+
+pci:v000011F8d00008535*
+ ID_MODEL_FROM_DATABASE=PM8535 PFX 80xG3 PCIe Fanout Switch
+
+pci:v000011F8d00008536*
+ ID_MODEL_FROM_DATABASE=PM8536 PFX 96xG3 PCIe Fanout Switch
 
 pci:v000011F8d00008546*
  ID_MODEL_FROM_DATABASE=PM8546 B-FEIP PSX 96xG3 PCIe Storage Switch
@@ -46353,7 +46485,7 @@ pci:v000011FD*
  ID_VENDOR_FROM_DATABASE=High Street Consultants
 
 pci:v000011FE*
- ID_VENDOR_FROM_DATABASE=Pepperl+Fuchs Comtrol, Inc.
+ ID_VENDOR_FROM_DATABASE=Pepperl+Fuchs
 
 pci:v000011FEd00000001*
  ID_MODEL_FROM_DATABASE=RocketPort PCI 32-port w/external I/F
@@ -47804,6 +47936,9 @@ pci:v00001268*
 pci:v00001269*
  ID_VENDOR_FROM_DATABASE=Thomson-CSF/TTM
 
+pci:v00001269d000000B3*
+ ID_MODEL_FROM_DATABASE=5G Data Card [Cinterion MV31-W]
+
 pci:v0000126A*
  ID_VENDOR_FROM_DATABASE=Lexmark International, Inc.
 
@@ -55232,6 +55367,9 @@ pci:v00001462*
 pci:v00001462d00003483*
  ID_MODEL_FROM_DATABASE=MSI USB 3.0 (VIA VL80x-based xHCI USB Controller)
 
+pci:v00001462d00007C56*
+ ID_MODEL_FROM_DATABASE=Realtek Ethernet controller RTL8111H
+
 pci:v00001462d0000AAF0*
  ID_MODEL_FROM_DATABASE=Radeon RX 580 Gaming X 8G
 
@@ -57212,6 +57350,9 @@ pci:v000014E4d000016D7sv000014E4sd00001404*
 pci:v000014E4d000016D7sv000014E4sd00004140*
  ID_MODEL_FROM_DATABASE=BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller (NetXtreme E-Series Advanced Dual-port 25Gb SFP28 Network Daughter Card)
 
+pci:v000014E4d000016D7sv000014E4sd00004143*
+ ID_MODEL_FROM_DATABASE=BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller (NetXtreme-E Single-port 40Gb/50Gb Ethernet OCP 2.0 Adapter (BCM957414M4143C))
+
 pci:v000014E4d000016D7sv000014E4sd00004146*
  ID_MODEL_FROM_DATABASE=BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller (NetXtreme-E Dual-port 25G SFP28 Ethernet OCP 3.0 Adapter (BCM957414N4140C))
 
@@ -57426,10 +57567,10 @@ pci:v000014E4d00001804*
  ID_MODEL_FROM_DATABASE=BCM57504 NetXtreme-E RDMA Partition
 
 pci:v000014E4d00001805*
- ID_MODEL_FROM_DATABASE=BCM57508 NetXtreme-E NGM2100D 2x100G KR Mezz RDMA Partition
+ ID_MODEL_FROM_DATABASE=BCM57508 NetXtreme-E RDMA Partition
 
 pci:v000014E4d00001805sv000014E4sd0000DF24*
- ID_MODEL_FROM_DATABASE=BCM57508 NetXtreme-E NGM2100D 2x100G KR Mezz RDMA Partition (NetXtreme-E NGM2100D BCM57508 2x100G KR Mezz RDMA Partition)
+ ID_MODEL_FROM_DATABASE=BCM57508 NetXtreme-E RDMA Partition (NetXtreme-E NGM2100D BCM57508 2x100G KR Mezz RDMA Partition)
 
 pci:v000014E4d00001806*
  ID_MODEL_FROM_DATABASE=BCM5750X NetXtreme-E Ethernet Virtual Function
@@ -60360,11 +60501,14 @@ pci:v000015B3d00000255*
  ID_MODEL_FROM_DATABASE=Spectrum-4, Secure Flash recovery mode
 
 pci:v000015B3d00000256*
- ID_MODEL_FROM_DATABASE=Ofek chiplet
+ ID_MODEL_FROM_DATABASE=Abir GearBox
 
 pci:v000015B3d00000257*
  ID_MODEL_FROM_DATABASE=Quantum-2 in Flash Recovery Mode
 
+pci:v000015B3d00000258*
+ ID_MODEL_FROM_DATABASE=AbirGearBox Flash Recovery
+
 pci:v000015B3d00000262*
  ID_MODEL_FROM_DATABASE=MT27710 [ConnectX-4 Lx Programmable] EN
 
@@ -60377,6 +60521,9 @@ pci:v000015B3d00000264*
 pci:v000015B3d00000281*
  ID_MODEL_FROM_DATABASE=NPS-600 Flash Recovery
 
+pci:v000015B3d00000358*
+ ID_MODEL_FROM_DATABASE=Abir GearBox Secure Flash recovery mode
+
 pci:v000015B3d00001002*
  ID_MODEL_FROM_DATABASE=MT25400 Family [ConnectX-2 Virtual Function]
 
@@ -65270,6 +65417,9 @@ pci:v000018ECd0000C232sv000018ECsd0000FF00*
 pci:v000018ECd0000C232sv000018ECsd0000FF01*
  ID_MODEL_FROM_DATABASE=COMBO-FXT100 (Boot design)
 
+pci:v000018ECd0000C400*
+ ID_MODEL_FROM_DATABASE=COMBO-400G1
+
 pci:v000018EE*
  ID_VENDOR_FROM_DATABASE=Chenming Mold Ind. Corp.
 
@@ -66602,6 +66752,9 @@ pci:v00001987d00005013*
 pci:v00001987d00005016*
  ID_MODEL_FROM_DATABASE=E16 PCIe4 NVMe Controller
 
+pci:v00001987d00005018*
+ ID_MODEL_FROM_DATABASE=E18 PCIe4 NVMe Controller
+
 pci:v00001989*
  ID_VENDOR_FROM_DATABASE=Montilio Inc.
 
@@ -67847,6 +68000,9 @@ pci:v00001B21d00002142*
 pci:v00001B21d00002142sv00001462sd00007A72*
  ID_MODEL_FROM_DATABASE=ASM2142 USB 3.1 Host Controller (H270 PC MATE)
 
+pci:v00001B21d00002824*
+ ID_MODEL_FROM_DATABASE=ASM2824 PCIe Gen3 Packet Switch
+
 pci:v00001B21d00003242*
  ID_MODEL_FROM_DATABASE=ASM3242 USB 3.2 Host Controller
 
@@ -68814,7 +68970,7 @@ pci:v00001C5Cd00001285*
  ID_MODEL_FROM_DATABASE=PC300 NVMe Solid State Drive 1TB
 
 pci:v00001C5Cd00001327*
- ID_MODEL_FROM_DATABASE=BC501 NVMe Solid State Drive 512GB
+ ID_MODEL_FROM_DATABASE=BC501 NVMe Solid State Drive
 
 pci:v00001C5Cd00001339*
  ID_MODEL_FROM_DATABASE=BC511
@@ -69749,6 +69905,12 @@ pci:v00001DCD*
 pci:v00001DD8*
  ID_VENDOR_FROM_DATABASE=Pensando Systems
 
+pci:v00001DD8d00000002*
+ ID_MODEL_FROM_DATABASE=DSC2 Elba Upstream Port
+
+pci:v00001DD8d00000002sv00001DD8sd00005001*
+ ID_MODEL_FROM_DATABASE=DSC2 Elba Upstream Port (DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card)
+
 pci:v00001DD8d00001000*
  ID_MODEL_FROM_DATABASE=DSC Capri Upstream Port
 
@@ -69779,6 +69941,9 @@ pci:v00001DD8d00001000sv00001DD8sd0000400D*
 pci:v00001DD8d00001000sv00001DD8sd0000400E*
  ID_MODEL_FROM_DATABASE=DSC Capri Upstream Port (DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card)
 
+pci:v00001DD8d00001000sv00001DD8sd00004014*
+ ID_MODEL_FROM_DATABASE=DSC Capri Upstream Port (DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card)
+
 pci:v00001DD8d00001001*
  ID_MODEL_FROM_DATABASE=DSC Virtual Downstream Port
 
@@ -69809,6 +69974,12 @@ pci:v00001DD8d00001001sv00001DD8sd0000400D*
 pci:v00001DD8d00001001sv00001DD8sd0000400E*
  ID_MODEL_FROM_DATABASE=DSC Virtual Downstream Port (DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card)
 
+pci:v00001DD8d00001001sv00001DD8sd00004014*
+ ID_MODEL_FROM_DATABASE=DSC Virtual Downstream Port (DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card)
+
+pci:v00001DD8d00001001sv00001DD8sd00005001*
+ ID_MODEL_FROM_DATABASE=DSC Virtual Downstream Port (DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card)
+
 pci:v00001DD8d00001002*
  ID_MODEL_FROM_DATABASE=DSC Ethernet Controller
 
@@ -69839,6 +70010,12 @@ pci:v00001DD8d00001002sv00001DD8sd0000400D*
 pci:v00001DD8d00001002sv00001DD8sd0000400E*
  ID_MODEL_FROM_DATABASE=DSC Ethernet Controller (DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card)
 
+pci:v00001DD8d00001002sv00001DD8sd00004014*
+ ID_MODEL_FROM_DATABASE=DSC Ethernet Controller (DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card)
+
+pci:v00001DD8d00001002sv00001DD8sd00005001*
+ ID_MODEL_FROM_DATABASE=DSC Ethernet Controller (DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card)
+
 pci:v00001DD8d00001003*
  ID_MODEL_FROM_DATABASE=DSC Ethernet Controller VF
 
@@ -69869,6 +70046,12 @@ pci:v00001DD8d00001003sv00001DD8sd0000400D*
 pci:v00001DD8d00001003sv00001DD8sd0000400E*
  ID_MODEL_FROM_DATABASE=DSC Ethernet Controller VF (DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card)
 
+pci:v00001DD8d00001003sv00001DD8sd00004014*
+ ID_MODEL_FROM_DATABASE=DSC Ethernet Controller VF (DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card)
+
+pci:v00001DD8d00001003sv00001DD8sd00005001*
+ ID_MODEL_FROM_DATABASE=DSC Ethernet Controller VF (DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card)
+
 pci:v00001DD8d00001004*
  ID_MODEL_FROM_DATABASE=DSC Management Controller
 
@@ -69899,6 +70082,12 @@ pci:v00001DD8d00001004sv00001DD8sd0000400D*
 pci:v00001DD8d00001004sv00001DD8sd0000400E*
  ID_MODEL_FROM_DATABASE=DSC Management Controller (DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card)
 
+pci:v00001DD8d00001004sv00001DD8sd00004014*
+ ID_MODEL_FROM_DATABASE=DSC Management Controller (DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card)
+
+pci:v00001DD8d00001004sv00001DD8sd00005001*
+ ID_MODEL_FROM_DATABASE=DSC Management Controller (DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card)
+
 pci:v00001DD8d00001007*
  ID_MODEL_FROM_DATABASE=DSC Storage Accelerator
 
@@ -69929,6 +70118,12 @@ pci:v00001DD8d00001007sv00001DD8sd0000400D*
 pci:v00001DD8d00001007sv00001DD8sd0000400E*
  ID_MODEL_FROM_DATABASE=DSC Storage Accelerator (DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card)
 
+pci:v00001DD8d00001007sv00001DD8sd00004014*
+ ID_MODEL_FROM_DATABASE=DSC Storage Accelerator (DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card)
+
+pci:v00001DD8d00001007sv00001DD8sd00005001*
+ ID_MODEL_FROM_DATABASE=DSC Storage Accelerator (DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card)
+
 pci:v00001DE0*
  ID_VENDOR_FROM_DATABASE=Groq
 
@@ -70319,6 +70514,15 @@ pci:v00001E3Bd00001098sv00001E3Bsd00000021*
 pci:v00001E3Bd00001098sv00001E3Bsd00000022*
  ID_MODEL_FROM_DATABASE=Haishen NVMe SSD (Enterprise NVMe SSD U.2 7.68TB (H3200))
 
+pci:v00001E3Bd00001098sv00001E3Bsd00000052*
+ ID_MODEL_FROM_DATABASE=Haishen NVMe SSD (Enterprise NVMe SSD U.2 0.8TB (H3900))
+
+pci:v00001E3Bd00001098sv00001E3Bsd00000053*
+ ID_MODEL_FROM_DATABASE=Haishen NVMe SSD (Enterprise NVMe SSD U.2 1.6TB (H3900))
+
+pci:v00001E3Bd00001098sv00001E3Bsd00000059*
+ ID_MODEL_FROM_DATABASE=Haishen NVMe SSD (Enterprise NVMe SSD U.2 0.75TB (H3900))
+
 pci:v00001E3Bd00001098sv00001E3Bsd00000061*
  ID_MODEL_FROM_DATABASE=Haishen NVMe SSD (Enterprise NVMe SSD HHHL 0.8TB (H2100))
 
@@ -70355,12 +70559,24 @@ pci:v00001E3Bd00001098sv00001E3Bsd0000007F*
 pci:v00001E3Bd00001098sv00001E3Bsd00000080*
  ID_MODEL_FROM_DATABASE=Haishen NVMe SSD (Enterprise NVMe SSD HHHL 7.68TB (H3200))
 
+pci:v00001E3Bd00001098sv00001E3Bsd0000008A*
+ ID_MODEL_FROM_DATABASE=Haishen NVMe SSD (Enterprise NVMe SSD HHHL 0.8TB (H3900))
+
+pci:v00001E3Bd00001098sv00001E3Bsd0000008B*
+ ID_MODEL_FROM_DATABASE=Haishen NVMe SSD (Enterprise NVMe SSD HHHL 1.6TB (H3900))
+
+pci:v00001E3Bd00001098sv00001E3Bsd00000091*
+ ID_MODEL_FROM_DATABASE=Haishen NVMe SSD (Enterprise NVMe SSD HHHL 0.75TB (H3900))
+
 pci:v00001E3D*
  ID_VENDOR_FROM_DATABASE=Burlywood, Inc
 
 pci:v00001E49*
  ID_VENDOR_FROM_DATABASE=Yangtze Memory Technologies Co.,Ltd
 
+pci:v00001E49d00001013*
+ ID_MODEL_FROM_DATABASE=PC210
+
 pci:v00001E4B*
  ID_VENDOR_FROM_DATABASE=MAXIO Technology (Hangzhou) Ltd.
 
@@ -70400,6 +70616,12 @@ pci:v00001E57d00000100*
 pci:v00001E57d00000100sv00000000sd00000100*
  ID_MODEL_FROM_DATABASE=The device has already been deleted. (PY8800 64GB Accelerator)
 
+pci:v00001E59*
+ ID_VENDOR_FROM_DATABASE=Oxford Nanopore Technologies
+
+pci:v00001E59d00000001*
+ ID_MODEL_FROM_DATABASE=MinION Mk1C
+
 pci:v00001E60*
  ID_VENDOR_FROM_DATABASE=Hailo Technologies Ltd.
 
@@ -70442,6 +70664,12 @@ pci:v00001EA0*
 pci:v00001EA0d00002A16*
  ID_MODEL_FROM_DATABASE=Cloud Intelligent Inference Controller
 
+pci:v00001EA7*
+ ID_VENDOR_FROM_DATABASE=Intelliprop, Inc
+
+pci:v00001EA7d0000223A*
+ ID_MODEL_FROM_DATABASE=Typhon+ PCIe to Gen-Z Bridge
+
 pci:v00001EAB*
  ID_VENDOR_FROM_DATABASE=Hefei DATANG Storage Technology Co.,LTD.
 
@@ -70481,6 +70709,9 @@ pci:v00001ED9*
 pci:v00001EE9*
  ID_VENDOR_FROM_DATABASE=SUSE LLC
 
+pci:v00001EFB*
+ ID_VENDOR_FROM_DATABASE=Flexxon Pte Ltd
+
 pci:v00001FC0*
  ID_VENDOR_FROM_DATABASE=Ascom (Finland) Oy
 
@@ -77030,6 +77261,9 @@ pci:v00008086d000010FBsv00001BD4sd0000002F*
 pci:v00008086d000010FBsv00001BD4sd00000032*
  ID_MODEL_FROM_DATABASE=82599ES 10-Gigabit SFI/SFP+ Network Connection (10G SFP+ DP EP102Fi4 Adapter)
 
+pci:v00008086d000010FBsv00001BD4sd00000067*
+ ID_MODEL_FROM_DATABASE=82599ES 10-Gigabit SFI/SFP+ Network Connection (F102I82599)
+
 pci:v00008086d000010FBsv00008086sd00000002*
  ID_MODEL_FROM_DATABASE=82599ES 10-Gigabit SFI/SFP+ Network Connection (Ethernet Server Adapter X520-DA2)
 
@@ -78032,6 +78266,9 @@ pci:v00008086d00001521sv00001BD4sd0000001D*
 pci:v00008086d00001521sv00001BD4sd00000035*
  ID_MODEL_FROM_DATABASE=I350 Gigabit Network Connection (1G base-T QP EP014Ti1 Adapter)
 
+pci:v00008086d00001521sv00001BD4sd00000066*
+ ID_MODEL_FROM_DATABASE=I350 Gigabit Network Connection (F014I350)
+
 pci:v00008086d00001521sv00008086sd00000001*
  ID_MODEL_FROM_DATABASE=I350 Gigabit Network Connection (Ethernet Server Adapter I350-T4)
 
@@ -78557,6 +78794,9 @@ pci:v00008086d00001572sv00001BD4sd00000042*
 pci:v00008086d00001572sv00001BD4sd00000056*
  ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Network Adapter X710-BM2 for OCP NIC 3.0)
 
+pci:v00008086d00001572sv00001BD4sd00000065*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (F102IX710)
+
 pci:v00008086d00001572sv00008086sd00000000*
  ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Converged Network Adapter X710)
 
@@ -78983,6 +79223,9 @@ pci:v00008086d00001593sv00008086sd00000009*
 pci:v00008086d00001593sv00008086sd0000000A*
  ID_MODEL_FROM_DATABASE=Ethernet Controller E810-C for SFP (Ethernet 25G 4P E810-XXV Adapter)
 
+pci:v00008086d00001593sv00008086sd0000000C*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller E810-C for SFP (Ethernet Network Adapter E810-XXV-4 for OCP 3.0)
+
 pci:v00008086d00001599*
  ID_MODEL_FROM_DATABASE=Ethernet Controller E810-XXV for backplane
 
@@ -79019,6 +79262,9 @@ pci:v00008086d0000159Bsv00008086sd00004001*
 pci:v00008086d0000159Bsv00008086sd00004002*
  ID_MODEL_FROM_DATABASE=Ethernet Controller E810-XXV for SFP (Ethernet Network Adapter E810-XXV-2 for OCP 3.0)
 
+pci:v00008086d0000159Bsv00008086sd00004003*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller E810-XXV for SFP (Ethernet Network Adapter E810-XXV-2)
+
 pci:v00008086d000015A0*
  ID_MODEL_FROM_DATABASE=Ethernet Connection (2) I218-LM
 
@@ -79499,6 +79745,12 @@ pci:v00008086d000018A0*
 pci:v00008086d000018A1*
  ID_MODEL_FROM_DATABASE=C4XXX Series QAT Virtual Function
 
+pci:v00008086d000018EE*
+ ID_MODEL_FROM_DATABASE=200xx Series QAT
+
+pci:v00008086d000018EF*
+ ID_MODEL_FROM_DATABASE=200xx Series QAT Virtual Function
+
 pci:v00008086d00001900*
  ID_MODEL_FROM_DATABASE=Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
 
@@ -79907,6 +80159,9 @@ pci:v00008086d000019E0*
 pci:v00008086d000019E2*
  ID_MODEL_FROM_DATABASE=Atom Processor C3000 Series QuickAssist Technology
 
+pci:v00008086d000019E3*
+ ID_MODEL_FROM_DATABASE=Atom Processor C3000 Series QuickAssist Technology Virtual Function
+
 pci:v00008086d00001A1C*
  ID_MODEL_FROM_DATABASE=Ethernet Connection (17) I219-LM
 
@@ -83649,7 +83904,10 @@ 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)
+ ID_MODEL_FROM_DATABASE=Omni-Path HFI Silicon 100 Series [discrete] (Omni-Path HFI Adapter 100 Series, 1 Port, OCP 3.0)
+
+pci:v00008086d000024F0sv0000434Esd00002628*
+ ID_MODEL_FROM_DATABASE=Omni-Path HFI Silicon 100 Series [discrete] (Omni-Path HFI Adapter 100 Series, 1 Port, PCIe x16)
 
 pci:v00008086d000024F0sv00008086sd00002628*
  ID_MODEL_FROM_DATABASE=Omni-Path HFI Silicon 100 Series [discrete] (Omni-Path HFI Adapter 100 Series, 1 Port, PCIe x16)
@@ -90671,6 +90929,9 @@ pci:v00008086d000037C8sv00008086sd00000001*
 pci:v00008086d000037C8sv00008086sd00000002*
  ID_MODEL_FROM_DATABASE=C62x Chipset QuickAssist Technology (QuickAssist Adapter 8970)
 
+pci:v00008086d000037C9*
+ ID_MODEL_FROM_DATABASE=C62x Chipset QuickAssist Technology Virtual Function
+
 pci:v00008086d000037CC*
  ID_MODEL_FROM_DATABASE=Ethernet Connection X722
 
@@ -92417,6 +92678,27 @@ pci:v00008086d000043F0sv00008086sd000002A4*
 pci:v00008086d0000444E*
  ID_MODEL_FROM_DATABASE=Turbo Memory Controller
 
+pci:v00008086d0000461E*
+ ID_MODEL_FROM_DATABASE=Alder Lake-P Thunderbolt 4 USB Controller
+
+pci:v00008086d0000461F*
+ ID_MODEL_FROM_DATABASE=Alder Lake-P Thunderbolt 4 PCI Express Root Port #3
+
+pci:v00008086d0000462F*
+ ID_MODEL_FROM_DATABASE=Alder Lake-P Thunderbolt 4 PCI Express Root Port #2
+
+pci:v00008086d0000463E*
+ ID_MODEL_FROM_DATABASE=Alder Lake-P Thunderbolt 4 NHI #0
+
+pci:v00008086d0000463F*
+ ID_MODEL_FROM_DATABASE=Alder Lake-P Thunderbolt 4 PCI Express Root Port #1
+
+pci:v00008086d0000466D*
+ ID_MODEL_FROM_DATABASE=Alder Lake-P Thunderbolt 4 NHI #1
+
+pci:v00008086d0000466E*
+ ID_MODEL_FROM_DATABASE=Alder Lake-P Thunderbolt 4 PCI Express Root Port #0
+
 pci:v00008086d0000467F*
  ID_MODEL_FROM_DATABASE=Volume Management Device NVMe RAID Controller
 
@@ -95768,6 +96050,9 @@ pci:v00008086d0000A0C8*
 pci:v00008086d0000A0E0*
  ID_MODEL_FROM_DATABASE=Tiger Lake-LP Management Engine Interface
 
+pci:v00008086d0000A0E3*
+ ID_MODEL_FROM_DATABASE=Tiger Lake-LP Active Management Technology - SOL
+
 pci:v00008086d0000A0E8*
  ID_MODEL_FROM_DATABASE=Tiger Lake-LP Serial IO I2C Controller #0
 

hwdb.d/20-usb-vendor-model.hwdb

@@ -54471,10 +54471,10 @@ usb:v15C2pFFDC*
  ID_MODEL_FROM_DATABASE=iMON PAD Remote Controller
 
 usb:v15C5*
- ID_VENDOR_FROM_DATABASE=Advance Multimedia Internet Technology Inc. (AMIT)
+ ID_VENDOR_FROM_DATABASE=Pressure Profile Systems, Inc.
 
 usb:v15C5p0008*
- ID_MODEL_FROM_DATABASE=WL532U 802.11g Adapter
+ ID_MODEL_FROM_DATABASE=Advance Multimedia Internet Technology Inc. (AMIT) WL532U 802.11g Adapter
 
 usb:v15C6*
  ID_VENDOR_FROM_DATABASE=Laboratoires MXM

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

@@ -135,11 +135,16 @@ usb:v1C7Ap0603*
 
 # Supported by libfprint driver goodixmoc
 usb:v27C6p5840*
-usb:v27C6p6496*
+usb:v27C6p609C*
 usb:v27C6p60A2*
-usb:v27C6p63AC*
 usb:v27C6p639C*
+usb:v27C6p63AC*
+usb:v27C6p6496*
+usb:v27C6p6584*
+usb:v27C6p658C*
+usb:v27C6p6592*
 usb:v27C6p6594*
+usb:v27C6p659C*
 usb:v27C6p6A94*
  ID_AUTOSUSPEND=1
 
@@ -149,7 +154,6 @@ usb:v298Dp1010*
 
 # Supported by libfprint driver synaptics
 usb:v06CBp00BD*
-usb:v06CBp00E9*
 usb:v06CBp00DF*
 usb:v06CBp00F9*
 usb:v06CBp00FC*
@@ -234,6 +238,7 @@ usb:v06CBp00C4*
 usb:v06CBp00CB*
 usb:v06CBp00D8*
 usb:v06CBp00DA*
+usb:v06CBp00E9*
 usb:v0A5Cp5801*
 usb:v0A5Cp5805*
 usb:v0A5Cp5834*

hwdb.d/60-evdev.hwdb

@@ -560,6 +560,13 @@ evdev:name:AlpsPS/2 ALPS GlidePoint:dmi:*svnLENOVO:*pvrLenovoYoga500-14IBD:*
  EVDEV_ABS_35=117:3952:36
  EVDEV_ABS_36=105:1960:26
 
+# Lenovo U41-70 (80JV)
+evdev:name:AlpsPS/2 ALPS GlidePoint:dmi:*svnLENOVO:*pvrLenovoU41-70:*
+ EVDEV_ABS_00=117:3958:36
+ EVDEV_ABS_01=104:1960:26
+ EVDEV_ABS_35=117:3958:36
+ EVDEV_ABS_36=104:1960:26
+
 # Lenovo Thinkpad T490 and T14 Gen1
 evdev:name:SynPS/2 Synaptics TouchPad:dmi:*:svnLENOVO:*pvrThinkPadT490:*
 evdev:name:SynPS/2 Synaptics TouchPad:dmi:*:svnLENOVO:*pvrThinkPadT14Gen1:*

hwdb.d/60-keyboard.hwdb

@@ -623,6 +623,8 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHPLicrice:*
 # HP EliteBook
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHPEliteBook*:*
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteBook*:*
+# HP Elite Dragonfly
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pnHPEliteDragonfly*:*
 # HP ProBook 440 G2
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHP440G2:*
 # HP ProBook

hwdb.d/ma-medium.txt

@@ -4598,18 +4598,24 @@ B00000-BFFFFF     (base 16)		Amethystum Storage Technology Co., Ltd
 				Walnut  CA  91789
 				US
 
-64-33-B5   (hex)		Geksacon
-C00000-CFFFFF     (base 16)		Geksacon
-				revolutionary street
-				Ufa  Republic of Bashkortostan  450005
-				RU
-
 04-71-4B   (hex)		uAvionix Corporation
 100000-1FFFFF     (base 16)		uAvionix Corporation
 				300 Pine Needle Lane
 				Bigfork  MT  59911
 				US
 
+28-36-13   (hex)		shenzhen technology limited
+700000-7FFFFF     (base 16)		shenzhen technology limited
+				903,No. 1 Shifeng Building, Xinzhuang Community Villa Road, Matian Street, Guangming District, Shenzhen City
+				Shenzhen  Guangdong  518000
+				CN
+
+64-33-B5   (hex)		Geksacon
+C00000-CFFFFF     (base 16)		Geksacon
+				Revolutionary Street 78
+				Ufa  Republic of Bashkortostan  450005
+				RU
+
 4C-4B-F9   (hex)		Shenzhen dingsheng technology co., LTD
 400000-4FFFFF     (base 16)		Shenzhen dingsheng technology co., LTD
 				Floor 3, building 5, kaijeda industrial zone, no.97, huaxing road, langkou community, dalang street, longhua district
@@ -8810,12 +8816,24 @@ B00000-BFFFFF     (base 16)		Daatrics LTD
 				Kwai Chung  NT  999077
 				HK
 
+28-36-13   (hex)		Qingdao Airpoint Electronics Co.,Ltd.
+900000-9FFFFF     (base 16)		Qingdao Airpoint Electronics Co.,Ltd.
+				Yuhuangling industrial Park, Xiazhuang-Rd, Chengyang-Qu
+				QingDao City  ShanDong Province  266109
+				CN
+
 64-33-B5   (hex)		University of Texas at Austin
 E00000-EFFFFF     (base 16)		University of Texas at Austin
 				1 University Station C3800
 				Austin  TX  78713-7407
 				US
 
+28-36-13   (hex)		Elytone Electronic Co., Ltd.
+400000-4FFFFF     (base 16)		Elytone Electronic Co., Ltd.
+				#218, Sec.2, Chung Cheng Road
+				San-Hsia District, New Taipei City    23742
+				TW
+
 20-85-93   (hex)		UNILUMIN GROUP CO.,LTD
 300000-3FFFFF     (base 16)		UNILUMIN GROUP CO.,LTD
 				No.112 Yongfu Rd.,BaoanDistrict,
@@ -13319,6 +13337,24 @@ D00000-DFFFFF     (base 16)		IIYAMA CORPORATION
 				Hoofddorp    2131HA
 				NL
 
+28-36-13   (hex)		Linear Computing Inc.
+300000-3FFFFF     (base 16)		Linear Computing Inc.
+				110 Galaxy Blvd
+				Etobicoke  Ontario  M9W 4Y6
+				CA
+
+28-36-13   (hex)		Hi-p (Suzhou) Electronics Co,Ltd
+100000-1FFFFF     (base 16)		Hi-p (Suzhou) Electronics Co,Ltd
+				5th floor, building G, no. 2337 gudai road (weijing center)
+				Shanghai  minhang district  215128
+				CN
+
+78-5E-E8   (hex)		Yake (Tianjin) Technology Co.,Ltd.
+A00000-AFFFFF     (base 16)		Yake (Tianjin) Technology Co.,Ltd.
+				No.2, Zhengtong Road, Caozili Town, Wuqing District, Tianjin
+				Tianjin  Tianjin  301727
+				CN
+
 4C-4B-F9   (hex)		Shandong Linkotech Electronic Co., Ltd.
 600000-6FFFFF     (base 16)		Shandong Linkotech Electronic Co., Ltd.
 				22nd Floor, Building 2, Aosheng Building, No.1166 Xinyi Street, High-tech Zone
@@ -17693,6 +17729,24 @@ C00000-CFFFFF     (base 16)		Haag-Streit AG
 				China  Guang Dong  518000
 				CN
 
+28-36-13   (hex)		Shandong SIASUN Industrial Software Research Institute Co., Ltd
+000000-0FFFFF     (base 16)		Shandong SIASUN Industrial Software Research Institute Co., Ltd
+				Rm301,Artificial Intelligence Building,Jingshi Road,Jinan Area Of China(Shandong) Pilot Free Trade Zone
+				jinan    250000
+				CN
+
+28-36-13   (hex)		AVYCON
+D00000-DFFFFF     (base 16)		AVYCON
+				16682 Millikan Ave
+				Irvine  CA  92606
+				US
+
+28-36-13   (hex)		ESI Ventures, LLC
+600000-6FFFFF     (base 16)		ESI Ventures, LLC
+				2085 Humphrey Street
+				Fort Wayne  IN  46803
+				US
+
 20-85-93   (hex)		Great Lite International
 700000-7FFFFF     (base 16)		Great Lite International
 				11F., No.207-2, Sec. 3, Beixin Rd., Xindian Dist.,
@@ -22195,3 +22249,39 @@ B00000-BFFFFF     (base 16)		electroCore Inc.
 				Matam Scientific Industries Center,   Building 8.2
 				Mail box 15123  Haifa  3508409
 				IL
+
+28-36-13   (hex)		midBit Technologies, LLC
+C00000-CFFFFF     (base 16)		midBit Technologies, LLC
+				153 Homestead Ln
+				Romney  WV  26757
+				US
+
+28-36-13   (hex)		Turing Video
+500000-5FFFFF     (base 16)		Turing Video
+				1730 S El Camino Real, Suite 350
+				San Mateo  CA  94402
+				US
+
+28-36-13   (hex)		MAKEEN Energy
+A00000-AFFFFF     (base 16)		MAKEEN Energy
+				Alsvej 21
+				Randers    8940
+				DK
+
+28-36-13   (hex)		Fuzhou Lesi Intelligent Technology Co., Ltd
+800000-8FFFFF     (base 16)		Fuzhou Lesi Intelligent Technology Co., Ltd
+				Room 1-3-5, north 9 / F, building 1, Fujian hi tech Pioneer Park, 611 Gongye Road, Gulou District
+				Fuzhou  Fujian  350000
+				CN
+
+28-36-13   (hex)		EGMedical, s.r.o.
+E00000-EFFFFF     (base 16)		EGMedical, s.r.o.
+				KRENOVA 19
+				Brno  JHMK  60200
+				CZ
+
+28-36-13   (hex)		Qorvo, Inc.
+B00000-BFFFFF     (base 16)		Qorvo, Inc.
+				500 W. Renner Road
+				Richardson  TX  75080
+				US

hwdb.d/ma-small.txt

@@ -5117,18 +5117,18 @@ E05000-E05FFF     (base 16)		Lobaro GmbH
 				Malaga  Malaga  29590
 				ES
 
-70-B3-D5   (hex)		HORIZON.INC
-69B000-69BFFF     (base 16)		HORIZON.INC
-				1600 Aza-Shironoshita Asahi
-				Shin Asahi-cho  Takashima, Shiga  520-1501
-				JP
-
 70-B3-D5   (hex)		aelettronica group srl
 A14000-A14FFF     (base 16)		aelettronica group srl
 				via matteotti,22
 				gaggiano  milano  20083
 				IT
 
+70-B3-D5   (hex)		HORIZON.INC
+69B000-69BFFF     (base 16)		HORIZON.INC
+				1600 Aza-Shironoshita Asahi
+				Shin Asahi-cho  Takashima, Shiga  520-1501
+				JP
+
 70-B3-D5   (hex)		MedRx, Inc
 3B6000-3B6FFF     (base 16)		MedRx, Inc
 				1200 Starkey Rd Ste.105
@@ -5147,18 +5147,18 @@ A14000-A14FFF     (base 16)		aelettronica group srl
 				Gothenburg  Västra Götaland  41250
 				SE
 
-70-B3-D5   (hex)		Vendanor AS
-D0B000-D0BFFF     (base 16)		Vendanor AS
-				Grandevegen 13
-				Stryn    6783
-				NO
-
 70-B3-D5   (hex)		Tinkerforge GmbH
 509000-509FFF     (base 16)		Tinkerforge GmbH
 				Zur Brinke 7
 				Schloss Holte-Stukenbrock  NRW  33758
 				DE
 
+70-B3-D5   (hex)		Vendanor AS
+D0B000-D0BFFF     (base 16)		Vendanor AS
+				Grandevegen 13
+				Stryn    6783
+				NO
+
 70-B3-D5   (hex)		4neXt S.r.l.s.
 E41000-E41FFF     (base 16)		4neXt S.r.l.s.
 				Via Leonardo da Vinci 15/4
@@ -5189,18 +5189,18 @@ F41000-F41FFF     (base 16)		AUTOMATIZACION Y CONECTIVIDAD SA DE CV
 				PORCIA  PORDENONE  330850
 				IT
 
-8C-1F-64   (hex)		LLC EMS-Expert
-21C000-21CFFF     (base 16)		LLC EMS-Expert
-				Gorodskoy, st., d.39,1
-				Tula  Tula region  300012
-				RU
-
 8C-1F-64   (hex)		Gamber Johnson-LLC
 42B000-42BFFF     (base 16)		Gamber Johnson-LLC
 				3001 Borham Ave
 				Stevens Point  WI  54481
 				US
 
+8C-1F-64   (hex)		LLC EMS-Expert
+21C000-21CFFF     (base 16)		LLC EMS-Expert
+				Gorodskoy, st., d.39,1
+				Tula  Tula region  300012
+				RU
+
 8C-1F-64   (hex)		Green Access Ltd
 878000-878FFF     (base 16)		Green Access Ltd
 				Unit 1 Kensworthgate  200-204 High Street South
@@ -5225,11 +5225,11 @@ B9A000-B9AFFF     (base 16)		QUERCUS TECHNOLOGIES, S.L.
 				LOS ANGELES  CA  90067
 				US
 
-8C-1F-64   (hex)		Arcopie
+8C-1F-64   (hex)		Pixel Design & Manufacturing Sdn. Bhd.
-28A000-28AFFF     (base 16)		Arcopie
+CE3000-CE3FFF     (base 16)		Pixel Design & Manufacturing Sdn. Bhd.
-				Office 438, YTC, 847, Buheung-ro, Gwangjeok-myeon
+				87, Jalan 20/7, Paramount Garden
-				Yangju-si  Alabama  11416
+				Petaling Jaya  Selangor  46300
-				KR
+				MY
 
 8C-1F-64   (hex)		Prosys
 A5C000-A5CFFF     (base 16)		Prosys
@@ -5237,29 +5237,17 @@ A5C000-A5CFFF     (base 16)		Prosys
 				fillinges    74250
 				FR
 
-8C-1F-64   (hex)		Pixel Design & Manufacturing Sdn. Bhd.
-CE3000-CE3FFF     (base 16)		Pixel Design & Manufacturing Sdn. Bhd.
-				87, Jalan 20/7, Paramount Garden
-				Petaling Jaya  Selangor  46300
-				MY
-
-8C-1F-64   (hex)		Antai technology Co.,Ltd
-72C000-72CFFF     (base 16)		Antai technology Co.,Ltd
-				T2-704, No.159 Shenwu Road, Minhang District
-				Shanghai  Shanghai  201100
-				CN
-
 8C-1F-64   (hex)		mapna group
 768000-768FFF     (base 16)		mapna group
 				mirdamad
 				Tehran    0512258788
 				IR
 
-8C-1F-64   (hex)		Esys Srl
+8C-1F-64   (hex)		Arcopie
-C1F000-C1FFFF     (base 16)		Esys Srl
+28A000-28AFFF     (base 16)		Arcopie
-				via Spagna 240/242
+				Office 438, YTC, 847, Buheung-ro, Gwangjeok-myeon
-				Rende  Calabria  87036
+				Yangju-si  Alabama  11416
-				IT
+				KR
 
 8C-1F-64   (hex)		Sicon srl
 193000-193FFF     (base 16)		Sicon srl
@@ -5267,12 +5255,42 @@ C1F000-C1FFFF     (base 16)		Esys Srl
 				Isola Vicentina  Vicenza  36033
 				IT
 
+8C-1F-64   (hex)		Antai technology Co.,Ltd
+72C000-72CFFF     (base 16)		Antai technology Co.,Ltd
+				T2-704, No.159 Shenwu Road, Minhang District
+				Shanghai  Shanghai  201100
+				CN
+
 8C-1F-64   (hex)		YULISTA INTEGRATED SOLUTION
 128000-128FFF     (base 16)		YULISTA INTEGRATED SOLUTION
 				7600 ADVANCED GATEWAY
 				HUNTSVILLE  AL  35808
 				US
 
+8C-1F-64   (hex)		Esys Srl
+C1F000-C1FFFF     (base 16)		Esys Srl
+				via Spagna 240/242
+				Rende  Calabria  87036
+				IT
+
+8C-1F-64   (hex)		Abacus Peripherals Pvt Ltd
+984000-984FFF     (base 16)		Abacus Peripherals Pvt Ltd
+				29 Apurva Industrial Estate, Makwana Road, Marol, Andheri East
+				Mumbai  Maharashtra  400059
+				IN
+
+8C-1F-64   (hex)		Rayhaan Networks
+ACE000-ACEFFF     (base 16)		Rayhaan Networks
+				Tuchmacherstrasse 36
+				Zurich    8041
+				CH
+
+8C-1F-64   (hex)		Intel Corporate
+397000-397FFF     (base 16)		Intel Corporate
+				Lot 8, Jalan Hi-Tech 2/3  
+				Kulim  Kedah  09000
+				MY
+
 70-B3-D5   (hex)		EVCO SPA
 A80000-A80FFF     (base 16)		EVCO SPA
 				VIA FELTRE N. 81
@@ -10349,16 +10367,22 @@ F74000-F74FFF     (base 16)		TESSA AGRITECH SRL
 				Leiferde  Niedersachsen  38542
 				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)		MBJ
 E03000-E03FFF     (base 16)		MBJ
 				Jochim-Klindt-Straße 7
 				Ahrensburg  Schleswig Holstein  22926
 				DE
 
-70-B3-D5   (hex)		Code Blue Corporation 
+70-B3-D5   (hex)		VK Integrated Systems
-271000-271FFF     (base 16)		Code Blue Corporation 
+A8F000-A8FFFF     (base 16)		VK Integrated Systems
-				259 Hedcor Street
+				810 Crossland Ave
-				Holland  MI  49423
+				Clarksville  TN  37040
 				US
 
 70-B3-D5   (hex)		Fischer Connectors
@@ -10367,42 +10391,30 @@ BF7000-BF7FFF     (base 16)		Fischer Connectors
 				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)		Wisebox.,Co.Ltd
 AC2000-AC2FFF     (base 16)		Wisebox.,Co.Ltd
 				23, Geoje-daero 108beon-gil, Yeonje-gu
 				Busan    47547
 				KR
 
-8C-1F-64   (hex)		DB Systel GmbH
-991000-991FFF     (base 16)		DB Systel GmbH
-				Jürgen-Ponto-Platz1
-				Frankfurt  Hessen  60329
-				DE
-
 8C-1F-64   (hex)		Katronic AG & Co. KG
 C41000-C41FFF     (base 16)		Katronic AG & Co. KG
 				Gießerweg 5
 				Wernigerode    38855
 				DE
 
+8C-1F-64   (hex)		DB Systel GmbH
+991000-991FFF     (base 16)		DB Systel GmbH
+				Jürgen-Ponto-Platz1
+				Frankfurt  Hessen  60329
+				DE
+
 8C-1F-64   (hex)		NAGTECH LLC
 29F000-29FFFF     (base 16)		NAGTECH LLC
 				12A, Krasnolesya Str., off 507
 				Ekaterinburg  Sverdlovskaya oblast  620110
 				RU
 
-8C-1F-64   (hex)		ROBOfiber, Inc.
-CF1000-CF1FFF     (base 16)		ROBOfiber, Inc.
-				3000F Danville Blvd, #300
-				Alamo  CA  94507
-				US
-
 8C-1F-64   (hex)		QLM Technology Ltd
 3A4000-3A4FFF     (base 16)		QLM Technology Ltd
 				Unit DX, Albert Road
@@ -10427,24 +10439,30 @@ C03000-C03FFF     (base 16)		Abiman Engineering
 				Moscow    115093
 				RU
 
+8C-1F-64   (hex)		ROBOfiber, Inc.
+CF1000-CF1FFF     (base 16)		ROBOfiber, Inc.
+				3000F Danville Blvd, #300
+				Alamo  CA  94507
+				US
+
 8C-1F-64   (hex)		castcore
 204000-204FFF     (base 16)		castcore
 				D1210, 947 Hanam-daero
 				Hanam-si, Gyeonggi-do    12982
 				KR
 
-8C-1F-64   (hex)		Zhejiang Laolan Information Technology Co., Ltd
-801000-801FFF     (base 16)		Zhejiang Laolan Information Technology Co., Ltd
-				Zhejiang Laolan Information Technology Co., Ltd
-				Hangzhou  Zhejiang   311700
-				CN
-
 8C-1F-64   (hex)		BlueSword Intelligent Technology Co., Ltd.
 AAB000-AABFFF     (base 16)		BlueSword Intelligent Technology Co., Ltd.
 				No. 909, Longaobei Road,Jinan,Shandong
 				Jinan  Shandong  250101
 				CN
 
+8C-1F-64   (hex)		Zhejiang Laolan Information Technology Co., Ltd
+801000-801FFF     (base 16)		Zhejiang Laolan Information Technology Co., Ltd
+				Zhejiang Laolan Information Technology Co., Ltd
+				Hangzhou  Zhejiang   311700
+				CN
+
 8C-1F-64   (hex)		Aton srl
 19C000-19CFFF     (base 16)		Aton srl
 				Via Guido Rossa 5
@@ -10457,12 +10475,6 @@ AED000-AEDFFF     (base 16)		MB connect line GmbH Fernwartungssysteme
 				Dinkelsbuehl  Bavaria  91550
 				DE
 
-8C-1F-64   (hex)		RealWear
-9C1000-9C1FFF     (base 16)		RealWear
-				600 Hathaway Rd, Ste 105
-				Vancouver  WA  98661
-				US
-
 8C-1F-64   (hex)		Jacquet Dechaume
 7C8000-7C8FFF     (base 16)		Jacquet Dechaume
 				1 Rue Louis Armand
@@ -10475,17 +10487,29 @@ AED000-AEDFFF     (base 16)		MB connect line GmbH Fernwartungssysteme
 				Kalmar    39356
 				SE
 
+8C-1F-64   (hex)		Sanskruti
+4FA000-4FAFFF     (base 16)		Sanskruti
+				76/121, Mohit House, 2nd cross, Dasarahali Main Road, buvaneswari Nagar
+				bangalore  karnataka  560024
+				IN
+
 8C-1F-64   (hex)		HEINEN ELEKTRONIK GmbH
 AA4000-AA4FFF     (base 16)		HEINEN ELEKTRONIK GmbH
 				Hunsrückstraße 7
 				HAAN  NRW  42781
 				DE
 
-8C-1F-64   (hex)		Sanskruti
+8C-1F-64   (hex)		RealWear
-4FA000-4FAFFF     (base 16)		Sanskruti
+9C1000-9C1FFF     (base 16)		RealWear
-				76/121, Mohit House, 2nd cross, Dasarahali Main Road, buvaneswari Nagar
+				600 Hathaway Rd, Ste 105
-				bangalore  karnataka  560024
+				Vancouver  WA  98661
-				IN
+				US
+
+8C-1F-64   (hex)		INFOSTECH Co., Ltd.
+F86000-F86FFF     (base 16)		INFOSTECH Co., Ltd.
+				26, Namsan-ro 39beon-gil, Uichang-gu
+				Changwon-si  Gyeongsangnam-do  51368
+				KR
 
 8C-1F-64   (hex)		Figment Design Laboratories
 445000-445FFF     (base 16)		Figment Design Laboratories
@@ -10505,12 +10529,24 @@ AB5000-AB5FFF     (base 16)		JUSTMORPH PTE. LTD.
 				Singapore    059507
 				SG
 
-8C-1F-64   (hex)		INFOSTECH Co., Ltd.
+8C-1F-64   (hex)		NEXCONTECH
-F86000-F86FFF     (base 16)		INFOSTECH Co., Ltd.
+53D000-53DFFF     (base 16)		NEXCONTECH
-				26, Namsan-ro 39beon-gil, Uichang-gu
+				138, Ilsan-ro, Ilsandong-gu, Goyang-si
-				Changwon-si  Gyeongsangnam-do  51368
+				Gyeonggi-do    10442
 				KR
 
+8C-1F-64   (hex)		Daedalean AG
+E43000-E43FFF     (base 16)		Daedalean AG
+				Albisriederstrasse 199
+				Zürich    8047
+				CH
+
+8C-1F-64   (hex)		Grupo Epelsa S.L.
+D54000-D54FFF     (base 16)		Grupo Epelsa S.L.
+				C/ Punto Net,3
+				Alcala de Henares  Madrid  28805
+				ES
+
 70-B3-D5   (hex)		System West dba ICS Electronics
 E06000-E06FFF     (base 16)		System West dba ICS Electronics
 				7034 Commerce Circle Suite A
@@ -15542,18 +15578,18 @@ AFD000-AFDFFF     (base 16)		dongsheng
 				Soest    59494
 				DE
 
-70-B3-D5   (hex)		Apantac LLC
-450000-450FFF     (base 16)		Apantac LLC
-				7556 SW Bridgeport Road
-				Durham  OR  97224
-				US
-
 8C-1F-64   (hex)		GIORDANO CONTROLS SPA
 DBD000-DBDFFF     (base 16)		GIORDANO CONTROLS SPA
 				VIA PARALLELA 2/4
 				VILLA BARTOLOMEA  IT  37049
 				IT
 
+70-B3-D5   (hex)		Apantac LLC
+450000-450FFF     (base 16)		Apantac LLC
+				7556 SW Bridgeport Road
+				Durham  OR  97224
+				US
+
 70-B3-D5   (hex)		i2Systems
 FFD000-FFDFFF     (base 16)		i2Systems
 				355 Bantam Lake Road
@@ -15626,36 +15662,36 @@ D29000-D29FFF     (base 16)		Secure Bits
 				Leeuwarden    8938 AG
 				NL
 
-8C-1F-64   (hex)		Potter Electric Signal Company
-FE0000-FE0FFF     (base 16)		Potter Electric Signal Company
-				1609 Park 370 Place
-				Hazelwood  MO  63042
-				US
-
 8C-1F-64   (hex)		Invisense AB
 2EF000-2EFFFF     (base 16)		Invisense AB
 				Nygatan 56
 				Linköping    582 27
 				SE
 
+8C-1F-64   (hex)		Potter Electric Signal Company
+FE0000-FE0FFF     (base 16)		Potter Electric Signal Company
+				1609 Park 370 Place
+				Hazelwood  MO  63042
+				US
+
 8C-1F-64   (hex)		NewAgeMicro
 73D000-73DFFF     (base 16)		NewAgeMicro
 				171 Forbes Blvd, Suite 5000
 				Mansfield  MA  02048
 				US
 
-8C-1F-64   (hex)		DEUTA-WERKE GmbH
-BA3000-BA3FFF     (base 16)		DEUTA-WERKE GmbH
-				Paffrather Str. 140
-				Bergisch Gladbach  North Rhine-Westphalia  51465
-				DE
-
 8C-1F-64   (hex)		INSEVIS GmbH
 414000-414FFF     (base 16)		INSEVIS GmbH
 				Am Weichselgarten 7
 				Erlangen    D-91058
 				DE
 
+8C-1F-64   (hex)		DEUTA-WERKE GmbH
+BA3000-BA3FFF     (base 16)		DEUTA-WERKE GmbH
+				Paffrather Str. 140
+				Bergisch Gladbach  North Rhine-Westphalia  51465
+				DE
+
 8C-1F-64   (hex)		Shenzhen Longyun Lighting Electric Appliances Co., Ltd
 95A000-95AFFF     (base 16)		Shenzhen Longyun Lighting Electric Appliances Co., Ltd
 				Building A5 , Silicon Valley Power Industrial Park, No.334, Guiyue Road, Guanlan
@@ -15680,6 +15716,12 @@ DC9000-DC9FFF     (base 16)		Peter Huber Kaeltemaschinenbau AG
 				Osaka  Osaka  531-6048
 				JP
 
+8C-1F-64   (hex)		Nexion Data Systems P/L
+712000-712FFF     (base 16)		Nexion Data Systems P/L
+				Unit 1, 53 Boyland Avenue
+				Coopers Plains  Queensland  4108
+				AU
+
 70-B3-D5   (hex)		YUYAMA MFG Co.,Ltd
 BBB000-BBBFFF     (base 16)		YUYAMA MFG Co.,Ltd
 				3-3-1
@@ -20867,51 +20909,57 @@ B33000-B33FFF     (base 16)		Aplex Technology Inc.
 				Shenzhen City  Guangdong  518129
 				CN
 
-70-B3-D5   (hex)		FARHO DOMOTICA SL
-ACE000-ACEFFF     (base 16)		FARHO DOMOTICA SL
-				POLIGONO DE TABAZA II, NAVES 9-13
-				TABAZA  ASTURIAS  33439
-				ES
-
-70-B3-D5   (hex)		The Engineerix Group
-C71000-C71FFF     (base 16)		The Engineerix Group
-				1418 Beech Ave 119A
-				McAllen  TX  78501
-				US
-
 70-B3-D5   (hex)		Flextronics International Kft
 1BC000-1BCFFF     (base 16)		Flextronics International Kft
 				38. Zrinyi Str.
 				Zalaegerszeg  Zala  8900
 				HU
 
+70-B3-D5   (hex)		FARHO DOMOTICA SL
+ACE000-ACEFFF     (base 16)		FARHO DOMOTICA SL
+				POLIGONO DE TABAZA II, NAVES 9-13
+				TABAZA  ASTURIAS  33439
+				ES
+
 70-B3-D5   (hex)		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)		The Engineerix Group
+C71000-C71FFF     (base 16)		The Engineerix Group
+				1418 Beech Ave 119A
+				McAllen  TX  78501
+				US
+
 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)		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)		VulcanForms
 E0E000-E0EFFF     (base 16)		VulcanForms
 				20 North Ave.
 				Burlington  MA  01803
 				US
 
+8C-1F-64   (hex)		GSP Sprachtechnologie GmbH
+B64000-B64FFF     (base 16)		GSP Sprachtechnologie GmbH
+				Teltowkanalstraße 1
+				Berlin    12247
+				DE
+
 8C-1F-64   (hex)		Xi‘an Hangguang Satellite and Control Technology Co.,Ltd
 270000-270FFF     (base 16)		Xi‘an Hangguang Satellite and Control Technology Co.,Ltd
 				Hi-tech Industrial Park Zaozitai Road No.10,Chang’an, Xi’an, Shaanxi China
@@ -20924,12 +20972,6 @@ D7E000-D7EFFF     (base 16)		Thales Belgium
 				Tubize  Brussels  1480
 				BE
 
-8C-1F-64   (hex)		GSP Sprachtechnologie GmbH
-B64000-B64FFF     (base 16)		GSP Sprachtechnologie GmbH
-				Teltowkanalstraße 1
-				Berlin    12247
-				DE
-
 8C-1F-64   (hex)		Brad Technology
 549000-549FFF     (base 16)		Brad Technology
 				20 Avenue des Erables
@@ -20942,18 +20984,18 @@ B64000-B64FFF     (base 16)		GSP Sprachtechnologie GmbH
 				Tel Aviv    6986519
 				IL
 
-8C-1F-64   (hex)		EkspertStroyProekt
-A57000-A57FFF     (base 16)		EkspertStroyProekt
-				office 422, str.1, d.1, ul. Eniseyskaya
-				Moscow    129344
-				RU
-
 8C-1F-64   (hex)		GS Elektromedizinsiche Geräte G. Stemple GmbH
 BC0000-BC0FFF     (base 16)		GS Elektromedizinsiche Geräte G. Stemple GmbH
 				Hauswiesenstr. 26
 				Kaufering  Bayern  86916
 				DE
 
+8C-1F-64   (hex)		EkspertStroyProekt
+A57000-A57FFF     (base 16)		EkspertStroyProekt
+				office 422, str.1, d.1, ul. Eniseyskaya
+				Moscow    129344
+				RU
+
 8C-1F-64   (hex)		BR. Voss Ingenjörsfirma AB
 264000-264FFF     (base 16)		BR. Voss Ingenjörsfirma AB
 				Getängsvägen 4
@@ -20984,36 +21026,36 @@ E5C000-E5CFFF     (base 16)		Scientific Lightning Solutions
 				Titusville  FL  32780
 				US
 
+8C-1F-64   (hex)		Grossenbacher Systeme AG
+83A000-83AFFF     (base 16)		Grossenbacher Systeme AG
+				Spinnereistrasse 10
+				St. Gallen    9008
+				CH
+
 8C-1F-64   (hex)		WOLF Advanced Technology
 370000-370FFF     (base 16)		WOLF Advanced Technology
 				175 Mostar Street, Suite 200
 				Stouffville  Ontario  L4A 0Y2
 				CA
 
-8C-1F-64   (hex)		YUYAMA MFG Co.,Ltd
-AE1000-AE1FFF     (base 16)		YUYAMA MFG Co.,Ltd
-				3-3-1
-				TOYONAKASHI  OSAKA  561-0841
-				JP
-
 8C-1F-64   (hex)		Roog zhi tong Technology(Beijing) Co.,Ltd
 296000-296FFF     (base 16)		Roog zhi tong Technology(Beijing) Co.,Ltd
 				Room 806, Huizhong building, building 2, Yard 1, Shangdi Seventh Street, Haidian District, Beijing
 				Beijing    100089
 				CN
 
+8C-1F-64   (hex)		YUYAMA MFG Co.,Ltd
+AE1000-AE1FFF     (base 16)		YUYAMA MFG Co.,Ltd
+				3-3-1
+				TOYONAKASHI  OSAKA  561-0841
+				JP
+
 8C-1F-64   (hex)		SBS SpA
 4C7000-4C7FFF     (base 16)		SBS SpA
 				via Circonvallazione s/n
 				Miasino  NO  28010
 				IT
 
-8C-1F-64   (hex)		Grossenbacher Systeme AG
-83A000-83AFFF     (base 16)		Grossenbacher Systeme AG
-				Spinnereistrasse 10
-				St. Gallen    9008
-				CH
-
 8C-1F-64   (hex)		Murata Manufacturing Co., Ltd.
 79D000-79DFFF     (base 16)		Murata Manufacturing Co., Ltd.
 				2288, Oaza-Ohshinohara, Yasu-cho,
@@ -21032,6 +21074,12 @@ AE1000-AE1FFF     (base 16)		YUYAMA MFG Co.,Ltd
 				Portsmouth  NH  03801
 				US
 
+8C-1F-64   (hex)		UBISCALE
+73F000-73FFFF     (base 16)		UBISCALE
+				1 Avenue de Bellefontaine
+				Cesson-Sevigne    35510
+				FR
+
 8C-1F-64   (hex)		Florida R&D Associates LLC
 2F5000-2F5FFF     (base 16)		Florida R&D Associates LLC
 				76 Spring Vista Drive
@@ -21050,12 +21098,36 @@ EE8000-EE8FFF     (base 16)		Global Organ Group B.V.
 				EDE  The Netherlands  6716BS
 				NL
 
-8C-1F-64   (hex)		UBISCALE
+8C-1F-64   (hex)		BIOTAGE GB LTD
-73F000-73FFFF     (base 16)		UBISCALE
+EF1000-EF1FFF     (base 16)		BIOTAGE GB LTD
-				1 Avenue de Bellefontaine
+				UNIT 10 DYFFRYN BUSINESS PARK
-				Cesson-Sevigne    35510
+				YSTRAD MYNACH    CF82 7TS
+				GB
+
+8C-1F-64   (hex)		AiUnion Co.,Ltd
+EEF000-EEFFFF     (base 16)		AiUnion Co.,Ltd
+				3F.-1, No. 268, Liancheng Rd., Zhonghe Dist.
+				New Taipei City   Taiwan (R.O.C.)  235
+				TW
+
+8C-1F-64   (hex)		Accemic Technologies GmbH
+79E000-79EFFF     (base 16)		Accemic Technologies GmbH
+				Franz-Huber-Str. 39
+				Kiefersfelden  Bavaria  83088
+				DE
+
+8C-1F-64   (hex)		ard sa
+AF7000-AF7FFF     (base 16)		ard sa
+				Micropolis Bat Clematis
+				Gap  France  05000
 				FR
 
+8C-1F-64   (hex)		YPP Corporation
+3E0000-3E0FFF     (base 16)		YPP Corporation
+				24
+				Geumchon-gu  Seoul  153-802
+				KR
+
 70-B3-D5   (hex)		DISMUNTEL SAL
 92C000-92CFFF     (base 16)		DISMUNTEL SAL
 				Pol ind cotes
@@ -26030,36 +26102,36 @@ EAA000-EAAFFF     (base 16)		Druck Ltd.
 				Karlsruhe    76187 
 				DE
 
-70-B3-D5   (hex)		Orlaco Products B.V.
-333000-333FFF     (base 16)		Orlaco Products B.V.
-				Albert Plesmanstraat 42
-				Barneveld    3772MN
-				NL
-
 70-B3-D5   (hex)		ScopeSensor Oy
 DF7000-DF7FFF     (base 16)		ScopeSensor Oy
 				Teollisuustie 1
 				Haukipudas    90830
 				FI
 
-70-B3-D5   (hex)		KBPR LLC
-11E000-11EFFF     (base 16)		KBPR LLC
-				Raketny bulvar street 16
-				Moscow  Select State  129164
-				RU
-
 70-B3-D5   (hex)		Anello Photonics
 96A000-96AFFF     (base 16)		Anello Photonics
 				3964 Rivermark Plaza, Suite 144
 				Santa Clara  CA  95054
 				US
 
+70-B3-D5   (hex)		Orlaco Products B.V.
+333000-333FFF     (base 16)		Orlaco Products B.V.
+				Albert Plesmanstraat 42
+				Barneveld    3772MN
+				NL
+
 70-B3-D5   (hex)		HORIZON.INC
 F40000-F40FFF     (base 16)		HORIZON.INC
 				1600 Aza-Shironoshita Asahi
 				Shin Asahi-cho  Takashima, Shiga  520-1501
 				JP
 
+70-B3-D5   (hex)		KBPR LLC
+11E000-11EFFF     (base 16)		KBPR LLC
+				Raketny bulvar street 16
+				Moscow  Select State  129164
+				RU
+
 70-B3-D5   (hex)		SUS Corporation
 1ED000-1EDFFF     (base 16)		SUS Corporation
 				6F, S-patio Bldg. 14-25 Minami-cho, Suruga-ku,
@@ -26084,11 +26156,11 @@ A0C000-A0CFFF     (base 16)		Lumiplan Duhamel
 				Suzhou  Jiangsu  215000
 				CN
 
-8C-1F-64   (hex)		CPC (UK)
+8C-1F-64   (hex)		SamabaNova Systems
-391000-391FFF     (base 16)		CPC (UK)
+0A8000-0A8FFF     (base 16)		SamabaNova Systems
-				Unit 3 Beta Way
+				2100 Geng Rd #103
-				Egham  Surrey  TW208RE
+				Palo Alto  CA  94303
-				GB
+				US
 
 8C-1F-64   (hex)		NavSys Technology Inc.
 3C4000-3C4FFF     (base 16)		NavSys Technology Inc.
@@ -26096,23 +26168,17 @@ A0C000-A0CFFF     (base 16)		Lumiplan Duhamel
 				Geumcheon-gu  Seoul, Republic of Korea  08511
 				KR
 
-8C-1F-64   (hex)		SamabaNova Systems
-0A8000-0A8FFF     (base 16)		SamabaNova Systems
-				2100 Geng Rd #103
-				Palo Alto  CA  94303
-				US
-
 8C-1F-64   (hex)		Edgeware AB
 FD1000-FD1FFF     (base 16)		Edgeware AB
 				Master Samuelsgatan 42
 				Stockholm    11157
 				SE
 
-8C-1F-64   (hex)		Intamsys Technology Co.Ltd
+8C-1F-64   (hex)		CPC (UK)
-466000-466FFF     (base 16)		Intamsys Technology Co.Ltd
+391000-391FFF     (base 16)		CPC (UK)
-				3/F, Building C9, No.3188 Xiupu Road Pudong New District,Shanghai
+				Unit 3 Beta Way
-				Shanghai    201315
+				Egham  Surrey  TW208RE
-				CN
+				GB
 
 8C-1F-64   (hex)		Power Electronics Espana, S.L.
 C2F000-C2FFFF     (base 16)		Power Electronics Espana, S.L.
@@ -26120,6 +26186,12 @@ C2F000-C2FFFF     (base 16)		Power Electronics Espana, S.L.
 				Paterna  Valencia  46980
 				ES
 
+8C-1F-64   (hex)		Intamsys Technology Co.Ltd
+466000-466FFF     (base 16)		Intamsys Technology Co.Ltd
+				3/F, Building C9, No.3188 Xiupu Road Pudong New District,Shanghai
+				Shanghai    201315
+				CN
+
 8C-1F-64   (hex)		Hikari Alphax Inc.
 166000-166FFF     (base 16)		Hikari Alphax Inc.
 				2-2-2, Nakanoshima, Kita-ku
@@ -26150,30 +26222,30 @@ FFA000-FFAFFF     (base 16)		Barracuda Measurement Solutions
 				Stafford  TX  77477
 				US
 
-8C-1F-64   (hex)		ASAP Electronics GmbH
-9CF000-9CFFFF     (base 16)		ASAP Electronics GmbH
-				Sachsstraße 1A
-				Gaimersheim  Bayern  85080
-				DE
-
-8C-1F-64   (hex)		WINK Streaming
-372000-372FFF     (base 16)		WINK Streaming
-				3 Prados Del Convento
-				Escazu  SJ  10201
-				CR
-
 8C-1F-64   (hex)		Yu-Heng Electric Co., LTD 
 575000-575FFF     (base 16)		Yu-Heng Electric Co., LTD 
 				No 8 , Gongye 2nd Rd., Renwu Industry Park
 				Kaohsiung  Kaohsiung City  814
 				TW
 
+8C-1F-64   (hex)		ASAP Electronics GmbH
+9CF000-9CFFFF     (base 16)		ASAP Electronics GmbH
+				Sachsstraße 1A
+				Gaimersheim  Bayern  85080
+				DE
+
 70-B3-D5   (hex)		Siemens Industry Software Inc.
 3FE000-3FEFFF     (base 16)		Siemens Industry Software Inc.
 				46871 Bayside Parkway
 				Fremont  CA  94538
 				US
 
+8C-1F-64   (hex)		WINK Streaming
+372000-372FFF     (base 16)		WINK Streaming
+				3 Prados Del Convento
+				Escazu  SJ  10201
+				CR
+
 8C-1F-64   (hex)		OTMetric
 7A6000-7A6FFF     (base 16)		OTMetric
 				1 rue de La Haye
@@ -26215,3 +26287,15 @@ D3C000-D3CFFF     (base 16)		KIB Energo LLC
 				Drielse Wetering 17
 				Kerkdriel  Gelderland  5331RK
 				NL
+
+8C-1F-64   (hex)		Landis+Gyr Equipamentos de Medição Ltda
+542000-542FFF     (base 16)		Landis+Gyr Equipamentos de Medição Ltda
+				Hasdrubal Bellegard, 400, CIC
+				Curitiba  Paraná  81460-120
+				BR
+
+8C-1F-64   (hex)		EVLO Stockage Énergie
+998000-998FFF     (base 16)		EVLO Stockage Énergie
+				1804 Boulevard Lionel-Boulet, Édifice Archimède
+				VARENNES  Quebec  J3X 1S1
+				CA

hwdb.d/pci.ids

@@ -1,8 +1,8 @@
 #
 #	List of PCI ID's
 #
-#	Version: 2021.05.16
+#	Version: 2021.06.22
-#	Date:    2021-05-16 03:15:02
+#	Date:    2021-06-22 03:15:02
 #
 #	Maintained by Albert Pool, Martin Mares, and other volunteers from
 #	the PCI ID Project at https://pci-ids.ucw.cz/.
@@ -683,6 +683,20 @@
 		1bd4 0026  12G SAS3008IT RACK
 		1bd4 0027  12G SAS3008IMR RACK
 		1bd4 0028  12G SAS3008IR RACK
+	00a5  Fusion-MPT 24GSAS/PCIe SAS40xx
+		1000 4600  MegaRAID 9670W-16i Tri-Mode Storage Adapter
+		1000 4610  MegaRAID 9670-24i Tri-Mode Storage Adapter
+		1000 4620  MegaRAID 9660-16i Tri-Mode Storage Adapter
+		1000 4630  MegaRAID 9660-8i8e Tri-Mode Storage Adapter
+		1000 4640  eHBA 9600W-16i Tri-Mode Storage Adapter
+		1000 4650  eHBA 9600W-16e Tri-Mode Storage Adapter
+		1000 4660  eHBA 9600-24i Tri-Mode Storage Adapter
+		1000 4670  eHBA 9600-16i Tri-Mode Storage Adapter
+		1000 4680  eHBA 9600-16e Tri-Mode Storage Adapter
+		1000 4690  eHBA 9620-16i Tri-Mode Storage Adapter
+		1000 46a0  MegaRAID 9660-24i Tri-Mode Storage Adapter
+		1000 46b0  MegaRAID 9665W-16i Tri-Mode Storage Adapter
+		1000 46c0  MegaRAID 9680W-16e Tri-Mode Storage Adapter
 	00ab  SAS3516 Fusion-MPT Tri-Mode RAID On Chip (ROC)
 # 8 Internal and 8 External port channel 9400 HBA
 		1000 3040  HBA 9400-8i8e
@@ -773,6 +787,8 @@
 		1028 200e  HBA350i MX
 		1d49 0205  ThinkSystem 440-16i SAS/SATA PCIe Gen4 12Gb Internal HBA
 		1d49 0206  ThinkSystem 440-16e SAS/SATA PCIe Gen4 12Gb HBA
+		1d49 0207  ThinkSystem 440-8i SAS/SATA PCIe Gen4 12Gb HBA
+		1d49 0208  ThinkSystem 440-16i SAS/SATA PCIe Gen4 12Gb HBA
 	00e7  Fusion-MPT 12GSAS/PCIe Unsupported SAS38xx
 # Tampered part
 		1028 200b  HBA355i Adapter Tampered
@@ -892,6 +908,7 @@
 		1d49 060d  ThinkSystem RAID 940-16i 8GB Flash PCIe Gen4 12Gb Internal Adapter
 		1d49 060e  ThinkSystem RAID 940-32i 8GB Flash PCIe Gen4 12Gb Adapter
 		1d49 060f  ThinkSystem RAID 940-8e 4GB Flash PCIe Gen4 12Gb Adapter
+		1d49 0610  ThinkSystem RAID 940-16i 4GB Flash PCIe Gen4 12Gb Adapter
 	10e3  MegaRAID 12GSAS/PCIe Unsupported SAS39xx
 		1028 1ae0  PERC H755 Adapter - Tampered Device
 		1028 1ae1  PERC H755 Front - Tampered Device
@@ -900,6 +917,8 @@
 	10e4  MegaRAID 12GSAS/PCIe Unsupported SAS38xx
 	10e5  MegaRAID 12GSAS/PCIe SAS38xx
 	10e6  MegaRAID 12GSAS/PCIe Secure SAS38xx
+		1d49 0505  ThinkSystem RAID 540-8i PCIe Gen4 12Gb Adapter
+		1d49 0506  ThinkSystem RAID 540-16i PCIe Gen4 12Gb Adapter
 	10e7  MegaRAID 12GSAS/PCIe Unsupported SAS38xx
 	1960  MegaRAID
 		1000 0518  MegaRAID 518 SCSI 320-2 Controller
@@ -988,6 +1007,7 @@
 	15ff  Fenghuang [Zhongshan Subor Z+]
 	1607  Arden
 	1636  Renoir
+	1637  Renoir Radeon High Definition Audio Controller
 	1638  Cezanne
 	163f  VanGogh
 	164c  Lucienne
@@ -3833,7 +3853,7 @@
 		17aa 21bb  Mobility Radeon HD 545v
 	9555  RV710/M92 [Mobility Radeon HD 4350/4550]
 		103c 1411  ProBook 4720s GPU (Mobility Radeon HD 4350)
-	9557  RV711 GL [FirePro RG220]
+	9557  RV711/M93 GL [FirePro RG220]
 	955f  RV710/M92 [Mobility Radeon HD 4330]
 	9580  RV630 [Radeon HD 2600 PRO]
 	9581  RV630/M76 [Mobility Radeon HD 2600]
@@ -4934,6 +4954,11 @@
 	1635  Renoir Internal PCIe GPP Bridge to Bus
 	1637  Renoir HD Audio Controller
 	1639  Renoir USB 3.1
+	163a  VanGogh USB0
+	163b  VanGogh USB1
+	163c  VanGogh SecUSB
+	163d  VanGogh SecureFunction
+	163e  VanGogh HSP
 	1641  Renoir 10GbE Controller Port 0 (XGBE0/1)
 	1642  Renoir WLAN
 	1643  Renoir BT
@@ -11998,6 +12023,10 @@
 		10de 1141  VCA 6000
 	17f1  GM200GL [Quadro M6000 24GB]
 	17fd  GM200GL [Tesla M40]
+	1ad0  Tegra PCIe x8 Endpoint
+	1ad1  Tegra PCIe x4/x8 Endpoint/Root Complex
+	1ad2  Tegra PCIe x1 Root Complex
+	1ad3  Xavier SATA Controller
 	1ad6  TU102 USB 3.1 Host Controller
 	1ad7  TU102 USB Type-C UCSI Controller
 	1ad8  TU104 USB 3.1 Host Controller
@@ -12225,10 +12254,11 @@
 	1f9d  TU117M [GeForce GTX 1650 Mobile / Max-Q]
 	1fae  TU117GL
 	1fb0  TU117GLM [Quadro T1000 Mobile]
-	1fb1  TU117GLM [Quadro T600 Mobile]
+	1fb1  TU117GL [T600]
 	1fb2  TU117GLM [Quadro T400 Mobile]
 	1fb8  TU117GLM [Quadro T2000 Mobile / Max-Q]
 	1fb9  TU117GLM [Quadro T1000 Mobile]
+	1fba  TU117GLM [T600 Mobile]
 	1fbb  TU117GLM [Quadro T500 Mobile]
 	1fbf  TU117GL
 	1fd9  TU117BM [GeForce GTX 1650 Mobile Refresh]
@@ -12264,6 +12294,7 @@
 		1462 3892  RTX 3080 10GB GAMING X TRIO
 	2208  GA102 [GeForce RTX 3080 Ti]
 	220d  GA102 [GeForce RTX 3080 Lite Hash Rate]
+	2216  GA102 [GeForce RTX 3080 Lite Hash Rate]
 	222b  GA102 [GeForce RTX 3090 Engineering Sample]
 	222f  GA102 [GeForce RTX 3080 11GB / 12GB Engineering Sample]
 	2230  GA102GL [RTX A6000]
@@ -12273,6 +12304,7 @@
 	2237  GA102GL [A10G]
 	223f  GA102GL
 	228b  GA104 High Definition Audio Controller
+	2296  Tegra PCIe Endpoint Virtual Network
 	2302  GA103
 	2321  GA103
 	2482  GA104 [GeForce RTX 3070 Ti]
@@ -12281,6 +12313,8 @@
 		10de 146b  GA104 [GeForce RTX 3070]
 		10de 14ae  GA104 [GeForce RTX 3070 16GB]
 	2486  GA104 [GeForce RTX 3060 Ti]
+	2488  GA104 [GeForce RTX 3070 Lite Hash Rate]
+	2489  GA104 [GeForce RTX 3060 Ti Lite Hash Rate]
 	249c  GA104M [GeForce RTX 3080 Mobile / Max-Q 8GB/16GB]
 	249d  GA104M [GeForce RTX 3070 Mobile / Max-Q]
 	249f  GA104M
@@ -12698,6 +12732,7 @@
 		ea50 ce19  mCOM10-L1900
 	816d  RTL811x EHCI host controller
 		ea50 ce19  mCOM10-L1900
+	816e  Realtek RealManage BMC
 	8171  RTL8191SEvA Wireless LAN Controller
 	8172  RTL8191SEvB Wireless LAN Controller
 	8173  RTL8192SE Wireless LAN Controller
@@ -14798,6 +14833,9 @@
 		117c 00bc  Celerity FC-321P
 		117c 00bd  Celerity FC-322P
 		117c 00be  Celerity FC-324P
+	00c5  ExpressNVM PCIe Gen4 Switch
+		117c 00c6  ExpressNVM S48F PCIe Gen4
+		117c 00c7  ExpressNVM S468 PCIe Gen4
 	00e6  ExpressSAS GT 12Gb/s SAS/SATA HBA
 		117c 00c0  ExpressSAS H1280 GT
 		117c 00c1  ExpressSAS H1208 GT
@@ -15092,6 +15130,7 @@
 # Nee Galileo Technology, Inc.
 11ab  Marvell Technology Group Ltd.
 	0100  88F3700 [Armada 3700 Family] ARM SoC
+	0110  88F8040 PCI Express controller
 	0146  GT-64010/64010A System Controller
 	0f53  88E6318 Link Street network controller
 	11ab  MV88SE614x SATA II PCI-E controller
@@ -15640,7 +15679,12 @@
 	8071  PM8071 Tachyon SPCve 12G eight-port SAS/SATA controller
 	8072  PM8072 Tachyon SPCv 12G 16-port SAS/SATA controller
 	8073  PM8073 Tachyon SPCve 12G 16-port SAS/SATA controller
-	8531  PM8531 PFX 24xG3 Fanout PCIe Switches
+	8531  PM8531 PFX 24xG3 PCIe Fanout Switch
+	8532  PM8532 PFX 32xG3 PCIe Fanout Switch
+	8533  PM8533 PFX 48xG3 PCIe Fanout Switch
+	8534  PM8534 PFX 64xG3 PCIe Fanout Switch
+	8535  PM8535 PFX 80xG3 PCIe Fanout Switch
+	8536  PM8536 PFX 96xG3 PCIe Fanout Switch
 	8546  PM8546 B-FEIP PSX 96xG3 PCIe Storage Switch
 	8562  PM8562 Switchtec PFX-L 32xG3 Fanout-Lite PCIe Gen3 Switch
 11f9  I-Cube Inc
@@ -15648,7 +15692,8 @@
 11fb  Datel Inc
 11fc  Silicon Magic
 11fd  High Street Consultants
-11fe  Pepperl+Fuchs Comtrol, Inc.
+# nee Comtrol, Inc.
+11fe  Pepperl+Fuchs
 	0001  RocketPort PCI 32-port w/external I/F
 	0002  RocketPort PCI 8-port w/external I/F
 	0003  RocketPort PCI 16-port w/external I/F
@@ -16142,6 +16187,8 @@
 	5a4b  Telsat Turbo
 1268  Tektronix
 1269  Thomson-CSF/TTM
+# MBIM on top of MHI
+	00b3  5G Data Card [Cinterion MV31-W]
 126a  Lexmark International, Inc.
 126b  Adax, Inc.
 126c  Northern Telecom
@@ -18645,6 +18692,7 @@
 1462  Micro-Star International Co., Ltd. [MSI]
 # VIA Driver-inf
 	3483  MSI USB 3.0 (VIA VL80x-based xHCI USB Controller)
+	7c56  Realtek Ethernet controller RTL8111H
 	aaf0  Radeon RX 580 Gaming X 8G
 1463  Fast Corporation
 1464  Interactive Circuits & Systems Ltd
@@ -19317,6 +19365,8 @@
 		14e4 1402  BCM957414A4142CC 10Gb/25Gb Ethernet PCIe
 		14e4 1404  BCM957414M4142C OCP 2x25G Type1 wRoCE
 		14e4 4140  NetXtreme E-Series Advanced Dual-port 25Gb SFP28 Network Daughter Card
+# BCM957414M4143C
+		14e4 4143  NetXtreme-E Single-port 40Gb/50Gb Ethernet OCP 2.0 Adapter (BCM957414M4143C)
 		14e4 4146  NetXtreme-E Dual-port 25G SFP28 Ethernet OCP 3.0 Adapter (BCM957414N4140C)
 		1590 020e  Ethernet 25Gb 2-port 631SFP28 Adapter
 		1590 0211  Ethernet 25Gb 2-port 631FLR-SFP28 Adapter
@@ -19388,7 +19438,7 @@
 		14e4 df24  BCM57508 NetXtreme-E NGM2100D 2x100G KR Mezz Ethernet Partition
 	1803  BCM57502 NetXtreme-E RDMA Partition
 	1804  BCM57504 NetXtreme-E RDMA Partition
-	1805  BCM57508 NetXtreme-E NGM2100D 2x100G KR Mezz RDMA Partition
+	1805  BCM57508 NetXtreme-E RDMA Partition
 		14e4 df24  NetXtreme-E NGM2100D BCM57508 2x100G KR Mezz RDMA Partition
 	1806  BCM5750X NetXtreme-E Ethernet Virtual Function
 		14e4 df24  BCM57508 NetXtreme-E NGM2100D 2x100G KR Mezz Ethernet Virtual Function
@@ -20379,12 +20429,14 @@
 	0253  Amos GearBox Manager
 	0254  Spectrum-4, Flash recovery mode
 	0255  Spectrum-4, Secure Flash recovery mode
-	0256  Ofek chiplet
+	0256  Abir GearBox
 	0257  Quantum-2 in Flash Recovery Mode
+	0258  AbirGearBox Flash Recovery
 	0262  MT27710 [ConnectX-4 Lx Programmable] EN
 	0263  MT27710 [ConnectX-4 Lx Programmable Virtual Function] EN
 	0264  Innova-2 Flex Burn image
 	0281  NPS-600 Flash Recovery
+	0358  Abir GearBox Secure Flash recovery mode
 	1002  MT25400 Family [ConnectX-2 Virtual Function]
 	1003  MT27500 Family [ConnectX-3]
 		1014 04b5  PCIe3 40GbE RoCE Converged Host Bus Adapter for Power
@@ -22071,6 +22123,7 @@
 		18ec 4200  Flexible FlowMon (szedata2) 1x10G
 		18ec ff00  Testing design
 		18ec ff01  Boot design
+	c400  COMBO-400G1
 18ee  Chenming Mold Ind. Corp.
 18f1  Spectrum GmbH
 18f4  Napatech A/S
@@ -22534,6 +22587,7 @@
 	5012  E12 NVMe Controller
 	5013  PS5013 E13 NVMe Controller
 	5016  E16 PCIe4 NVMe Controller
+	5018  E18 PCIe4 NVMe Controller
 1989  Montilio Inc.
 	0001  RapidFile Bridge
 	8001  RapidFile
@@ -22995,6 +23049,7 @@
 	1343  ASM1143 USB 3.1 Host Controller
 	2142  ASM2142 USB 3.1 Host Controller
 		1462 7a72  H270 PC MATE
+	2824  ASM2824 PCIe Gen3 Packet Switch
 	3242  ASM3242 USB 3.2 Host Controller
 1b26  Netcope Technologies, a.s.
 	c132  COMBO-LXT155
@@ -23344,7 +23399,7 @@
 	1283  PC300 NVMe Solid State Drive 256GB
 	1284  PC300 NVMe Solid State Drive 512GB
 	1285  PC300 NVMe Solid State Drive 1TB
-	1327  BC501 NVMe Solid State Drive 512GB
+	1327  BC501 NVMe Solid State Drive
 	1339  BC511
 	1504  SC300 512GB M.2 2280 SATA Solid State Drive
 	1527  PC401 NVMe Solid State Drive 256GB
@@ -23669,6 +23724,8 @@
 1dc5  FADU Inc.
 1dcd  Liqid Inc.
 1dd8  Pensando Systems
+	0002  DSC2 Elba Upstream Port
+		1dd8 5001  DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card
 	1000  DSC Capri Upstream Port
 		1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
 		1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
@@ -23679,6 +23736,7 @@
 		1dd8 400c  DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card
 		1dd8 400d  DSP DSC-100 Ent 100Gb Card
 		1dd8 400e  DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card
+		1dd8 4014  DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card
 	1001  DSC Virtual Downstream Port
 		1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
 		1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
@@ -23689,6 +23747,8 @@
 		1dd8 400c  DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card
 		1dd8 400d  DSP DSC-100 Ent 100Gb Card
 		1dd8 400e  DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card
+		1dd8 4014  DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card
+		1dd8 5001  DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card
 	1002  DSC Ethernet Controller
 		1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
 		1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
@@ -23699,6 +23759,8 @@
 		1dd8 400c  DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card
 		1dd8 400d  DSP DSC-100 Ent 100Gb Card
 		1dd8 400e  DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card
+		1dd8 4014  DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card
+		1dd8 5001  DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card
 	1003  DSC Ethernet Controller VF
 		1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
 		1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
@@ -23709,6 +23771,8 @@
 		1dd8 400c  DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card
 		1dd8 400d  DSP DSC-100 Ent 100Gb Card
 		1dd8 400e  DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card
+		1dd8 4014  DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card
+		1dd8 5001  DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card
 	1004  DSC Management Controller
 		1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
 		1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
@@ -23719,6 +23783,8 @@
 		1dd8 400c  DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card
 		1dd8 400d  DSP DSC-100 Ent 100Gb Card
 		1dd8 400e  DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card
+		1dd8 4014  DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card
+		1dd8 5001  DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card
 	1007  DSC Storage Accelerator
 		1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
 		1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
@@ -23729,6 +23795,8 @@
 		1dd8 400c  DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card
 		1dd8 400d  DSP DSC-100 Ent 100Gb Card
 		1dd8 400e  DSC-25 10/25G 2-port 4G RAM 8G eMMC G1 Services Card
+		1dd8 4014  DSC-100 40/100G 2-port 8G RAM 16G eMMC G1 Services Card
+		1dd8 5001  DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card
 1de0  Groq
 # rename due to conflict with a term in use by another company for an entirely different product.
 	0000  TSP100 Tensor Streaming Processor
@@ -23882,6 +23950,9 @@
 		1e3b 0015  Enterprise NVMe SSD U.2 3.84TB (H3200)
 		1e3b 0021  Enterprise NVMe SSD U.2 6.4TB (H3100)
 		1e3b 0022  Enterprise NVMe SSD U.2 7.68TB (H3200)
+		1e3b 0052  Enterprise NVMe SSD U.2 0.8TB (H3900)
+		1e3b 0053  Enterprise NVMe SSD U.2 1.6TB (H3900)
+		1e3b 0059  Enterprise NVMe SSD U.2 0.75TB (H3900)
 		1e3b 0061  Enterprise NVMe SSD HHHL 0.8TB (H2100)
 		1e3b 0062  Enterprise NVMe SSD HHHL 0.96TB (H2200)
 		1e3b 0064  Enterprise NVMe SSD HHHL 1.6TB (H2100)
@@ -23894,8 +23965,13 @@
 		1e3b 007d  Enterprise NVMe SSD HHHL 3.84TB (H3200)
 		1e3b 007f  Enterprise NVMe SSD HHHL 6.4TB (H3100)
 		1e3b 0080  Enterprise NVMe SSD HHHL 7.68TB (H3200)
+		1e3b 008a  Enterprise NVMe SSD HHHL 0.8TB (H3900)
+		1e3b 008b  Enterprise NVMe SSD HHHL 1.6TB (H3900)
+		1e3b 0091  Enterprise NVMe SSD HHHL 0.75TB (H3900)
 1e3d  Burlywood, Inc
 1e49  Yangtze Memory Technologies Co.,Ltd
+# YMTC PCIe/NVMe SSD
+	1013  PC210
 1e4b  MAXIO Technology (Hangzhou) Ltd.
 	1001  NVMe SSD Controller MAP1001
 	1002  NVMe SSD Controller MAP1002
@@ -23910,6 +23986,8 @@
 1e57  Beijing Panyi Technology Co., Ltd
 	0100  The device has already been deleted.
 		0000 0100  PY8800 64GB Accelerator
+1e59  Oxford Nanopore Technologies
+	0001  MinION Mk1C
 1e60  Hailo Technologies Ltd.
 	2864  Hailo-8 AI Processor
 1e6b  Axiado Corp.
@@ -23925,6 +24003,8 @@
 1e95  Solid State Storage Technology Corporation
 1ea0  Tencent Technology (Shenzhen) Company Limited
 	2a16  Cloud Intelligent Inference Controller
+1ea7  Intelliprop, Inc
+	223a  Typhon+ PCIe to Gen-Z Bridge
 1eab  Hefei DATANG Storage Technology Co.,LTD.
 	300a  NVMe SSD Controller 300A
 	300b  NVMe SSD Controller 300B
@@ -23938,6 +24018,7 @@
 	0101  FG4 PCIe Frame Grabber
 1ed9  Myrtle.ai
 1ee9  SUSE LLC
+1efb  Flexxon Pte Ltd
 # nee Tumsan Oy
 1fc0  Ascom (Finland) Oy
 	0300  E2200 Dual E1/Rawpipe Card
@@ -26272,6 +26353,7 @@
 		1bd4 001b  10G SFP+ DP ER102Fi4 Rack Adapter
 		1bd4 002f  10G SFP+ DP EP102Fi4A Adapter
 		1bd4 0032  10G SFP+ DP EP102Fi4 Adapter
+		1bd4 0067  F102I82599
 		8086 0002  Ethernet Server Adapter X520-DA2
 		8086 0003  Ethernet Server Adapter X520-2
 		8086 0006  Ethernet Server Adapter X520-1
@@ -26607,6 +26689,7 @@
 		193d 1080  NIC-ETH360T-3S-4P
 		1bd4 001d  1G base-T QP EP014Ti1 Adapter
 		1bd4 0035  1G base-T QP EP014Ti1 Adapter
+		1bd4 0066  F014I350
 		8086 0001  Ethernet Server Adapter I350-T4
 		8086 0002  Ethernet Server Adapter I350-T2
 		8086 0003  Ethernet Network Adapter I350-T4 for OCP NIC 3.0
@@ -26783,6 +26866,7 @@
 		19e5 d11c  Ethernet 2-port X710 10Gb SFP+ Adapter SP330
 		1bd4 0042  10G SFP+ DP EP102Fi4 Adapter
 		1bd4 0056  Ethernet Network Adapter X710-BM2 for OCP NIC 3.0
+		1bd4 0065  F102IX710
 		8086 0000  Ethernet Converged Network Adapter X710
 		8086 0001  Ethernet Converged Network Adapter X710-4
 		8086 0002  Ethernet Converged Network Adapter X710-4
@@ -26933,6 +27017,7 @@
 		8086 0008  Ethernet Network Adapter E810-XXV-2
 		8086 0009  Ethernet Network Adapter E810-XXV-2 for OCP 2.0
 		8086 000a  Ethernet 25G 4P E810-XXV Adapter
+		8086 000c  Ethernet Network Adapter E810-XXV-4 for OCP 3.0
 	1599  Ethernet Controller E810-XXV for backplane
 	159a  Ethernet Controller E810-XXV for QSFP
 	159b  Ethernet Controller E810-XXV for SFP
@@ -26945,6 +27030,7 @@
 		8086 0005  Ethernet Network Adapter E810-XXV-2 for OCP 3.0
 		8086 4001  Ethernet Network Adapter E810-XXV-2
 		8086 4002  Ethernet Network Adapter E810-XXV-2 for OCP 3.0
+		8086 4003  Ethernet Network Adapter E810-XXV-2
 	15a0  Ethernet Connection (2) I218-LM
 	15a1  Ethernet Connection (2) I218-V
 	15a2  Ethernet Connection (3) I218-LM
@@ -27106,6 +27192,8 @@
 	189a  Ethernet Connection E822-L 1GbE
 	18a0  C4xxx Series QAT
 	18a1  C4XXX Series QAT Virtual Function
+	18ee  200xx Series QAT
+	18ef  200xx Series QAT Virtual Function
 	1900  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
 	1901  6th-10th Gen Core Processor PCIe Controller (x16)
 	1902  HD Graphics 510
@@ -27242,6 +27330,7 @@
 	19df  Atom Processor C3000 Series SMBus controller
 	19e0  Atom Processor C3000 Series SPI Controller
 	19e2  Atom Processor C3000 Series QuickAssist Technology
+	19e3  Atom Processor C3000 Series QuickAssist Technology Virtual Function
 	1a1c  Ethernet Connection (17) I219-LM
 	1a1d  Ethernet Connection (17) I219-V
 	1a1e  Ethernet Connection (16) I219-LM
@@ -28492,7 +28581,8 @@
 		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
+		434e 0001  Omni-Path HFI Adapter 100 Series, 1 Port, OCP 3.0
+		434e 2628  Omni-Path HFI Adapter 100 Series, 1 Port, PCIe x16
 		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
@@ -30839,6 +30929,7 @@
 	37c8  C62x Chipset QuickAssist Technology
 		8086 0001  QuickAssist Adapter 8960
 		8086 0002  QuickAssist Adapter 8970
+	37c9  C62x Chipset QuickAssist Technology Virtual Function
 	37cc  Ethernet Connection X722
 	37cd  Ethernet Virtual Function 700 Series
 	37ce  Ethernet Connection X722 for 10GbE backplane
@@ -31421,6 +31512,13 @@
 		8086 0264  Wireless-AC 9461
 		8086 02a4  Wireless-AC 9462
 	444e  Turbo Memory Controller
+	461e  Alder Lake-P Thunderbolt 4 USB Controller
+	461f  Alder Lake-P Thunderbolt 4 PCI Express Root Port #3
+	462f  Alder Lake-P Thunderbolt 4 PCI Express Root Port #2
+	463e  Alder Lake-P Thunderbolt 4 NHI #0
+	463f  Alder Lake-P Thunderbolt 4 PCI Express Root Port #1
+	466d  Alder Lake-P Thunderbolt 4 NHI #1
+	466e  Alder Lake-P Thunderbolt 4 PCI Express Root Port #0
 	467f  Volume Management Device NVMe RAID Controller
 	4680  AlderLake-S GT1
 	46a0  AlderLake-P GT2
@@ -32538,6 +32636,7 @@
 	a0c6  Tiger Lake-LP Serial IO I2C Controller #5
 	a0c8  Tiger Lake-LP Smart Sound Technology Audio Controller
 	a0e0  Tiger Lake-LP Management Engine Interface
+	a0e3  Tiger Lake-LP Active Management Technology - SOL
 	a0e8  Tiger Lake-LP Serial IO I2C Controller #0
 	a0e9  Tiger Lake-LP Serial IO I2C Controller #1
 	a0ea  Tiger Lake-LP Serial IO I2C Controller #2

hwdb.d/pnp_id_registry.html

@@ -2484,6 +2484,13 @@
  <tr class="even"><td>New H3C Technology Co., Ltd.</td><td>NHC</td><td>06/10/2021</td> </tr>
  <tr class="odd"><td>Seco S.p.A.</td><td>SCG</td><td>06/10/2021</td> </tr>
  <tr class="even"><td>Silent Power Electronics GmbH</td><td>LCP</td><td>06/10/2021</td> </tr>
+ <tr class="odd"><td>NAFASAE INDIA Pvt. Ltd</td><td>NAF</td><td>06/18/2021</td> </tr>
+ <tr class="even"><td>Pico Technology Inc.</td><td>PIR</td><td>06/18/2021</td> </tr>
+ <tr class="odd"><td>Life is Style Inc.</td><td>LIS</td><td>06/18/2021</td> </tr>
+ <tr class="even"><td>Hansung Co., Ltd</td><td>HSN</td><td>06/18/2021</td> </tr>
+ <tr class="odd"><td>Hubei Century Joint Innovation Technology Co.Ltd</td><td>TTR</td><td>06/18/2021</td> </tr>
+ <tr class="even"><td>Zake IP Holdings LLC (3B tech)</td><td>VIO</td><td>06/18/2021</td> </tr>
+ <tr class="odd"><td>PreSonus Audio Electronics</td><td>PAE</td><td>06/24/2021</td> </tr>
       </tbody>
     </table>
   </body>

hwdb.d/usb.ids

@@ -9,8 +9,8 @@
 #	The latest version can be obtained from
 #		http://www.linux-usb.org/usb.ids
 #
-# Version: 2021.06.06
+# Version: 2021.06.16
-# Date:    2021-06-06 20:34:10
+# Date:    2021-06-16 20:34:10
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -18177,8 +18177,8 @@
 	0042  Antec Veris Multimedia Station E-Z IR Receiver
 	ffda  iMON PAD Remote Controller
 	ffdc  iMON PAD Remote Controller
-15c5  Advance Multimedia Internet Technology Inc. (AMIT)
+15c5  Pressure Profile Systems, Inc.
-	0008  WL532U 802.11g Adapter
+	0008  Advance Multimedia Internet Technology Inc. (AMIT) WL532U 802.11g Adapter
 15c6  Laboratoires MXM
 	1000  DigistimSP (cold)
 	1001  DigistimSP (warm)

man/50-xdg-data-dirs.sh

@@ -5,8 +5,8 @@ XDG_DATA_DIRS="${XDG_DATA_DIRS:-/usr/local/share/:/usr/share}"
 
 # add a directory if it exists
 if [[ -d /opt/foo/share ]]; then
-    XDG_DATA_DIRS=/opt/foo/share:${XDG_DATA_DIRS}
+    XDG_DATA_DIRS="/opt/foo/share:${XDG_DATA_DIRS}"
 fi
 
 # write our output
-echo XDG_DATA_DIRS=$XDG_DATA_DIRS
+echo "XDG_DATA_DIRS=${XDG_DATA_DIRS}"

man/repart.d.xml

@@ -571,33 +571,34 @@
       <varlistentry>
         <term><varname>Flags=</varname></term>
 
-        <listitem><para>Configures the 64bit GPT partition flags to set for the partition when creating
+        <listitem><para>Configures the 64bit GPT partition flags field to set for the partition when creating
         it. This option has no effect if the partition already exists. If not specified the flags values is
-        set to all zeroes, except if the partition type (as configured with <varname>Type=</varname> above)
+        set to all zeroes, except for the three bits that can also be configured via
-        refers to a Verity partition, in which case bit 60 is set (i.e. the read-only bit). This bit may also
+        <varname>NoAuto=</varname>, <varname>ReadOnly=</varname> and <varname>GrowFileSystem=</varname>; see
-        be configured separately via <varname>ReadOnly=</varname>, see below. Specify the flags value in
+        below for details on the defaults for these three flags. Specify the flags value in hexadecimal (by
-        hexadecimal (by prefixing it with <literal>0x</literal>), binary (prefix <literal>0b</literal>) or
+        prefixing it with <literal>0x</literal>), binary (prefix <literal>0b</literal>) or decimal (no
-        decimal (no prefix).</para></listitem>
+        prefix).</para></listitem>
       </varlistentry>
 
       <varlistentry>
+        <term><varname>NoAuto=</varname></term>
         <term><varname>ReadOnly=</varname></term>
         <term><varname>GrowFileSystem=</varname></term>
 
-        <listitem><para>Configures the Read-Only and Grow-File-System partition flags (bit 60 and 59) of the
+        <listitem><para>Configures the No-Auto, Read-Only and Grow-File-System partition flags (bit 63, 60
-        partition table entry, as defined by the <ulink
+        and 59) of the partition table entry, as defined by the <ulink
         url="https://systemd.io/DISCOVERABLE_PARTITIONS">Discoverable Partitions Specification</ulink>. Only
-        available for partition types supported by the specification. This option is a friendly way to set bit
+        available for partition types supported by the specification. This option is a friendly way to set
-        60 and 59 of the partition flags value without setting any of the other bits, and may be set via
+        bits 63, 60 and 59 of the partition flags value without setting any of the other bits, and may be set
-        <varname>Flags=</varname> too, see above.</para>
+        via <varname>Flags=</varname> too, see above.</para>
 
-        <para>If <varname>Flags=</varname> is used in conjunction with one or both of
+        <para>If <varname>Flags=</varname> is used in conjunction with one or more of
-        <varname>ReadOnly=</varname>/<varname>GrowFileSystem=</varname> the latter control the value of the
+        <varname>NoAuto=</varname>/<varname>ReadOnly=</varname>/<varname>GrowFileSystem=</varname> the latter
-        relevant flags, i.e. the high-level settings
+        control the value of the relevant flags, i.e. the high-level settings
-        <varname>ReadOnly=</varname>/<varname>GrowFileSystem=</varname> override the low-level setting
+        <varname>NoAuto=</varname>/<varname>ReadOnly=</varname>/<varname>GrowFileSystem=</varname> override
-        <varname>Flags=</varname>.</para>
+        the relevant bits of the low-level setting <varname>Flags=</varname>.</para>
 
-        <para>Note that the two flags affect only automatic partition mounting, as implemented by
+        <para>Note that the three flags affect only automatic partition mounting, as implemented by
         <citerefentry><refentrytitle>systemd-gpt-auto-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
         or the <option>--image=</option> option of various commands (such as
         <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>). It
@@ -611,10 +612,10 @@
         precedence in most tools reading these flags, and since growing the file system involves writing to
         the partition it is consequently ignored.</para>
 
-        <para><varname>ReadOnly=</varname> defaults to on for Verity partition
+        <para><varname>NoAuto=</varname> defaults to off. <varname>ReadOnly=</varname> defaults to on for
-        types. <varname>GrowFileSystem=</varname> defaults to on for all partition types that support it,
+        Verity partition types, and off for all others. <varname>GrowFileSystem=</varname> defaults to on for
-        except if the partition is marked read-only (and thus effectively, defaults to off for Verity
+        all partition types that support it, except if the partition is marked read-only (and thus
-        partitions).</para></listitem>
+        effectively, defaults to off for Verity partitions).</para></listitem>
       </varlistentry>
     </variablelist>
   </refsect1>

man/systemd-ask-password.xml

@@ -210,10 +210,19 @@
       <varlistentry>
         <term><option>--no-output</option></term>
 
-        <listitem><para>Do not print passwords to standard output.
+        <listitem><para>Do not print passwords to standard output.  This is useful if you want to store a
-        This is useful if you want to store a password in kernel
+        password in kernel keyring with <option>--keyname=</option> but do not want it to show up on screen
-        keyring with <option>--keyname</option> but do not want it
+        or in logs.</para></listitem>
-        to show up on screen or in logs.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-n</option></term>
+
+        <listitem><para>By default, when writing the acquired password to standard output it is suffixed by a
+        newline character. This may be turned off with the <option>-n</option> switch, similar to the switch
+        of the same name of the <citerefentry
+        project='man-pages'><refentrytitle>echo</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+        command.</para></listitem>
       </varlistentry>
 
       <xi:include href="standard-options.xml" xpointer="help" />

man/systemd-resolved.service.xml

@@ -242,7 +242,7 @@
       control of the client library. <filename>nss-dns</filename> will first try to resolve names using
       search domains and even if those queries are routed to <filename>systemd-resolved</filename>, it will
       send them out over the network using the usual rules for multi-label name routing <footnote><para>For
-      example, if <filename>/etc/nsswitch.conf</filename> has <programlisting>nameserver 127.0.0.53
+      example, if <filename>/etc/resolv.conf</filename> has <programlisting>nameserver 127.0.0.53
 search foobar.com barbar.com
       </programlisting>and we look up <literal>localhost</literal>, <filename>nss-dns</filename> will send
       the following queries to <filename>systemd-resolved</filename> listening on 127.0.0.53:53: first

man/systemd.exec.xml

@@ -675,7 +675,9 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting>
         <varname>SystemCallArchitectures=</varname>,
         <varname>SystemCallFilter=</varname>, or
         <varname>SystemCallLog=</varname> are specified. Note that even if this setting is overridden
-        by them, <command>systemctl show</command> shows the original value of this setting. Also see
+        by them, <command>systemctl show</command> shows the original value of this setting. In case the
+        service will be run in a new mount namespace anyway and SELinux is disabled, all file systems
+        are mounted with <constant>MS_NOSUID</constant> flag. Also see
         <ulink url="https://www.kernel.org/doc/html/latest/userspace-api/no_new_privs.html">No New
         Privileges Flag</ulink>.</para></listitem>
       </varlistentry>

man/systemd.net-naming-scheme.xml

@@ -381,7 +381,12 @@
           <para>Some firmware and hypervisor implementations report unreasonable high numbers for the onboard
           index. To prevent the generation of bogus onbard interface names, index numbers greater than 16381
           (2^14-1) were ignored. For s390 PCI devices index values up to 65535 (2^16-1) are valid. To account
-          for that, the limit is increased to now 65535.</para></listitem>
+          for that, the limit is increased to now 65535.</para>
+
+          <para>The udev rule <varname>NAME=</varname> replaces <literal>:</literal>,
+          <literal>/</literal>, and <literal>%</literal> with an underscore (<literal>_</literal>), and
+          refuses strings which contain only numerics.</para>
+          </listitem>
         </varlistentry>
 
       </variablelist>

man/systemd.network.xml

@@ -220,11 +220,16 @@
           <command>systemd-networkd-wait-online</command>). When <literal>no</literal>, the network is ignored
           when determining the online state. When a minimum operational state and an optional maximum operational
           state are set, <literal>yes</literal> is implied, and this controls the minimum and maximum
-          operational state required for the network interface to be considered online.
+          operational state required for the network interface to be considered online.</para>
-          Defaults to <literal>yes</literal>.</para>
 
-          <para>The network will be brought up normally in all cases, but in
+          <para>Defaults to <literal>yes</literal> when <varname>ActivationPolicy=</varname> is not set,
-          the event that there is no address being assigned by DHCP or the
+          or set to <literal>up</literal>, <literal>always-up</literal>, or <literal>bound</literal>.
+          Defaults to <literal>no</literal> when <varname>ActivationPolicy=</varname> is set to
+          <literal>manual</literal> or <literal>down</literal>. This is forced to <literal>no</literal>
+          when <varname>ActivationPolicy=</varname> is set to <literal>always-down</literal>.</para>
+
+          <para>The network will be brought up normally (as configured by <varname>ActivationPolicy=</varname>),
+          but in the event that there is no address being assigned by DHCP or the
           cable is not plugged in, the link will simply remain offline and be
           skipped automatically by <command>systemd-networkd-wait-online</command>
           if <literal>RequiredForOnline=no</literal>.</para>
@@ -265,6 +270,11 @@
           the administrative state. When <varname>BindCarrier=</varname> is also set, this is
           automatically set to <literal>bound</literal> and any other value is ignored.</para>
 
+          <para>When the policy is set to <literal>down</literal> or <literal>manual</literal>,
+          the default value of <varname>RequiredForOnline=</varname> is <literal>no</literal>.
+          When the policy is set to <literal>always-down</literal>, the value of
+          <varname>RequiredForOnline=</varname> forced to <literal>no</literal>.</para>
+
           <para>The administrative state is not the same as the carrier state, so using
           <literal>always-up</literal> does not mean the link will never lose carrier. The link
           carrier depends on both the administrative state as well as the network device's physical
@@ -1098,8 +1108,8 @@ IPv6Token=prefixstable:2002:da8:1::</programlisting></para>
           <listitem>
             <para>Takes one of <literal>ipv4</literal>, <literal>ipv6</literal>,
             <literal>both</literal>, <literal>none</literal>. When <literal>ipv4</literal>,
-            performs IPv4 Duplicate Address Detection. See
+            performs IPv4 Address Conflict Detection. See
-            <ulink url="https://tools.ietf.org/html/rfc5227">RFC 5224</ulink>.
+            <ulink url="https://tools.ietf.org/html/rfc5227">RFC 5227</ulink>.
             When <literal>ipv6</literal>, performs IPv6 Duplicate Address Detection. See
             <ulink url="https://tools.ietf.org/html/rfc4862">RFC 4862</ulink>.
             Defaults to <literal>ipv6</literal>.</para>

man/systemd.unit.xml

@@ -1646,6 +1646,19 @@
           </listitem>
         </varlistentry>
 
+        <varlistentry>
+          <term><varname>ConditionOSRelease=</varname></term>
+
+          <listitem><para>Verify that a specific <literal>key=value</literal> pair is set in the host's
+          <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
+
+          <para>Other than exact matching with <literal>=</literal>, and <literal>!=</literal>, relative
+          comparisons are supported for versioned parameters (e.g. <literal>VERSION_ID</literal>). The
+          comparator can be one of <literal>&lt;</literal>, <literal>&lt;=</literal>, <literal>=</literal>,
+          <literal>!=</literal>, <literal>&gt;=</literal> and <literal>&gt;</literal>.</para>
+          </listitem>
+        </varlistentry>
+
         <varlistentry>
           <term><varname>AssertArchitecture=</varname></term>
           <term><varname>AssertVirtualization=</varname></term>
@@ -1673,6 +1686,7 @@
           <term><varname>AssertControlGroupController=</varname></term>
           <term><varname>AssertMemory=</varname></term>
           <term><varname>AssertCPUs=</varname></term>
+          <term><varname>AssertOSRelease=</varname></term>
 
           <listitem><para>Similar to the <varname>ConditionArchitecture=</varname>,
           <varname>ConditionVirtualization=</varname>, …, condition settings described above, these settings

man/udev.xml

@@ -117,7 +117,7 @@
           <varlistentry>
             <term><literal>:=</literal></term>
             <listitem>
-              <para>Assign  a  value  to  a key finally; disallow any later changes.</para>
+              <para>Assign a value to a key finally; disallow any later changes.</para>
             </listitem>
           </varlistentry>
         </variablelist>
@@ -607,9 +607,12 @@
                 <varlistentry>
                   <term><option>string_escape=<replaceable>none|replace</replaceable></option></term>
                   <listitem>
-                    <para>Usually, control and other possibly unsafe characters are replaced
+                    <para>When <literal>replace</literal>, possibly unsafe characters in strings
-                    in strings used for device naming. The mode of replacement can be specified
+                    assigned to <varname>NAME</varname>, <varname>SYMLINK</varname>, and
-                    with this option.</para>
+                    <varname>ENV{<replaceable>key</replaceable>}</varname> are replaced. When
+                    <literal>none</literal>, no replacement is performed. When unset, the replacement
+                    is performed for <varname>NAME</varname>, <varname>SYMLINK</varname>, but not for
+                    <varname>ENV{<replaceable>key</replaceable>}</varname>. Defaults to unset.</para>
                   </listitem>
                 </varlistentry>
                 <varlistentry>

meson.build

@@ -793,12 +793,37 @@ endif
 conf.set_quoted('NOBODY_USER_NAME', nobody_user)
 conf.set_quoted('NOBODY_GROUP_NAME', nobody_group)
 
-tty_gid = get_option('tty-gid')
+static_ugids = []
-conf.set('TTY_GID', tty_gid)
+foreach option : ['adm-gid',
+                  'audio-gid',
+                  'cdrom-gid',
+                  'dialout-gid',
+                  'disk-gid',
+                  'input-gid',
+                  'kmem-gid',
+                  'kvm-gid',
+                  'lp-gid',
+                  'render-gid',
+                  'sgx-gid',
+                  'tape-gid',
+                  'tty-gid',
+                  'users-gid',
+                  'utmp-gid',
+                  'video-gid',
+                  'wheel-gid',
+                  'systemd-journal-gid',
+                  'systemd-network-uid',
+                  'systemd-resolve-uid',
+                  'systemd-timesync-uid']
+        name = option.underscorify().to_upper()
+        val = get_option(option)
 
-# Ensure provided GID argument is numeric, otherwise fall back to default assignment
+        # Ensure provided GID argument is numeric, otherwise fall back to default assignment
-users_gid = get_option('users-gid')
+        conf.set(name, val >= 0 ? val : '-')
-conf.set('USERS_GID', users_gid < 0 ? '-' : users_gid)
+        if val >= 0
+                static_ugids += '@0@:@1@'.format(option, val)
+        endif
+endforeach
 
 conf.set10('ENABLE_ADM_GROUP', get_option('adm-group'))
 conf.set10('ENABLE_WHEEL_GROUP', get_option('wheel-group'))
@@ -1682,7 +1707,6 @@ install_libsystemd_static = static_library(
                         libcap,
                         libblkid,
                         libmount,
-                        libselinux,
                         libgcrypt],
         c_args : libsystemd_c_args + (static_libsystemd_pic ? [] : ['-fno-PIC']))
 
@@ -3713,14 +3737,13 @@ status = [
         'extra start script:                @0@'.format(get_option('rc-local')),
         'debug shell:                       @0@ @ @1@'.format(get_option('debug-shell'),
                                                               get_option('debug-tty')),
-        'TTY GID:                           @0@'.format(tty_gid),
-        'users GID:                         @0@'.format(conf.get('USERS_GID')),
         'system UIDs:                       <=@0@ (alloc >=@1@)'.format(conf.get('SYSTEM_UID_MAX'),
                                                                         conf.get('SYSTEM_ALLOC_UID_MIN')),
         'system GIDs:                       <=@0@ (alloc >=@1@)'.format(conf.get('SYSTEM_GID_MAX'),
                                                                         conf.get('SYSTEM_ALLOC_GID_MIN')),
         'dynamic UIDs:                      @0@…@1@'.format(dynamic_uid_min, dynamic_uid_max),
         'container UID bases:               @0@…@1@'.format(container_uid_base_min, container_uid_base_max),
+        'static UID/GID allocations:        @0@'.format(' '.join(static_ugids)),
         '/dev/kvm access mode:              @0@'.format(get_option('dev-kvm-mode')),
         'render group access mode:          @0@'.format(get_option('group-render-mode')),
         'certificate root directory:        @0@'.format(get_option('certificate-root')),

meson_options.txt

@@ -204,6 +204,7 @@ option('status-unit-format-default', type : 'combo',
        description : 'use unit name or description in messages by default')
 option('time-epoch', type : 'integer', value : '-1',
        description : 'time epoch for time clients')
+
 option('system-alloc-uid-min', type : 'integer', value : '-1',
        description : 'minimum system UID used when allocating')
 option('system-alloc-gid-min', type : 'integer', value : '-1',
@@ -220,10 +221,6 @@ option('container-uid-base-min', type : 'integer', value : 0x00080000,
        description : 'minimum container UID base')
 option('container-uid-base-max', type : 'integer', value : 0x6FFF0000,
        description : 'maximum container UID base')
-option('tty-gid', type : 'integer', value : 5,
-       description : 'the numeric GID of the "tty" group')
-option('users-gid', type : 'integer', value : '-1',
-       description : 'the numeric GID of the "users" group')
 option('adm-group', type : 'boolean',
        description : 'the ACL for adm group should be added')
 option('wheel-group', type : 'boolean',
@@ -234,6 +231,49 @@ option('nobody-user', type : 'string',
 option('nobody-group', type : 'string',
        description : 'The name of the nobody group (the one with GID 65534)',
        value : 'nobody')
+option('adm-gid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the "adm" group')
+option('audio-gid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the "audio" group')
+option('cdrom-gid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the "cdrom" group')
+option('dialout-gid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the "dialout" group')
+option('disk-gid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the "disk" group')
+option('input-gid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the "input" group')
+option('kmem-gid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the "kmem" group')
+option('kvm-gid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the "kvm" group')
+option('lp-gid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the "lp" group')
+option('render-gid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the "render" group')
+option('sgx-gid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the "sgx" group')
+option('tape-gid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the "tape" group')
+option('tty-gid', type : 'integer', value : 5,
+       description : 'the numeric GID of the "tty" group')
+option('users-gid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the "users" group')
+option('utmp-gid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the "utmp" group')
+option('video-gid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the "video" group')
+option('wheel-gid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the "wheel" group')
+option('systemd-journal-gid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the systemd-journal group')
+option('systemd-network-uid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the systemd-network user')
+option('systemd-resolve-uid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the systemd-resolve user')
+option('systemd-timesync-uid', type : 'integer', value : '-1',
+       description : 'soft-static allocation for the systemd-timesync user')
+
 option('dev-kvm-mode', type : 'string', value : '0666',
        description : '/dev/kvm access mode')
 option('group-render-mode', type : 'string', value : '0666',

po/ko.po

@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-08 17:48+0100\n"
-"PO-Revision-Date: 2021-04-15 10:01+0000\n"
+"PO-Revision-Date: 2021-06-22 10:04+0000\n"
 "Last-Translator: simmon <simmon@nplob.com>\n"
 "Language-Team: Korean <https://translate.fedoraproject.org/projects/systemd/"
 "master/ko/>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.5.3\n"
+"X-Generator: Weblate 4.7\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
 #: src/core/org.freedesktop.systemd1.policy.in:22
@@ -112,7 +112,7 @@ msgstr "홈 영역 암호 변경"
 #: src/home/org.freedesktop.home1.policy:64
 msgid ""
 "Authentication is required to change the password of a user's home area."
-msgstr "사용자 홈 영역의 암호를 바꾸려면 인증이 필요합니다."
+msgstr "사용자 홈 영역의 비밀번호를 변경하려면 인증이 필요합니다."
 
 #: src/hostname/org.freedesktop.hostname1.policy:20
 msgid "Set hostname"

rules.d/60-persistent-storage.rules

@@ -38,13 +38,13 @@ KERNEL=="nvme*[0-9]n*[0-9]", ENV{DEVTYPE}=="disk", ATTRS{wwid}=="?*", ENV{ID_WWN
 KERNEL=="nvme*[0-9]n*[0-9]", ENV{DEVTYPE}=="disk", ATTRS{model}=="?*", ENV{ID_MODEL}="$attr{model}"
 KERNEL=="nvme*[0-9]n*[0-9]", ENV{DEVTYPE}=="disk", ATTRS{firmware_rev}=="?*", ENV{ID_REVISION}="$attr{firmware_rev}"
 KERNEL=="nvme*[0-9]n*[0-9]", ENV{DEVTYPE}=="disk", ENV{ID_MODEL}=="?*", ENV{ID_SERIAL_SHORT}=="?*", \
-  ENV{ID_SERIAL}="$env{ID_MODEL}_$env{ID_SERIAL_SHORT}", SYMLINK+="disk/by-id/nvme-$env{ID_SERIAL}"
+  OPTIONS="string_escape=replace", ENV{ID_SERIAL}="$env{ID_MODEL}_$env{ID_SERIAL_SHORT}", SYMLINK+="disk/by-id/nvme-$env{ID_SERIAL}"
 
 KERNEL=="nvme*[0-9]n*[0-9]p*[0-9]", ENV{DEVTYPE}=="partition", ATTRS{serial}=="?*", ENV{ID_SERIAL_SHORT}="$attr{serial}"
 KERNEL=="nvme*[0-9]n*[0-9]p*[0-9]", ENV{DEVTYPE}=="partition", ATTRS{model}=="?*", ENV{ID_MODEL}="$attr{model}"
 KERNEL=="nvme*[0-9]n*[0-9]p*[0-9]", ENV{DEVTYPE}=="partition", ATTRS{firmware_rev}=="?*", ENV{ID_REVISION}="$attr{firmware_rev}"
 KERNEL=="nvme*[0-9]n*[0-9]p*[0-9]", ENV{DEVTYPE}=="partition", ENV{ID_MODEL}=="?*", ENV{ID_SERIAL_SHORT}=="?*", \
-  ENV{ID_SERIAL}="$env{ID_MODEL}_$env{ID_SERIAL_SHORT}", SYMLINK+="disk/by-id/nvme-$env{ID_SERIAL}-part%n"
+  OPTIONS="string_escape=replace", ENV{ID_SERIAL}="$env{ID_MODEL}_$env{ID_SERIAL_SHORT}", SYMLINK+="disk/by-id/nvme-$env{ID_SERIAL}-part%n"
 
 # virtio-blk
 KERNEL=="vd*[!0-9]", ATTRS{serial}=="?*", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/virtio-$env{ID_SERIAL}"

shell-completion/bash/bootctl

@@ -69,7 +69,7 @@ _bootctl() {
         fi
     done
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
     elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
         comps=''

shell-completion/bash/busctl

@@ -140,7 +140,7 @@ _busctl() {
 
     n=$(($COMP_CWORD - $i))
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
     elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
         comps=''

shell-completion/bash/coredumpctl

@@ -83,7 +83,7 @@ _coredumpctl() {
             fi
         done
 
-        if [[ -z $verb ]]; then
+        if [[ -z ${verb-} ]]; then
             comps=${VERBS[*]}
         elif __contains_word "$verb" ${VERBS[LIST]} ${VERBS[DUMP]}; then
             comps=''

shell-completion/bash/homectl

@@ -170,7 +170,7 @@ _homectl() {
         fi
     done
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
     elif __contains_word "$verb" ${VERBS[NAME]}; then
         comps=$(__get_homes)

shell-completion/bash/hostnamectl

@@ -39,7 +39,7 @@ _hostnamectl() {
         [ARG]='-H --host -M --machine --json'
     )
 
-    if __contains_word "$prev" ${OPTS[ARG]} ${OPTS[ARGUNKNOWN]}; then
+    if __contains_word "$prev" ${OPTS[ARG]}; then
         case $prev in
             --host|-H)
                 comps=$(compgen -A hostname)
@@ -77,7 +77,7 @@ _hostnamectl() {
         fi
     done
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
     elif __contains_word "$verb" ${VERBS[CHASSIS]}; then
         comps='desktop laptop convertible server tablet handset watch embedded vm container'

shell-completion/bash/localectl

@@ -67,7 +67,7 @@ _localectl() {
         fi
     done
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
     elif __contains_word "$verb" ${VERBS[VARIANTS]}; then
         comps=$(command localectl list-x11-keymap-layouts)

shell-completion/bash/loginctl

@@ -93,7 +93,7 @@ _loginctl () {
         fi
     done
 
-    if   [[ -z $verb ]]; then
+    if   [[ -z ${verb-} ]]; then
         comps="${VERBS[*]}"
 
     elif __contains_word "$verb" ${VERBS[SESSIONS]}; then

shell-completion/bash/machinectl

@@ -95,7 +95,7 @@ _machinectl() {
         return 0
     fi
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
 
     elif __contains_word "$verb" ${VERBS[STANDALONE]}; then

shell-completion/bash/networkctl

@@ -69,7 +69,7 @@ _networkctl() {
         return 0
     fi
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
     elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
         comps=''

shell-completion/bash/portablectl

@@ -79,7 +79,7 @@ _portablectl() {
 
     n=$(($COMP_CWORD - $i))
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
     elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
         comps=''

shell-completion/bash/resolvectl

@@ -87,7 +87,7 @@ _resolvectl() {
         fi
     done
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps="${VERBS[*]}"
 
     elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[DOMAIN]}; then

shell-completion/bash/systemctl.in

@@ -254,7 +254,7 @@ _systemctl () {
         cur_orig="$(printf '%q' $cur)"
     fi
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps="${VERBS[*]}"
 
     elif __contains_word "$verb" ${VERBS[ALL_UNITS]}; then

shell-completion/bash/systemd-analyze

@@ -93,12 +93,12 @@ _systemd_analyze() {
         return 0
     fi
 
-    if [[ -z $verb  && $cur = -* ]]; then
+    if [[ -z ${verb-}  && $cur = -* ]]; then
         COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
         return 0
     fi
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
 
     elif __contains_word "$verb" ${VERBS[STANDALONE]}; then

shell-completion/bash/systemd-delta

@@ -48,12 +48,12 @@ _systemd-delta() {
         return 0
     fi
 
-    if [[ "$cur" = -* ]]; then
+    if [[ "$cur" = -* ]] || [[ -z ${comps-} ]]; then
         COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
         return 0
     fi
 
-    COMPREPLY=( $(compgen -W '$comps' -- "$cur") )
+    COMPREPLY=( $(compgen -W '${comps-}' -- "$cur") )
     return 0
 }
 

shell-completion/bash/systemd-id128

@@ -61,7 +61,7 @@ _systemd_id128() {
         fi
     done
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
     elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
         comps=''

shell-completion/bash/systemd-resolve

@@ -71,7 +71,7 @@ _systemd-resolve() {
         return 0
     fi
 
-    if [[ "$cur" = -* ]]; then
+    if [[ "$cur" = -* ]] || [[ -z ${comps-} ]]; then
         COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") )
         return 0
     fi

shell-completion/bash/timedatectl

@@ -76,7 +76,7 @@ _timedatectl() {
         fi
     done
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         comps=${VERBS[*]}
     elif __contains_word "$verb" ${VERBS[BOOLEAN]}; then
         comps='true false'

shell-completion/bash/udevadm

@@ -73,7 +73,7 @@ _udevadm() {
         fi
     done
 
-    if [[ -z $verb ]]; then
+    if [[ -z ${verb-} ]]; then
         if [[ "$cur" = -* ]]; then
             COMPREPLY=( $(compgen -W '${OPTS[COMMON]} ${OPTS[DEBUG]}' -- "$cur") )
         else

shell-completion/zsh/_bootctl

@@ -1,4 +1,4 @@
-#compdef bootctl                    -*- shell-script -*-
+#compdef bootctl
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 __bootctl() {

shell-completion/zsh/_busctl

@@ -1,4 +1,4 @@
-#compdef busctl                    -*- shell-script -*-
+#compdef busctl
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 # busctl(1) completion                               -*- shell-script -*-

shell-completion/zsh/_coredumpctl

@@ -1,4 +1,4 @@
-#compdef coredumpctl                    -*- shell-script -*-
+#compdef coredumpctl
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 (( $+functions[_coredumpctl_commands] )) ||

shell-completion/zsh/_hostnamectl

@@ -1,4 +1,4 @@
-#compdef hostnamectl                    -*- shell-script -*-
+#compdef hostnamectl
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 (( $+functions[_hostnamectl_hostname] )) ||

shell-completion/zsh/_journalctl

@@ -1,4 +1,4 @@
-#compdef journalctl                    -*- shell-script -*-
+#compdef journalctl
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 (( $+functions[_journalctl_fields] )) ||

shell-completion/zsh/_kernel-install

@@ -1,4 +1,4 @@
-#compdef kernel-install                    -*- shell-script -*-
+#compdef kernel-install
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 (( $+functions[_kernel-install_images] )) ||

shell-completion/zsh/_localectl

@@ -1,4 +1,4 @@
-#compdef localectl                    -*- shell-script -*-
+#compdef localectl
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 (( $+functions[_localectl_set-locale] )) ||

shell-completion/zsh/_loginctl

@@ -1,4 +1,4 @@
-#compdef loginctl                    -*- shell-script -*-
+#compdef loginctl
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 (( $+functions[_loginctl_all_sessions] )) ||

shell-completion/zsh/_machinectl

@@ -1,4 +1,4 @@
-#compdef machinectl                    -*- shell-script -*-
+#compdef machinectl
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 (( $+functions[__machinectl_get_machines] )) ||

shell-completion/zsh/_networkctl

@@ -1,4 +1,4 @@
-#compdef networkctl                    -*- shell-script -*-
+#compdef networkctl
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 (( $+functions[_networkctl_commands] )) ||

shell-completion/zsh/_resolvectl

@@ -1,4 +1,4 @@
-#compdef resolvectl systemd-resolve         -*- shell-script -*-
+#compdef resolvectl systemd-resolve
 # SPDX-License-Identifier: LGPL-2.1-or-later
 #
 # This file is part of systemd.

shell-completion/zsh/_systemctl.in

@@ -1,4 +1,4 @@
-#compdef systemctl                    -*- shell-script -*-
+#compdef systemctl
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 (( $+functions[_systemctl_commands] )) || _systemctl_commands()

shell-completion/zsh/_systemd

@@ -1,4 +1,4 @@
-#compdef systemd-cat systemd-ask-password systemd-cgls systemd-cgtop systemd-detect-virt systemd-machine-id-setup systemd-notify systemd-tty-ask-password-agent                    -*- shell-script -*-
+#compdef systemd-cat systemd-ask-password systemd-cgls systemd-cgtop systemd-detect-virt systemd-machine-id-setup systemd-notify systemd-tty-ask-password-agent
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 local curcontext="$curcontext" state lstate line

shell-completion/zsh/_systemd-analyze

@@ -1,4 +1,4 @@
-#compdef systemd-analyze                    -*- shell-script -*-
+#compdef systemd-analyze
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 (( $+functions[_systemd-analyze_log-level] )) ||

shell-completion/zsh/_systemd-delta

@@ -1,4 +1,4 @@
-#compdef systemd-delta                    -*- shell-script -*-
+#compdef systemd-delta
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 (( $+functions[_systemd-delta_types] )) ||

shell-completion/zsh/_systemd-inhibit

@@ -1,4 +1,4 @@
-#compdef systemd-inhibit                    -*- shell-script -*-
+#compdef systemd-inhibit
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 (( $+functions[_systemd-inhibit_commands] )) ||

shell-completion/zsh/_systemd-nspawn

@@ -1,4 +1,4 @@
-#compdef systemd-nspawn                    -*- shell-script -*-
+#compdef systemd-nspawn
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 (( $+functions[_systemd-nspawn_caps] )) ||

shell-completion/zsh/_systemd-run

@@ -1,4 +1,4 @@
-#compdef systemd-run                    -*- shell-script -*-
+#compdef systemd-run
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 # @todo _systemctl has a helper with the same name, so we must redefine

shell-completion/zsh/_systemd-tmpfiles

@@ -1,4 +1,4 @@
-#compdef systemd-tmpfiles                    -*- shell-script -*-
+#compdef systemd-tmpfiles
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 _arguments \

shell-completion/zsh/_timedatectl

@@ -1,4 +1,4 @@
-#compdef timedatectl                    -*- shell-script -*-
+#compdef timedatectl
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 _timedatectl_set-timezone(){

shell-completion/zsh/_udevadm

@@ -1,4 +1,4 @@
-#compdef udevadm                    -*- shell-script -*-
+#compdef udevadm
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 (( $+functions[_udevadm_info] )) ||

src/ask-password/ask-password.c

@@ -24,6 +24,7 @@ static usec_t arg_timeout = DEFAULT_TIMEOUT_USEC;
 static bool arg_multiple = false;
 static bool arg_no_output = false;
 static AskPasswordFlags arg_flags = ASK_PASSWORD_PUSH_CACHE;
+static bool arg_newline = true;
 
 STATIC_DESTRUCTOR_REGISTER(arg_message, freep);
 
@@ -54,6 +55,8 @@ static int help(void) {
                "     --accept-cached  Accept cached passwords\n"
                "     --multiple       List multiple passwords if available\n"
                "     --no-output      Do not print password to standard output\n"
+               "  -n                  Do not suffix password written to standard output with\n"
+               "                      newline\n"
                "\nSee the %2$s for details.\n",
                program_invocation_short_name,
                link,
@@ -104,7 +107,7 @@ static int parse_argv(int argc, char *argv[]) {
 
         /* Note the asymmetry: the long option --echo= allows an optional argument, the short option does
          * not. */
-        while ((c = getopt_long(argc, argv, "+he", options, NULL)) >= 0)
+        while ((c = getopt_long(argc, argv, "+hen", options, NULL)) >= 0)
 
                 switch (c) {
 
@@ -177,6 +180,10 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_credential_name = optarg;
                         break;
 
+                case 'n':
+                        arg_newline = false;
+                        break;
+
                 case '?':
                         return -EINVAL;
 
@@ -237,8 +244,14 @@ static int run(int argc, char *argv[]) {
                 return log_error_errno(r, "Failed to query password: %m");
 
         STRV_FOREACH(p, l) {
-                if (!arg_no_output)
+                if (!arg_no_output) {
-                        puts(*p);
+                        if (arg_newline)
+                                puts(*p);
+                        else
+                                fputs(*p, stdout);
+                }
+
+                fflush(stdout);
 
                 if (!arg_multiple)
                         break;

src/basic/dirent-util.c

@@ -7,7 +7,7 @@
 #include "path-util.h"
 #include "string-util.h"
 
-int dirent_ensure_type(DIR *d, struct dirent *de) {
+static int dirent_ensure_type(DIR *d, struct dirent *de) {
         struct stat st;
 
         assert(d);
@@ -59,11 +59,23 @@ bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) {
         return endswith(de->d_name, suffix);
 }
 
-struct dirent* readdir_no_dot(DIR *dirp) {
+struct dirent *readdir_ensure_type(DIR *d) {
-        struct dirent* d;
+        struct dirent *de;
+
+        assert(d);
+
+        errno = 0;
+        de = readdir(d);
+        if (de)
+                (void) dirent_ensure_type(d, de);
+        return de;
+}
+
+struct dirent *readdir_no_dot(DIR *dirp) {
+        struct dirent *d;
 
         for (;;) {
-                d = readdir(dirp);
+                d = readdir_ensure_type(dirp);
                 if (d && dot_or_dot_dot(d->d_name))
                         continue;
                 return d;

src/basic/dirent-util.h

@@ -8,15 +8,14 @@
 #include "macro.h"
 #include "path-util.h"
 
-int dirent_ensure_type(DIR *d, struct dirent *de);
-
 bool dirent_is_file(const struct dirent *de) _pure_;
 bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) _pure_;
 
-struct dirent* readdir_no_dot(DIR *dirp);
+struct dirent *readdir_ensure_type(DIR *d);
+struct dirent *readdir_no_dot(DIR *dirp);
 
 #define FOREACH_DIRENT(de, d, on_error)                                 \
-        for (errno = 0, de = readdir(d);; errno = 0, de = readdir(d))   \
+        for (de = readdir_ensure_type(d);; de = readdir_ensure_type(d)) \
                 if (!de) {                                              \
                         if (errno > 0) {                                \
                                 on_error;                               \
@@ -27,7 +26,7 @@ struct dirent* readdir_no_dot(DIR *dirp);
                 else
 
 #define FOREACH_DIRENT_ALL(de, d, on_error)                             \
-        for (errno = 0, de = readdir(d);; errno = 0, de = readdir(d))   \
+        for (de = readdir_ensure_type(d);; de = readdir_ensure_type(d)) \
                 if (!de) {                                              \
                         if (errno > 0) {                                \
                                 on_error;                               \

src/basic/dlfcn-util.c

@@ -1,40 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-
-#include "dlfcn-util.h"
-
-int dlsym_many_and_warn(void *dl, int level, ...) {
-        va_list ap;
-        int r;
-
-        /* Tries to resolve a bunch of function symbols, and logs errors about the ones it cannot
-         * resolve. Note that this function possibly modifies the supplied function pointers if the whole
-         * operation fails */
-
-        va_start(ap, level);
-
-        for (;;) {
-                void (**fn)(void);
-                void (*tfn)(void);
-                const char *symbol;
-
-                fn = va_arg(ap, typeof(fn));
-                if (!fn)
-                        break;
-
-                symbol = va_arg(ap, typeof(symbol));
-
-                tfn = (typeof(tfn)) dlsym(dl, symbol);
-                if (!tfn) {
-                        r = log_full_errno(level,
-                                           SYNTHETIC_ERRNO(ELIBBAD),
-                                           "Can't find symbol %s: %s", symbol, dlerror());
-                        va_end(ap);
-                        return r;
-                }
-
-                *fn = tfn;
-        }
-
-        va_end(ap);
-        return 0;
-}

src/basic/dlfcn-util.h

@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-#pragma once
-
-#include <dlfcn.h>
-
-#include "macro.h"
-
-DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(void*, dlclose, NULL);
-
-int dlsym_many_and_warn(void *dl, int level, ...);
-
-/* Macro useful for putting together variable/symbol name pairs when calling dlsym_many_and_warn(). Assumes
- * that each library symbol to resolve will be placed in a variable with the "sym_" prefix, i.e. a symbol
- * "foobar" is loaded into a variable "sym_foobar". */
-#define DLSYM_ARG(arg) \
-        &sym_##arg, STRINGIFY(arg)

src/basic/extract-word.c

@@ -27,6 +27,7 @@ int extract_first_word(const char **p, char **ret, const char *separators, Extra
 
         assert(p);
         assert(ret);
+        assert(!FLAGS_SET(flags, EXTRACT_KEEP_QUOTE | EXTRACT_UNQUOTE));
 
         /* Bail early if called after last value or with no input */
         if (!*p)
@@ -50,7 +51,8 @@ int extract_first_word(const char **p, char **ret, const char *separators, Extra
                         goto finish_force_terminate;
                 else if (strchr(separators, c)) {
                         if (flags & EXTRACT_DONT_COALESCE_SEPARATORS) {
-                                (*p)++;
+                                if (!(flags & EXTRACT_RETAIN_SEPARATORS))
+                                        (*p)++;
                                 goto finish_force_next;
                         }
                 } else {
@@ -123,48 +125,58 @@ int extract_first_word(const char **p, char **ret, const char *separators, Extra
                                         return -EINVAL;
                                 } else if (c == quote) {        /* found the end quote */
                                         quote = 0;
-                                        break;
+                                        if (flags & EXTRACT_UNQUOTE)
+                                                break;
                                 } else if (c == '\\' && !(flags & EXTRACT_RETAIN_ESCAPE)) {
                                         backslash = true;
                                         break;
-                                } else {
-                                        if (!GREEDY_REALLOC(s, sz+2))
-                                                return -ENOMEM;
-
-                                        s[sz++] = c;
                                 }
+
+                                if (!GREEDY_REALLOC(s, sz+2))
+                                        return -ENOMEM;
+
+                                s[sz++] = c;
+
+                                if (quote == 0)
+                                        break;
                         }
 
                 } else {
                         for (;; (*p)++, c = **p) {
                                 if (c == 0)
                                         goto finish_force_terminate;
-                                else if (IN_SET(c, '\'', '"') && (flags & EXTRACT_UNQUOTE)) {
+                                else if (IN_SET(c, '\'', '"') && (flags & (EXTRACT_KEEP_QUOTE | EXTRACT_UNQUOTE))) {
                                         quote = c;
-                                        break;
+                                        if (flags & EXTRACT_UNQUOTE)
+                                                break;
                                 } else if (c == '\\' && !(flags & EXTRACT_RETAIN_ESCAPE)) {
                                         backslash = true;
                                         break;
                                 } else if (strchr(separators, c)) {
                                         if (flags & EXTRACT_DONT_COALESCE_SEPARATORS) {
-                                                (*p)++;
+                                                if (!(flags & EXTRACT_RETAIN_SEPARATORS))
+                                                        (*p)++;
                                                 goto finish_force_next;
                                         }
-                                        /* Skip additional coalesced separators. */
+                                        if (!(flags & EXTRACT_RETAIN_SEPARATORS))
-                                        for (;; (*p)++, c = **p) {
+                                                /* Skip additional coalesced separators. */
-                                                if (c == 0)
+                                                for (;; (*p)++, c = **p) {
-                                                        goto finish_force_terminate;
+                                                        if (c == 0)
-                                                if (!strchr(separators, c))
+                                                                goto finish_force_terminate;
-                                                        break;
+                                                        if (!strchr(separators, c))
-                                        }
+                                                                break;
+                                                }
                                         goto finish;
 
-                                } else {
-                                        if (!GREEDY_REALLOC(s, sz+2))
-                                                return -ENOMEM;
-
-                                        s[sz++] = c;
                                 }
+
+                                if (!GREEDY_REALLOC(s, sz+2))
+                                        return -ENOMEM;
+
+                                s[sz++] = c;
+
+                                if (quote != 0)
+                                        break;
                         }
                 }
         }

src/basic/extract-word.h

@@ -8,9 +8,11 @@ typedef enum ExtractFlags {
         EXTRACT_CUNESCAPE                = 1 << 1, /* Unescape known escape sequences. */
         EXTRACT_UNESCAPE_RELAX           = 1 << 2, /* Allow and keep unknown escape sequences, allow and keep trailing backslash. */
         EXTRACT_UNESCAPE_SEPARATORS      = 1 << 3, /* Unescape separators (those specified, or whitespace by default). */
-        EXTRACT_UNQUOTE                  = 1 << 4, /* Remove quoting with "" and ''. */
+        EXTRACT_KEEP_QUOTE               = 1 << 4, /* Ignore separators in quoting with "" and ''. */
-        EXTRACT_DONT_COALESCE_SEPARATORS = 1 << 5, /* Don't treat multiple adjacent separators as one */
+        EXTRACT_UNQUOTE                  = 1 << 5, /* Ignore separators in quoting with "" and '', and remove the quotes. */
-        EXTRACT_RETAIN_ESCAPE            = 1 << 6, /* Treat escape character '\' as any other character without special meaning */
+        EXTRACT_DONT_COALESCE_SEPARATORS = 1 << 6, /* Don't treat multiple adjacent separators as one */
+        EXTRACT_RETAIN_ESCAPE            = 1 << 7, /* Treat escape character '\' as any other character without special meaning */
+        EXTRACT_RETAIN_SEPARATORS        = 1 << 8, /* Do not advance the original string pointer past the separator(s) */
 
         /* Note that if no flags are specified, escaped escape characters will be silently stripped. */
 } ExtractFlags;

src/basic/fd-util.c

@@ -2,19 +2,20 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <linux/btrfs.h>
+#include <linux/magic.h>
+#include <sys/ioctl.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "copy.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
 #include "io-util.h"
 #include "macro.h"
-#include "memfd-util.h"
 #include "missing_fcntl.h"
 #include "missing_syscall.h"
 #include "parse-util.h"
@@ -520,343 +521,6 @@ int move_fd(int from, int to, int cloexec) {
         return to;
 }
 
-int acquire_data_fd(const void *data, size_t size, unsigned flags) {
-
-        _cleanup_close_pair_ int pipefds[2] = { -1, -1 };
-        char pattern[] = "/dev/shm/data-fd-XXXXXX";
-        _cleanup_close_ int fd = -1;
-        int isz = 0, r;
-        ssize_t n;
-        off_t f;
-
-        assert(data || size == 0);
-
-        /* Acquire a read-only file descriptor that when read from returns the specified data. This is much more
-         * complex than I wish it was. But here's why:
-         *
-         * a) First we try to use memfds. They are the best option, as we can seal them nicely to make them
-         *    read-only. Unfortunately they require kernel 3.17, and – at the time of writing – we still support 3.14.
-         *
-         * b) Then, we try classic pipes. They are the second best options, as we can close the writing side, retaining
-         *    a nicely read-only fd in the reading side. However, they are by default quite small, and unprivileged
-         *    clients can only bump their size to a system-wide limit, which might be quite low.
-         *
-         * c) Then, we try an O_TMPFILE file in /dev/shm (that dir is the only suitable one known to exist from
-         *    earliest boot on). To make it read-only we open the fd a second time with O_RDONLY via
-         *    /proc/self/<fd>. Unfortunately O_TMPFILE is not available on older kernels on tmpfs.
-         *
-         * d) Finally, we try creating a regular file in /dev/shm, which we then delete.
-         *
-         * It sucks a bit that depending on the situation we return very different objects here, but that's Linux I
-         * figure. */
-
-        if (size == 0 && ((flags & ACQUIRE_NO_DEV_NULL) == 0)) {
-                /* As a special case, return /dev/null if we have been called for an empty data block */
-                r = open("/dev/null", O_RDONLY|O_CLOEXEC|O_NOCTTY);
-                if (r < 0)
-                        return -errno;
-
-                return r;
-        }
-
-        if ((flags & ACQUIRE_NO_MEMFD) == 0) {
-                fd = memfd_new("data-fd");
-                if (fd < 0)
-                        goto try_pipe;
-
-                n = write(fd, data, size);
-                if (n < 0)
-                        return -errno;
-                if ((size_t) n != size)
-                        return -EIO;
-
-                f = lseek(fd, 0, SEEK_SET);
-                if (f != 0)
-                        return -errno;
-
-                r = memfd_set_sealed(fd);
-                if (r < 0)
-                        return r;
-
-                return TAKE_FD(fd);
-        }
-
-try_pipe:
-        if ((flags & ACQUIRE_NO_PIPE) == 0) {
-                if (pipe2(pipefds, O_CLOEXEC|O_NONBLOCK) < 0)
-                        return -errno;
-
-                isz = fcntl(pipefds[1], F_GETPIPE_SZ, 0);
-                if (isz < 0)
-                        return -errno;
-
-                if ((size_t) isz < size) {
-                        isz = (int) size;
-                        if (isz < 0 || (size_t) isz != size)
-                                return -E2BIG;
-
-                        /* Try to bump the pipe size */
-                        (void) fcntl(pipefds[1], F_SETPIPE_SZ, isz);
-
-                        /* See if that worked */
-                        isz = fcntl(pipefds[1], F_GETPIPE_SZ, 0);
-                        if (isz < 0)
-                                return -errno;
-
-                        if ((size_t) isz < size)
-                                goto try_dev_shm;
-                }
-
-                n = write(pipefds[1], data, size);
-                if (n < 0)
-                        return -errno;
-                if ((size_t) n != size)
-                        return -EIO;
-
-                (void) fd_nonblock(pipefds[0], false);
-
-                return TAKE_FD(pipefds[0]);
-        }
-
-try_dev_shm:
-        if ((flags & ACQUIRE_NO_TMPFILE) == 0) {
-                fd = open("/dev/shm", O_RDWR|O_TMPFILE|O_CLOEXEC, 0500);
-                if (fd < 0)
-                        goto try_dev_shm_without_o_tmpfile;
-
-                n = write(fd, data, size);
-                if (n < 0)
-                        return -errno;
-                if ((size_t) n != size)
-                        return -EIO;
-
-                /* Let's reopen the thing, in order to get an O_RDONLY fd for the original O_RDWR one */
-                return fd_reopen(fd, O_RDONLY|O_CLOEXEC);
-        }
-
-try_dev_shm_without_o_tmpfile:
-        if ((flags & ACQUIRE_NO_REGULAR) == 0) {
-                fd = mkostemp_safe(pattern);
-                if (fd < 0)
-                        return fd;
-
-                n = write(fd, data, size);
-                if (n < 0) {
-                        r = -errno;
-                        goto unlink_and_return;
-                }
-                if ((size_t) n != size) {
-                        r = -EIO;
-                        goto unlink_and_return;
-                }
-
-                /* Let's reopen the thing, in order to get an O_RDONLY fd for the original O_RDWR one */
-                r = open(pattern, O_RDONLY|O_CLOEXEC);
-                if (r < 0)
-                        r = -errno;
-
-        unlink_and_return:
-                (void) unlink(pattern);
-                return r;
-        }
-
-        return -EOPNOTSUPP;
-}
-
-/* When the data is smaller or equal to 64K, try to place the copy in a memfd/pipe */
-#define DATA_FD_MEMORY_LIMIT (64U*1024U)
-
-/* If memfd/pipe didn't work out, then let's use a file in /tmp up to a size of 1M. If it's large than that use /var/tmp instead. */
-#define DATA_FD_TMP_LIMIT (1024U*1024U)
-
-int fd_duplicate_data_fd(int fd) {
-
-        _cleanup_close_ int copy_fd = -1, tmp_fd = -1;
-        _cleanup_free_ void *remains = NULL;
-        size_t remains_size = 0;
-        const char *td;
-        struct stat st;
-        int r;
-
-        /* Creates a 'data' fd from the specified source fd, containing all the same data in a read-only fashion, but
-         * independent of it (i.e. the source fd can be closed and unmounted after this call succeeded). Tries to be
-         * somewhat smart about where to place the data. In the best case uses a memfd(). If memfd() are not supported
-         * uses a pipe instead. For larger data will use an unlinked file in /tmp, and for even larger data one in
-         * /var/tmp. */
-
-        if (fstat(fd, &st) < 0)
-                return -errno;
-
-        /* For now, let's only accept regular files, sockets, pipes and char devices */
-        if (S_ISDIR(st.st_mode))
-                return -EISDIR;
-        if (S_ISLNK(st.st_mode))
-                return -ELOOP;
-        if (!S_ISREG(st.st_mode) && !S_ISSOCK(st.st_mode) && !S_ISFIFO(st.st_mode) && !S_ISCHR(st.st_mode))
-                return -EBADFD;
-
-        /* If we have reason to believe the data is bounded in size, then let's use memfds or pipes as backing fd. Note
-         * that we use the reported regular file size only as a hint, given that there are plenty special files in
-         * /proc and /sys which report a zero file size but can be read from. */
-
-        if (!S_ISREG(st.st_mode) || st.st_size < DATA_FD_MEMORY_LIMIT) {
-
-                /* Try a memfd first */
-                copy_fd = memfd_new("data-fd");
-                if (copy_fd >= 0) {
-                        off_t f;
-
-                        r = copy_bytes(fd, copy_fd, DATA_FD_MEMORY_LIMIT, 0);
-                        if (r < 0)
-                                return r;
-
-                        f = lseek(copy_fd, 0, SEEK_SET);
-                        if (f != 0)
-                                return -errno;
-
-                        if (r == 0) {
-                                /* Did it fit into the limit? If so, we are done. */
-                                r = memfd_set_sealed(copy_fd);
-                                if (r < 0)
-                                        return r;
-
-                                return TAKE_FD(copy_fd);
-                        }
-
-                        /* Hmm, pity, this didn't fit. Let's fall back to /tmp then, see below */
-
-                } else {
-                        _cleanup_(close_pairp) int pipefds[2] = { -1, -1 };
-                        int isz;
-
-                        /* If memfds aren't available, use a pipe. Set O_NONBLOCK so that we will get EAGAIN rather
-                         * then block indefinitely when we hit the pipe size limit */
-
-                        if (pipe2(pipefds, O_CLOEXEC|O_NONBLOCK) < 0)
-                                return -errno;
-
-                        isz = fcntl(pipefds[1], F_GETPIPE_SZ, 0);
-                        if (isz < 0)
-                                return -errno;
-
-                        /* Try to enlarge the pipe size if necessary */
-                        if ((size_t) isz < DATA_FD_MEMORY_LIMIT) {
-
-                                (void) fcntl(pipefds[1], F_SETPIPE_SZ, DATA_FD_MEMORY_LIMIT);
-
-                                isz = fcntl(pipefds[1], F_GETPIPE_SZ, 0);
-                                if (isz < 0)
-                                        return -errno;
-                        }
-
-                        if ((size_t) isz >= DATA_FD_MEMORY_LIMIT) {
-
-                                r = copy_bytes_full(fd, pipefds[1], DATA_FD_MEMORY_LIMIT, 0, &remains, &remains_size, NULL, NULL);
-                                if (r < 0 && r != -EAGAIN)
-                                        return r; /* If we get EAGAIN it could be because of the source or because of
-                                                   * the destination fd, we can't know, as sendfile() and friends won't
-                                                   * tell us. Hence, treat this as reason to fall back, just to be
-                                                   * sure. */
-                                if (r == 0) {
-                                        /* Everything fit in, yay! */
-                                        (void) fd_nonblock(pipefds[0], false);
-
-                                        return TAKE_FD(pipefds[0]);
-                                }
-
-                                /* Things didn't fit in. But we read data into the pipe, let's remember that, so that
-                                 * when writing the new file we incorporate this first. */
-                                copy_fd = TAKE_FD(pipefds[0]);
-                        }
-                }
-        }
-
-        /* If we have reason to believe this will fit fine in /tmp, then use that as first fallback. */
-        if ((!S_ISREG(st.st_mode) || st.st_size < DATA_FD_TMP_LIMIT) &&
-            (DATA_FD_MEMORY_LIMIT + remains_size) < DATA_FD_TMP_LIMIT) {
-                off_t f;
-
-                tmp_fd = open_tmpfile_unlinkable(NULL /* NULL as directory means /tmp */, O_RDWR|O_CLOEXEC);
-                if (tmp_fd < 0)
-                        return tmp_fd;
-
-                if (copy_fd >= 0) {
-                        /* If we tried a memfd/pipe first and it ended up being too large, then copy this into the
-                         * temporary file first. */
-
-                        r = copy_bytes(copy_fd, tmp_fd, UINT64_MAX, 0);
-                        if (r < 0)
-                                return r;
-
-                        assert(r == 0);
-                }
-
-                if (remains_size > 0) {
-                        /* If there were remaining bytes (i.e. read into memory, but not written out yet) from the
-                         * failed copy operation, let's flush them out next. */
-
-                        r = loop_write(tmp_fd, remains, remains_size, false);
-                        if (r < 0)
-                                return r;
-                }
-
-                r = copy_bytes(fd, tmp_fd, DATA_FD_TMP_LIMIT - DATA_FD_MEMORY_LIMIT - remains_size, COPY_REFLINK);
-                if (r < 0)
-                        return r;
-                if (r == 0)
-                        goto finish;  /* Yay, it fit in */
-
-                /* It didn't fit in. Let's not forget to use what we already used */
-                f = lseek(tmp_fd, 0, SEEK_SET);
-                if (f != 0)
-                        return -errno;
-
-                CLOSE_AND_REPLACE(copy_fd, tmp_fd);
-
-                remains = mfree(remains);
-                remains_size = 0;
-        }
-
-        /* As last fallback use /var/tmp */
-        r = var_tmp_dir(&td);
-        if (r < 0)
-                return r;
-
-        tmp_fd = open_tmpfile_unlinkable(td, O_RDWR|O_CLOEXEC);
-        if (tmp_fd < 0)
-                return tmp_fd;
-
-        if (copy_fd >= 0) {
-                /* If we tried a memfd/pipe first, or a file in /tmp, and it ended up being too large, than copy this
-                 * into the temporary file first. */
-                r = copy_bytes(copy_fd, tmp_fd, UINT64_MAX, COPY_REFLINK);
-                if (r < 0)
-                        return r;
-
-                assert(r == 0);
-        }
-
-        if (remains_size > 0) {
-                /* Then, copy in any read but not yet written bytes. */
-                r = loop_write(tmp_fd, remains, remains_size, false);
-                if (r < 0)
-                        return r;
-        }
-
-        /* Copy in the rest */
-        r = copy_bytes(fd, tmp_fd, UINT64_MAX, COPY_REFLINK);
-        if (r < 0)
-                return r;
-
-        assert(r == 0);
-
-finish:
-        /* Now convert the O_RDWR file descriptor into an O_RDONLY one (and as side effect seek to the beginning of the
-         * file again */
-
-        return fd_reopen(tmp_fd, O_RDONLY|O_CLOEXEC);
-}
-
 int fd_move_above_stdio(int fd) {
         int flags, copy;
         PROTECT_ERRNO;
@@ -1057,3 +721,20 @@ int read_nr_open(void) {
         /* If we fail, fall back to the hard-coded kernel limit of 1024 * 1024. */
         return 1024 * 1024;
 }
+
+/* This is here because it's fd-related and is called from sd-journal code. Other btrfs-related utilities are
+ * in src/shared, but libsystemd must not link to libsystemd-shared, see docs/ARCHITECTURE.md. */
+int btrfs_defrag_fd(int fd) {
+        int r;
+
+        assert(fd >= 0);
+
+        r = fd_verify_regular(fd);
+        if (r < 0)
+                return r;
+
+        if (ioctl(fd, BTRFS_IOC_DEFRAG, NULL) < 0)
+                return -errno;
+
+        return 0;
+}

src/basic/fd-util.h

@@ -76,10 +76,6 @@ enum {
         ACQUIRE_NO_REGULAR  = 1 << 4,
 };
 
-int acquire_data_fd(const void *data, size_t size, unsigned flags);
-
-int fd_duplicate_data_fd(int fd);
-
 int fd_move_above_stdio(int fd);
 
 int rearrange_stdio(int original_input_fd, int original_output_fd, int original_error_fd);
@@ -107,5 +103,5 @@ static inline int make_null_stdio(void) {
 
 
 int fd_reopen(int fd, int flags);
-
 int read_nr_open(void);
+int btrfs_defrag_fd(int fd);

src/basic/fs-util.c

@@ -8,7 +8,6 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "blockdev-util.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"
@@ -581,8 +580,6 @@ int get_files_in_directory(const char *path, char ***list) {
                 return -errno;
 
         FOREACH_DIRENT_ALL(de, d, return -errno) {
-                dirent_ensure_type(d, de);
-
                 if (!dirent_is_file(de))
                         continue;
 
@@ -1504,91 +1501,6 @@ int open_parent(const char *path, int flags, mode_t mode) {
         return fd;
 }
 
-static int blockdev_is_encrypted(const char *sysfs_path, unsigned depth_left) {
-        _cleanup_free_ char *p = NULL, *uuids = NULL;
-        _cleanup_closedir_ DIR *d = NULL;
-        int r, found_encrypted = false;
-
-        assert(sysfs_path);
-
-        if (depth_left == 0)
-                return -EINVAL;
-
-        p = path_join(sysfs_path, "dm/uuid");
-        if (!p)
-                return -ENOMEM;
-
-        r = read_one_line_file(p, &uuids);
-        if (r != -ENOENT) {
-                if (r < 0)
-                        return r;
-
-                /* The DM device's uuid attribute is prefixed with "CRYPT-" if this is a dm-crypt device. */
-                if (startswith(uuids, "CRYPT-"))
-                        return true;
-        }
-
-        /* Not a dm-crypt device itself. But maybe it is on top of one? Follow the links in the "slaves/"
-         * subdir. */
-
-        p = mfree(p);
-        p = path_join(sysfs_path, "slaves");
-        if (!p)
-                return -ENOMEM;
-
-        d = opendir(p);
-        if (!d) {
-                if (errno == ENOENT) /* Doesn't have underlying devices */
-                        return false;
-
-                return -errno;
-        }
-
-        for (;;) {
-                _cleanup_free_ char *q = NULL;
-                struct dirent *de;
-
-                errno = 0;
-                de = readdir_no_dot(d);
-                if (!de) {
-                        if (errno != 0)
-                                return -errno;
-
-                        break; /* No more underlying devices */
-                }
-
-                q = path_join(p, de->d_name);
-                if (!q)
-                        return -ENOMEM;
-
-                r = blockdev_is_encrypted(q, depth_left - 1);
-                if (r < 0)
-                        return r;
-                if (r == 0) /* we found one that is not encrypted? then propagate that immediately */
-                        return false;
-
-                found_encrypted = true;
-        }
-
-        return found_encrypted;
-}
-
-int path_is_encrypted(const char *path) {
-        char p[SYS_BLOCK_PATH_MAX(NULL)];
-        dev_t devt;
-        int r;
-
-        r = get_block_device(path, &devt);
-        if (r < 0)
-                return r;
-        if (r == 0) /* doesn't have a block device */
-                return false;
-
-        xsprintf_sys_block_path(p, NULL, devt);
-
-        return blockdev_is_encrypted(p, 10 /* safety net: maximum recursion depth */);
-}
-
 int conservative_renameat(
                 int olddirfd, const char *oldpath,
                 int newdirfd, const char *newpath) {

src/basic/fs-util.h

@@ -145,8 +145,6 @@ int syncfs_path(int atfd, const char *path);
 
 int open_parent(const char *path, int flags, mode_t mode);
 
-int path_is_encrypted(const char *path);
-
 int conservative_renameat(int olddirfd, const char *oldpath, int newdirfd, const char *newpath);
 static inline int conservative_rename(const char *oldpath, const char *newpath) {
         return conservative_renameat(AT_FDCWD, oldpath, AT_FDCWD, newpath);

src/basic/locale-util.c

@@ -169,8 +169,6 @@ static int add_locales_from_libdir (Set *locales) {
         FOREACH_DIRENT(entry, dir, return -errno) {
                 char *z;
 
-                dirent_ensure_type(dir, entry);
-
                 if (entry->d_type != DT_DIR)
                         continue;
 

src/basic/meson.build

@@ -15,10 +15,6 @@ basic_sources = files('''
         async.h
         audit-util.c
         audit-util.h
-        blockdev-util.c
-        blockdev-util.h
-        btrfs-util.c
-        btrfs-util.h
         build.c
         build.h
         bus-label.c
@@ -33,15 +29,11 @@ basic_sources = files('''
         chattr-util.h
         conf-files.c
         conf-files.h
-        copy.c
-        copy.h
         creds-util.c
         creds-util.h
         def.h
         dirent-util.c
         dirent-util.h
-        dlfcn-util.c
-        dlfcn-util.h
         dns-def.h
         efivars.c
         efivars.h
@@ -85,8 +77,6 @@ basic_sources = files('''
         ioprio.h
         khash.c
         khash.h
-        label.c
-        label.h
         limits-util.c
         limits-util.h
         linux/btrfs.h
@@ -144,6 +134,7 @@ basic_sources = files('''
         missing_keyctl.h
         missing_magic.h
         missing_mman.h
+        missing_mount.h
         missing_network.h
         missing_prctl.h
         missing_random.h
@@ -156,7 +147,6 @@ basic_sources = files('''
         missing_syscall.h
         missing_timerfd.h
         missing_type.h
-        mkdir-label.c
         mkdir.c
         mkdir.h
         mountpoint-util.c
@@ -187,8 +177,6 @@ basic_sources = files('''
         procfs-util.c
         procfs-util.h
         pthread-util.h
-        quota-util.c
-        quota-util.h
         random-util.c
         random-util.h
         ratelimit.c
@@ -201,10 +189,6 @@ basic_sources = files('''
         replace-var.h
         rlimit-util.c
         rlimit-util.h
-        rm-rf.c
-        rm-rf.h
-        selinux-util.c
-        selinux-util.h
         set.h
         sigbus.c
         sigbus.h
@@ -212,9 +196,6 @@ basic_sources = files('''
         signal-util.h
         siphash24.c
         siphash24.h
-        smack-util.c
-        smack-util.h
-        socket-label.c
         socket-util.c
         socket-util.h
         sort-util.c
@@ -393,10 +374,7 @@ libbasic = static_library(
         dependencies : [versiondep,
                         threads,
                         libcap,
-                        libseccomp,
+                        libm],
-                        libselinux,
-                        libm,
-                        libdl],
         c_args : ['-fvisibility=default'],
         install : false)
 

src/basic/missing_mount.h

@@ -0,0 +1,8 @@
+#pragma once
+
+#include <sys/mount.h>
+
+/* dab741e0e02bd3c4f5e2e97be74b39df2523fc6e (5.10) */
+#ifndef MS_NOSYMFOLLOW
+#define MS_NOSYMFOLLOW 256
+#endif

src/basic/mountpoint-util.c

@@ -8,7 +8,6 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
-#include "label.h"
 #include "missing_stat.h"
 #include "missing_syscall.h"
 #include "mkdir.h"
@@ -510,25 +509,3 @@ int mount_propagation_flags_from_string(const char *name, unsigned long *ret) {
                 return -EINVAL;
         return 0;
 }
-
-int make_mount_point_inode_from_stat(const struct stat *st, const char *dest, mode_t mode) {
-        assert(st);
-        assert(dest);
-
-        if (S_ISDIR(st->st_mode))
-                return mkdir_label(dest, mode);
-        else
-                return mknod(dest, S_IFREG|(mode & ~0111), 0);
-}
-
-int make_mount_point_inode_from_path(const char *source, const char *dest, mode_t mode) {
-        struct stat st;
-
-        assert(source);
-        assert(dest);
-
-        if (stat(source, &st) < 0)
-                return -errno;
-
-        return make_mount_point_inode_from_stat(&st, dest, mode);
-}

src/basic/mountpoint-util.h

@@ -23,7 +23,3 @@ int dev_is_devtmpfs(void);
 
 const char *mount_propagation_flags_to_string(unsigned long flags);
 int mount_propagation_flags_from_string(const char *name, unsigned long *ret);
-
-/* Creates a mount point (not parents) based on the source path or stat - ie, a file or a directory */
-int make_mount_point_inode_from_stat(const struct stat *st, const char *dest, mode_t mode);
-int make_mount_point_inode_from_path(const char *source, const char *dest, mode_t mode);

src/basic/path-util.c

@@ -514,10 +514,6 @@ int path_compare(const char *a, const char *b) {
         }
 }
 
-bool path_equal(const char *a, const char *b) {
-        return path_compare(a, b) == 0;
-}
-
 bool path_equal_or_files_same(const char *a, const char *b, int flags) {
         return path_equal(a, b) || files_same(a, b, flags) > 0;
 }

src/basic/path-util.h

@@ -62,7 +62,11 @@ static inline char* path_startswith(const char *path, const char *prefix) {
         return path_startswith_full(path, prefix, true);
 }
 int path_compare(const char *a, const char *b) _pure_;
-bool path_equal(const char *a, const char *b) _pure_;
+
+static inline bool path_equal(const char *a, const char *b) {
+        return path_compare(a, b) == 0;
+}
+
 bool path_equal_or_files_same(const char *a, const char *b, int flags);
 /* Compares only the last portion of the input paths, ie: the filenames */
 bool path_equal_filename(const char *a, const char *b);

src/basic/socket-util.c

@@ -748,6 +748,22 @@ static const char* const ip_tos_table[] = {
 
 DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(ip_tos, int, 0xff);
 
+bool ifname_valid_char(char a) {
+        if ((unsigned char) a >= 127U)
+                return false;
+
+        if ((unsigned char) a <= 32U)
+                return false;
+
+        if (IN_SET(a,
+                   ':',  /* colons are used by the legacy "alias" interface logic */
+                   '/',  /* slashes cannot work, since we need to use network interfaces in sysfs paths, and in paths slashes are separators */
+                   '%')) /* %d is used in the kernel's weird foo%d format string naming feature which we really really don't want to ever run into by accident */
+                return false;
+
+        return true;
+}
+
 bool ifname_valid_full(const char *p, IfnameValidFlags flags) {
         bool numeric = true;
 
@@ -781,16 +797,7 @@ bool ifname_valid_full(const char *p, IfnameValidFlags flags) {
                 return false;
 
         for (const char *t = p; *t; t++) {
-                if ((unsigned char) *t >= 127U)
+                if (!ifname_valid_char(*t))
-                        return false;
-
-                if ((unsigned char) *t <= 32U)
-                        return false;
-
-                if (IN_SET(*t,
-                           ':',  /* colons are used by the legacy "alias" interface logic */
-                           '/',  /* slashes cannot work, since we need to use network interfaces in sysfs paths, and in paths slashes are separators */
-                           '%')) /* %d is used in the kernel's weird foo%d format string naming feature which we really really don't want to ever run into by accident */
                         return false;
 
                 numeric = numeric && (*t >= '0' && *t <= '9');

src/basic/socket-util.h

@@ -139,6 +139,7 @@ typedef enum {
         IFNAME_VALID_NUMERIC     = 1 << 1,
         _IFNAME_VALID_ALL        = IFNAME_VALID_ALTERNATIVE | IFNAME_VALID_NUMERIC,
 } IfnameValidFlags;
+bool ifname_valid_char(char a);
 bool ifname_valid_full(const char *p, IfnameValidFlags flags);
 static inline bool ifname_valid(const char *p) {
         return ifname_valid_full(p, 0);

src/basic/terminal-util.c

@@ -21,7 +21,6 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "copy.h"
 #include "def.h"
 #include "env-util.h"
 #include "fd-util.h"

src/basic/time-util.c

@@ -429,19 +429,37 @@ char *format_timestamp_relative(char *buf, size_t l, usec_t t) {
                 s = "left";
         }
 
-        if (d >= USEC_PER_YEAR)
+        if (d >= USEC_PER_YEAR) {
-                snprintf(buf, l, USEC_FMT " years " USEC_FMT " months %s",
+                usec_t years = d / USEC_PER_YEAR;
-                         d / USEC_PER_YEAR,
+                usec_t months = (d % USEC_PER_YEAR) / USEC_PER_MONTH;
-                         (d % USEC_PER_YEAR) / USEC_PER_MONTH, s);
+
-        else if (d >= USEC_PER_MONTH)
+                snprintf(buf, l, USEC_FMT " %s " USEC_FMT " %s %s",
-                snprintf(buf, l, USEC_FMT " months " USEC_FMT " days %s",
+                         years,
-                         d / USEC_PER_MONTH,
+                         years == 1 ? "year" : "years",
-                         (d % USEC_PER_MONTH) / USEC_PER_DAY, s);
+                         months,
-        else if (d >= USEC_PER_WEEK)
+                         months == 1 ? "month" : "months",
-                snprintf(buf, l, USEC_FMT " weeks " USEC_FMT " days %s",
+                         s);
-                         d / USEC_PER_WEEK,
+        } else if (d >= USEC_PER_MONTH) {
-                         (d % USEC_PER_WEEK) / USEC_PER_DAY, s);
+                usec_t months = d / USEC_PER_MONTH;
-        else if (d >= 2*USEC_PER_DAY)
+                usec_t days = (d % USEC_PER_MONTH) / USEC_PER_DAY;
+
+                snprintf(buf, l, USEC_FMT " %s " USEC_FMT " %s %s",
+                         months,
+                         months == 1 ? "month" : "months",
+                         days,
+                         days == 1 ? "day" : "days",
+                         s);
+        } else if (d >= USEC_PER_WEEK) {
+                usec_t weeks = d / USEC_PER_WEEK;
+                usec_t days = (d % USEC_PER_WEEK) / USEC_PER_DAY;
+
+                snprintf(buf, l, USEC_FMT " %s " USEC_FMT " %s %s",
+                         weeks,
+                         weeks == 1 ? "week" : "weeks",
+                         days,
+                         days == 1 ? "day" : "days",
+                         s);
+        } else if (d >= 2*USEC_PER_DAY)
                 snprintf(buf, l, USEC_FMT " days %s", d / USEC_PER_DAY, s);
         else if (d >= 25*USEC_PER_HOUR)
                 snprintf(buf, l, "1 day " USEC_FMT "h %s",

src/basic/unit-file.c

@@ -321,7 +321,6 @@ int unit_file_build_name_map(
                         if (hashmap_contains(ids, de->d_name))
                                 continue;
 
-                        dirent_ensure_type(d, de);
                         if (de->d_type == DT_LNK) {
                                 /* We don't explicitly check for alias loops here. unit_ids_map_get() which
                                  * limits the number of hops should be used to access the map. */

src/basic/virt.c

@@ -186,6 +186,7 @@ static int detect_vm_dmi_vendor(void) {
                                 return dmi_vendor_table[j].id;
                         }
         }
+        log_debug("No virtualization found in DMI vendor table.");
         return VIRTUALIZATION_NONE;
 }
 
@@ -202,7 +203,8 @@ static int detect_vm_smbios(void) {
 
         r = read_full_virtual_file("/sys/firmware/dmi/entries/0-0/raw", &s, &readsize);
         if (r < 0) {
-                log_debug_errno(r, "Unable to read /sys/firmware/dmi/entries/0-0/raw, ignoring: %m");
+                log_debug_errno(r, "Unable to read /sys/firmware/dmi/entries/0-0/raw, "
+                                "using the virtualization information found in DMI vendor table, ignoring: %m");
                 return SMBIOS_VM_BIT_UNKNOWN;
         }
         if (readsize < 20 || s[1] < 20) {
@@ -210,16 +212,17 @@ static int detect_vm_smbios(void) {
                  * extension bytes. The data we're interested in is in extension byte 2, which would be at
                  * 0x13. If we didn't read that much data, or if the BIOS indicates that we don't have that
                  * much data, we don't infer anything from the SMBIOS. */
-                log_debug("Only read %zu bytes from /sys/firmware/dmi/entries/0-0/raw (expected 20)", readsize);
+                log_debug("Only read %zu bytes from /sys/firmware/dmi/entries/0-0/raw (expected 20). "
+                          "Using the virtualization information found in DMI vendor table.", readsize);
                 return SMBIOS_VM_BIT_UNKNOWN;
         }
 
         uint8_t byte = (uint8_t) s[19];
         if (byte & (1U<<4)) {
-                log_debug("DMI BIOS Extension table indicates virtualization");
+                log_debug("DMI BIOS Extension table indicates virtualization.");
                 return SMBIOS_VM_BIT_SET;
         }
-        log_debug("DMI BIOS Extension table does not indicate virtualization");
+        log_debug("DMI BIOS Extension table does not indicate virtualization.");
         return SMBIOS_VM_BIT_UNSET;
 }
 #endif /* defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) */

src/core/dbus-manager.c

@@ -11,6 +11,7 @@
 #include "bus-common-errors.h"
 #include "bus-get-properties.h"
 #include "bus-log-control-api.h"
+#include "data-fd-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-job.h"

src/core/dbus-socket.c

@@ -383,8 +383,8 @@ static int bus_socket_set_transient_property(
                                 return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown Socket type: %s", t);
 
                         if (p->type != SOCKET_SOCKET) {
-                                if (!path_is_valid(p->path))
+                                if (!path_is_valid(a))
-                                        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid socket path: %s", t);
+                                        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid socket path: %s", a);
 
                                 p->path = strdup(a);
                                 if (!p->path)

src/core/execute.c

@@ -46,6 +46,7 @@
 #include "cgroup-setup.h"
 #include "chown-recursive.h"
 #include "cpu-set-util.h"
+#include "data-fd-util.h"
 #include "def.h"
 #include "env-file.h"
 #include "env-util.h"
@@ -3189,6 +3190,8 @@ static int apply_mount_namespace(
                         .protect_proc = context->protect_proc,
                         .proc_subset = context->proc_subset,
                         .private_ipc = context->private_ipc || context->ipc_namespace_path,
+                        /* If NNP is on, we can turn on MS_NOSUID, since it won't have any effect anymore. */
+                        .mount_nosuid = context->no_new_privileges && !mac_selinux_use(),
                 };
         } else if (!context->dynamic_user && root_dir)
                 /*