2026-04-10 09:04:50 +02:00
35 changed files with 1302 additions and 15785 deletions
--- a/.packit.yml
+++ b/.packit.yml
@ -31,6 +31,9 @@ actions:
    # [0] https://github.com/mesonbuild/meson/issues/7360
    # [1] https://github.com/systemd/systemd/pull/18908#issuecomment-792250110
    - 'sed -i "/^CONFIGURE_OPTS=(/a--werror" .packit_rpm/systemd.spec'
+    # FIXME: temporarily disable the deprecated-declarations check to suppress
+    #        OpenSSL 3.0 warnings in Rawhide
+    - 'sed -i "1 i %global optflags %{optflags} -Wno-deprecated-declarations" .packit_rpm/systemd.spec'

 jobs:
 - job: copr_build
--- a/434
+++ b/434
@ -2,43 +2,44 @@ systemd System and Service Manager

 CHANGES WITH 250 in spe:

-        * Support for encrypted and authenticated credentials has been added.
-          This extends the credential logic introduced with v247 to support
-          non-interactive symmetric encryption and authentication, based on a
-          key that is stored on the /var/ file system or in the TPM2 chip (if
-          available), or the combination of both (by default if a TPM2 chip
-          exists the combination is used, otherwise the /var/ key only). The
-          credentials are automatically decrypted at the moment a service is
-          started, and are made accessible to the service itself in unencrypted
-          form. A new tool 'systemd-creds' encrypts credentials for this
-          purpose, and two new service file settings LoadCredentialEncrypted=
-          and SetCredentialEncrypted= configure such credentials.
-
-          This feature is useful to store sensitive material such as SSL
-          certificates, passwords and similar securely at rest and only decrypt
-          them when needed, and in a way that is tied to the local OS
-          installation or hardware.
+        * Support for encrypted and authenticated credentials has been
+          added. This extends the credentials logic introduced with v247 to
+          support non-interactive symmetric encryption and authentication,
+          based on a key that is stored on the /var/ file system or in the TPM2
+          chip (if available), or the combination of both (by default if a TPM2
+          chip exists the combination is used, otherwise the /var/ key
+          only). The credentials are automatically decrypted at the moment a
+          service is started, and are made accessible to the service itself in
+          unencrypted form. A new tool `systemd-creds` has been added to
+          encrypt credentials for this purpose, and two new service file
+          settings LoadCredentialEncrypted= and SetCredentialEncrypted= have
+          been added to configure encrypted credentials prepared that way. This
+          feature is useful for ensuring sensitive material such as SSL
+          certificates, passwords and similar are stored securely when at rest
+          and only decrypted when needed, and in a way that can be reproduced
+          only on the local OS installation and hardware.

        * systemd-gpt-auto-generator can now automatically set up discoverable
          LUKS2 encrypted swap partitions.

-        * The GPT Discoverable Partitions Specification has been substantially
-          extended with support for root and /usr/ partitions for the majority
-          of architectures systemd supports. This includes platforms that do
-          not natively support UEFI, because even though GPT is specified under
-          UEFI umbrella, it is useful on other systems too. Specifically,
+        * The GPT Discoverable Partitions Specification has been updated
+          substantially to support Root and /usr/ partitions for the majority
+          of architectures systemd supports. This include platforms that do not
+          natively support UEFI. Even though GPT is specified under UEFI
+          umbrella its useful on other systems too. Specifically,
          systemd-nspawn, systemd-sysext, systemd-gpt-auto-generator and
-          Portable Services use the concept without requiring UEFI.
+          Portable Services make heavy use of the concept, none of which are
+          specific to UEFI.

-        * The GPT Discoverable Partitions Specifications has been extended with
-          a new set of partitions that may carry PKCS#7 signatures for Verity
-          partitions, encoded in a simple JSON format. This implements a simple
-          mechanism for building disk images that are fully authenticated and
-          can be tested against a set of cryptographic certificates. This is
-          now implemented for the various systemd tools that can operate with
-          disk images, such as systemd-nspawn, systemd-sysext, systemd-dissect,
-          Portable services/RootImage=, systemd-tmpfiles, and systemd-sysusers.
-          The PKCS#7 signatures are passed to the kernel (where they are
+        * The GPT Discoverable Partitions Specifications has learnt a new set
+          of partitions that may carry PKCS#7 signatures for Verity partitions,
+          encoded in a simple JSON format. This implements a simple mechanism
+          for building disk images that are fully authenticated and can be
+          tested against a set of cryptographic certificates. This is now
+          implemented for the various systemd tools that can operate with disk
+          images, such as systemd-nspawn, systemd-sysext, systemd-dissect,
+          Portable services/RootImage=, systemd-tmpfiles, systemd-sysusers, and
+          so on. The PKCS#7 signatures are passed to the kernel (where they are
          checked against certificates from the kernel keyring), or can be
          verified against certificates provided in userspace (via a simple
          drop-in file mechanism).
@ -61,11 +62,11 @@ CHANGES WITH 250 in spe:

        * The GPT image dissection logic in systemd-nspawn/systemd-dissect/…
          now is able to decode images for non-native architectures as well.
-          This allows systemd-nspawn to boot images of non-native architectures
-          if the corresponding user mode emulator is installed and
-          systemd-binfmtd is running.
+          This enables systemd-nspawn to boot images of non-native
+          architectures if the corresponding user mode emulator is installed
+          and systemd-binfmtd is running.

-        * systemd-logind gained new settings HandlePowerKeyLongPress=,
+        * systemd-logind gained a new settings HandlePowerKeyLongPress=,
          HandleRebootKeyLongPress=, HandleSuspendKeyLongPress= and
          HandleHibernateKeyLongPress= which may be used to configure actions
          when the relevant keys are pressed for more than 5s. This is useful
@ -76,19 +77,20 @@ CHANGES WITH 250 in spe:
          does not trigger any operation by default.

        * When showing unit status updates on the console during boot and
-          shutdown, and a service is slow to start so that the cylon animation
+          shutdown, and a service is slow to start so that the KITT animation
          is shown, the most recent sd_notify() STATUS= text is now shown as
          well. Services may use this to make the boot/shutdown output easier
          to understand, and to indicate what precisely a service that is slow
-          to start or stop is waiting for. In particular, the per-user service
+          to start or stop is waiting for. Specifically, the per-user service
          manager instance now reports what it is doing and which service it is
          waiting for this way to the system service manager.

        * The service manager will now re-execute on reception of the
          SIGRTMIN+25 signal. It previously already did that on SIGTERM — but
          only when running as PID 1. There was no signal to request this when
-          running as per-user service manager, i.e. as any other PID than 1.
-          SIGRTMIN+25 works for both system and user managers.
+          running as per-user service manager, i.e. as any other PID than
+          1. SIGRTMIN+25 will work in any case, i.e. both as system and user
+          service manager.

        * The hardware watchdog logic in PID 1 gained support for operating
          with the default timeout configured in the hardware, instead of
@ -109,9 +111,9 @@ CHANGES WITH 250 in spe:
          system services or the managers themselves.

        * A new per-service setting RestrictFileSystems= as been added that
-          restricts the file systems a service has access to by their type.
-          This is based on the new BPF LSM of the Linux kernel. It provides an
-          effective way to make certain API file systems unavailable to
+          restricts the file systems a service has access to by their
+          type. This is based on the new BPF LSM of the Linux kernel. This is
+          an effective way to make certain API file systems unavailable to
          services (and thus minimizing attack surface). A new command
          "systemd-analyze filesystems" has been added that lists all known
          file system types (and how they are grouped together under useful
@ -120,7 +122,7 @@ CHANGES WITH 250 in spe:
        * Services now support a new setting RestrictNetworkInterfaces= for
          restricting access to specific network interfaces.

-        * Service unit files gained new settings StartupAllowedCPUs= and
+        * New service unit files gained new settings StartupAllowedCPUs= and
          StartupAllowedMemoryNodes=. These are similar to their counterparts
          without the "Startup" prefix and apply during the boot process
          only. This is useful to improve boot-time behavior of the system and
@ -138,23 +140,23 @@ CHANGES WITH 250 in spe:
          [Condition|Assert][Memory|CPU|IO]Pressure= have been added to make a
          unit skip/fail activation if the system's (or a slice's) memory/cpu/io
          pressure is above the configured threshold, using the kernel PSI
-          feature. For more details see systemd.unit(5) and
+          feature. Fore more details see systemd.unit.5 and
          https://www.kernel.org/doc/html/latest/accounting/psi.html

        * The combination of ProcSubset=pid and ProtectKernelTunables=yes and/or
          ProtectKernelLogs=yes can now be used.

-        * The default maximum numbers of inodes have been raised from 64k to 1M
-          for /dev, and from 400k to 1M for /tmp.
+        * The default maximum number of inodes for /dev has been doubled, from
+          64k to 128k.

        * The per-user service manager learnt support for communicating with
          systemd-oomd to acquire OOM kill information.

        * A new service setting ExecSearchPath= has been added that allows
-          changing the search path for executables for services. It affects
-          where we look for the binaries specified in ExecStart= and similar,
-          and the specified directories are also added the $PATH environment
-          variable passed to invoked processes.
+          changing the search path for executables for services. It affects how
+          the binaries specified in ExecStart= and similar are searched and
+          also affects the $PATH environment variable passed to invoked
+          processes.

        * A new setting RuntimeRandomizedExtraSec= has been added for service
          and scope units that allows extending the runtime time-out as
@ -162,7 +164,7 @@ CHANGES WITH 250 in spe:

        * The syntax of the service unit settings RuntimeDirectory=,
          StateDirectory=, CacheDirectory=, LogsDirectory= has been extended:
-          if the specified value is now suffixed with a colon, followed by
+          if the specified string is now suffixed with a colon, followed by
          another filename, the latter will be created as symbolic link to the
          specified directory. This allows creating these service directories
          together with alias symlinks to make them available under multiple
@ -171,28 +173,28 @@ CHANGES WITH 250 in spe:
        * Service unit files gained two new settings TTYRows=/TTYColumns= for
          configuring rows/columns of the TTY device passed to
          stdin/stdout/stderr of the service. This is useful to propagate TTY
-          dimensions to a virtual machine.
+          dimensions from another environment.

-        * A new service unit file setting ExitType= has been added that
-          specifies when to assume a service has exited. By default systemd
-          only watches the main process of a service. By setting
-          ExitType=cgroup it can be told to wait for the last process in a
-          cgroup instead.
+        * A new service unit file setting ExitType= has been added, that allows
+          configuring when precisely to assume a service has exited. By default
+          systemd watches the main process of a service only to determine its
+          lifetime. By setting ExitType=cgroup it can be told to wait for the
+          last process in a cgroup instead.

        * Automount unit files gained a new setting ExtraOptions= that can be
          used to configure additional mount options to pass to the kernel when
          mounting the autofs instance.

-        * "Urlification" (generation of ESC sequences that generate clickable
-          hyperlinks in modern terminals) may now be turned off altogether
-          during build-time.
+        * "Urlification" (i.e. generation of ESC sequences that generate
+          clickable hyperlinks in modern terminals) may now be turned off
+          altogether during build-time.

-        * The TPM2/FIDO2/PKCS11 support in systemd-cryptsetup is now also built
-          as a plug-in for cryptsetup. This means the plain cryptsetup command
-          may now be used to unlock volumes set up this way.
+        * The tpm2/fido2/pkcs11 support in systemd-cryptsetup is now also built
+          as plug-in for upstream cryptsetup. This means plain cryptsetup may
+          now be used to unlock volumes set up this way.

        * The TPM2 logic in cryptsetup will now automatically detect systems
-          where the TPM2 chip advertises SHA256 PCR banks but the firmware only
+          where the TPM2 chip supports SHA256 PCR banks but the firmware only
          updates the SHA1 banks. In such a case PCR policies will be
          automatically bound to the latter, not the former. This makes the PCR
          policies reliable, but of course do not provide the same level of
@ -204,15 +206,16 @@ CHANGES WITH 250 in spe:
          than ECC, and hence are only used if ECC is not available.

        * /etc/crypttab gained support for a new token-timeout= setting for
-          encrypted volumes that allows configuration of the maximum time to
-          wait for PKCS#11/FIDO2 tokens to be plugged in. If the time elapses
-          the logic will query the user for a regular passphrase/recovery key
+          encrypted volumes that allow configuration of a maximum time to wait
+          for PKCS#11/FIDO2 tokens to be plugged in. If the time elapses the
+          logic will query the user for a regular passphrase/recovery key
          instead.

        * Support for activating dm-integrity volumes at boot via a new file
-          /etc/integritytab and the tool systemd-integritysetup have been
-          added. This is similar to /etc/crypttab and /etc/veritytab, but deals
-          with dm-integrity instead of dm-crypt/dm-verity.
+          /etc/integritytab and a tool systemd-integritysetup has been
+          added. This behaves similar to the existing /etc/crypttab and
+          /etc/veritytab, but deals with dm-integrity instead of
+          dm-crypt/dm-verity.

        * The systemd-veritysetup-generator now understands a new usrhash=
          kernel command line option for specifying the Verity root hash for
@ -230,9 +233,9 @@ CHANGES WITH 250 in spe:

        * A new unit systemd-boot-update.service has been added. If enabled
          (the default) and the sd-boot loader is detected to be installed, it
-          is automatically updated to the newest version when out of date. This
-          is useful to ensure the boot loader remains up-to-date, and updates
-          automatically propagate from the OS tree in /usr/.
+          is automatically updated to the newest version if it's out of
+          date. This is useful to ensure the boot loader remains up-to-date,
+          and updates automatically propagate from the OS tree in /usr/.

        * sd-boot will now build with SBAT by default in order to facilitate
          working with recent versions of Shim that require it to be present.
@ -299,38 +302,6 @@ CHANGES WITH 250 in spe:
          an explicitly specified unit name, independently of what the filename
          actually is.

-        * systemd-analyze verify gained a new switch --recursive-errors= which
-          controls whether to only fail on errors found in the specified units
-          or recursively any dependent units.
-
-        * systemd-analyze security now supports a new --offline mode for
-          analyzing unit files stored on disk instead of loaded units. It may
-          be combined with --root=/--image to analyze unit files under a root
-          directory or disk image. It also learnt a new --threshold= parameter
-          for specifying an exposure level threshold: if the exposure level
-          exceeds the specified value the call will fail. It also gained a new
-          --security-policy= switch for configuring security policies to
-          enforce on the units. A policy is a JSON file that lists which tests
-          shall be weighted how much to determine the overall exposure
-          level. Altogether these new features are useful for fully automatic
-          analysis and enforcement of security policies on unit files.
-
-        * systemd-analyze security gain a new --json= switch for JSON output.
-
-        * systemd-analyze learnt a new --quiet switch for reducing
-          non-essential output. It's honored by the "dot", "syscall-filter",
-          "filesystems" commands.
-
-        * systemd-analyze security gained a --profile option that can be used
-          to take into account a portable profile when analyzing portable
-          services, since a lot of the security-related settings are enabled
-          through them.
-
-        * systemd-analyze learnt a new inspect-elf verb that parses ELF core
-          files, binaries and executables and prints metadata information,
-          including the build-id and other info described on:
-          https://systemd.io/COREDUMP_PACKAGE_METADATA/
-
        * The [IPv6AcceptRA] section of .network files gained support for a new
          UseMTU= setting that may be used to control whether to apply the
          announced MTU settings to the local interface.
@ -403,11 +374,42 @@ CHANGES WITH 250 in spe:
          SuppressInterfaceGroup= setting.

        * The IgnoreCarrierLoss= setting in the [Network] section of .network
-          files now allows a duration to be specified, controlling how long to
-          wait before reacting to carrier loss.
+          files now accepts a duration to be specified, controlling how time to
+          wait before no longer ignoring carrier losses.

-        * The [DHCPServer] section of .network file gained a new Router=
-          setting to specify the router address.
+        * The [DHCPServer] section of .network file gained a new Router= setting
+          to specify the router address.
+
+        * systemd-analyze verify gained a new switch --recursive-errors= which
+          controls whether to only fail on errors found in the specified units
+          or recursively any dependent units.
+
+        * systemd-analyze security now supports a new --offline mode for
+          analyzing unit files stored on disk instead of loaded units. It may
+          be combined with --root=/--image to analyze unit files container in a
+          root directory or disk image. It also learnt a new --threshold=
+          parameter for specifying an exposure level threshold: if the exposure
+          level exceeds the specified value the call will fail. It also gained
+          a new --security-policy= switch for configuring security policies to
+          enforce on the units. A policy is a JSON file that lists which tests
+          shall be weighted how much to determine the overall exposure
+          level. It also gained a new --json= switch for generating JSON
+          output. Altogether these new features are useful for fully automatic
+          analysis and enforcement of security policies on unit files.
+
+        * systemd-analyze security gained a --profile option that can be used
+          to take into account a portable profile when analyzing portable
+          services, since a lot of the security-related settings are enabled
+          through them.
+
+        * systemd-analyze learnt a new --quiet switch for reducing
+          non-essential output. It's honored by the "dot", "syscall-filter",
+          "filesystems" commands.
+
+        * systemd-analyze learnt a new inspect-elf verb that parses ELF core
+          files, binaries and executables and prints metadata information,
+          including the build-id and other info described on:
+          https://systemd.io/COREDUMP_PACKAGE_METADATA/

        * systemd-nspawn's --setenv= switch now supports an additional syntax:
          if only a variable name is specified (i.e. without being suffixed by
@ -424,8 +426,8 @@ CHANGES WITH 250 in spe:
          not essential as all build artifacts can be regenerated any time, but
          the performance win is beneficial.

-        * systemd-nspawn will now raise the RLIMIT_NOFILE hard limit to the
-          same value that PID 1 uses for most forked off processes.
+        * systemd-nspawn will now raise RLIMIT_NOFILE's hard limit to the same
+          value that PID 1 raises it for most forked off processes.

        * systemd-nspawn's --bind=/--bind-ro= switches now optionally take
          uidmap/nouidmap options as last parameter. If "uidmap" is used the
@ -433,18 +435,28 @@ CHANGES WITH 250 in spe:
          the host's file ownerships are mapped 1:1 to container file
          ownerships, even if user namespacing is used. This way
          files/directories bound into containers will no longer show up as
-          owned by the nobody user as they typically did if no special care was
+          owned by the nobody user as they typically do if no special care is
          taken to shift them manually.

        * When discovering Windows installations sd-boot will now attempt to
-          show the Windows version.
+          extract the Windows version found.

        * The color scheme to use in sd-boot may now be configured at
          build-time.

+        * systemd-boot will now paint the input cursor on its own instead of
+          relying on the firmware to do so, increasing compatibility with broken
+          firmware that doesn't make the cursor reasonably visible.
+
        * sd-boot gained the ability to change screen resolution during
          boot-time, by hitting the "r" key. This will cycle through available
-          resolutions and save the last selection.
+          resolutions and save them.
+
+        * sd-boot gained support for automatically loading all EFI drivers
+          placed in the /EFI/systemd/drivers/ subdirectory of the EFI System
+          Partition (ESP). These drivers are loaded before the menu entries are
+          searched and loaded. This is useful for easily loading additional
+          file system drivers for the XBOOTLDR partition or similar.

        * sd-boot learnt a new hotkey "f". When pressed the system will enter
          firmware setup. This is useful in environments where it is difficult
@ -455,16 +467,6 @@ CHANGES WITH 250 in spe:
          selected on the last boot (using the "@saved" identifier for menu
          items).

-        * sd-boot gained support for automatically loading all EFI drivers
-          placed in the /EFI/systemd/drivers/ subdirectory of the EFI System
-          Partition (ESP). These drivers are loaded before the menu entries are
-          loaded. This is useful e.g. to load additional file system drivers
-          for the XBOOTLDR partition.
-
-        * systemd-boot will now paint the input cursor on its own instead of
-          relying on the firmware to do so, increasing compatibility with broken
-          firmware that doesn't make the cursor reasonably visible.
-
        * sd-boot now embeds a .osrel PE section like we expect from Boot
          Loader Specification Type #2 Unified Kernels. This means sd-boot
          itself may be used in place of a Type #2 Unified Kernel. This is
@ -477,14 +479,14 @@ CHANGES WITH 250 in spe:
          for installing/applying new devicetree files without updating the
          kernel image.

-        * Similarly, sd-stub now can read devicetree data from a PE section
+        * Similar, sd-stub now can read devicetree data from a PE section
          ".dtb" and apply it before invoking the kernel.

        * sd-stub (the EFI stub that can be glued in front of a Linux kernel)
          gained the ability to pick up credentials and sysext files placed
-          next to the kernel image file, wrap them in a cpio archive and pass
-          as an additional initrd to the invoked Linux kernel, in effect
-          placing those files in the /.extra/ directory of the initrd
+          next to the kernel image file during initialization, wrap them in a
+          cpio archive and pass them as additional initrd to the invoked Linux
+          kernel, placing them in the /.extra/ directory of the initrd
          environment. This is useful to implement trusted initrd environments
          which are fully authenticated but still can be extended (via sysexts)
          and parameterized (via encrypted/authenticated credentials, see
@ -495,24 +497,24 @@ CHANGES WITH 250 in spe:
          complete EFI unified kernel image, implementing Boot Loader
          Specification Type #2.

-        * sd-stub may now provide the initrd to the executed kernel via the
+        * sd-stub may now provide the initrd to the execute kernel via the
          LINUX_EFI_INITRD_MEDIA_GUID EFI protocol, adding compatibility for
          non-x86 architectures.

-        * bootctl learnt new set-timeout and set-timeout-oneshot commands that
-          may be used to set the boot menu time-out of the boot loader (for all
-          or just the subsequent boot).
+        * bootctl learnt the new set-timeout and set-timeout-oneshot that may
+          be used to set the boot menu time-out of the boot loader (for all or
+          just the subsequent boot).

        * systemd-sysext now optionally doesn't insist on extension-release.d/
-          files being placed in the image under the image's file name. If the
+          files to be placed in the image under the image's right name. If the
          file system xattr user.extension-release.strict is set on the
-          extension release file, it is accepted regardless of its name. This
+          extension release file it is accepted regardless of its name. This
          relaxes security restrictions a bit, as system extension may be
          attached under a wrong name this way.

        * udevadm's test-builtin command learnt a new --action= switch for
          testing the built-in with the specified action (in place of the
-          default 'add').
+          default of 'add'.

        * udevadm info gained new switches --property=/--value for showing only
          specific udev properties/values instead of all.
@ -523,27 +525,27 @@ CHANGES WITH 250 in spe:
          be accessible to regular users.

        * A new hwdb database entry has been added that carries information
-          about types of cameras (regular or infrared), and in which direction
-          they point (front or back).
+          about what type of camera discovered cameras are (regular or
+          infrared), and in which direction they point (front or back).

        * A new rule to allow console users access to rfkill by default has been
          added to hwdb.

        * A new build-time meson option "extra-net-naming-schemes=" has been
-          added to define additional naming schemes schemes for udev's network
-          interface naming logic. This is useful for enterprise distributions
-          and similar which want to pin the schemes of certain distribution
-          releases under a specific name and previously had to patch the
-          sources to introduce new named schemes.
+          added for defining additional naming schemes schemes definitions for
+          udev's network interface naming logic. This is useful for enterprise
+          distributions and similar which want to pin the schemes of certain
+          distribution releases under a specific name and previously had to
+          patched our sources to introduce new named schemes.

        * The predictable naming logic for network interfaces has been extended
          to generate stable names from Xen netfront device information.

        * hostnamed's chassis property can now be sourced from chassis-type
-          field encoded in devicetree (in addition to the existing DMI
+          field encoded in devicetree (in addition to the preexisting DMI
          support).

-        * systemd-cgls now optionally displays cgroup IDs and extended
+        * systemd-cgls now optionally display cgroup IDs and extended
          attributes for each cgroup. (Controllable via the new --xattr= +
          --cgroup-id= switches.)

@ -562,25 +564,25 @@ CHANGES WITH 250 in spe:
          attempted exactly once but if the home directory was busy for some
          reason it was not tried again.

-        * systemd-homed's LUKS2 home area backend will now create a BSD file
+        * systemd-homed's LUKS2 home area backend will now issue a BSD file
          system lock on the image file while the home area is active
-          (i.e. mounted). If a home area is found to be locked, logins are
+          (i.e. mounted). If a home area is found to be locked logins are
          politely refused. This should improve behavior when using home areas
          images that are accessible via the network from multiple clients, and
          reduce the chance of accidental file system corruption in that case.

        * Optionally, systemd-homed will now drop the kernel buffer cache once
-          a user has fully logged out, configurable via the new --drop-caches=
+          a user fully logged out, configurable via the new --drop-caches=
          homectl switch.

-        * systemd-homed now makes use of UID mapped mounts for the home areas.
-          If the kernel and used file system support it, files are now
+        * systemd-homed now makes use of UID mapped mounts for the home
+          areas. If the kernel and used file system support it, files are now
          internally owned by the "nobody" user (i.e. the user typically used
          for indicating "this ownership is not mapped"), and dynamically
          mapped to the UID used locally on the system via the UID mapping
          mount logic of recent kernels. This makes migrating home areas
-          between different systems cheaper because recursively chown()ing file
-          system trees is no longer necessary.
+          between different systems cheap as recursively chown()ing file system
+          trees is no longer necessary.

        * systemd-homed's CIFS backend now optionally supports CIFS service
          names with a directory suffix, in order to place home directories in
@ -590,12 +592,12 @@ CHANGES WITH 250 in spe:
          mount options in the JSON user record (cifsExtraMountOptions field,
          and --cifs-extra-mount-options= homectl switch). This is for example
          useful for configuring mount options such as "noserverino" that some
-          SMB3 services require (use that to run a homed home directory from a
-          FritzBox SMB3 share this way).
+          SMB3 services require (for example: use that to run a homed home
+          directory from a FritzBox SMB3 share this way).

        * systemd-homed will now default to btrfs' zstd compression for home
-          areas. This is inspired by Fedora's recent decision to switch to zstd
-          by default.
+          areas. This is inspired by Fedora's recent decision to enable this by
+          default.

        * Additional mount options to use when mounting the file system of
          LUKS2 volumes in systemd-homed has been added. Via the
@ -614,13 +616,13 @@ CHANGES WITH 250 in spe:

        * systemd-homed gained the ability to automatically shrink home areas
          on logout to their minimal size and grow them again on next
-          login. This ensures that while inactive, a home area only takes up
-          the minimal space necessary, but once activated, it provides
-          sufficient space for the user's needs. This behavior is only
-          supported if btrfs is used as file system inside the home area
-          (because only for btrfs online growing/shrinking is implemented in
-          the kernel). This behavior is now enabled by default, but may be
-          controlled via the new --auto-resize-mode= setting of homectl.
+          login. This ensures that while inactive a home area only takes up the
+          minimal space necessary, but once activated provides sufficient space
+          for the user's needs. This behavior is only supported if btrfs is
+          used as file system inside the home area (because only for btrfs
+          online growing/shrinking is implemented in the kernel). This
+          behavior is now enabled by default, but may be controlled via the
+          new --auto-resize-mode= setting of homectl.

        * systemd-homed gained support for automatically re-balancing free disk
          space among active home areas, in case the LUKS2 backends are used,
@ -633,7 +635,7 @@ CHANGES WITH 250 in spe:
          user record field (as exposed via the new --rebalance-weight= homectl
          setting). Re-balancing is mostly automatic, but can also be requested
          explicitly via "homectl rebalance", which is synchronous, and thus
-          may be used to wait until the rebalance run is complete.
+          may be used to wait until a rebalance run is complete.

        * userdbctl gained a --json= switch for configured the JSON formatting
          to use when outputting user or group records.
@ -645,9 +647,9 @@ CHANGES WITH 250 in spe:
        * userdbctl's ssh-authorized-keys command learnt a new --chain switch,
          for chaining up another command to execute after completing the
          look-up. Since the OpenSSH's AuthorizedKeysCommand only allows
-          configuration of a single command to invoke, this maybe used to
-          invoke multiple: first userdbctl's own implementation, and then any
-          other also configured in the command line.
+          configuration of a single command to invoke this maybe used to invoke
+          multiple: first userdbctl's own implementation, and then any other
+          also configured in the command line.

        * The sd-event API gained a new function sd_event_add_inotify_fd() that
          is similar to sd_event_add_inotify() but accepts a file descriptor
@ -665,12 +667,12 @@ CHANGES WITH 250 in spe:
          https://systemd.io/PORTING_TO_NEW_ARCHITECTURES

        * The x-systemd.makefs option in /etc/fstab now explicitly supports
-          ext2, ext3, and f2fs file systems.
+          f2fs file systems.

        * The systemd-getty-generator now honors a new kernel command line
          argument systemd.getty_auto= and a new environment variable
          $SYSTEMD_GETTY_AUTO that allows turning it off at boot. This is for
-          example useful to turn off gettys inside of containers or similar
+          example useful for turning off gettys inside of containers or similar
          environments.

        * systemd-resolved now listens on a second DNS stub address: 127.0.0.54
@ -695,96 +697,42 @@ CHANGES WITH 250 in spe:

        * systemd-repart no longer requires OpenSSL.

-        * systemd-sysusers will no longer create the redundant 'nobody' group
-          by default, as the 'nobody' user is already created with an
-          appropriate primary group.
+        * systemd-sysusers will no longer create the redundant 'nobody' group by default,
+          as the 'nobody' user is already created with an appropriate primary group.

        * If a unit uses RuntimeMaxSec, systemctl show will now display it.

        * systemctl show-environment gained support for --output=json.

        * pam_systemd will now first try to use the X11 abstract socket, and
-          fallback to the socket file in /tmp/.X11-unix/ only if that does not
-          work.
+          fallback to the socket file in /tmp/.X11-unix/ only if that does not work.

-        * systemd-journald will no longer go back to volatile storage
-          regardless of configuration when its unit is restarted.
+        * systemd-journald will no longer go back to volatile storage regardless of
+          configuration when its unit is restarted.

-        * Initial support for the LoongArch architecture has been added (system
-          call lists, GPT partition table UUIDs, etc).
+        * Initial support for the LoongArch architecture has been added
+          (system calls, defines, etc).

-        * systemd-journald's own logging messages are now also logged to the
-          journal itself when systemd-journald logs to /dev/kmsg.
+        * A LICENSES/ directory is now included in the git tree. It contains a README.md
+          file that explains the licenses used by source files in this repository.
+          It also contains the text of all applicable licenses as they appear on spdx.org.

-        * systemd-journald now re-enables COW for archived journal files on
-          filesystems that support COW. One benefit of this change is that
-          archived journal files will now get compressed on btrfs filesystems
-          that have compression enabled.
+        * systemd-journald now re-enables COW for archived journal files on filesystems
+          that support COW. One benefit of this change is that archived journal files will
+          now get compressed on btrfs filesystems that have compression enabled.

-        * systemd-journald now deduplicates fields in a single log message
-          before adding it to the journal. In archived journal files, it will
-          also punch holes for unused parts and truncate the file as
-          appropriate, leading to reductions in disk usage.
+        * systemd-journald now truncates archived journal files and punches holes in unused
+          parts of archived journal files, leading to some minor reductions in disk usage.

-        * journalctl --verify was extended with more informative error
-          messages.
+        * systemd-journald now deduplicates fields in a single log message before adding
+          it to the journal.

-        * More of sd-journal's functions are now resistant against journal file
-          corruption.
+        * journalctl --verify was extended with more informative error messages.

-        * The shutdown command learnt a new option --show, to display the
-          scheduled shutdown.
+        * More of sd-journal's functions are now resistant against journal file corruption.

-        * A LICENSES/ directory is now included in the git tree. It contains a
-          README.md file that explains the licenses used by source files in
-          this repository.  It also contains the text of all applicable
-          licenses as they appear on spdx.org.
-
-        Contributions from: Aakash Singh, Adolfo Jayme Barrientos, Albert Brox,
-        Alberto Mardegan, Alexander Kanavin, alexlzhu, Alfonso Sánchez-Beato,
-        Alvin Šipraga, Alyssa Ross, Amir Omidi, Anatol Pomozov,
-        Andika Triwidada, Andreas Rammhold, Andreas Valder, Andrej Lajovic,
-        Andrew Soutar, Andrew Stone, Andy Chi, Anita Zhang, Anssi Hannula,
-        Antonio Alvarez Feijoo, Antony Deepak Thomas, Arnaud Ferraris,
-        Arvid E. Picciani, Bastien Nocera, Benjamin Berg,
-        Benjamin Herrenschmidt, Ben Stockett, Bogdan Seniuc, Boqun Feng,
-        Carl Lei, chlorophyll-zz, Chris Packham, Christian Brauner,
-        Christian Göttsche, Christian Wehrli, Christoph Anton Mitterer,
-        Cristian Rodríguez, Daan De Meyer, Daniel Maixner, Dann Frazier,
-        Dan Streetman, David Seifert, David Tardon, dependabot[bot],
-        Dimitri John Ledkov, Dimitri Papadopoulos, Dimitry Ishenko,
-        Dmitry Khlebnikov, Dominique Martinet, duament, Egor, Egor Ignatov,
-        Emil Renner Berthing, Emily Gonyer, Ettore Atalan, Evgeny Vereshchagin,
-        Florian Klink, Franck Bui, Frantisek Sumsal, Geass-LL, Gibeom Gwon,
-        GnunuX, Gogo Gogsi, gregzuro, Greg Zuro, Gustavo Costa, Hans de Goede,
-        Hela Basa, Henri Chain, hikigaya58, Hugo Carvalho,
-        Hugo Osvaldo Barrera, Iago Lopez Galeiras, Iago López Galeiras,
-        I-dont-need-name, Jack Dähn, James Hilliard, Jan Janssen,
-        Jan Kuparinen, Jan Macku, Jan Palus, jiangchuangang, jlempen,
-        John Lindgren, Jonas Dreßler, Jonas Witschel, Joris Hartog,
-        José Expósito, Julia Kartseva, Kai-Heng Feng, Kai Wohlfahrt,
-        Kay Siver Bø, KennthStailey, Kevin Kuehler, Kevin Orr, Khem Raj,
-        Kristian Klausen, Kyle Laker, lainahai, Lennart Poettering,
-        Lia Lenckowski, longpanda, Luca Boccassi, Luca BRUNO, Ludwig Nussel,
-        Lukas Senionis, Maanya Goenka, Maciek Borzecki, Marcel Menzel,
-        Marco Scardovi, Marcus Harrison, Mark Boudreau, Matthijs van Duin,
-        Mauricio Vásquez, Maxime de Roucy, Max Resch, MertsA, Michael Biebl,
-        Michael Catanzaro, Michal Koutný, Michal Sekletár, Miika Karanki,
-        Mike Gilbert, Milo Turner, ml, monosans, Nacho Barrientos, nassir90,
-        nl6720, Ondrej Kozina, Paulo Neves, Pavel Březina, pedro martelletto,
-        Peter Hutterer, Peter Morrow, Piotr Drąg, Rasmus Villemoes, ratijas,
-        Raul Tambre, rene, Riccardo Schirone, Robert-L-Turner, Ross Jennings,
-        saikat0511, Scott Lamb, Sergei Trofimovich, Sho Iizuka,
-        Slava Bacherikov, Slimane Selyan Amiri, StefanBruens, Steven Siloti,
-        svonohr, Taiki Sugawara, Takashi Sakamoto, Takuro Onoue, Thomas Blume,
-        Thomas Haller, Thomas Mühlbacher, Tianlu Shao, Toke Høiland-Jørgensen,
-        Tom Yan, Tony Asleson, Topi Miettinen, Ulrich Ölmann, Urs Ritzmann,
-        Vincent Bernat, Vito Caputo, Vladimir Panteleev, WANG Xuerui, Wind/owZ,
-        Wu Xiaotian, xdavidwu, Xiaotian Wu, xujing, yangmingtai, Yao Wei,
-        Yao Wei (魏銘廷), Yegor Alexeyev, Yu Watanabe,
-        Zbigniew Jędrzejewski-Szmek, Дамјан Георгиевски, наб
-
-        — Warsaw, 2021-12---
+        * systemd-journald's own logging messages are now also logged to the journal itself
+          when systemd-journald logs to /dev/kmsg.

 CHANGES WITH 249:

--- a/hwdb.d/20-OUI.hwdb
+++ b/hwdb.d/20-OUI.hwdb
--- a/hwdb.d/20-acpi-vendor.hwdb
+++ b/hwdb.d/20-acpi-vendor.hwdb
@ -195,9 +195,6 @@ acpi:LNUX*:
 acpi:LOON*:
 ID_VENDOR_FROM_DATABASE=Loongson Technology Corporation Limited

-acpi:LTSC*:
- ID_VENDOR_FROM_DATABASE=Lontium Semiconductor Corporation
-
 acpi:MCHP*:
 ID_VENDOR_FROM_DATABASE=Microchip Technology Inc

@ -309,9 +306,6 @@ acpi:VFSI*:
 acpi:VSHY*:
 ID_VENDOR_FROM_DATABASE=Vishay Intertechnology, Inc.

-acpi:WACF*:
- ID_VENDOR_FROM_DATABASE=Wacom Technology
-
 acpi:WCOM*:
 ID_VENDOR_FROM_DATABASE=Wacom

@ -1252,7 +1246,7 @@ acpi:BUL*:
 ID_VENDOR_FROM_DATABASE=Bull

 acpi:BUR*:
- ID_VENDOR_FROM_DATABASE=B&R Industrial Automation GmbH
+ ID_VENDOR_FROM_DATABASE=Bernecker & Rainer Ind-Eletronik GmbH

 acpi:BUS*:
 ID_VENDOR_FROM_DATABASE=BusTek
@ -2470,7 +2464,7 @@ acpi:ESA*:
 ID_VENDOR_FROM_DATABASE=Elbit Systems of America

 acpi:ESB*:
- ID_VENDOR_FROM_DATABASE=ScioTeq
+ ID_VENDOR_FROM_DATABASE=Esterline Belgium BVBA

 acpi:ESC*:
 ID_VENDOR_FROM_DATABASE=Eden Sistemas de Computacao S/A
@ -3897,9 +3891,6 @@ acpi:KOL*:
 acpi:KOM*:
 ID_VENDOR_FROM_DATABASE=Kontron GmbH

-acpi:KOP*:
- ID_VENDOR_FROM_DATABASE=Kopin Corporation
-
 acpi:KOU*:
 ID_VENDOR_FROM_DATABASE=KOUZIRO Co.,Ltd.

@ -4788,9 +4779,6 @@ acpi:MXI*:
 acpi:MXL*:
 ID_VENDOR_FROM_DATABASE=Hitachi Maxell, Ltd.

-acpi:MXM*:
- ID_VENDOR_FROM_DATABASE=C&T Solution Inc.
-
 acpi:MXP*:
 ID_VENDOR_FROM_DATABASE=Maxpeed Corporation

@ -5061,9 +5049,6 @@ acpi:NVI*:
 acpi:NVL*:
 ID_VENDOR_FROM_DATABASE=Novell Inc

-acpi:NVO*:
- ID_VENDOR_FROM_DATABASE=Netvio Ltd.
-
 acpi:NVT*:
 ID_VENDOR_FROM_DATABASE=Navatek Engineering Corporation

@ -5091,9 +5076,6 @@ acpi:NXP*:
 acpi:NXQ*:
 ID_VENDOR_FROM_DATABASE=Nexiq Technologies, Inc.

-acpi:NXR*:
- ID_VENDOR_FROM_DATABASE=Nextorage Corporation
-
 acpi:NXS*:
 ID_VENDOR_FROM_DATABASE=Technology Nexus Secure Open Systems AB

@ -6555,9 +6537,6 @@ acpi:STT*:
 acpi:STU*:
 ID_VENDOR_FROM_DATABASE=Sentelic Corporation

-acpi:STV*:
- ID_VENDOR_FROM_DATABASE=Beijing Guochengwantong Information Technology Co., Ltd.
-
 acpi:STW*:
 ID_VENDOR_FROM_DATABASE=Starwin Inc.

@ -7344,9 +7323,6 @@ acpi:VBT*:
 acpi:VCC*:
 ID_VENDOR_FROM_DATABASE=Virtual Computer Corporation

-acpi:VCE*:
- ID_VENDOR_FROM_DATABASE=VARCem
-
 acpi:VCI*:
 ID_VENDOR_FROM_DATABASE=VistaCom Inc

--- a/hwdb.d/20-acpi-vendor.hwdb.patch
+++ b/hwdb.d/20-acpi-vendor.hwdb.patch
@ -1,5 +1,5 @@
--- 20-acpi-vendor.hwdb.base	2021-12-09 11:01:54.284913786 +0100
-+++ 20-acpi-vendor.hwdb	2021-12-09 11:01:54.304914014 +0100
+--- 20-acpi-vendor.hwdb.base	2021-07-07 10:33:12.713907413 +0100
+++ 20-acpi-vendor.hwdb	2021-07-07 10:33:12.725907583 +0100
@@ -3,6 +3,8 @@
 # Data imported from:
 #     https://uefi.org/uefi-pnp-export
@ -19,7 +19,7 @@
 acpi:AMDI*:
  ID_VENDOR_FROM_DATABASE=AMD
 
-@@ -325,6 +324,9 @@
+@@ -319,6 +318,9 @@
 acpi:AAA*:
  ID_VENDOR_FROM_DATABASE=Avolites Ltd
 
@ -29,7 +29,7 @@
 acpi:AAE*:
  ID_VENDOR_FROM_DATABASE=Anatek Electronics Inc.
 
-@@ -352,6 +354,9 @@
+@@ -346,6 +348,9 @@
 acpi:ABO*:
  ID_VENDOR_FROM_DATABASE=D-Link Systems Inc
 
@ -39,7 +39,7 @@
 acpi:ABS*:
  ID_VENDOR_FROM_DATABASE=Abaco Systems, Inc.
 
-@@ -397,7 +402,7 @@
+@@ -391,7 +396,7 @@
 acpi:ACO*:
  ID_VENDOR_FROM_DATABASE=Allion Computer Inc.
 
@ -48,7 +48,7 @@
  ID_VENDOR_FROM_DATABASE=Aspen Tech Inc
 
 acpi:ACR*:
-@@ -670,6 +675,9 @@
+@@ -664,6 +669,9 @@
 acpi:AMT*:
  ID_VENDOR_FROM_DATABASE=AMT International Industry
 
@ -58,7 +58,7 @@
 acpi:AMX*:
  ID_VENDOR_FROM_DATABASE=AMX LLC
 
-@@ -718,6 +726,9 @@
+@@ -712,6 +720,9 @@
 acpi:AOA*:
  ID_VENDOR_FROM_DATABASE=AOpen Inc.
 
@ -68,7 +68,7 @@
 acpi:AOE*:
  ID_VENDOR_FROM_DATABASE=Advanced Optics Electronics, Inc.
 
-@@ -727,6 +738,9 @@
+@@ -721,6 +732,9 @@
 acpi:AOT*:
  ID_VENDOR_FROM_DATABASE=Alcatel
 
@ -78,7 +78,7 @@
 acpi:APC*:
  ID_VENDOR_FROM_DATABASE=American Power Conversion
 
-@@ -902,7 +916,7 @@
+@@ -896,7 +910,7 @@
  ID_VENDOR_FROM_DATABASE=ALPS ALPINE CO., LTD.
 
 acpi:AUO*:
@ -87,7 +87,7 @@
 
 acpi:AUR*:
  ID_VENDOR_FROM_DATABASE=Aureal Semiconductor
-@@ -982,6 +996,9 @@
+@@ -976,6 +990,9 @@
 acpi:AXE*:
  ID_VENDOR_FROM_DATABASE=Axell Corporation
 
@ -97,7 +97,7 @@
 acpi:AXI*:
  ID_VENDOR_FROM_DATABASE=American Magnetics
 
-@@ -1132,6 +1149,9 @@
+@@ -1126,6 +1143,9 @@
 acpi:BML*:
  ID_VENDOR_FROM_DATABASE=BIOMED Lab
 
@ -107,7 +107,7 @@
 acpi:BMS*:
  ID_VENDOR_FROM_DATABASE=BIOMEDISYS
 
-@@ -1144,6 +1164,9 @@
+@@ -1138,6 +1158,9 @@
 acpi:BNO*:
  ID_VENDOR_FROM_DATABASE=Bang & Olufsen
 
@ -117,7 +117,7 @@
 acpi:BNS*:
  ID_VENDOR_FROM_DATABASE=Boulder Nonlinear Systems
 
-@@ -1387,6 +1410,9 @@
+@@ -1381,6 +1404,9 @@
 acpi:CHA*:
  ID_VENDOR_FROM_DATABASE=Chase Research PLC
 
@ -127,7 +127,7 @@
 acpi:CHD*:
  ID_VENDOR_FROM_DATABASE=ChangHong Electric Co.,Ltd
 
-@@ -1549,6 +1575,9 @@
+@@ -1543,6 +1569,9 @@
 acpi:COD*:
  ID_VENDOR_FROM_DATABASE=CODAN Pty. Ltd.
 
@ -137,7 +137,7 @@
 acpi:COI*:
  ID_VENDOR_FROM_DATABASE=Codec Inc.
 
-@@ -1958,7 +1987,7 @@
+@@ -1952,7 +1981,7 @@
  ID_VENDOR_FROM_DATABASE=Dragon Information Technology
 
 acpi:DJE*:
@ -146,7 +146,7 @@
 
 acpi:DJP*:
  ID_VENDOR_FROM_DATABASE=Maygay Machines, Ltd
-@@ -2296,6 +2325,9 @@
+@@ -2290,6 +2319,9 @@
 acpi:EIN*:
  ID_VENDOR_FROM_DATABASE=Elegant Invention
 
@ -156,7 +156,7 @@
 acpi:EKA*:
  ID_VENDOR_FROM_DATABASE=MagTek Inc.
 
-@@ -2560,6 +2592,9 @@
+@@ -2554,6 +2586,9 @@
 acpi:FCG*:
  ID_VENDOR_FROM_DATABASE=First International Computer Ltd
 
@ -166,7 +166,7 @@
 acpi:FCS*:
  ID_VENDOR_FROM_DATABASE=Focus Enhancements, Inc.
 
-@@ -2936,7 +2971,7 @@
+@@ -2930,7 +2965,7 @@
  ID_VENDOR_FROM_DATABASE=General Standards Corporation
 
 acpi:GSM*:
@ -175,7 +175,7 @@
 
 acpi:GSN*:
  ID_VENDOR_FROM_DATABASE=Grandstream Networks, Inc.
-@@ -3037,6 +3072,9 @@
+@@ -3031,6 +3066,9 @@
 acpi:HEC*:
  ID_VENDOR_FROM_DATABASE=Hisense Electric Co., Ltd.
 
@ -185,7 +185,7 @@
 acpi:HEL*:
  ID_VENDOR_FROM_DATABASE=Hitachi Micro Systems Europe Ltd
 
-@@ -3169,6 +3207,9 @@
+@@ -3163,6 +3201,9 @@
 acpi:HSD*:
  ID_VENDOR_FROM_DATABASE=HannStar Display Corp
 
@ -195,7 +195,7 @@
 acpi:HSM*:
  ID_VENDOR_FROM_DATABASE=AT&T Microelectronics
 
-@@ -3295,6 +3336,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
 
-@@ -3391,6 +3435,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
 
-@@ -3436,6 +3483,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
 
-@@ -3952,6 +4002,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
 
-@@ -4000,6 +4053,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
 
-@@ -4015,6 +4071,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
 
-@@ -4072,6 +4131,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
 
-@@ -4106,7 +4168,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
-@@ -4282,6 +4344,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
 
-@@ -4522,6 +4587,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
 
-@@ -4756,6 +4824,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.
 
-@@ -5278,6 +5349,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.
 
-@@ -5341,9 +5415,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
 
-@@ -5434,9 +5505,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.
 
-@@ -5572,15 +5640,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
 
-@@ -5896,9 +5958,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
 
-@@ -6067,9 +6126,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
 
-@@ -6535,6 +6591,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
 
-@@ -6619,6 +6678,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
 
-@@ -6709,6 +6771,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
 
-@@ -6751,6 +6816,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.
 
-@@ -6874,9 +6942,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
 
-@@ -7186,14 +7251,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.
-@@ -7228,6 +7293,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
 
-@@ -7483,9 +7551,6 @@
+@@ -7459,9 +7527,6 @@
 acpi:WAL*:
  ID_VENDOR_FROM_DATABASE=Wave Access
 
@ -461,7 +461,7 @@
 acpi:WAV*:
  ID_VENDOR_FROM_DATABASE=Wavephore
 
-@@ -7610,7 +7675,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.
-@@ -7624,9 +7689,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.
 
-@@ -7657,9 +7719,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
 
-@@ -7726,6 +7785,9 @@
+@@ -7702,6 +7761,9 @@
 acpi:ZBX*:
  ID_VENDOR_FROM_DATABASE=Zebax Technologies
 
--- a/hwdb.d/20-pci-classes.hwdb
+++ b/hwdb.d/20-pci-classes.hwdb
@ -176,15 +176,6 @@ pci:v*d*sv*sd*bc05sc00*
 pci:v*d*sv*sd*bc05sc01*
 ID_PCI_SUBCLASS_FROM_DATABASE=FLASH memory

-pci:v*d*sv*sd*bc05sc02*
- ID_PCI_SUBCLASS_FROM_DATABASE=CXL
-
-pci:v*d*sv*sd*bc05sc02i00*
- ID_PCI_INTERFACE_FROM_DATABASE=CXL Memory Device - vendor specific
-
-pci:v*d*sv*sd*bc05sc02i10*
- ID_PCI_INTERFACE_FROM_DATABASE=CXL Memory Device (CXL 2.x)
-
 pci:v*d*sv*sd*bc05sc80*
 ID_PCI_SUBCLASS_FROM_DATABASE=Memory controller

@ -524,9 +515,6 @@ pci:v*d*sv*sd*bc0Csc08*
 pci:v*d*sv*sd*bc0Csc09*
 ID_PCI_SUBCLASS_FROM_DATABASE=CANBUS

-pci:v*d*sv*sd*bc0Csc80*
- ID_PCI_SUBCLASS_FROM_DATABASE=Serial bus controller
-
 pci:v*d*sv*sd*bc0D*
 ID_PCI_CLASS_FROM_DATABASE=Wireless controller

--- a/hwdb.d/20-pci-vendor-model.hwdb
+++ b/hwdb.d/20-pci-vendor-model.hwdb
--- a/hwdb.d/20-usb-vendor-model.hwdb
+++ b/hwdb.d/20-usb-vendor-model.hwdb
@ -152,12 +152,6 @@ usb:v0386*
 usb:v0386p0001*
 ID_MODEL_FROM_DATABASE=PSX for USB Converter

-usb:v03C3*
- ID_VENDOR_FROM_DATABASE=ZWO
-
-usb:v03C3p120E*
- ID_MODEL_FROM_DATABASE=ASI120MC-S Planetary Camera
-
 usb:v03D9*
 ID_VENDOR_FROM_DATABASE=Shenzhen Sinote Tech-Electron Co., Ltd

@ -302,9 +296,6 @@ usb:v03EBp2065*
 usb:v03EBp2066*
 ID_MODEL_FROM_DATABASE=LUFA Multiple Report HID Demo

-usb:v03EBp2067*
- ID_MODEL_FROM_DATABASE=LUFA HID Class Bootloader
-
 usb:v03EBp2068*
 ID_MODEL_FROM_DATABASE=LUFA Virtual Serial/Mass Storage Demo

@ -995,9 +986,6 @@ usb:v03F0p161D*
 usb:v03F0p1624*
 ID_MODEL_FROM_DATABASE=Smart Card Keyboard - JP

-usb:v03F0p1647*
- ID_MODEL_FROM_DATABASE=Z27n G2 Monitor Hub
-
 usb:v03F0p1702*
 ID_MODEL_FROM_DATABASE=PhotoSmart 380 series

@ -1265,9 +1253,6 @@ usb:v03F0p2811*
 usb:v03F0p2817*
 ID_MODEL_FROM_DATABASE=Color LaserJet 2840

-usb:v03F0p2841*
- ID_MODEL_FROM_DATABASE=OMEN MINDFRAME [3XT27AA]
-
 usb:v03F0p2902*
 ID_MODEL_FROM_DATABASE=PhotoSmart A820 series

@ -2072,9 +2057,6 @@ usb:v03F0pBB02*
 usb:v03F0pBC02*
 ID_MODEL_FROM_DATABASE=PhotoSmart 8700 series

-usb:v03F0pBC11*
- ID_MODEL_FROM_DATABASE=Photosmart 7520 series
-
 usb:v03F0pBD02*
 ID_MODEL_FROM_DATABASE=PhotoSmart Pro B9100 series

@ -2366,9 +2348,6 @@ usb:v0403p6EE0*
 usb:v0403p6F70*
 ID_MODEL_FROM_DATABASE=HB-RF-USB

-usb:v0403p7BE8*
- ID_MODEL_FROM_DATABASE=FT232R
-
 usb:v0403p8028*
 ID_MODEL_FROM_DATABASE=Dev board JTAG (FT232H based)

@ -2651,9 +2630,6 @@ usb:v0403pDAF4*
 usb:v0403pE0D0*
 ID_MODEL_FROM_DATABASE=Total Phase Aardvark I2C/SPI Host Adapter

-usb:v0403pE518*
- ID_MODEL_FROM_DATABASE=IBR IMB-usb
-
 usb:v0403pE521*
 ID_MODEL_FROM_DATABASE=EVER Sinline XL Series UPS

@ -2705,9 +2681,6 @@ usb:v0403pED73*
 usb:v0403pED74*
 ID_MODEL_FROM_DATABASE=HAMEG HO820 Serial Port

-usb:v0403pEEA2*
- ID_MODEL_FROM_DATABASE=PCStage Lite 32 channel DMX512 Interface
-
 usb:v0403pEF10*
 ID_MODEL_FROM_DATABASE=FT1245BL

@ -3458,9 +3431,6 @@ usb:v040Ap4021*
 usb:v040Ap4022*
 ID_MODEL_FROM_DATABASE=1400 Digital Photo Printer

-usb:v040Ap4023*
- ID_MODEL_FROM_DATABASE=Photo Printer 8800 / 9810
-
 usb:v040Ap402B*
 ID_MODEL_FROM_DATABASE=Photo Printer 6850

@ -3965,9 +3935,6 @@ usb:v0416p7722*
 usb:v0416p7723*
 ID_MODEL_FROM_DATABASE=SD Card Reader

-usb:v0416pB23C*
- ID_MODEL_FROM_DATABASE=KT108 keyboard
-
 usb:v0416pC141*
 ID_MODEL_FROM_DATABASE=Barcode Scanner

@ -4973,15 +4940,9 @@ usb:v0424p2228*
 usb:v0424p223A*
 ID_MODEL_FROM_DATABASE=8-in-1 Card Reader

-usb:v0424p2412*
- ID_MODEL_FROM_DATABASE=Hub
-
 usb:v0424p2503*
 ID_MODEL_FROM_DATABASE=USB 2.0 Hub

-usb:v0424p2504*
- ID_MODEL_FROM_DATABASE=Hub
-
 usb:v0424p2507*
 ID_MODEL_FROM_DATABASE=hub

@ -5190,7 +5151,7 @@ usb:v042F*
 ID_VENDOR_FROM_DATABASE=Molex, Inc.

 usb:v0430*
- ID_VENDOR_FROM_DATABASE=Fujitsu Component Limited
+ ID_VENDOR_FROM_DATABASE=Sun Microsystems, Inc.

 usb:v0430p0002*
 ID_MODEL_FROM_DATABASE=109 Keyboard
@ -6128,9 +6089,6 @@ usb:v0451p8140*
 usb:v0451p8142*
 ID_MODEL_FROM_DATABASE=TUSB8041 4-Port Hub

-usb:v0451p9261*
- ID_MODEL_FROM_DATABASE=TUSB9261 SerialATA-Bridge
-
 usb:v0451p926B*
 ID_MODEL_FROM_DATABASE=TUSB9260 Boot Loader

@ -7838,9 +7796,6 @@ usb:v0461p4E22*
 usb:v0461p4E6F*
 ID_MODEL_FROM_DATABASE=Acer Wired Keyboard Model KBAY211

-usb:v0461p4E72*
- ID_MODEL_FROM_DATABASE=Acer Wired Keyboard Model KBAY211
-
 usb:v0463*
 ID_VENDOR_FROM_DATABASE=MGE UPS Systems

@ -8246,9 +8201,6 @@ usb:v046Dp08E0*
 usb:v046Dp08E1*
 ID_MODEL_FROM_DATABASE=Labtec Webcam

-usb:v046Dp08E5*
- ID_MODEL_FROM_DATABASE=C920 PRO HD Webcam
-
 usb:v046Dp08F0*
 ID_MODEL_FROM_DATABASE=QuickCam Messenger

@ -8435,9 +8387,6 @@ usb:v046Dp0A66*
 usb:v046Dp0A8F*
 ID_MODEL_FROM_DATABASE=H390 headset with microphone

-usb:v046Dp0AAA*
- ID_MODEL_FROM_DATABASE=Logitech G PRO X Gaming Headset
-
 usb:v046Dp0B02*
 ID_MODEL_FROM_DATABASE=C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)

@ -8996,9 +8945,6 @@ usb:v046DpC332*
 usb:v046DpC335*
 ID_MODEL_FROM_DATABASE=G910 Orion Spectrum Mechanical Keyboard

-usb:v046DpC336*
- ID_MODEL_FROM_DATABASE=G213 Prodigy Gaming Keyboard
-
 usb:v046DpC33A*
 ID_MODEL_FROM_DATABASE=G413 Gaming Keyboard

@ -10061,9 +10007,6 @@ usb:v0480p0100*
 usb:v0480p0200*
 ID_MODEL_FROM_DATABASE=External Disk

-usb:v0480p0212*
- ID_MODEL_FROM_DATABASE=Toshiba Canvio Connect II 500GB Portable Hard Drive
-
 usb:v0480p0820*
 ID_MODEL_FROM_DATABASE=Canvio Advance Disk

@ -10979,9 +10922,6 @@ usb:v04A5p6200*
 usb:v04A5p7500*
 ID_MODEL_FROM_DATABASE=Hi-Speed Mass Storage Device

-usb:v04A5p8001*
- ID_MODEL_FROM_DATABASE=BenQ ZOWIE Gaming Mouse
-
 usb:v04A5p9000*
 ID_MODEL_FROM_DATABASE=AWL300 Wireless Adapter

@ -13667,12 +13607,6 @@ usb:v04B4p5500*
 usb:v04B4p5A9B*
 ID_MODEL_FROM_DATABASE=Dacal CD/DVD Library D-101/DC-300/DC-016RW

-usb:v04B4p6022*
- ID_MODEL_FROM_DATABASE=Hantek DSO-6022BE
-
-usb:v04B4p602A*
- ID_MODEL_FROM_DATABASE=Hantek DSO-6022BL
-
 usb:v04B4p6370*
 ID_MODEL_FROM_DATABASE=ViewMate Desktop Mouse CC2201

@ -13742,9 +13676,6 @@ usb:v04B4pF111*
 usb:v04B4pF115*
 ID_MODEL_FROM_DATABASE=PSoC FirstTouch Programmer

-usb:v04B4pF139*
- ID_MODEL_FROM_DATABASE=KitProg
-
 usb:v04B4pF231*
 ID_MODEL_FROM_DATABASE=DELLY Changer 4in1 universal IR remote

@ -13766,12 +13697,6 @@ usb:v04B5*
 usb:v04B5p3064*
 ID_MODEL_FROM_DATABASE=Hantek DSO-3064

-usb:v04B5p6022*
- ID_MODEL_FROM_DATABASE=Hantek DSO-6022BE
-
-usb:v04B5p602A*
- ID_MODEL_FROM_DATABASE=Hantek DSO-6022BL
-
 usb:v04B6*
 ID_VENDOR_FROM_DATABASE=Hint Corp.

@ -13805,9 +13730,6 @@ usb:v04B8p0007*
 usb:v04B8p0015*
 ID_MODEL_FROM_DATABASE=Stylus Photo R3000

-usb:v04B8p0080*
- ID_MODEL_FROM_DATABASE=SC-P400 Series
-
 usb:v04B8p0101*
 ID_MODEL_FROM_DATABASE=GT-7000U [Perfection 636]

@ -14783,9 +14705,6 @@ usb:v04CAp7025*
 usb:v04CAp7046*
 ID_MODEL_FROM_DATABASE=TOSHIBA Web Camera - HD

-usb:v04CAp7054*
- ID_MODEL_FROM_DATABASE=HP HD Webcam
-
 usb:v04CAp9304*
 ID_MODEL_FROM_DATABASE=Hub

@ -15074,9 +14993,6 @@ usb:v04CBp02E0*
 usb:v04CBp5006*
 ID_MODEL_FROM_DATABASE=ASK-300

-usb:v04CBp5007*
- ID_MODEL_FROM_DATABASE=DX100
-
 usb:v04CC*
 ID_VENDOR_FROM_DATABASE=ST-Ericsson

@ -15338,9 +15254,6 @@ usb:v04D9p0006*
 usb:v04D9p0022*
 ID_MODEL_FROM_DATABASE=Portable Keyboard

-usb:v04D9p0129*
- ID_MODEL_FROM_DATABASE=Keyboard [KBPV8000]
-
 usb:v04D9p0348*
 ID_MODEL_FROM_DATABASE=Keyboard

@ -16262,9 +16175,6 @@ usb:v04E8p390F*
 usb:v04E8p3911*
 ID_MODEL_FROM_DATABASE=SCX-1020 series

-usb:v04E8p4001*
- ID_MODEL_FROM_DATABASE=PSSD T7
-
 usb:v04E8p4005*
 ID_MODEL_FROM_DATABASE=GT-S8000 Jet (msc)

@ -17051,9 +16961,6 @@ usb:v04F2pB3FD*
 usb:v04F2pB40E*
 ID_MODEL_FROM_DATABASE=HP Truevision HD camera

-usb:v04F2pB420*
- ID_MODEL_FROM_DATABASE=Lenovo EasyCamera
-
 usb:v04F2pB444*
 ID_MODEL_FROM_DATABASE=Lenovo Integrated Webcam

@ -20567,9 +20474,6 @@ usb:v054Cp082F*
 usb:v054Cp0847*
 ID_MODEL_FROM_DATABASE=WG-C10 Portable Wireless Server

-usb:v054Cp0873*
- ID_MODEL_FROM_DATABASE=UP-971AD
-
 usb:v054Cp0877*
 ID_MODEL_FROM_DATABASE=UP-D898/X898 series

@ -20618,9 +20522,6 @@ usb:v054Cp0CDA*
 usb:v054Cp0CE0*
 ID_MODEL_FROM_DATABASE=WF-1000XM3 [Wireless Noise-Canceling Headphones]

-usb:v054Cp0CE6*
- ID_MODEL_FROM_DATABASE=DualSense wireless controller (PS5)
-
 usb:v054Cp0CF0*
 ID_MODEL_FROM_DATABASE=MRW-G1

@ -21698,12 +21599,6 @@ usb:v056Ap03AA*
 usb:v056Ap03AC*
 ID_MODEL_FROM_DATABASE=DTH-W1620 [MobileStudio Pro 16] touchscreen

-usb:v056Ap03C5*
- ID_MODEL_FROM_DATABASE=CTL-4100WL [Intuos BT (S)]
-
-usb:v056Ap03C7*
- ID_MODEL_FROM_DATABASE=CTL-6100WL [Intuos BT (M)]
-
 usb:v056Ap0400*
 ID_MODEL_FROM_DATABASE=PenPartner 4x5

@ -24857,9 +24752,6 @@ usb:v05ACp850A*
 usb:v05ACp8510*
 ID_MODEL_FROM_DATABASE=FaceTime HD Camera (Built-in)

-usb:v05ACp8511*
- ID_MODEL_FROM_DATABASE=FaceTime HD Camera (Built-in)
-
 usb:v05ACp8600*
 ID_MODEL_FROM_DATABASE=iBridge

@ -24872,9 +24764,6 @@ usb:v05ACp9127*
 usb:v05ACp912F*
 ID_MODEL_FROM_DATABASE=Hub in 30" Cinema Display

-usb:v05ACp9210*
- ID_MODEL_FROM_DATABASE=Studio Display 21"
-
 usb:v05ACp9215*
 ID_MODEL_FROM_DATABASE=Studio Display 15"

@ -25169,9 +25058,6 @@ usb:v05C6p9274*
 usb:v05C6p9275*
 ID_MODEL_FROM_DATABASE=iRex Technologies Gobi 2000 Wireless Modem

-usb:v05C6pF000*
- ID_MODEL_FROM_DATABASE=TA-1004 [Nokia 8]
-
 usb:v05C6pF003*
 ID_MODEL_FROM_DATABASE=Nokia 8110 4G

@ -26156,9 +26042,6 @@ usb:v05E0p1701*
 usb:v05E0p1900*
 ID_MODEL_FROM_DATABASE=SNAPI Imaging Device

-usb:v05E0p1A00*
- ID_MODEL_FROM_DATABASE=CS4070 Barcode Scanner
-
 usb:v05E0p2000*
 ID_MODEL_FROM_DATABASE=MC3090 Rugged Mobile Computer

@ -26285,15 +26168,6 @@ usb:v05E3p0612*
 usb:v05E3p0616*
 ID_MODEL_FROM_DATABASE=hub

-usb:v05E3p0618*
- ID_MODEL_FROM_DATABASE=Hub
-
-usb:v05E3p0620*
- ID_MODEL_FROM_DATABASE=GL3523 Hub
-
-usb:v05E3p0626*
- ID_MODEL_FROM_DATABASE=Hub
-
 usb:v05E3p0660*
 ID_MODEL_FROM_DATABASE=USB 2.0 Hub

@ -26405,9 +26279,6 @@ usb:v05E3p0749*
 usb:v05E3p0751*
 ID_MODEL_FROM_DATABASE=microSD Card Reader

-usb:v05E3p0752*
- ID_MODEL_FROM_DATABASE=micros Reader
-
 usb:v05E3p0760*
 ID_MODEL_FROM_DATABASE=USB 2.0 Card Reader/Writer

@ -28841,150 +28712,9 @@ usb:v06BCp01E0*
 usb:v06BCp020B*
 ID_MODEL_FROM_DATABASE=OKI ES4140 Mono Printer

-usb:v06BCp021F*
- ID_MODEL_FROM_DATABASE=ES8460 Multifunction Printer
-
-usb:v06BCp026F*
- ID_MODEL_FROM_DATABASE=MC351 Multifunction Printer
-
-usb:v06BCp0270*
- ID_MODEL_FROM_DATABASE=MC351 Multifunction Printer
-
-usb:v06BCp0271*
- ID_MODEL_FROM_DATABASE=MC351 Multifunction Printer
-
-usb:v06BCp0272*
- ID_MODEL_FROM_DATABASE=MC351 Multifunction Printer
-
-usb:v06BCp0273*
- ID_MODEL_FROM_DATABASE=MC351 Multifunction Printer
-
-usb:v06BCp0274*
- ID_MODEL_FROM_DATABASE=ES3451 Multifunction Printer
-
-usb:v06BCp0275*
- ID_MODEL_FROM_DATABASE=MC351 Multifunction Printer
-
-usb:v06BCp0276*
- ID_MODEL_FROM_DATABASE=MC351 Multifunction Printer
-
-usb:v06BCp0277*
- ID_MODEL_FROM_DATABASE=MC351 Multifunction Printer
-
-usb:v06BCp0278*
- ID_MODEL_FROM_DATABASE=MC351 Multifunction Printer
-
-usb:v06BCp0279*
- ID_MODEL_FROM_DATABASE=MC361 Multifunction Printer
-
-usb:v06BCp027A*
- ID_MODEL_FROM_DATABASE=MC361 Multifunction Printer
-
-usb:v06BCp027B*
- ID_MODEL_FROM_DATABASE=MC361 Multifunction Printer
-
-usb:v06BCp027C*
- ID_MODEL_FROM_DATABASE=MC361 Multifunction Printer
-
-usb:v06BCp027D*
- ID_MODEL_FROM_DATABASE=MC361 Multifunction Printer
-
-usb:v06BCp027E*
- ID_MODEL_FROM_DATABASE=ES3461 Multifunction Printer
-
-usb:v06BCp027F*
- ID_MODEL_FROM_DATABASE=MC361 Multifunction Printer
-
-usb:v06BCp0280*
- ID_MODEL_FROM_DATABASE=MC361 Multifunction Printer
-
-usb:v06BCp0281*
- ID_MODEL_FROM_DATABASE=MC361 Multifunction Printer
-
-usb:v06BCp0282*
- ID_MODEL_FROM_DATABASE=MC361 Multifunction Printer
-
-usb:v06BCp0283*
- ID_MODEL_FROM_DATABASE=MC561 Multifunction Printer
-
-usb:v06BCp0284*
- ID_MODEL_FROM_DATABASE=MC561 Multifunction Printer
-
-usb:v06BCp0285*
- ID_MODEL_FROM_DATABASE=MC561 Multifunction Printer
-
-usb:v06BCp0286*
- ID_MODEL_FROM_DATABASE=MC561 Multifunction Printer
-
-usb:v06BCp0287*
- ID_MODEL_FROM_DATABASE=CX2731 Multifunction Printer
-
-usb:v06BCp0288*
- ID_MODEL_FROM_DATABASE=ES5461 Multifunction Printer
-
-usb:v06BCp0289*
- ID_MODEL_FROM_DATABASE=ES5461 Multifunction Printer
-
-usb:v06BCp028A*
- ID_MODEL_FROM_DATABASE=MC561 Multifunction Printer
-
-usb:v06BCp028B*
- ID_MODEL_FROM_DATABASE=MC561 Multifunction Printer
-
-usb:v06BCp028C*
- ID_MODEL_FROM_DATABASE=MC561 Multifunction Printer
-
-usb:v06BCp02B4*
- ID_MODEL_FROM_DATABASE=MC861 Multifunction Printer
-
-usb:v06BCp02B5*
- ID_MODEL_FROM_DATABASE=ES8461 Multifunction Printer
-
-usb:v06BCp02B6*
- ID_MODEL_FROM_DATABASE=MC851 Multifunction Printer
-
-usb:v06BCp02B7*
- ID_MODEL_FROM_DATABASE=ES8451 Multifunction Printer
-
 usb:v06BCp02BB*
 ID_MODEL_FROM_DATABASE=OKI PT390 POS Printer

-usb:v06BCp02BD*
- ID_MODEL_FROM_DATABASE=MB461 Multifunction Printer
-
-usb:v06BCp02BE*
- ID_MODEL_FROM_DATABASE=MB471 Multifunction Printer
-
-usb:v06BCp02BF*
- ID_MODEL_FROM_DATABASE=MB491 Multifunction Printer
-
-usb:v06BCp02CA*
- ID_MODEL_FROM_DATABASE=ES4161 Multifunction Printer
-
-usb:v06BCp02CB*
- ID_MODEL_FROM_DATABASE=ES4191 Multifunction Printer
-
-usb:v06BCp02D4*
- ID_MODEL_FROM_DATABASE=MPS4200mb Multifunction Printer
-
-usb:v06BCp02E7*
- ID_MODEL_FROM_DATABASE=MC352 Multifunction Printer
-
-usb:v06BCp02E8*
- ID_MODEL_FROM_DATABASE=MC362 Multifunction Printer
-
-usb:v06BCp02E9*
- ID_MODEL_FROM_DATABASE=MC562 Multifunction Printer
-
-usb:v06BCp02EA*
- ID_MODEL_FROM_DATABASE=ES3452 Multifunction Printer
-
-usb:v06BCp02EB*
- ID_MODEL_FROM_DATABASE=ES5462 Multifunction Printer
-
-usb:v06BCp02EE*
- ID_MODEL_FROM_DATABASE=MB451 Multifunction Printer
-
 usb:v06BCp0383*
 ID_MODEL_FROM_DATABASE=MC563 Multifunction Printer

@ -65513,60 +65243,6 @@ usb:v25DA*
 usb:v25DAp0001*
 ID_MODEL_FROM_DATABASE=Weather Station

-usb:v25DD*
- ID_VENDOR_FROM_DATABASE=Bit4id Srl
-
-usb:v25DDp1101*
- ID_MODEL_FROM_DATABASE=miniLector-s
-
-usb:v25DDp1201*
- ID_MODEL_FROM_DATABASE=cryptokey
-
-usb:v25DDp2221*
- ID_MODEL_FROM_DATABASE=iAM
-
-usb:v25DDp2311*
- ID_MODEL_FROM_DATABASE=keyfour-a1
-
-usb:v25DDp2321*
- ID_MODEL_FROM_DATABASE=CKey4
-
-usb:v25DDp2341*
- ID_MODEL_FROM_DATABASE=tokenME FIPS v3
-
-usb:v25DDp2351*
- ID_MODEL_FROM_DATABASE=Digital DNA Key
-
-usb:v25DDp2354*
- ID_MODEL_FROM_DATABASE=Digital-DNA Key
-
-usb:v25DDp2361*
- ID_MODEL_FROM_DATABASE=Digital-DNA Key BT
-
-usb:v25DDp2362*
- ID_MODEL_FROM_DATABASE=Digital-DNA Key
-
-usb:v25DDp2371*
- ID_MODEL_FROM_DATABASE=TokenME EVO v2
-
-usb:v25DDp23B4*
- ID_MODEL_FROM_DATABASE=ArubaKey AK901
-
-usb:v25DDp3111*
- ID_MODEL_FROM_DATABASE=miniLector EVO
-
-usb:v25DDp3211*
- ID_MODEL_FROM_DATABASE=miniLector AIR EVO
-
-usb:v25DDp3403*
- ID_MODEL_FROM_DATABASE=miniLector AIR NFC v3
-
-usb:v25DDp3503*
- ID_MODEL_FROM_DATABASE=mLector AIR DI V3
-
-usb:v25DDpB001*
- ID_MODEL_FROM_DATABASE=miniLector Blue
-
 usb:v25E3*
 ID_VENDOR_FROM_DATABASE=Lumigon

--- a/hwdb.d/60-autosuspend-fingerprint-reader.hwdb
+++ b/hwdb.d/60-autosuspend-fingerprint-reader.hwdb
@ -146,7 +146,6 @@ usb:v04F3p0C58*
 ID_PERSIST=0

 # Supported by libfprint driver elanmoc
-usb:v04F3p0C7D*
 usb:v04F3p0C7E*
 ID_AUTOSUSPEND=1
 ID_PERSIST=0
@ -163,7 +162,6 @@ usb:v27C6p60A2*
 usb:v27C6p639C*
 usb:v27C6p63AC*
 usb:v27C6p63BC*
-usb:v27C6p63CC*
 usb:v27C6p6496*
 usb:v27C6p6584*
 usb:v27C6p658C*
@ -290,7 +288,6 @@ usb:v0A5Cp5842*
 usb:v0A5Cp5843*
 usb:v0A5Cp5844*
 usb:v0A5Cp5845*
-usb:v0BDAp5812*
 usb:v10A5p0007*
 usb:v1188p9545*
 usb:v138Ap0007*
--- a/hwdb.d/acpi_id_registry.html
+++ b/hwdb.d/acpi_id_registry.html
@ -108,8 +108,6 @@
 <tr class="even"><td>Dynabook Inc.</td><td>DNBK</td><td>06/01/2021</td> </tr>
 <tr class="odd"><td>Dioo Microcircuits Co., Ltd. Jiangsu</td><td>DIOO</td><td>06/04/2021</td> </tr>
 <tr class="even"><td>Purism SPC</td><td>PURI</td><td>06/10/2021</td> </tr>
- <tr class="odd"><td>Lontium Semiconductor Corporation</td><td>LTSC</td><td>07/21/2021</td> </tr>
- <tr class="even"><td>Wacom Technology</td><td>WACF</td><td>09/21/2021</td> </tr>
      </tbody>
    </table>
  </body>
--- a/hwdb.d/ma-large.txt
+++ b/hwdb.d/ma-large.txt
--- a/hwdb.d/ma-medium.txt
+++ b/hwdb.d/ma-medium.txt
--- a/hwdb.d/ma-small.txt
+++ b/hwdb.d/ma-small.txt
--- a/hwdb.d/pci.ids
+++ b/hwdb.d/pci.ids
--- a/hwdb.d/pnp_id_registry.html
+++ b/hwdb.d/pnp_id_registry.html
@ -274,7 +274,7 @@
 <tr class="even"><td>Beko Elektronik A.S.</td><td>BEK</td><td>06/15/2005</td> </tr>
 <tr class="odd"><td>Beltronic Industrieelektronik GmbH</td><td>BEL</td><td>09/05/2006</td> </tr>
 <tr class="even"><td>Benson Medical Instruments Company</td><td>BMI</td><td>12/04/1996</td> </tr>
- <tr class="odd"><td>B&amp;R Industrial Automation GmbH</td><td>BUR</td><td>11/29/1996</td> </tr>
+ <tr class="odd"><td>Bernecker &amp; Rainer Ind-Eletronik GmbH</td><td>BUR</td><td>11/29/1996</td> </tr>
 <tr class="even"><td>Best Buy</td><td>INZ</td><td>06/04/2004</td> </tr>
 <tr class="odd"><td>Best Buy</td><td>VPR</td><td>05/16/2002</td> </tr>
 <tr class="even"><td>Best Power</td><td>BPU</td><td>11/29/1996</td> </tr>
@ -723,7 +723,7 @@
 <tr class="odd"><td>ESS Technology Inc</td><td>ESS</td><td>11/29/1996</td> </tr>
 <tr class="even"><td>ESSential Comm. Corporation</td><td>ECC</td><td>11/29/1996</td> </tr>
 <tr class="odd"><td>Esterline Technologies</td><td>ESL</td><td>01/06/2012</td> </tr>
- <tr class="even"><td>ScioTeq</td><td>ESB</td><td>01/15/2015</td> </tr>
+ <tr class="even"><td>Esterline Belgium BVBA</td><td>ESB</td><td>01/15/2015</td> </tr>
 <tr class="odd"><td>E-Systems Inc</td><td>ESY</td><td>11/29/1996</td> </tr>
 <tr class="even"><td>ET&amp;T Technology Company Ltd</td><td>EEE</td><td>05/04/1998</td> </tr>
 <tr class="odd"><td>E-Tech Inc</td><td>ETT</td><td>11/29/1996</td> </tr>
@ -2491,12 +2491,6 @@
 <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>
- <tr class="even"><td>C&amp;T Solution Inc.</td><td>MXM</td><td>07/21/2021</td> </tr>
- <tr class="odd"><td>VARCem</td><td>VCE</td><td>07/21/2021</td> </tr>
- <tr class="even"><td>Nextorage Corporation</td><td>NXR</td><td>09/21/2021</td> </tr>
- <tr class="odd"><td>Netvio Ltd.</td><td>NVO</td><td>09/21/2021</td> </tr>
- <tr class="even"><td>Beijing Guochengwantong Information Technology Co., Ltd.</td><td>STV</td><td>09/21/2021</td> </tr>
- <tr class="odd"><td>Kopin Corporation</td><td>KOP</td><td>10/01/2021</td> </tr>
      </tbody>
    </table>
  </body>
--- a/hwdb.d/usb.ids
+++ b/hwdb.d/usb.ids
@ -9,8 +9,8 @@
 #	The latest version can be obtained from
 #		http://www.linux-usb.org/usb.ids
 #
-# Version: 2021.10.24
-# Date:    2021-10-24 20:34:08
+# Version: 2021.07.01
+# Date:    2021-07-01 20:34:10
 #

 # Vendors, devices and interfaces. Please keep sorted.
@ -70,8 +70,6 @@
 	ac02  ATV Turbo / Rally2 Dual Channel USB 2.0 Flash Drive
 0386  LTS
 	0001  PSX for USB Converter
-03c3  ZWO
-	120e  ASI120MC-S Planetary Camera
 03d9  Shenzhen Sinote Tech-Electron Co., Ltd
 	0499  SE340D PC Remote Control
 03da  Bernd Walter Computer Technology
@ -120,7 +118,6 @@
 	2064  Interfaceless Control-Only LUFA Devices
 	2065  LUFA Test and Measurement Demo Application
 	2066  LUFA Multiple Report HID Demo
-	2067  LUFA HID Class Bootloader
 	2068  LUFA Virtual Serial/Mass Storage Demo
 	2069  LUFA Webserver Project
 	2103  JTAG ICE mkII
@ -351,7 +348,6 @@
 	1617  LaserJet 3015
 	161d  Wireless Rechargeable Optical Mouse (HID)
 	1624  Smart Card Keyboard - JP
-	1647  Z27n G2 Monitor Hub
 	1702  PhotoSmart 380 series
 	1704  DeskJet 948C
 	1705  ScanJet 5590
@ -441,7 +437,6 @@
 	2805  Scanjet G2710
 	2811  PSC-2100
 	2817  Color LaserJet 2840
-	2841  OMEN MINDFRAME [3XT27AA]
 	2902  PhotoSmart A820 series
 	2911  PSC 2200
 	2917  LaserJet 2420
@ -710,7 +705,6 @@
 	ba02  PhotoSmart 8100 series
 	bb02  PhotoSmart 8400 series
 	bc02  PhotoSmart 8700 series
-	bc11  Photosmart 7520 series
 	bd02  PhotoSmart Pro B9100 series
 	bef4  NEC Picty760
 	c002  PhotoSmart 7800 series
@ -808,7 +802,6 @@
 	601f  Myriad-RF LimeSDR-Mini
 	6ee0  EZO Carrier Board
 	6f70  HB-RF-USB
-	7be8  FT232R
 	8028  Dev board JTAG (FT232H based)
 	8040  4 Port Hub
 	8070  7 Port Hub
@ -903,7 +896,6 @@
 	d9ab  Actisense NGT-1 NMEA2000 Gateway
 	daf4  Qundis Serial Infrared Head
 	e0d0  Total Phase Aardvark I2C/SPI Host Adapter
-	e518  IBR IMB-usb
 	e521  EVER Sinline XL Series UPS
 	e6c8  PYRAMID Computer GmbH LCD
 	e700  Elster Unicom III Optical Probe
@ -921,7 +913,6 @@
 	ed72  HAMEG HO720 Serial Port
 	ed73  HAMEG HO730 Serial Port
 	ed74  HAMEG HO820 Serial Port
-	eea2  PCStage Lite 32 channel DMX512 Interface
 	ef10  FT1245BL
 	f070  Serial Converter 422/485 [Vardaan VEUSB422R3]
 	f0c8  SPROG Decoder Programmer
@ -1172,7 +1163,6 @@
 	4000  InkJet Color Printer
 	4021  Photo Printer 6800
 	4022  1400 Digital Photo Printer
-	4023  Photo Printer 8800 / 9810
 	402b  Photo Printer 6850
 	402e  605 Photo Printer
 	4034  805 Photo Printer
@ -1341,7 +1331,6 @@
 	7721  Memory Stick Reader/Writer
 	7722  Memory Stick Reader/Writer
 	7723  SD Card Reader
-	b23c  KT108 keyboard
 	c141  Barcode Scanner
 0417  Symbios Logic
 0418  AST Research
@ -1677,9 +1666,7 @@
 	2134  Hub
 	2228  9-in-2 Card Reader
 	223a  8-in-1 Card Reader
-	2412  Hub
 	2503  USB 2.0 Hub
-	2504  Hub
 	2507  hub
 	2512  USB 2.0 Hub
 	2513  2.0 Hub
@ -1749,7 +1736,7 @@
 042e  Acer, Inc.
 	0380  MP3 Player
 042f  Molex, Inc.
-0430  Fujitsu Component Limited
+0430  Sun Microsystems, Inc.
 	0002  109 Keyboard
 	0005  Type 6 Keyboard
 	000a  109 Japanese Keyboard
@ -2062,7 +2049,6 @@
 	8043  Hub
 	8140  TUSB8041 4-Port Hub
 	8142  TUSB8041 4-Port Hub
-	9261  TUSB9261 SerialATA-Bridge
 	926b  TUSB9260 Boot Loader
 	bef3  CC1352R1 Launchpad
 	dbc0  Device Bay Controller
@ -2632,7 +2618,6 @@
 	4e04  Lenovo Keyboard KB1021
 	4e22  Dell Mouse, 2 Buttons, Modell: MS111-P
 	4e6f  Acer Wired Keyboard Model KBAY211
-	4e72  Acer Wired Keyboard Model KBAY211
 0463  MGE UPS Systems
 	0001  UPS
 	ffff  UPS
@ -2768,7 +2753,6 @@
 	08dd  QuickCam for Notebooks
 	08e0  QuickCam Express
 	08e1  Labtec Webcam
-	08e5  C920 PRO HD Webcam
 	08f0  QuickCam Messenger
 	08f1  QuickCam Express
 	08f2  Microphone (Messenger)
@ -2831,7 +2815,6 @@
 	0a5d  G933 Headset Battery Charger
 	0a66  [G533 Wireless Headset Dongle]
 	0a8f  H390 headset with microphone
-	0aaa  Logitech G PRO X Gaming Headset
 	0b02  C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)
 	8801  Video Camera
 	b014  Bluetooth Mouse M336/M337/M535
@ -3018,7 +3001,6 @@
 	c32b  G910 Orion Spark Mechanical Keyboard
 	c332  G502 Proteus Spectrum Optical Mouse
 	c335  G910 Orion Spectrum Mechanical Keyboard
-	c336  G213 Prodigy Gaming Keyboard
 	c33a  G413 Gaming Keyboard
 	c33f  G815 Mechanical Keyboard
 	c401  TrackMan Marble Wheel
@ -3373,7 +3355,6 @@
 	0014  InTouch Module
 	0100  Stor.E Slim USB 3.0
 	0200  External Disk
-	0212  Toshiba Canvio Connect II 500GB Portable Hard Drive
 	0820  Canvio Advance Disk
 	0821  Canvio Advance 2TB model DTC920
 	0900  MQ04UBF100
@ -3679,7 +3660,6 @@
 	6180  MP3 Player
 	6200  MP3 Player
 	7500  Hi-Speed Mass Storage Device
-	8001  BenQ ZOWIE Gaming Mouse
 	9000  AWL300 Wireless Adapter
 	9001  AWL400 Wireless Adapter
 	9213  Kbd Hub
@ -4575,8 +4555,6 @@
 	5202  Combi Keyboard-Hub (Keyboard)
 	5500  HID->COM RS232 Adapter
 	5a9b  Dacal CD/DVD Library D-101/DC-300/DC-016RW
-	6022  Hantek DSO-6022BE
-	602a  Hantek DSO-6022BL
 	6370  ViewMate Desktop Mouse CC2201
 	6502  CY4609
 	6506  CY4603
@ -4600,7 +4578,6 @@
 	f000  CY30700 Licorice evaluation board
 	f111  CY8CKIT-002 PSoC MiniProg3 Rev A Program and debug kit
 	f115  PSoC FirstTouch Programmer
-	f139  KitProg
 	f231  DELLY Changer 4in1 universal IR remote
 	f232  Mono embedded computer
 	fd10  Gembird MSIS-PM
@ -4608,8 +4585,6 @@
 	fd15  Energenie EG-PMS2
 04b5  ROHM LSI Systems USA, LLC
 	3064  Hantek DSO-3064
-	6022  Hantek DSO-6022BE
-	602a  Hantek DSO-6022BL
 04b6  Hint Corp.
 04b7  Compal Electronics, Inc.
 04b8  Seiko Epson Corp.
@ -4621,7 +4596,6 @@
 	0006  Printer
 	0007  Printer
 	0015  Stylus Photo R3000
-	0080  SC-P400 Series
 	0101  GT-7000U [Perfection 636]
 	0102  GT-2200
 	0103  GT-6600U [Perfection 610]
@ -4947,7 +4921,6 @@
 	7022  HP HD Webcam
 	7025  HP HD Webcam
 	7046  TOSHIBA Web Camera - HD
-	7054  HP HD Webcam
 	9304  Hub
 	f01c  TT1280DA DVB-T TV Tuner
 04cb  Fuji Photo Film Co., Ltd
@ -5044,7 +5017,6 @@
 	02c5  FinePix S9900W Digital Camera (PTP)
 	02e0  X-T200 Digital Camera
 	5006  ASK-300
-	5007  DX100
 04cc  ST-Ericsson
 	1122  Hub
 	1520  USB 2.0 Hub (Avocent KVM)
@ -5132,7 +5104,6 @@
 04d9  Holtek Semiconductor, Inc.
 	0006  Wired Keyboard (78/79 key) [RPI Wired Keyboard 5]
 	0022  Portable Keyboard
-	0129  Keyboard [KBPV8000]
 	0348  Keyboard
 	0407  Keyboard [TEX Shinobi]
 	048e  Optical Mouse
@ -5440,7 +5411,6 @@
 	3903  Xerox WorkCentre XK50cx
 	390f  InkJet Color Printer
 	3911  SCX-1020 series
-	4001  PSSD T7
 	4005  GT-S8000 Jet (msc)
 	4f1f  GT-S8000 Jet (mtp)
 	5000  YP-MF series
@ -5703,7 +5673,6 @@
 	b3f6  HD WebCam (Acer)
 	b3fd  HD WebCam (Asus N-series)
 	b40e  HP Truevision HD camera
-	b420  Lenovo EasyCamera
 	b444  Lenovo Integrated Webcam
 	b49f  Bluetooth (RTL8723BE)
 	b563  Integrated Camera
@ -6875,7 +6844,6 @@
 	07c4  ILCE-6000 (aka Alpha-6000) in Mass Storage mode
 	082f  Walkman NWZW Series
 	0847  WG-C10 Portable Wireless Server
-	0873  UP-971AD
 	0877  UP-D898/X898 series
 	0884  MDR-ZX770BN [Wireless Noise Canceling Stereo Headset]
 	088c  Portable Headphone Amplifier
@ -6892,7 +6860,6 @@
 	0cd3  WH-1000XM3 [Wireless Noise-Canceling Headphones]
 	0cda  PlayStation Classic controller
 	0ce0  WF-1000XM3 [Wireless Noise-Canceling Headphones]
-	0ce6  DualSense wireless controller (PS5)
 	0cf0  MRW-G1
 	0d58  WH-1000XM4 [Wireless Noise-Canceling Headphones]
 	1000  Wireless Buzz! Receiver
@ -7252,8 +7219,6 @@
 	039d  DTH-W1320 [MobileStudio Pro 16] internal hub
 	03aa  DTH-W1620 [MobileStudio Pro 16] tablet
 	03ac  DTH-W1620 [MobileStudio Pro 16] touchscreen
-	03c5  CTL-4100WL [Intuos BT (S)]
-	03c7  CTL-6100WL [Intuos BT (M)]
 	0400  PenPartner 4x5
 	4001  TPC4001
 	4004  TPC4004
@ -8305,12 +8270,10 @@
 	8509  FaceTime HD Camera
 	850a  FaceTime Camera
 	8510  FaceTime HD Camera (Built-in)
-	8511  FaceTime HD Camera (Built-in)
 	8600  iBridge
 	911c  Hub in A1082 [Cinema HD Display 23"]
 	9127  Hub in Thunderbolt Display
 	912f  Hub in 30" Cinema Display
-	9210  Studio Display 21"
 	9215  Studio Display 15"
 	9217  Studio Display 17"
 	9218  Cinema Display 23"
@ -8409,7 +8372,6 @@
 	9265  Asus Gobi 2000 Wireless Modem
 	9274  iRex Technologies Gobi 2000 Wireless Modem (QDL mode)
 	9275  iRex Technologies Gobi 2000 Wireless Modem
-	f000  TA-1004 [Nokia 8]
 	f003  Nokia 8110 4G
 05c7  Qtronix Corp.
 	0113  PC Line Mouse
@ -8738,7 +8700,6 @@
 	1200  Bar Code Scanner
 	1701  Bar Code Scanner (CDC)
 	1900  SNAPI Imaging Device
-	1a00  CS4070 Barcode Scanner
 	2000  MC3090 Rugged Mobile Computer
 	200d  MC70 Rugged Mobile Computer
 05e1  Syntek Semiconductor Co., Ltd
@ -8781,9 +8742,6 @@
 	0610  Hub
 	0612  Hub
 	0616  hub
-	0618  Hub
-	0620  GL3523 Hub
-	0626  Hub
 	0660  USB 2.0 Hub
 	0700  SIIG US2256 CompactFlash Card Reader
 	0701  USB 2.0 IDE Adapter
@ -8821,7 +8779,6 @@
 	0748  All-in-One Cardreader
 	0749  SD Card Reader and Writer
 	0751  microSD Card Reader
-	0752  micros Reader
 	0760  USB 2.0 Card Reader/Writer
 	0761  Genesys Mass Storage Device
 	0780  USBFS DFU Adapter
@ -9634,54 +9591,7 @@
 	01df  CX2633 Multifunction Printer
 	01e0  ES8460 Multifunction Printer
 	020b  OKI ES4140 Mono Printer
-	021f  ES8460 Multifunction Printer
-	026f  MC351 Multifunction Printer
-	0270  MC351 Multifunction Printer
-	0271  MC351 Multifunction Printer
-	0272  MC351 Multifunction Printer
-	0273  MC351 Multifunction Printer
-	0274  ES3451 Multifunction Printer
-	0275  MC351 Multifunction Printer
-	0276  MC351 Multifunction Printer
-	0277  MC351 Multifunction Printer
-	0278  MC351 Multifunction Printer
-	0279  MC361 Multifunction Printer
-	027a  MC361 Multifunction Printer
-	027b  MC361 Multifunction Printer
-	027c  MC361 Multifunction Printer
-	027d  MC361 Multifunction Printer
-	027e  ES3461 Multifunction Printer
-	027f  MC361 Multifunction Printer
-	0280  MC361 Multifunction Printer
-	0281  MC361 Multifunction Printer
-	0282  MC361 Multifunction Printer
-	0283  MC561 Multifunction Printer
-	0284  MC561 Multifunction Printer
-	0285  MC561 Multifunction Printer
-	0286  MC561 Multifunction Printer
-	0287  CX2731 Multifunction Printer
-	0288  ES5461 Multifunction Printer
-	0289  ES5461 Multifunction Printer
-	028a  MC561 Multifunction Printer
-	028b  MC561 Multifunction Printer
-	028c  MC561 Multifunction Printer
-	02b4  MC861 Multifunction Printer
-	02b5  ES8461 Multifunction Printer
-	02b6  MC851 Multifunction Printer
-	02b7  ES8451 Multifunction Printer
 	02bb  OKI PT390 POS Printer
-	02bd  MB461 Multifunction Printer
-	02be  MB471 Multifunction Printer
-	02bf  MB491 Multifunction Printer
-	02ca  ES4161 Multifunction Printer
-	02cb  ES4191 Multifunction Printer
-	02d4  MPS4200mb Multifunction Printer
-	02e7  MC352 Multifunction Printer
-	02e8  MC362 Multifunction Printer
-	02e9  MC562 Multifunction Printer
-	02ea  ES3452 Multifunction Printer
-	02eb  ES5462 Multifunction Printer
-	02ee  MB451 Multifunction Printer
 	0383  MC563 Multifunction Printer
 	0a91  B2500MFP (printer+scanner)
 	3801  B6100 Laser Printer
@ -21858,24 +21768,6 @@
 	0014  Single User touchfoil(tm) (SU2-80)
 25da  Netatmo
 	0001  Weather Station
-25dd  Bit4id Srl
-	1101  miniLector-s
-	1201  cryptokey
-	2221  iAM
-	2311  keyfour-a1
-	2321  CKey4
-	2341  tokenME FIPS v3
-	2351  Digital DNA Key
-	2354  Digital-DNA Key
-	2361  Digital-DNA Key BT
-	2362  Digital-DNA Key
-	2371  TokenME EVO v2
-	23b4  ArubaKey AK901
-	3111  miniLector EVO
-	3211  miniLector AIR EVO
-	3403  miniLector AIR NFC v3
-	3503  mLector AIR DI V3
-	b001  miniLector Blue
 25e3  Lumigon
 25f0  ShanWan
 	c131  Gioteck PS3 2.4G Wireless Controller
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@ -41,9 +41,8 @@
    <title>Configuration Format</title>

    <para>Each file contains a list of binfmt_misc kernel binary format rules. Consult the kernel's <ulink
-    url="https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.html">Kernel Support for
-    miscellaneous Binary Formats (binfmt_misc)</ulink> documentation file for more information on
-    registration of additional binary formats and how to write rules.</para>
+    url="https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.html">binfmt-misc.rst</ulink> documentation
+    file for more information on registration of additional binary formats and how to write rules.</para>

    <para>Empty lines and lines beginning with <literal>;</literal> and <literal>#</literal> are ignored.
    Note that this means you may not use those symbols as the delimiter in binary format rules.</para>
--- a/man/custom-entities.ent.in
+++ b/man/custom-entities.ent.in
@ -13,5 +13,5 @@
 <!ENTITY DEBUGTTY "{{DEBUGTTY}}">
 <!ENTITY RC_LOCAL_PATH "{{RC_LOCAL_PATH}}">
 <!ENTITY HIGH_RLIMIT_NOFILE "{{HIGH_RLIMIT_NOFILE}}">
-<!ENTITY fedora_latest_version "35">
+<!ENTITY fedora_latest_version "34">
 <!ENTITY fedora_cloud_release "1.2">
--- a/man/shutdown.xml
+++ b/man/shutdown.xml
@ -125,13 +125,6 @@
        <literal>now</literal>.</para></listitem>
      </varlistentry>

-      <varlistentry>
-        <term><option>--show</option></term>
-
-        <listitem><para>Show a pending shutdown action and time if
-        there is any.</para></listitem>
-      </varlistentry>
-
    </variablelist>
  </refsect1>

--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@ -1550,11 +1550,8 @@ Table=1234</programlisting></para>
        <varlistentry>
          <term><varname>IPServiceType=</varname></term>
          <listitem>
-            <para>Takes one of the special values <literal>none</literal>, <literal>CS6</literal>, or
-            <literal>CS4</literal>. When <literal>none</literal> no IP sevice type is set to the packet
-            sent from the DHCPv4 client. When <literal>CS6</literal> (network control) or
-            <literal>CS4</literal> (realtime), the corresponding service type will be set. Defaults to
-            <literal>CS6</literal>.</para>
+            <para>Takes string; <literal>CS6</literal> or <literal>CS4</literal>. Used to set IP
+            service type to CS6 (network control) or CS4 (Realtime). Defaults to CS6.</para>
          </listitem>
        </varlistentry>
        <varlistentry>
--- a/meson.build
+++ b/meson.build
@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later

 project('systemd', 'c',
-        version : '250',
+        version : '249',
        license : 'LGPLv2+',
        default_options: [
                'c_std=gnu99',
@ -13,8 +13,8 @@ project('systemd', 'c',
        meson_version : '>= 0.53.2',
       )

-libsystemd_version = '0.33.0'
-libudev_version = '1.7.3'
+libsystemd_version = '0.32.0'
+libudev_version = '1.7.2'

 conf = configuration_data()
 conf.set_quoted('PROJECT_URL', 'https://www.freedesktop.org/wiki/Software/systemd')
--- a/mkosi.default.d/fedora/10-mkosi.fedora
+++ b/mkosi.default.d/fedora/10-mkosi.fedora
@ -5,7 +5,7 @@

 [Distribution]
 Distribution=fedora
-Release=35
+Release=34

 [Packages]
 BuildPackages=
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@ -221,12 +221,9 @@ int get_process_cmdline(pid_t pid, size_t max_columns, ProcessCmdlineFlags flags
                        return -ENOMEM;

                /* Drop trailing empty strings. See issue #21186. */
-                STRV_FOREACH_BACKWARDS(p, args) {
-                        if (!isempty(*p))
-                                break;
-
-                        *p = mfree(*p);
-                }
+                STRV_FOREACH_BACKWARDS(p, args)
+                        if (isempty(*p))
+                                *p = mfree(*p);

                ans = quote_command_line(args, shflags);
                if (!ans)
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@ -1704,24 +1704,17 @@ int config_parse_dhcp_ip_service_type(
                void *data,
                void *userdata) {

-        int *tos = data;
-
        assert(filename);
        assert(lvalue);
        assert(rvalue);
-        assert(data);

-        if (isempty(rvalue))
-                *tos = -1; /* use sd_dhcp_client's default (currently, CS6). */
-        else if (streq(rvalue, "none"))
-                *tos = 0;
-        else if (streq(rvalue, "CS4"))
-                *tos = IPTOS_CLASS_CS4;
+        if (streq(rvalue, "CS4"))
+                *((int *)data) = IPTOS_CLASS_CS4;
        else if (streq(rvalue, "CS6"))
-                *tos = IPTOS_CLASS_CS6;
+                *((int *)data) = IPTOS_CLASS_CS6;
        else
                log_syntax(unit, LOG_WARNING, filename, line, 0,
-                           "Failed to parse %s=, ignoring assignment: %s", lvalue, rvalue);
+                           "Failed to parse IPServiceType type '%s', ignoring.", rvalue);

        return 0;
 }
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@ -87,12 +87,9 @@ bool link_ipv4ll_enabled(Link *link) {
        if (ether_addr_is_null(&link->hw_addr.ether))
                return false;

-        /* ARPHRD_INFINIBAND seems to potentially support IPv4LL.
-         * But currently sd-ipv4ll and sd-ipv4acd only support ARPHRD_ETHER. */
-        if (link->iftype != ARPHRD_ETHER)
-                return false;
-
-        if (streq_ptr(link->kind, "vrf"))
+        if (STRPTR_IN_SET(link->kind,
+                          "vrf", "wireguard", "ipip", "gre", "ip6gre","ip6tnl", "sit", "vti",
+                          "vti6", "nlmon", "xfrm", "bareudp"))
                return false;

        /* L3 or L3S mode do not support ARP. */
--- a/src/resolve/resolved-dns-dnssec.c
+++ b/src/resolve/resolved-dns-dnssec.c
@ -13,14 +13,6 @@
 #include "sort-util.h"
 #include "string-table.h"

-#if PREFER_OPENSSL
-#  pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(RSA*, RSA_free, NULL);
-DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(EC_KEY*, EC_KEY_free, NULL);
-#  pragma GCC diagnostic pop
-#endif
-
 #define VERIFY_RRS_MAX 256
 #define MAX_KEY_SIZE (32*1024)

@ -96,15 +88,13 @@ static int dnssec_rsa_verify_raw(
                const void *data, size_t data_size,
                const void *exponent, size_t exponent_size,
                const void *modulus, size_t modulus_size) {
-        int r;

 #if PREFER_OPENSSL
-#  pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wdeprecated-declarations"
        _cleanup_(RSA_freep) RSA *rpubkey = NULL;
        _cleanup_(EVP_PKEY_freep) EVP_PKEY *epubkey = NULL;
        _cleanup_(EVP_PKEY_CTX_freep) EVP_PKEY_CTX *ctx = NULL;
        _cleanup_(BN_freep) BIGNUM *e = NULL, *m = NULL;
+        int r;

        assert(hash_algorithm);

@ -151,11 +141,13 @@ static int dnssec_rsa_verify_raw(
                return log_debug_errno(SYNTHETIC_ERRNO(EIO),
                                       "Signature verification failed: 0x%lx", ERR_get_error());

-#  pragma GCC diagnostic pop
+        return r;
+
 #else
        gcry_sexp_t public_key_sexp = NULL, data_sexp = NULL, signature_sexp = NULL;
        gcry_mpi_t n = NULL, e = NULL, s = NULL;
        gcry_error_t ge;
+        int r;

        assert(hash_algorithm);

@ -231,8 +223,9 @@ finish:
                gcry_sexp_release(signature_sexp);
        if (data_sexp)
                gcry_sexp_release(data_sexp);
-#endif
+
        return r;
+#endif
 }

 static int dnssec_rsa_verify(
@ -298,17 +291,15 @@ static int dnssec_ecdsa_verify_raw(
                const void *signature_s, size_t signature_s_size,
                const void *data, size_t data_size,
                const void *key, size_t key_size) {
-        int k;

 #if PREFER_OPENSSL
-#  pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wdeprecated-declarations"
        _cleanup_(EC_GROUP_freep) EC_GROUP *ec_group = NULL;
        _cleanup_(EC_POINT_freep) EC_POINT *p = NULL;
        _cleanup_(EC_KEY_freep) EC_KEY *eckey = NULL;
        _cleanup_(BN_CTX_freep) BN_CTX *bctx = NULL;
        _cleanup_(BN_freep) BIGNUM *r = NULL, *s = NULL;
        _cleanup_(ECDSA_SIG_freep) ECDSA_SIG *sig = NULL;
+        int k;

        assert(hash_algorithm);

@ -363,11 +354,13 @@ static int dnssec_ecdsa_verify_raw(
                return log_debug_errno(SYNTHETIC_ERRNO(EIO),
                                       "Signature verification failed: 0x%lx", ERR_get_error());

-#  pragma GCC diagnostic pop
+        return k;
+
 #else
        gcry_sexp_t public_key_sexp = NULL, data_sexp = NULL, signature_sexp = NULL;
        gcry_mpi_t q = NULL, r = NULL, s = NULL;
        gcry_error_t ge;
+        int k;

        assert(hash_algorithm);

@ -442,8 +435,9 @@ finish:
                gcry_sexp_release(signature_sexp);
        if (data_sexp)
                gcry_sexp_release(data_sexp);
-#endif
+
        return k;
+#endif
 }

 static int dnssec_ecdsa_verify(
--- a/src/shared/mount-util.h
+++ b/src/shared/mount-util.h
@ -11,9 +11,9 @@
 #include "errno-util.h"
 #include "macro.h"

-/* 4MB for contents of regular files, 1m inodes for directories, symbolic links and device nodes, using
+/* 4MB for contents of regular files, 128k inodes for directories, symbolic links and device specials, using
 * large storage array systems as a baseline */
-#define TMPFS_LIMITS_DEV             ",size=4m,nr_inodes=1m"
+#define TMPFS_LIMITS_DEV             ",size=4m,nr_inodes=128k"

 /* Very little, if any use expected */
 #define TMPFS_LIMITS_EMPTY_OR_ALMOST ",size=4m,nr_inodes=1k"
--- a/src/shared/openssl-util.h
+++ b/src/shared/openssl-util.h
@ -17,6 +17,8 @@ DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(X509_NAME*, X509_NAME_free, NULL);
 DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(EVP_PKEY_CTX*, EVP_PKEY_CTX_free, NULL);
 DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(EVP_PKEY*, EVP_PKEY_free, NULL);
 DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(EVP_CIPHER_CTX*, EVP_CIPHER_CTX_free, NULL);
+DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(RSA*, RSA_free, NULL);
+DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(EC_KEY*, EC_KEY_free, NULL);
 DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(EC_POINT*, EC_POINT_free, NULL);
 DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(EC_GROUP*, EC_GROUP_free, NULL);
 DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(BIGNUM*, BN_free, NULL);
--- a/src/systemctl/systemctl-compat-shutdown.c
+++ b/src/systemctl/systemctl-compat-shutdown.c
@ -28,7 +28,6 @@ static int shutdown_help(void) {
               "  -k             Don't halt/power-off/reboot, just send warnings\n"
               "     --no-wall   Don't send wall message before halt/power-off/reboot\n"
               "  -c             Cancel a pending shutdown\n"
-               "     --show      Show pending shutdown\n"
               "\nSee the %s for details.\n",
               program_invocation_short_name,
               ansi_highlight(),
@ -41,8 +40,7 @@ static int shutdown_help(void) {
 int shutdown_parse_argv(int argc, char *argv[]) {
        enum {
                ARG_HELP = 0x100,
-                ARG_NO_WALL,
-                ARG_SHOW
+                ARG_NO_WALL
        };

        static const struct option options[] = {
@ -52,7 +50,6 @@ int shutdown_parse_argv(int argc, char *argv[]) {
                { "reboot",    no_argument,       NULL, 'r'         },
                { "kexec",     no_argument,       NULL, 'K'         }, /* not documented extension */
                { "no-wall",   no_argument,       NULL, ARG_NO_WALL },
-                { "show",      no_argument,       NULL, ARG_SHOW    },
                {}
        };

@ -111,10 +108,6 @@ int shutdown_parse_argv(int argc, char *argv[]) {
                        arg_action = ACTION_CANCEL_SHUTDOWN;
                        break;

-                case ARG_SHOW:
-                        arg_action = ACTION_SHOW_SHUTDOWN;
-                        break;
-
                case '?':
                        return -EINVAL;

--- a/src/systemctl/systemctl-logind.c
+++ b/src/systemctl/systemctl-logind.c
@ -372,41 +372,6 @@ int logind_cancel_shutdown(void) {
 #endif
 }

-int logind_show_shutdown(void) {
-#if ENABLE_LOGIND
-        _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
-        _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
-        sd_bus *bus;
-        const char *action = NULL;
-        uint64_t elapse;
-        int r;
-
-        r = acquire_bus(BUS_FULL, &bus);
-        if (r < 0)
-                return r;
-
-        r = bus_get_property(bus, bus_login_mgr, "ScheduledShutdown", &error, &reply, "(st)");
-        if (r < 0)
-                return log_error_errno(r, "Failed to query scheduled shutdown: %s", bus_error_message(&error, r));
-
-        r = sd_bus_message_read(reply, "(st)", &action, &elapse);
-        if (r < 0)
-                return r;
-
-        if (isempty(action))
-                return log_error_errno(SYNTHETIC_ERRNO(ENODATA), "No scheduled shutdown.");
-
-        log_info("%s scheduled for %s, use 'shutdown -c' to cancel.",
-                 action,
-                 FORMAT_TIMESTAMP_STYLE(arg_when, arg_timestamp_style));
-
-        return 0;
-#else
-        return log_error_errno(SYNTHETIC_ERRNO(ENOSYS),
-                               "Not compiled with logind support, cannot show scheduled shutdowns.");
-#endif
-}
-
 int help_boot_loader_entry(void) {
 #if ENABLE_LOGIND
        _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
--- a/src/systemctl/systemctl-logind.h
+++ b/src/systemctl/systemctl-logind.h
@ -14,6 +14,5 @@ int prepare_boot_loader_entry(void);

 int logind_schedule_shutdown(void);
 int logind_cancel_shutdown(void);
-int logind_show_shutdown(void);

 int help_boot_loader_entry(void);
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@ -1169,10 +1169,6 @@ static int run(int argc, char *argv[]) {
                r = logind_cancel_shutdown();
                break;

-        case ACTION_SHOW_SHUTDOWN:
-                r = logind_show_shutdown();
-                break;
-
        case ACTION_RUNLEVEL:
                r = runlevel_main();
                break;
--- a/src/systemctl/systemctl.h
+++ b/src/systemctl/systemctl.h
@ -32,7 +32,6 @@ enum action {
        ACTION_RUNLEVEL,
        ACTION_TELINIT,
        ACTION_CANCEL_SHUTDOWN,
-        ACTION_SHOW_SHUTDOWN,
        _ACTION_MAX,
        _ACTION_INVALID = -EINVAL,
 };
--- a/tools/meson-render-jinja2.py
+++ b/tools/meson-render-jinja2.py
@ -31,6 +31,5 @@ if __name__ == '__main__':
    output = render(sys.argv[2], defines)
    with open(sys.argv[3], 'w') as f:
        f.write(output)
-        f.write('\n')
    info = os.stat(sys.argv[2])
    os.chmod(sys.argv[3], info.st_mode)
--- a/units/tmp.mount
+++ b/units/tmp.mount
@ -22,4 +22,4 @@ After=swap.target
 What=tmpfs
 Where=/tmp
 Type=tmpfs
-Options=mode=1777,strictatime,nosuid,nodev,size=50%,nr_inodes=1m
+Options=mode=1777,strictatime,nosuid,nodev,size=50%,nr_inodes=400k