21 changed files with 703 additions and 7793 deletions
--- a/56
+++ b/56
@ -2,6 +2,17 @@ systemd System and Service Manager

 CHANGES WITH 244 in spe:

+        * systemd-udevd: removed the 30s timeout for killing stale workers on
+          exit. systemd-udevd now waits for workers to finish. The hard-coded
+          exit timeout of 30s was too short for some large installations, where
+          driver initialization could be prematurely interrupted during initrd
+          processing if the root file system had been mounted and init was
+          preparing to switch root. If udevd is run without systemd and workers
+          are hanging while udevd receives an exit signal, udevd will now exit
+          when udev.event_timeout is reached for the last hanging worker. With
+          systemd, the exit timeout can additionally be configured using
+          TimeoutStopSec= in systemd-udevd.service.
+
        * Support for the cpuset cgroups v2 controller has been added.
          Processes may be restricted to specific CPUs using the new
          AllowedCPUs= setting, and to specific memory NUMA nodes using the new
@ -37,33 +48,12 @@ CHANGES WITH 244 in spe:
          <unit_type>.d/ (e.g. service.d/) that may be used to add configuration
          that affects all corresponding unit files.

-        * systemctl gained support for 'stop --job-mode=triggering' which will
-          stop the specified unit and any units which could trigger it.
-
-        * Unit status display now includes units triggering and triggered by
-          the unit being shown.
-
        * The RuntimeMaxSec= setting is now supported by scopes, not just
          .service units. This is particularly useful for PAM sessions which
          create a scope unit for the user login. systemd.runtime_max_sec=
          setting may used with the pam_systemd module to limit the duration
          of the PAM session, for example for time-limited logins.

-        * A new @pkey system call group is now defined to make it easier to
-          whitelist memory protection syscalls for containers and services
-          which need to use them.
-
-        * systemd-udevd: removed the 30s timeout for killing stale workers on
-          exit. systemd-udevd now waits for workers to finish. The hard-coded
-          exit timeout of 30s was too short for some large installations, where
-          driver initialization could be prematurely interrupted during initrd
-          processing if the root file system had been mounted and init was
-          preparing to switch root. If udevd is run without systemd and workers
-          are hanging while udevd receives an exit signal, udevd will now exit
-          when udev.event_timeout is reached for the last hanging worker. With
-          systemd, the exit timeout can additionally be configured using
-          TimeoutStopSec= in systemd-udevd.service.
-
        * udev now provides a program (fido_id) that identifies FIDO CTAP1
          ("U2F")/CTAP2 security tokens based on the usage declared in their
          report and descriptor and outputs suitable environment variables.
@ -116,21 +106,12 @@ CHANGES WITH 244 in spe:
          The client may be configured to request specific options from the
          server using a new RequestOptions= setting.

-          The client may be configured to send arbitrary options to the server
-          using a new SendOption= setting.
-
          A new IPServiceType= setting has been added to configure the "IP
          service type" value used by the client.

        * The DHCPv6 client learnt a new PrefixDelegationHint= option to
          request prefix hints in the DHCPv6 solicitation.

-        * The DHCPv4 server may be configured to send arbitrary options using
-          a new SendRawOption= setting.
-
-        * The DHCPv4 server may now be configured to emit SIP server list using
-          the new EmitSIP= and SIP= settings.
-
        * systemd-networkd and networkctl may now renew DHCP leases on demand.
          networkctl has a new 'networkctl renew' verb.

@ -149,6 +130,9 @@ CHANGES WITH 244 in spe:
        * systemd-networkd now includes default configuration that enables
          link-local addressing when connected to an ad-hoc wireless network.

+        * The DHCPv4 server may now be configured to emit SIP server list using
+          the new EmitSIP= and SIP= settings.
+
        * systemd-networkd may configure the Traffic Control queueing
          disciplines in the kernel using the new
          [TrafficControlQueueingDiscipline] section and Parent=,
@ -163,10 +147,6 @@ CHANGES WITH 244 in spe:
          because some external program has modified the kernel configuration
          on its own).

-        * systemd-analyze gained a new --base-time= switch instructs the
-          'calendar' verb to resolve times relative to that timestamp instead
-          of the present time.
-
        * journalctl --update-catalog now produces deterministic output (making
          reproducible image builds easier).

@ -178,14 +158,10 @@ CHANGES WITH 244 in spe:
          configuration time using the -Dservice-watchdog= setting. If set to
          empty, the watchdogs will be disabled.

-	* systemd-resolved validates IP addresses in certificates now when GnuTLS
-	  is being used.
-
        * libcryptsetup >= 2.0.1 is now required.

-        * A configuration option -Duser-path= may be used to override the $PATH
-          used by the user service manager. The default is again to use the same
-          path as the system manager.
+	* systemd-resolved validates IP addresses in certificates now when GnuTLS
+	  is being used.

 CHANGES WITH 243:

--- 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
@ -1086,9 +1086,6 @@ acpi:BIO*:
 acpi:BIT*:
 ID_VENDOR_FROM_DATABASE=Bit 3 Computer

-acpi:BLD*:
- ID_VENDOR_FROM_DATABASE=BILD INNOVATIVE TECHNOLOGY LLC
-
 acpi:BLI*:
 ID_VENDOR_FROM_DATABASE=Busicom

@ -2067,9 +2064,6 @@ acpi:DSA*:
 acpi:DSD*:
 ID_VENDOR_FROM_DATABASE=DS Multimedia Pte Ltd

-acpi:DSG*:
- ID_VENDOR_FROM_DATABASE=Disguise Technologies
-
 acpi:DSI*:
 ID_VENDOR_FROM_DATABASE=Digitan Systems Inc

@ -2280,9 +2274,6 @@ acpi:ELA*:
 acpi:ELC*:
 ID_VENDOR_FROM_DATABASE=Electro Scientific Ind

-acpi:ELD*:
- ID_VENDOR_FROM_DATABASE=Express Luck, Inc.
-
 acpi:ELE*:
 ID_VENDOR_FROM_DATABASE=Elecom Company Ltd

@ -2544,9 +2535,6 @@ acpi:FDI*:
 acpi:FDT*:
 ID_VENDOR_FROM_DATABASE=Fujitsu Display Technologies Corp.

-acpi:FDX*:
- ID_VENDOR_FROM_DATABASE=Findex, Inc.
-
 acpi:FEC*:
 ID_VENDOR_FROM_DATABASE=FURUNO ELECTRIC CO., LTD.

@ -3276,9 +3264,6 @@ acpi:ICO*:
 acpi:ICP*:
 ID_VENDOR_FROM_DATABASE=ICP Electronics, Inc./iEi Technology Corp.

-acpi:ICR*:
- ID_VENDOR_FROM_DATABASE=Icron
-
 acpi:ICS*:
 ID_VENDOR_FROM_DATABASE=Integrated Circuit Systems

@ -3999,9 +3984,6 @@ acpi:LGX*:
 acpi:LHA*:
 ID_VENDOR_FROM_DATABASE=Lars Haagh ApS

-acpi:LHC*:
- ID_VENDOR_FROM_DATABASE=Beihai Century Joint Innovation Technology Co.,Ltd
-
 acpi:LHE*:
 ID_VENDOR_FROM_DATABASE=Lung Hwa Electronics Company Ltd

@ -4365,9 +4347,6 @@ acpi:MGL*:
 acpi:MGT*:
 ID_VENDOR_FROM_DATABASE=Megatech R & D Company

-acpi:MHQ*:
- ID_VENDOR_FROM_DATABASE=Moxa Inc.
-
 acpi:MIC*:
 ID_VENDOR_FROM_DATABASE=Micom Communications Inc

@ -4470,9 +4449,6 @@ acpi:MMN*:
 acpi:MMS*:
 ID_VENDOR_FROM_DATABASE=MMS Electronics

-acpi:MMT*:
- ID_VENDOR_FROM_DATABASE=MIMO Monitors
-
 acpi:MNC*:
 ID_VENDOR_FROM_DATABASE=Mini Micro Methods Ltd

@ -5319,9 +5295,6 @@ acpi:PIM*:
 acpi:PIO*:
 ID_VENDOR_FROM_DATABASE=Pioneer Electronic Corporation

-acpi:PIS*:
- ID_VENDOR_FROM_DATABASE=TECNART CO.,LTD.
-
 acpi:PIX*:
 ID_VENDOR_FROM_DATABASE=Pixie Tech Inc

@ -6135,9 +6108,6 @@ acpi:SJE*:
 acpi:SKD*:
 ID_VENDOR_FROM_DATABASE=Schneider & Koch

-acpi:SKI*:
- ID_VENDOR_FROM_DATABASE=LLC SKTB “SKIT”
-
 acpi:SKM*:
 ID_VENDOR_FROM_DATABASE=Guangzhou Teclast Information Technology Limited

@ -7446,9 +7416,6 @@ acpi:WKH*:
 acpi:WLD*:
 ID_VENDOR_FROM_DATABASE=Wildfire Communications Inc

-acpi:WLF*:
- ID_VENDOR_FROM_DATABASE=WOLF Advanced Technology
-
 acpi:WML*:
 ID_VENDOR_FROM_DATABASE=Wolfson Microelectronics Ltd

--- 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	2019-11-15 11:30:38.436197406 +0100
-+++ 20-acpi-vendor.hwdb	2019-11-15 11:30:38.472197605 +0100
+--- 20-acpi-vendor.hwdb.base	2019-08-22 09:17:21.083026269 +0200
+++ 20-acpi-vendor.hwdb	2019-08-22 09:17:21.101026408 +0200
@@ -3,6 +3,8 @@
 # Data imported from:
 #     https://uefi.org/uefi-pnp-export
@ -97,7 +97,7 @@
 acpi:AXI*:
  ID_VENDOR_FROM_DATABASE=American Magnetics
 
-@@ -1090,6 +1107,9 @@
+@@ -1087,6 +1104,9 @@
 acpi:BML*:
  ID_VENDOR_FROM_DATABASE=BIOMED Lab
 
@ -107,7 +107,7 @@
 acpi:BMS*:
  ID_VENDOR_FROM_DATABASE=BIOMEDISYS
 
-@@ -1102,6 +1122,9 @@
+@@ -1099,6 +1119,9 @@
 acpi:BNO*:
  ID_VENDOR_FROM_DATABASE=Bang & Olufsen
 
@ -117,7 +117,7 @@
 acpi:BNS*:
  ID_VENDOR_FROM_DATABASE=Boulder Nonlinear Systems
 
-@@ -1342,6 +1365,9 @@
+@@ -1339,6 +1362,9 @@
 acpi:CHA*:
  ID_VENDOR_FROM_DATABASE=Chase Research PLC
 
@ -127,7 +127,7 @@
 acpi:CHD*:
  ID_VENDOR_FROM_DATABASE=ChangHong Electric Co.,Ltd
 
-@@ -1495,6 +1521,9 @@
+@@ -1492,6 +1518,9 @@
 acpi:COD*:
  ID_VENDOR_FROM_DATABASE=CODAN Pty. Ltd.
 
@ -137,7 +137,7 @@
 acpi:COI*:
  ID_VENDOR_FROM_DATABASE=Codec Inc.
 
-@@ -1901,7 +1930,7 @@
+@@ -1898,7 +1927,7 @@
  ID_VENDOR_FROM_DATABASE=Dragon Information Technology
 
 acpi:DJE*:
@ -146,7 +146,7 @@
 
 acpi:DJP*:
  ID_VENDOR_FROM_DATABASE=Maygay Machines, Ltd
-@@ -2233,6 +2262,9 @@
+@@ -2227,6 +2256,9 @@
 acpi:EIN*:
  ID_VENDOR_FROM_DATABASE=Elegant Invention
 
@ -156,7 +156,7 @@
 acpi:EKA*:
  ID_VENDOR_FROM_DATABASE=MagTek Inc.
 
-@@ -2494,6 +2526,9 @@
+@@ -2485,6 +2517,9 @@
 acpi:FCG*:
  ID_VENDOR_FROM_DATABASE=First International Computer Ltd
 
@ -166,7 +166,7 @@
 acpi:FCS*:
  ID_VENDOR_FROM_DATABASE=Focus Enhancements, Inc.
 
-@@ -2867,7 +2902,7 @@
+@@ -2855,7 +2890,7 @@
  ID_VENDOR_FROM_DATABASE=General Standards Corporation
 
 acpi:GSM*:
@ -175,7 +175,7 @@
 
 acpi:GSN*:
  ID_VENDOR_FROM_DATABASE=Grandstream Networks, Inc.
-@@ -2968,6 +3003,9 @@
+@@ -2956,6 +2991,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
 
-@@ -3097,6 +3135,9 @@
+@@ -3085,6 +3123,9 @@
 acpi:HSD*:
  ID_VENDOR_FROM_DATABASE=HannStar Display Corp
 
@ -195,7 +195,7 @@
 acpi:HSM*:
  ID_VENDOR_FROM_DATABASE=AT&T Microelectronics
 
-@@ -3220,6 +3261,9 @@
+@@ -3208,6 +3249,9 @@
 acpi:ICI*:
  ID_VENDOR_FROM_DATABASE=Infotek Communication Inc
 
@ -205,7 +205,7 @@
 acpi:ICM*:
  ID_VENDOR_FROM_DATABASE=Intracom SA
 
-@@ -3316,6 +3360,9 @@
+@@ -3301,6 +3345,9 @@
 acpi:IKE*:
  ID_VENDOR_FROM_DATABASE=Ikegami Tsushinki Co. Ltd.
 
@ -215,7 +215,7 @@
 acpi:IKS*:
  ID_VENDOR_FROM_DATABASE=Ikos Systems Inc
 
-@@ -3361,6 +3408,9 @@
+@@ -3346,6 +3393,9 @@
 acpi:IMT*:
  ID_VENDOR_FROM_DATABASE=Inmax Technology Corporation
 
@ -225,7 +225,7 @@
 acpi:INA*:
  ID_VENDOR_FROM_DATABASE=Inventec Corporation
 
-@@ -3868,6 +3918,9 @@
+@@ -3853,6 +3903,9 @@
 acpi:LAN*:
  ID_VENDOR_FROM_DATABASE=Sodeman Lancom Inc
 
@ -235,7 +235,7 @@
 acpi:LAS*:
  ID_VENDOR_FROM_DATABASE=LASAT Comm. A/S
 
-@@ -3913,6 +3966,9 @@
+@@ -3898,6 +3951,9 @@
 acpi:LED*:
  ID_VENDOR_FROM_DATABASE=Long Engineering Design Inc
 
@ -245,7 +245,7 @@
 acpi:LEG*:
  ID_VENDOR_FROM_DATABASE=Legerity, Inc
 
-@@ -3928,6 +3984,9 @@
+@@ -3913,6 +3969,9 @@
 acpi:LGC*:
  ID_VENDOR_FROM_DATABASE=Logic Ltd
 
@ -255,7 +255,7 @@
 acpi:LGI*:
  ID_VENDOR_FROM_DATABASE=Logitech Inc
 
-@@ -3982,6 +4041,9 @@
+@@ -3964,6 +4023,9 @@
 acpi:LND*:
  ID_VENDOR_FROM_DATABASE=Land Computer Company Ltd
 
@ -265,7 +265,7 @@
 acpi:LNK*:
  ID_VENDOR_FROM_DATABASE=Link Tech Inc
 
-@@ -4016,7 +4078,7 @@
+@@ -3998,7 +4060,7 @@
  ID_VENDOR_FROM_DATABASE=Design Technology
 
 acpi:LPL*:
@ -274,7 +274,7 @@
 
 acpi:LSC*:
  ID_VENDOR_FROM_DATABASE=LifeSize Communications
-@@ -4192,6 +4254,9 @@
+@@ -4174,6 +4236,9 @@
 acpi:MCX*:
  ID_VENDOR_FROM_DATABASE=Millson Custom Solutions Inc.
 
@ -284,7 +284,7 @@
 acpi:MDA*:
  ID_VENDOR_FROM_DATABASE=Media4 Inc
 
-@@ -4429,6 +4494,9 @@
+@@ -4405,6 +4470,9 @@
 acpi:MOM*:
  ID_VENDOR_FROM_DATABASE=Momentum Data Systems
 
@ -294,7 +294,7 @@
 acpi:MOS*:
  ID_VENDOR_FROM_DATABASE=Moses Corporation
 
-@@ -4654,6 +4722,9 @@
+@@ -4630,6 +4698,9 @@
 acpi:NAL*:
  ID_VENDOR_FROM_DATABASE=Network Alchemy
 
@ -304,7 +304,7 @@
 acpi:NAT*:
  ID_VENDOR_FROM_DATABASE=NaturalPoint Inc.
 
-@@ -5158,6 +5229,9 @@
+@@ -5134,6 +5205,9 @@
 acpi:PCX*:
  ID_VENDOR_FROM_DATABASE=PC Xperten
 
@ -314,7 +314,7 @@
 acpi:PDM*:
  ID_VENDOR_FROM_DATABASE=Psion Dacom Plc.
 
-@@ -5221,9 +5295,6 @@
+@@ -5197,9 +5271,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
 
-@@ -5311,9 +5382,6 @@
+@@ -5284,9 +5355,6 @@
 acpi:PNL*:
  ID_VENDOR_FROM_DATABASE=Panelview, Inc.
 
@ -334,7 +334,7 @@
 acpi:PNR*:
  ID_VENDOR_FROM_DATABASE=Planar Systems, Inc.
 
-@@ -5449,15 +5517,9 @@
+@@ -5422,15 +5490,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
 
-@@ -5773,9 +5835,6 @@
+@@ -5746,9 +5808,6 @@
 acpi:RTI*:
  ID_VENDOR_FROM_DATABASE=Rancho Tech Inc
 
@ -360,7 +360,7 @@
 acpi:RTL*:
  ID_VENDOR_FROM_DATABASE=Realtek Semiconductor Company Ltd
 
-@@ -5941,9 +6000,6 @@
+@@ -5914,9 +5973,6 @@
 acpi:SEE*:
  ID_VENDOR_FROM_DATABASE=SeeColor Corporation
 
@ -370,7 +370,7 @@
 acpi:SEI*:
  ID_VENDOR_FROM_DATABASE=Seitz & Associates Inc
 
-@@ -6400,6 +6456,9 @@
+@@ -6370,6 +6426,9 @@
 acpi:SVD*:
  ID_VENDOR_FROM_DATABASE=SVD Computer
 
@ -380,7 +380,7 @@
 acpi:SVI*:
  ID_VENDOR_FROM_DATABASE=Sun Microsystems
 
-@@ -6484,6 +6543,9 @@
+@@ -6454,6 +6513,9 @@
 acpi:SZM*:
  ID_VENDOR_FROM_DATABASE=Shenzhen MTC Co., Ltd
 
@ -390,7 +390,7 @@
 acpi:TAA*:
  ID_VENDOR_FROM_DATABASE=Tandberg
 
-@@ -6574,6 +6636,9 @@
+@@ -6544,6 +6606,9 @@
 acpi:TDG*:
  ID_VENDOR_FROM_DATABASE=Six15 Technologies
 
@ -400,7 +400,7 @@
 acpi:TDM*:
  ID_VENDOR_FROM_DATABASE=Tandem Computer Europe Inc
 
-@@ -6616,6 +6681,9 @@
+@@ -6586,6 +6651,9 @@
 acpi:TEV*:
  ID_VENDOR_FROM_DATABASE=Televés, S.A.
 
@ -410,7 +410,7 @@
 acpi:TEZ*:
  ID_VENDOR_FROM_DATABASE=Tech Source Inc.
 
-@@ -6730,9 +6798,6 @@
+@@ -6700,9 +6768,6 @@
 acpi:TNC*:
  ID_VENDOR_FROM_DATABASE=TNC Industrial Company Ltd
 
@ -420,7 +420,7 @@
 acpi:TNM*:
  ID_VENDOR_FROM_DATABASE=TECNIMAGEN SA
 
-@@ -7039,14 +7104,14 @@
+@@ -7009,14 +7074,14 @@
 acpi:UNC*:
  ID_VENDOR_FROM_DATABASE=Unisys Corporation
 
@ -441,7 +441,7 @@
 
 acpi:UNI*:
  ID_VENDOR_FROM_DATABASE=Uniform Industry Corp.
-@@ -7081,6 +7146,9 @@
+@@ -7051,6 +7116,9 @@
 acpi:USA*:
  ID_VENDOR_FROM_DATABASE=Utimaco Safeware AG
 
@ -451,7 +451,7 @@
 acpi:USD*:
  ID_VENDOR_FROM_DATABASE=U.S. Digital Corporation
 
-@@ -7324,9 +7392,6 @@
+@@ -7294,9 +7362,6 @@
 acpi:WAL*:
  ID_VENDOR_FROM_DATABASE=Wave Access
 
@ -461,7 +461,7 @@
 acpi:WAV*:
  ID_VENDOR_FROM_DATABASE=Wavephore
 
-@@ -7451,7 +7516,7 @@
+@@ -7418,7 +7483,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.
-@@ -7465,9 +7530,6 @@
+@@ -7432,9 +7497,6 @@
 acpi:XDM*:
  ID_VENDOR_FROM_DATABASE=XDM Ltd.
 
@ -480,7 +480,7 @@
 acpi:XES*:
  ID_VENDOR_FROM_DATABASE=Extreme Engineering Solutions, Inc.
 
-@@ -7498,9 +7560,6 @@
+@@ -7465,9 +7527,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
 
-@@ -7567,6 +7626,9 @@
+@@ -7534,6 +7593,9 @@
 acpi:ZBX*:
  ID_VENDOR_FROM_DATABASE=Zebax Technologies
 
--- a/hwdb.d/20-pci-vendor-model.hwdb
+++ b/hwdb.d/20-pci-vendor-model.hwdb
--- a/hwdb.d/20-usb-vendor-model.hwdb
+++ b/hwdb.d/20-usb-vendor-model.hwdb
@ -167,9 +167,6 @@ usb:v03E7p2150*
 usb:v03E7p2485*
 ID_MODEL_FROM_DATABASE=Movidius MyriadX

-usb:v03E7pF63B*
- ID_MODEL_FROM_DATABASE=Myriad VPU [Movidius Neural Compute Stick]
-
 usb:v03E8*
 ID_VENDOR_FROM_DATABASE=EndPoints, Inc.

@ -701,9 +698,6 @@ usb:v03F0p0604*
 usb:v03F0p0605*
 ID_MODEL_FROM_DATABASE=ScanJet 2200c

-usb:v03F0p0610*
- ID_MODEL_FROM_DATABASE=Z24i Monitor Hub
-
 usb:v03F0p0611*
 ID_MODEL_FROM_DATABASE=OfficeJet K60xi

@ -770,9 +764,6 @@ usb:v03F0p0917*
 usb:v03F0p0924*
 ID_MODEL_FROM_DATABASE=Modular Smartcard Keyboard

-usb:v03F0p0941*
- ID_MODEL_FROM_DATABASE=X500 Optical Mouse
-
 usb:v03F0p094A*
 ID_MODEL_FROM_DATABASE=Optical Mouse [672662-001]

@ -2834,9 +2825,6 @@ usb:v0408p3000*
 usb:v0408p3001*
 ID_MODEL_FROM_DATABASE=Optical Touch Screen

-usb:v0408pA060*
- ID_MODEL_FROM_DATABASE=HD Webcam
-
 usb:v0409*
 ID_VENDOR_FROM_DATABASE=NEC Corp.

@ -3380,18 +3368,6 @@ usb:v040Ap402E*
 usb:v040Ap4034*
 ID_MODEL_FROM_DATABASE=805 Photo Printer

-usb:v040Ap4035*
- ID_MODEL_FROM_DATABASE=7000 Photo Printer
-
-usb:v040Ap4037*
- ID_MODEL_FROM_DATABASE=7010 Photo Printer
-
-usb:v040Ap4038*
- ID_MODEL_FROM_DATABASE=7015 Photo Printer
-
-usb:v040Ap404D*
- ID_MODEL_FROM_DATABASE=8810 Photo Printer
-
 usb:v040Ap404F*
 ID_MODEL_FROM_DATABASE=305 Photo Printer

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

-usb:v0416pC141*
- ID_MODEL_FROM_DATABASE=Barcode Scanner
-
 usb:v0417*
 ID_VENDOR_FROM_DATABASE=Symbios Logic

@ -4797,7 +4770,7 @@ usb:v0423p1237*
 ID_MODEL_FROM_DATABASE=Andromeda Hub

 usb:v0424*
- ID_VENDOR_FROM_DATABASE=Microchip Technology, Inc. (formerly SMSC)
+ ID_VENDOR_FROM_DATABASE=Standard Microsystems Corp.

 usb:v0424p0001*
 ID_MODEL_FROM_DATABASE=Integrated Hub
@ -4883,75 +4856,6 @@ usb:v0424p4060*
 usb:v0424p4064*
 ID_MODEL_FROM_DATABASE=Ultra Fast Media Reader

-usb:v0424p4712*
- ID_MODEL_FROM_DATABASE=USB4712 high-speed hub
-
-usb:v0424p4713*
- ID_MODEL_FROM_DATABASE=USB4715 high-speed hub (2 ports disabled)
-
-usb:v0424p4714*
- ID_MODEL_FROM_DATABASE=USB4715 high-speed hub (1 port disabled)
-
-usb:v0424p4715*
- ID_MODEL_FROM_DATABASE=USB4715 high-speed hub
-
-usb:v0424p4910*
- ID_MODEL_FROM_DATABASE=USB491x hub integrated functions (primary)
-
-usb:v0424p4912*
- ID_MODEL_FROM_DATABASE=USB4912 high-speed hub (1 port disabled)
-
-usb:v0424p4914*
- ID_MODEL_FROM_DATABASE=USB4914 high-speed hub
-
-usb:v0424p4916*
- ID_MODEL_FROM_DATABASE=USB4916 high-speed hub
-
-usb:v0424p4920*
- ID_MODEL_FROM_DATABASE=USB491x hub integrated functions (secondary)
-
-usb:v0424p4925*
- ID_MODEL_FROM_DATABASE=USB4925 high-speed hub (primary upstream)
-
-usb:v0424p4927*
- ID_MODEL_FROM_DATABASE=USB4927 high-speed hub (primary upstream)
-
-usb:v0424p4931*
- ID_MODEL_FROM_DATABASE=USB4925/4927 high-speed hub (secondary upstream)
-
-usb:v0424p4940*
- ID_MODEL_FROM_DATABASE=USB47xx/49xx hub integrated WinUSB
-
-usb:v0424p4942*
- ID_MODEL_FROM_DATABASE=USB47xx/49xx hub integrated I2S audio port
-
-usb:v0424p4943*
- ID_MODEL_FROM_DATABASE=USB47xx/49xx hub integrated I2S audio + HID port
-
-usb:v0424p4944*
- ID_MODEL_FROM_DATABASE=USB47xx/49xx hub integrated serial port
-
-usb:v0424p4946*
- ID_MODEL_FROM_DATABASE=USB47xx/49xx hub integrated serial + I2S audio port
-
-usb:v0424p4947*
- ID_MODEL_FROM_DATABASE=USB47xx/49xx hub integrated serial + I2S audio + HID port
-
-usb:v0424p494A*
- ID_MODEL_FROM_DATABASE=USB47xx/49xx hub integrated WinUSB + I2S audio port
-
-usb:v0424p494B*
- ID_MODEL_FROM_DATABASE=USB47xx/49xx hub integrated WinUSB + I2S audio + HID port
-
-usb:v0424p494C*
- ID_MODEL_FROM_DATABASE=USB47xx/49xx hub integrated WinUSB + serial port
-
-usb:v0424p494E*
- ID_MODEL_FROM_DATABASE=USB47xx/49xx hub integrated WinUSB + serial + I2S audio port
-
-usb:v0424p494F*
- ID_MODEL_FROM_DATABASE=USB47xx/49xx hub integrated WinUSB + serial + I2S audio + HID port
-
 usb:v0424p5434*
 ID_MODEL_FROM_DATABASE=Hub

@ -5066,9 +4970,6 @@ usb:v0430p00A2*
 usb:v0430p0100*
 ID_MODEL_FROM_DATABASE=3-button Mouse

-usb:v0430p0502*
- ID_MODEL_FROM_DATABASE=Panasonic CF-19 HID Touch Panel
-
 usb:v0430p100E*
 ID_MODEL_FROM_DATABASE=24.1" LCD Monitor v4 / FID-638 Mouse

@ -5138,9 +5039,6 @@ usb:v0437*
 usb:v0438*
 ID_VENDOR_FROM_DATABASE=Advanced Micro Devices, Inc.

-usb:v0438p7900*
- ID_MODEL_FROM_DATABASE=Root Hub
-
 usb:v0439*
 ID_VENDOR_FROM_DATABASE=Voice Technologies Group

@ -5468,9 +5366,6 @@ usb:v043Dp008E*
 usb:v043Dp008F*
 ID_MODEL_FROM_DATABASE=X422

-usb:v043Dp0091*
- ID_MODEL_FROM_DATABASE=Laser Printer E232
-
 usb:v043Dp0093*
 ID_MODEL_FROM_DATABASE=X5250

@ -5975,36 +5870,9 @@ usb:v0451pE004*
 usb:v0451pE008*
 ID_MODEL_FROM_DATABASE=TI-84 Plus Silver Calculator

-usb:v0451pE00E*
- ID_MODEL_FROM_DATABASE=TI-89 Titanium Presentation Link
-
-usb:v0451pE00F*
- ID_MODEL_FROM_DATABASE=TI-84 Plus Presentation Link
-
-usb:v0451pE010*
- ID_MODEL_FROM_DATABASE=TI SmartPad Keyboard
-
-usb:v0451pE011*
- ID_MODEL_FROM_DATABASE=Nspire CAS+ prototype
-
 usb:v0451pE012*
 ID_MODEL_FROM_DATABASE=TI-Nspire Calculator

-usb:v0451pE013*
- ID_MODEL_FROM_DATABASE=Network Bridge
-
-usb:v0451pE01C*
- ID_MODEL_FROM_DATABASE=Data Collection Sled [Nspire Lab Cradle, Nspire Datatracker Cradle]
-
-usb:v0451pE01F*
- ID_MODEL_FROM_DATABASE=Python Adapter (firmware install mode)
-
-usb:v0451pE020*
- ID_MODEL_FROM_DATABASE=Python Adapter
-
-usb:v0451pE022*
- ID_MODEL_FROM_DATABASE=Nspire CX II
-
 usb:v0451pF430*
 ID_MODEL_FROM_DATABASE=MSP-FET430UIF JTAG Tool

@ -6173,9 +6041,6 @@ usb:v0458p0101*
 usb:v0458p011B*
 ID_MODEL_FROM_DATABASE=NetScroll T220

-usb:v0458p0186*
- ID_MODEL_FROM_DATABASE=Genius DX-120 Mouse
-
 usb:v0458p1001*
 ID_MODEL_FROM_DATABASE=Joystick

@ -6272,9 +6137,6 @@ usb:v0458p3019*
 usb:v0458p301A*
 ID_MODEL_FROM_DATABASE=MaxFire G-12U Vibration

-usb:v0458p301C*
- ID_MODEL_FROM_DATABASE=Genius MaxFighter F-16U
-
 usb:v0458p301D*
 ID_MODEL_FROM_DATABASE=Genius MaxFire MiniPad

@ -6290,15 +6152,6 @@ usb:v0458p5003*
 usb:v0458p5004*
 ID_MODEL_FROM_DATABASE=G-pen Tablet

-usb:v0458p5005*
- ID_MODEL_FROM_DATABASE=Genius EasyPen M406
-
-usb:v0458p5012*
- ID_MODEL_FROM_DATABASE=Genius EasyPen M406W
-
-usb:v0458p5014*
- ID_MODEL_FROM_DATABASE=Genius EasyPen 340
-
 usb:v0458p505E*
 ID_MODEL_FROM_DATABASE=Genius iSlim 330

@ -45582,7 +45435,7 @@ usb:v10C3p00A5*
 ID_MODEL_FROM_DATABASE=ULS Print Support

 usb:v10C4*
- ID_VENDOR_FROM_DATABASE=Silicon Labs
+ ID_VENDOR_FROM_DATABASE=Cygnal Integrated Products, Inc.

 usb:v10C4p0002*
 ID_MODEL_FROM_DATABASE=F32x USBXpress Device
@ -45698,65 +45551,17 @@ usb:v10C4p89C6*
 usb:v10C4p89E1*
 ID_MODEL_FROM_DATABASE=C8051F38x HDMI Extender [UHBX-SW3-WP]

-usb:v10C4p89FB*
- ID_MODEL_FROM_DATABASE=Qivicon ZigBee Stick
-
-usb:v10C4p8A3C*
- ID_MODEL_FROM_DATABASE=C8051F38x HDBaseT Receiver [UHBX-R-XT]
-
-usb:v10C4p8A6C*
- ID_MODEL_FROM_DATABASE=C8051F38x 4K HDMI Audio Extractor [EMX-AMP]
-
-usb:v10C4p8ACB*
- ID_MODEL_FROM_DATABASE=C8051F38x HDBaseT Wall Plate Receiver with IR, RS-232, and PoH [UHBX-R-WP]
-
-usb:v10C4p8AF8*
- ID_MODEL_FROM_DATABASE=C8051F38x 4K HDMI Audio Extractor w/Audio Amplifier, HDBT Input, Line Audio Input RS-232 Ports and IP Control [VSA-X21]
-
-usb:v10C4p8B8C*
- ID_MODEL_FROM_DATABASE=C8051F38x 4K HDMI Audio Extractor w/Audio Amplifier, HDBT Input, Line Audio Input RS-232 Ports and IP Control [SC-3H]
-
-usb:v10C4p8DB5*
- ID_MODEL_FROM_DATABASE=C8051F38x CATx HDMI Receiver with USB [EX-HDU-R]
-
-usb:v10C4p8DB6*
- ID_MODEL_FROM_DATABASE=C8051F38x CATx HDMI Receiver
-
 usb:v10C4pEA60*
- ID_MODEL_FROM_DATABASE=CP210x UART Bridge
+ ID_MODEL_FROM_DATABASE=CP2102/CP2109 UART Bridge Controller [CP210x family]

 usb:v10C4pEA61*
 ID_MODEL_FROM_DATABASE=CP210x UART Bridge

-usb:v10C4pEA63*
+usb:v10C4pEA70*
 ID_MODEL_FROM_DATABASE=CP210x UART Bridge

-usb:v10C4pEA70*
- ID_MODEL_FROM_DATABASE=CP2105 Dual UART Bridge
-
-usb:v10C4pEA71*
- ID_MODEL_FROM_DATABASE=CP2108 Quad UART Bridge
-
 usb:v10C4pEA80*
- ID_MODEL_FROM_DATABASE=CP2110 HID UART Bridge
-
-usb:v10C4pEA90*
- ID_MODEL_FROM_DATABASE=CP2112 HID I2C Bridge
-
-usb:v10C4pEA91*
- ID_MODEL_FROM_DATABASE=CP2112 HID SMBus/I2C Bridge for CP2614 Evaluation Kit
-
-usb:v10C4pEA93*
- ID_MODEL_FROM_DATABASE=CP2112 HID SMBus/I2C Bridge for CP2615 Evaluation Kit
-
-usb:v10C4pEAB0*
- ID_MODEL_FROM_DATABASE=CP2114 I2S Audio Bridge
-
-usb:v10C4pEAC0*
- ID_MODEL_FROM_DATABASE=CP2614 MFi Accessory Digital Audio Bridge
-
-usb:v10C4pEAC1*
- ID_MODEL_FROM_DATABASE=CP2615 I2S Audio Bridge
+ ID_MODEL_FROM_DATABASE=CP210x UART Bridge

 usb:v10C4pEAC9*
 ID_MODEL_FROM_DATABASE=EFM8UB1 Bootloader
@ -45764,9 +45569,6 @@ usb:v10C4pEAC9*
 usb:v10C4pEACA*
 ID_MODEL_FROM_DATABASE=EFM8UB2 Bootloader

-usb:v10C4pEACB*
- ID_MODEL_FROM_DATABASE=EFM8UB3 Bootloader
-
 usb:v10C5*
 ID_VENDOR_FROM_DATABASE=Sanei Electric, Inc.

@ -49781,9 +49583,6 @@ usb:v1493p001C*
 usb:v1493p001D*
 ID_MODEL_FROM_DATABASE=Greentit [Ambit2 R]

-usb:v1493p001E*
- ID_MODEL_FROM_DATABASE=Ibisbill [Ambit3 Run]
-
 usb:v1497*
 ID_VENDOR_FROM_DATABASE=Panstrong Company Ltd.

@ -56252,9 +56051,6 @@ usb:v1E7Dp2D50*
 usb:v1E7Dp2D51*
 ID_MODEL_FROM_DATABASE=Kone+ Mouse

-usb:v1E7Dp2E22*
- ID_MODEL_FROM_DATABASE=Kone XTD Mouse
-
 usb:v1E7Dp30D4*
 ID_MODEL_FROM_DATABASE=Arvo Keyboard

@ -58181,39 +57977,6 @@ usb:v27B8*
 usb:v27B8p01ED*
 ID_MODEL_FROM_DATABASE=blink(1)

-usb:v27C6*
- ID_VENDOR_FROM_DATABASE=Shenzhen Goodix Technology Co.,Ltd.
-
-usb:v27C6p5117*
- ID_MODEL_FROM_DATABASE=Fingerprint Reader
-
-usb:v27C6p5201*
- ID_MODEL_FROM_DATABASE=Fingerprint Reader
-
-usb:v27C6p5301*
- ID_MODEL_FROM_DATABASE=Fingerprint Reader
-
-usb:v27C6p530C*
- ID_MODEL_FROM_DATABASE=Fingerprint Reader
-
-usb:v27C6p5385*
- ID_MODEL_FROM_DATABASE=Fingerprint Reader
-
-usb:v27C6p538C*
- ID_MODEL_FROM_DATABASE=Fingerprint Reader
-
-usb:v27C6p5395*
- ID_MODEL_FROM_DATABASE=Fingerprint Reader
-
-usb:v27C6p5584*
- ID_MODEL_FROM_DATABASE=Fingerprint Reader
-
-usb:v27C6p55B4*
- ID_MODEL_FROM_DATABASE=Fingerprint Reader
-
-usb:v27C6p5740*
- ID_MODEL_FROM_DATABASE=Fingerprint Reader
-
 usb:v2821*
 ID_VENDOR_FROM_DATABASE=ASUSTek Computer Inc.

@ -58496,12 +58259,6 @@ usb:v2C7Cp0306*
 usb:v2C7Cp0435*
 ID_MODEL_FROM_DATABASE=AG35 LTE modem

-usb:v2CDC*
- ID_VENDOR_FROM_DATABASE=Sea & Sun Technology GmbH
-
-usb:v2CDCpF232*
- ID_MODEL_FROM_DATABASE=CTD48Mc CTD Probe
-
 usb:v2DCF*
 ID_VENDOR_FROM_DATABASE=Dialog Semiconductor

--- a/hwdb.d/ma-large.txt
+++ b/hwdb.d/ma-large.txt
--- a/hwdb.d/ma-medium.txt
+++ b/hwdb.d/ma-medium.txt
@ -641,6 +641,12 @@ A8-3F-A1   (hex)		BEGLEC
 				Shenzhen    518106
 				CN

+1C-FD-08   (hex)		LABEL 
+900000-9FFFFF     (base 16)		LABEL 
+				18 ALLEE DE MONTREAL 
+				ANNEMASSE    74100
+				FR
+
 A8-3F-A1   (hex)		Neos Ventures Limited
 800000-8FFFFF     (base 16)		Neos Ventures Limited
 				47 Bermondsey Street
@ -1781,6 +1787,12 @@ A00000-AFFFFF     (base 16)		Trilux Group Management GmbH
 				Meguro-ku  Tokyo  153-0063
 				JP

+50-A4-D0   (hex)		TRAXENS
+000000-0FFFFF     (base 16)		TRAXENS
+				15 rue Marc Donadille - Les Baronnies Bat.C
+				MARSEILLE    13013
+				FR
+
 50-A4-D0   (hex)		XinLian'AnBao（Beijing）Technology Co.，LTD.
 800000-8FFFFF     (base 16)		XinLian'AnBao（Beijing）Technology Co.，LTD.
 				（Room 501,Building 10, Area 2, Headquarters Base）NO.188,South 4th Ring West Road, Fengtai District
@ -3320,222 +3332,6 @@ E00000-EFFFFF     (base 16)		Evolute Systems Private Limited
 				Tianjin  Tianjin  300000
 				CN

-44-03-77   (hex)		Bolin Technology Co., Ltd
-E00000-EFFFFF     (base 16)		Bolin Technology Co., Ltd
-				5/F, No 4 Block, Jinruizhonghe Industry Park,Huarong Road, Da Lang, Long Hua, Shenzhen, China.
-				shenzhen  Guang Dong  518109
-				CN
-
-50-62-55   (hex)		COTT Electronics
-D00000-DFFFFF     (base 16)		COTT Electronics
-				71-75 Shelton Street
-				London    WC2H 9JQ
-				GB
-
-50-62-55   (hex)		SHINSOFT CO., LTD.
-E00000-EFFFFF     (base 16)		SHINSOFT CO., LTD.
-				3F., No. 128, Xinhu 2nd Rd., Neihu Dist.
-				Taipei City    114
-				TW
-
-1C-FD-08   (hex)		Cobham Slip Rings
-900000-9FFFFF     (base 16)		Cobham Slip Rings
-				18 Rue de Montréal
-				ANNEMASSE  Ville-la-Grand  74108
-				FR
-
-C4-95-4D   (hex)		BA International Electronics Co. Ltd.
-000000-0FFFFF     (base 16)		BA International Electronics Co. Ltd.
-				8F., No. 140, Nanhua 1st St., Luzhu Dist.,
-				Taoyuan City    338
-				TW
-
-C4-95-4D   (hex)		LLC TechnoEnergo
-700000-7FFFFF     (base 16)		LLC TechnoEnergo
-				Kemerovskaya str., 3
-				Nizhny Novgorod  Nizhny Novgorod region  603152
-				RU
-
-C4-95-4D   (hex)		Xinjiang Golden Calf Energy IOT Technology Co., Ltd 
-800000-8FFFFF     (base 16)		Xinjiang Golden Calf Energy IOT Technology Co., Ltd 
-				A02 office building of Cloud Computing Industrial Park, Karamay District
-				Karamay  Xinjiang  834000
-				CN
-
-C4-95-4D   (hex)		Teletronik AG
-100000-1FFFFF     (base 16)		Teletronik AG
-				Bahnhofstrasse 10.
-				Zug    6302
-				CH
-
-C4-95-4D   (hex)		AKKA Germany GmbH
-600000-6FFFFF     (base 16)		AKKA Germany GmbH
-				Riesstrasse 14
-				München  Bayern  80992
-				DE
-
-64-31-39   (hex)		Livongo Health
-100000-1FFFFF     (base 16)		Livongo Health
-				150 W. Evelyn Ave, Suite 150
-				Mountain View  CA  94041
-				US
-
-C4-95-4D   (hex)		KAT Mekatronik Urunleri AS
-A00000-AFFFFF     (base 16)		KAT Mekatronik Urunleri AS
-				Istanbul Trakya Serbest Bolgesi Ataturk Bulvari No:20
-				Istanbul  Catalca  34500
-				TR
-
-C4-95-4D   (hex)		GL Solutions Inc.
-400000-4FFFFF     (base 16)		GL Solutions Inc.
-				16-3 Kuramae 4-chome
-				Taito-ku  Tokyo  111-0051
-				JP
-
-00-69-67   (hex)		miliwave
-100000-1FFFFF     (base 16)		miliwave
-				room 423,105 gwanggyo-ro, yengtong-gu
-				suwon-si  Kyunggi-do  16229
-				KR
-
-00-69-67   (hex)		Comcast-SRL
-600000-6FFFFF     (base 16)		Comcast-SRL
-				Alejo Martinez 17
-				Sosua  Puerto Plata  34443
-				DO
-
-00-69-67   (hex)		aversix
-D00000-DFFFFF     (base 16)		aversix
-				???????????351?4??7 (????)
-				???  ???  235
-				TW
-
-00-69-67   (hex)		Ningbo Shen Link Communication Technology Co.,Ltd
-200000-2FFFFF     (base 16)		Ningbo Shen Link Communication Technology Co.,Ltd
-				No.87,Fengming Road,Lizhou Street
-				Yuyao City  Zhejiang Province  315403
-				CN
-
-00-69-67   (hex)		Zhejiang Holip Electronic Technology Co.,Ltd
-A00000-AFFFFF     (base 16)		Zhejiang Holip Electronic Technology Co.,Ltd
-				NO.339 XINQIAO NORTH ROAD
-				Haiyan  Zhejiang  314300
-				CN
-
-A0-22-4E   (hex)		Hunan Youmei Science&Technology Development Co.,Ltd.
-E00000-EFFFFF     (base 16)		Hunan Youmei Science&Technology Development Co.,Ltd.
-				3F, Building No.B8, Cultural Advertising Creative Industry Park, Economic Development Zone
-				Huaihua City  Hunan Province  418000
-				CN
-
-A0-22-4E   (hex)		MESIT asd, s.r.o.
-600000-6FFFFF     (base 16)		MESIT asd, s.r.o.
-				Sokolovska 573
-				Uherske Hradiste    686 01
-				CZ
-
-A0-22-4E   (hex)		Standartoptic, Limited Liability Company
-C00000-CFFFFF     (base 16)		Standartoptic, Limited Liability Company
-				Moskovsky p, 22nd kilometer Kievskoe highway, house 4, building 1 floor 9 Block B office 903?
-				Moscow    108811
-				RU
-
-20-0A-0D   (hex)		Amazon Technologies Inc.
-B00000-BFFFFF     (base 16)		Amazon Technologies Inc.
-				P.O Box 8102
-				Reno  NV  89507
-				US
-
-20-0A-0D   (hex)		Clearly IP Inc
-300000-3FFFFF     (base 16)		Clearly IP Inc
-				2416 Industrial Dr Unit F
-				Neenah  WI  54956
-				US
-
-20-0A-0D   (hex)		Bently & EL  Co. Ltd.
-D00000-DFFFFF     (base 16)		Bently & EL  Co. Ltd.
-				7F-3, Fuxing North Road, Zhong Shan District
-				Taipei    104
-				TW
-
-20-0A-0D   (hex)		Austin Hughes Electronics Ltd.
-600000-6FFFFF     (base 16)		Austin Hughes Electronics Ltd.
-				Unit 3608-12, Cable TV Tower, 9 Hoi Shing Road, Tsuen Wan,  Hong Kong
-				Hong Kong  Kwai Tsing New Territories  00000
-				HK
-
-20-0A-0D   (hex)		HANGZHOU DANGBEI NETWORK TECH.Co.,Ltd
-E00000-EFFFFF     (base 16)		HANGZHOU DANGBEI NETWORK TECH.Co.,Ltd
-				Build C,Wanfu Center,Binkang Road No.228,Binjiang Area
-				China    210051
-				CN
-
-40-2C-76   (hex)		Beijing Smarot Technology Co., Ltd.
-400000-4FFFFF     (base 16)		Beijing Smarot Technology Co., Ltd.
-				Room 505, unit 2, 5th floor, 12th building, 3rd yard , Kangze road, Fangshan district
-				Beijing  Beijing  102488
-				CN
-
-40-2C-76   (hex)		Shanghai Dahua Scale Factory
-100000-1FFFFF     (base 16)		Shanghai Dahua Scale Factory
-				No.1013 Wangqiao Road,Pudong New District
-				Shanghai  Shanghai  201201
-				CN
-
-50-DE-19   (hex)		Tianjin Natianal Health Technology Co.,Ltd
-700000-7FFFFF     (base 16)		Tianjin Natianal Health Technology Co.,Ltd
-				Room 2-6, No.8, Haitai development fifth Road, Huayuan industrial Zone , Binhai high-tech District
-				Tianjin  Tianjin  300450
-				CN
-
-50-DE-19   (hex)		Clear Flow by Antiference
-100000-1FFFFF     (base 16)		Clear Flow by Antiference
-				Fradley Distribution Park, Wood End Lane
-				Lichfield  Staffordshire  WS13 8NE
-				GB
-
-50-DE-19   (hex)		AEG Identifikationssysteme GmbH
-900000-9FFFFF     (base 16)		AEG Identifikationssysteme GmbH
-				Hörvelsinger Weg 47
-				Ulm    89081
-				DE
-
-50-DE-19   (hex)		SPII SPA
-200000-2FFFFF     (base 16)		SPII SPA
-				VIA D. VOLPI 37 - ANGOLO VIA MONTOLI
-				SARONNO  VARESE  21047
-				IT
-
-50-A4-D0   (hex)		TRAXENS
-000000-0FFFFF     (base 16)		TRAXENS
-				HELIOPOLIS III – 16 rue Louis Leprince Ringuet
-				Marseille  Provence-Alpes-Côte d'Azur  13013
-				FR
-
-50-DE-19   (hex)		TRAXENS
-300000-3FFFFF     (base 16)		TRAXENS
-				HELIOPOLIS III – 16 rue Louis Leprince Ringuet
-				Marseille  Provence-Alpes-Côte d'Azur  13013
-				FR
-
-3C-FA-D3   (hex)		LIPS Corporation
-700000-7FFFFF     (base 16)		LIPS Corporation
-				2F., No. 100, Ruiguang Rd., Neihu Dist.
-				Taipei  Taiwan  114
-				TW
-
-50-DE-19   (hex)		Tannak International AB
-A00000-AFFFFF     (base 16)		Tannak International AB
-				 Midgårdsvägen 13
-				Luleå     973 34
-				SE
-
-3C-FA-D3   (hex)		 Corelink Technology Co.,Ltd
-B00000-BFFFFF     (base 16)		 Corelink Technology Co.,Ltd
-				2701, building D2, No.1, Keyuan Weiyi Road, Laoshan District
-				Qingdao  Shandong  China
-				CN
-
 4C-4B-F9   (hex)		Shenzhen dingsheng technology co., LTD
 400000-4FFFFF     (base 16)		Shenzhen dingsheng technology co., LTD
 				Floor 3, building 5, kaijeda industrial zone, no.97, huaxing road, langkou community, dalang street, longhua district
@ -6773,150 +6569,6 @@ B00000-BFFFFF     (base 16)		Hangzhou Asia Infrastructure Tech. Co., Ltd.
 				Hangzhou  Zhejiang  310000
 				CN

-50-62-55   (hex)		Hypertech Advance Co., LTD
-300000-3FFFFF     (base 16)		Hypertech Advance Co., LTD
-				1F., No. 9, Changchun 6th Rd., Zhongli Dist.,
-				 Taoyuan City    320
-				TW
-
-50-62-55   (hex)		AVTECH Software, Inc.
-700000-7FFFFF     (base 16)		AVTECH Software, Inc.
-				16 Cutler Str, Cutler Mill
-				Warren  RI  02885
-				US
-
-50-62-55   (hex)		Suzhou Ruixinjie Information Technology Co.,Ltd
-500000-5FFFFF     (base 16)		Suzhou Ruixinjie Information Technology Co.,Ltd
-				Room 907,No. 99 Changli Road
-				Suzhou  Jiangsu  215000
-				CN
-
-64-31-39   (hex)		Hunan Voc Acoustics Technology Co., Ltd.
-600000-6FFFFF     (base 16)		Hunan Voc Acoustics Technology Co., Ltd.
-				State Industrialpark, Jiulong Development Zone, Yanling County
-				Zhuzhou  Hunan  412500
-				CN
-
-50-62-55   (hex)		AED Distribution
-C00000-CFFFFF     (base 16)		AED Distribution
-				Bedrijvenpark De Veert 13/004
-				Willebroek    2830
-				BE
-
-64-31-39   (hex)		KOANGYOW INTEGRATION MACHINE CO., LTD.
-300000-3FFFFF     (base 16)		KOANGYOW INTEGRATION MACHINE CO., LTD.
-				7F., No. 566, Zhongzheng Rd., Xindian Dist.
-				New Taipei City    23148
-				TW
-
-64-31-39   (hex)		SHEN ZHEN FUCHANG TECHNOLOGY Co.,Ltd.
-C00000-CFFFFF     (base 16)		SHEN ZHEN FUCHANG TECHNOLOGY Co.,Ltd.
-				Floor 4 11 Building Qixing Factory,Niu Cheng 2rd Industrial Area,Xili Nanshan District
-				Shenzhen  GUANGDONG  518055
-				CN
-
-C4-95-4D   (hex)		Sercomm Corporation.
-300000-3FFFFF     (base 16)		Sercomm Corporation.
-				3F,No.81,Yu-Yih Rd.,Chu-Nan Chen
-				Miao-Lih Hsuan    115
-				TW
-
-C4-95-4D   (hex)		SolidGear Corporation
-C00000-CFFFFF     (base 16)		SolidGear Corporation
-				Shinyokohama Kaneko Bldg 8F, 2-3-9 ShinYokohama Kohoku-ku
-				Yokohama  Knanagawa  222-0033
-				JP
-
-00-69-67   (hex)		Hangzhou Wise IOT Technology Co.,Ltd
-900000-9FFFFF     (base 16)		Hangzhou Wise IOT Technology Co.,Ltd
-				Room 405, Building 2, No. 31, Science and Technology Avenue, Yuhang Street, Yuhang District
-				Hangzhou  Zhejiang  310012
-				CN
-
-00-69-67   (hex)		Ambient-System sp. z o.o.
-800000-8FFFFF     (base 16)		Ambient-System sp. z o.o.
-				ul. Galaktyczna 37
-				Gdansk    80-299
-				PL
-
-00-69-67   (hex)		Tianjin Lianwu Technology Co., Ltd. 
-E00000-EFFFFF     (base 16)		Tianjin Lianwu Technology Co., Ltd. 
-				Room 201, 2nd floor, Building 8, No.35, Caizhi Street, Xuefu Industrial Zone, Xiqing District
-				Tianjin  Tianjin  300380
-				CN
-
-64-31-39   (hex)		Active Brains
-400000-4FFFFF     (base 16)		Active Brains
-				Yokohama Dia BLDG 8F 1-7 Kinkocho Kanagawa-ku
-				Yokohama  Kanagawa  221-0056
-				JP
-
-00-69-67   (hex)		Datapan d.o.o.
-B00000-BFFFFF     (base 16)		Datapan d.o.o.
-				Velika Pot 19
-				Solkan    5250
-				SI
-
-A0-22-4E   (hex)		IST ElektronikgesmbH
-A00000-AFFFFF     (base 16)		IST ElektronikgesmbH
-				Marktplatz 40
-				Neukirchen am Walde  Upper Austria  4724
-				AT
-
-A0-22-4E   (hex)		rNET Controls 
-100000-1FFFFF     (base 16)		rNET Controls 
-				8231 SW Cirrus Dr
-				Beaverton  OR  97008
-				US
-
-20-0A-0D   (hex)		Tecnint HTE SRL
-700000-7FFFFF     (base 16)		Tecnint HTE SRL
-				Via della Tecnica 16/18
-				Osnago  Lecco  23875
-				IT
-
-20-0A-0D   (hex)		IRSAP
-A00000-AFFFFF     (base 16)		IRSAP
-				Via delle Industrie, 211
-				Arqua' Polesine  Veneto  45031
-				IT
-
-40-2C-76   (hex)		Baumer Bourdon-Haenni
-500000-5FFFFF     (base 16)		Baumer Bourdon-Haenni
-				125 Rue de la marre
-				Vendôme    41100
-				FR
-
-40-2C-76   (hex)		NowTechnologies Zrt
-A00000-AFFFFF     (base 16)		NowTechnologies Zrt
-				18 Realtanoda
-				Budapest    1053
-				HU
-
-40-2C-76   (hex)		Annapurna labs
-200000-2FFFFF     (base 16)		Annapurna labs
-				Matam Scientific Industries Center,   Building 8.2
-				Mail box 15123  Haifa  3508409
-				IL
-
-50-DE-19   (hex)		Shenzhen Vipstech Co., Ltd
-C00000-CFFFFF     (base 16)		Shenzhen Vipstech Co., Ltd
-				Building 10th, Baiwangxin Industrial Park, No. 1002 Songbai Road, Xili Street, 
-				Shenzhen  Guangdong  518100
-				CN
-
-3C-FA-D3   (hex)		Shenzhen zhong ju  Fiber optical Co.Ltd
-C00000-CFFFFF     (base 16)		Shenzhen zhong ju  Fiber optical Co.Ltd
-				3t Floor Build A .jin he Rui park .guan lan.
-				Shen zhen  Guang dong  518000
-				CN
-
-50-DE-19   (hex)		Telic AG
-000000-0FFFFF     (base 16)		Telic AG
-				Raiffeisenallee 12b
-				Oberhaching    82041
-				DE
-
 20-85-93   (hex)		UNILUMIN GROUP CO.,LTD
 300000-3FFFFF     (base 16)		UNILUMIN GROUP CO.,LTD
 				No.112 Yongfu Rd.,BaoanDistrict,
@ -10184,162 +9836,6 @@ A00000-AFFFFF     (base 16)		symplr
 				Toyohashi  Aichi  441-8560
 				JP

-44-03-77   (hex)		Annapurna labs
-300000-3FFFFF     (base 16)		Annapurna labs
-				Matam Scientific Industries Center,   Building 8.2
-				Mail box 15123  Haifa  3508409
-				IL
-
-50-62-55   (hex)		CCTV Manufacturer
-A00000-AFFFFF     (base 16)		CCTV Manufacturer
-				Room 1807,Bagua 4 Rd,Futian District
-				Shenzhen  Guangdong  518029
-				CN
-
-50-62-55   (hex)		Roda industrial development Co.,Ltd.
-800000-8FFFFF     (base 16)		Roda industrial development Co.,Ltd.
-				2-3F,Building C,Unistar Park,GenYu Road,GuangMing New District
-				Shenzhen    518000
-				CN
-
-50-62-55   (hex)		Hagiwara Solutions Co., Ltd 
-100000-1FFFFF     (base 16)		Hagiwara Solutions Co., Ltd 
-				7F, Sakae TV BLD, 3-10-32, Nishiki, Naka-ku,
-				Nagoya City  Aichi Prefecture  460-0003
-				JP
-
-64-31-39   (hex)		Shenzhen He&e Technology Co.,Ltd.
-500000-5FFFFF     (base 16)		Shenzhen He&e Technology Co.,Ltd.
-				2nd Floor, Building A7, Shenzhen Low Carbon Technology Demonstration Park, Silicon Valley Power, Guiyue Road, Guanlan Street, Longhua District, Shenzhen, China
-				ShenZhen    518100
-				CN
-
-64-31-39   (hex)		Shenzhen Huanyin Electronics Ltd.
-800000-8FFFFF     (base 16)		Shenzhen Huanyin Electronics Ltd.
-				Room 1707, 17/F, West Block, Nanshan Digital Culture Industrial Base, Nanshan District
-				Shenzhen  Guangdong  519052
-				CN
-
-64-31-39   (hex)		Product Development Associates, Inc.
-A00000-AFFFFF     (base 16)		Product Development Associates, Inc.
-				1145 E. Cliff Rd
-				Burnsville  MN  55337
-				US
-
-C4-95-4D   (hex)		Newland Era Edu Hi-Tech(BeiJing)Co.,Ltd
-D00000-DFFFFF     (base 16)		Newland Era Edu Hi-Tech(BeiJing)Co.,Ltd
-				No. 1, Linkong 2 Road,North Wenhuaying Village, Gaoliying Town, Shunyi District, Beijing
-				Beijing    101303
-				CN
-
-64-31-39   (hex)		Smartplus Inc.
-200000-2FFFFF     (base 16)		Smartplus Inc.
-				415 steelcase road east
-				markham  Ontario  L3R1G3
-				CA
-
-C4-95-4D   (hex)		Multicom, Inc
-B00000-BFFFFF     (base 16)		Multicom, Inc
-				1076 Florida Central Parkway
-				Longwood  FL  32750
-				US
-
-00-69-67   (hex)		PANGAEA SOLUTION INC
-700000-7FFFFF     (base 16)		PANGAEA SOLUTION INC
-				774, Yuseong-daero, Yuseong-gu, 
-				Daejeon  Daejeon  34171
-				KR
-
-00-69-67   (hex)		Command Alkon, Inc
-400000-4FFFFF     (base 16)		Command Alkon, Inc
-				1800 International Park Dr., Ste 400
-				Birmingham  AL  35243
-				US
-
-C4-95-4D   (hex)		Canare Electric Co., Ltd.
-E00000-EFFFFF     (base 16)		Canare Electric Co., Ltd.
-				B-13F,Shiba Park Bldg.,2-4-1,Shiba-Koen
-				Minato  Tokyo  105-0011
-				JP
-
-00-69-67   (hex)		Desird Design R&D
-C00000-CFFFFF     (base 16)		Desird Design R&D
-				Mehmetçik Mahallesi Aspendos Bulvar? No:99A Muratpa?a/ANTALYA
-				Antalya    07300
-				TR
-
-A0-22-4E   (hex)		Kyung In Electronics
-000000-0FFFFF     (base 16)		Kyung In Electronics
-				#1411, Byucksan Digital Valley 2, 184, Gasan Digital2-ro, Geumcheon-gu
-				 Seoul    08501
-				KR
-
-A0-22-4E   (hex)		TMGcore LLC
-400000-4FFFFF     (base 16)		TMGcore LLC
-				6815 Communications Pkwy
-				Plano  TX  75024
-				US
-
-A0-22-4E   (hex)		EISST  International Ltd
-800000-8FFFFF     (base 16)		EISST  International Ltd
-				10 Queen Street Place
-				London  London  EC4R 1AG
-				GB
-
-20-0A-0D   (hex)		Wideband Systems, Inc.
-100000-1FFFFF     (base 16)		Wideband Systems, Inc.
-				11900 Bournefield Way STE 120
-				Silver Spring  MD  20904
-				US
-
-20-0A-0D   (hex)		sehwa
-C00000-CFFFFF     (base 16)		sehwa
-				231, Techno 2-ro, Yuseong-gu, Daejeon, Republic of Korea
-				Daejeon  Daejeon  34026
-				KR
-
-20-0A-0D   (hex)		Shenzhen Zhangyue Technology Co.,Ltd 
-500000-5FFFFF     (base 16)		Shenzhen Zhangyue Technology Co.,Ltd 
-				Nanshan District Yuehai Street Weixin Software Science Park Building 8 9th Floor Room 903
-				Shenzhen  Guangdong  518500
-				CN
-
-40-2C-76   (hex)		Guangzhou Qi'an Technology Co., Ltd.
-D00000-DFFFFF     (base 16)		Guangzhou Qi'an Technology Co., Ltd.
-				No. 3, Dasonggang, Jiangnan Avenue Middle Road, Haizhu District, Guangzhou (office only)
-				Guangzhou  Guangdong  510220
-				CN
-
-40-2C-76   (hex)		Beijing Kuaiyu Electronic Co., Ltd.
-B00000-BFFFFF     (base 16)		Beijing Kuaiyu Electronic Co., Ltd.
-				Kuaiyu Technologies, Building 11, Yuquan Huigu, Tsinghua Science Park, No. 3 Minzhuang Road, Haidian District, Beijing
-				Beijing    100195
-				CN
-
-50-DE-19   (hex)		Langogo Technology Co., Ltd.
-400000-4FFFFF     (base 16)		Langogo Technology Co., Ltd.
-				 2/F, Boxun Building, Keyuan North Road, Nanshan District
-				Shenzhen  Guangdong  518103
-				CN
-
-3C-FA-D3   (hex)		GRG Banking Technology Co.,Ltd
-400000-4FFFFF     (base 16)		GRG Banking Technology Co.,Ltd
-				232 Gaotang Road,Tianhe District
-				Guangzhou  Guangdong  510000
-				CN
-
-3C-FA-D3   (hex)		UltiMachine
-A00000-AFFFFF     (base 16)		UltiMachine
-				200 12th St. N.
-				South Pittsburg  TN  37380
-				US
-
-3C-FA-D3   (hex)		Harman Connected Services, Inc.
-300000-3FFFFF     (base 16)		Harman Connected Services, Inc.
-				636 Ellis Street Mountain View
-				New York  CA  10003
-				US
-
 4C-4B-F9   (hex)		Shandong Linkotech Electronic Co., Ltd.
 600000-6FFFFF     (base 16)		Shandong Linkotech Electronic Co., Ltd.
 				22nd Floor, Building 2, Aosheng Building, No.1166 Xinyi Street, High-tech Zone
@ -13661,117 +13157,6 @@ D00000-DFFFFF     (base 16)		OMNISENSE SYSTEMS PRIVATE LIMITED TAIWAN BRANCH
 				Taipei    114
 				TW

-50-62-55   (hex)		Ufanet SC
-000000-0FFFFF     (base 16)		Ufanet SC
-				bldg 4/3, Prospect Octyabrya
-				Ufa    450001
-				RU
-
-64-31-39   (hex)		Dongguan Huili electroacoustic Industrial Co.,ltd
-700000-7FFFFF     (base 16)		Dongguan Huili electroacoustic Industrial Co.,ltd
-				Dalang Town, Biyun Cai Bai Cun East Second Street 66,A4 Building 501
-				Dongguan  Guangdong  523770
-				CN
-
-50-62-55   (hex)		Southern Ground Audio LLC
-900000-9FFFFF     (base 16)		Southern Ground Audio LLC
-				101 Gardner Park
-				Peachtree City  GA  30269
-				US
-
-C4-95-4D   (hex)		Shenzhen Xtooltech Co., Ltd
-900000-9FFFFF     (base 16)		Shenzhen Xtooltech Co., Ltd
-				10574 Acacia St, Suite D4
-				Rancho Cucamonga  CA  91730
-				US
-
-C4-95-4D   (hex)		Shen Zhen Euse Technology Co.,Ltd
-200000-2FFFFF     (base 16)		Shen Zhen Euse Technology Co.,Ltd
-				4/F, Block A2, Xinhao First Industrial Zone,  Qiaotou Community, Fuhai Street
-				Shenzhen  Guangdong  518103
-				CN
-
-A0-22-4E   (hex)		ProPhotonix
-300000-3FFFFF     (base 16)		ProPhotonix
-				3020 Euro Business Park
-				Co Cork  Little Island  n/A
-				IE
-
-20-0A-0D   (hex)		Netinovo Technologies(Shenzhen) Ltd
-200000-2FFFFF     (base 16)		Netinovo Technologies(Shenzhen) Ltd
-				101,201,301,Bldg8,No.1 industry zone,Shanmen Community,Yanluo Street
-				Shenzhen  Guangdong  518105
-				CN
-
-A0-22-4E   (hex)		Applied Information, Inc.
-700000-7FFFFF     (base 16)		Applied Information, Inc.
-				4411 Suwanee Dam Rd, Suite 510
-				Suwanee  GA  30024
-				US
-
-40-2C-76   (hex)		Annapurna labs
-900000-9FFFFF     (base 16)		Annapurna labs
-				Matam Scientific Industries Center,   Building 8.2
-				Mail box 15123  Haifa  3508409
-				IL
-
-20-0A-0D   (hex)		bcheck NV
-800000-8FFFFF     (base 16)		bcheck NV
-				Livornostraat 66/12
-				Brussels  Brussels  1000
-				BE
-
-40-2C-76   (hex)		Zhejiang Guoli Security Technology Co., Ltd.
-700000-7FFFFF     (base 16)		Zhejiang Guoli Security Technology Co., Ltd.
-				Room (1-1-178), No. 150, Zhangpu Road, Jiushigang Town, Haishu District
-				Ningbo  Zhejiang  315000
-				CN
-
-40-2C-76   (hex)		Lista AG
-000000-0FFFFF     (base 16)		Lista AG
-				Fabrikstrasse 1
-				Erlen  TG  8586
-				CH
-
-40-2C-76   (hex)		Suteng Innovation Technology Co., Ltd.
-800000-8FFFFF     (base 16)		Suteng Innovation Technology Co., Ltd.
-				10-11/F, Block 3, Chongwen Garden, Nanshan IPark, 3370 Liuxian Avenue, Nanshan District
-				Shenzhen    518000
-				CN
-
-40-2C-76   (hex)		Guangzhou LANGO Electronics Technology Co., Ltd.
-600000-6FFFFF     (base 16)		Guangzhou LANGO Electronics Technology Co., Ltd.
-				136#, Gaopu Road, Tianhe District
-				Guangzhou  Guangdong  510663
-				CN
-
-50-DE-19   (hex)		BRAINWARE TERAHERTA INFORMATION TECHNOLOGY CO.,LTD.
-B00000-BFFFFF     (base 16)		BRAINWARE TERAHERTA INFORMATION TECHNOLOGY CO.,LTD.
-				F3 and F4 of Innovation Industrial Park Phase II in Hefei High-tech Zone
-				Hefei   Anhui   230000
-				CN
-
-50-DE-19   (hex)		Bliq B.V.
-500000-5FFFFF     (base 16)		Bliq B.V.
-				Hogeweyselaan 145
-				Weesp    1382JK
-				NL
-
-50-DE-19   (hex)		Penny & Giles Aerospace Ltd
-D00000-DFFFFF     (base 16)		Penny & Giles Aerospace Ltd
-				15 Enterprise Way
-				Christchurch  Dorset  BH23 6HH
-				GB
-
-50-DE-19   (hex)		Private
-E00000-EFFFFF     (base 16)		Private
-
-3C-FA-D3   (hex)		Home Control AS
-000000-0FFFFF     (base 16)		Home Control AS
-				Postboks 1618 Vika
-				Oslo    0119 
-				NO
-
 20-85-93   (hex)		Great Lite International
 700000-7FFFFF     (base 16)		Great Lite International
 				11F., No.207-2, Sec. 3, Beixin Rd., Xindian Dist.,
@ -17008,147 +16393,3 @@ C00000-CFFFFF     (base 16)		BIG Climatic Manufacture, Co. LTD, Zhongshan Branch
 				Nantou Dadao, 20
 				Zhongshan  Guangdong  528427
 				CN
-
-50-62-55   (hex)		Shenzhen Sinway South Technology Co., Ltd
-600000-6FFFFF     (base 16)		Shenzhen Sinway South Technology Co., Ltd
-				No.7, Guantian Road, Guanlan Street, Longhua District
-				Shenzhen  Guangdong  518110
-				CN
-
-50-62-55   (hex)		CHENGDU COVE TECHNOLOGY CO.,LTD
-B00000-BFFFFF     (base 16)		CHENGDU COVE TECHNOLOGY CO.,LTD
-				No.1-3, Floor 4, Building 2,No.1366 Middle Section of Tianfu Ave
-				Chengdu   SICHUAN  610000
-				CN
-
-50-62-55   (hex)		XSLAB Inc.
-400000-4FFFFF     (base 16)		XSLAB Inc.
-				#1103, 11, DIGITAL-RO 33-GIL, GURO-GU
-				SEOUL    08380
-				KR
-
-50-62-55   (hex)		ShenZhen ChuangMo Electronics Technology Co., Ltd
-200000-2FFFFF     (base 16)		ShenZhen ChuangMo Electronics Technology Co., Ltd
-				West Floor 4,building A,Bafangyuan high and new industrial zone,No.108 Zhoushi Rd.,Shiyan sub-district,Baoan, 
-				Shenzhen  Guangdong  518108
-				CN
-
-64-31-39   (hex)		SHENZHEN EMEET INTELLIGENT TECHNOLOGY CO., LTD.
-000000-0FFFFF     (base 16)		SHENZHEN EMEET INTELLIGENT TECHNOLOGY CO., LTD.
-				Unit 2C,Building A6,Guangming Science Park,Guangming Road 3009
-				Shenzhen  Guangdong  518000
-				CN
-
-64-31-39   (hex)		ZHEJIANG MOORGEN INTELLIGENT TECHNOLOGY CO.,LTD
-D00000-DFFFFF     (base 16)		ZHEJIANG MOORGEN INTELLIGENT TECHNOLOGY CO.,LTD
-				5 / F, Building A, qinghua pioneer park?No. 318 Tianhu Road, Camel Street, Zhenhai District
-				Ningbo    315202
-				CN
-
-64-31-39   (hex)		ATG UV Technology
-E00000-EFFFFF     (base 16)		ATG UV Technology
-				Genesis House
-				Wigan    WN5 8AA
-				GB
-
-C4-95-4D   (hex)		Marble Automation
-500000-5FFFFF     (base 16)		Marble Automation
-				Keteldiep 6
-				Urk    8321 MH
-				NL
-
-00-69-67   (hex)		Shenzhen Xiao Bi En Culture Education Technology Co.,Ltd.
-500000-5FFFFF     (base 16)		Shenzhen Xiao Bi En Culture Education Technology Co.,Ltd.
-				4GH Unit,Block D,Central Avenue,Intersection of Xixiang Avenue and Baoyuan Road,Labor Community,Xixiang Street,Baoan District
-				Shenzhen  China  518102
-				CN
-
-00-69-67   (hex)		Annapurna labs
-000000-0FFFFF     (base 16)		Annapurna labs
-				Matam Scientific Industries Center,   Building 8.2
-				Mail box 15123  Haifa  3508409
-				IL
-
-00-69-67   (hex)		Suzhou Radiant Lighting Technology Co.,Ltd
-300000-3FFFFF     (base 16)		Suzhou Radiant Lighting Technology Co.,Ltd
-				Jiatai Road West, Shuanglong Industrial Park,Fenghuang Town
-				Zhangjiagang  Jiangsu  215600
-				CN
-
-A0-22-4E   (hex)		Zhuhai Cheer Technology Co., LTD.
-500000-5FFFFF     (base 16)		Zhuhai Cheer Technology Co., LTD.
-				No.8 Hongwan Road, Hongwan Industry Zone, Xiangzhou District
-				Zhuhai  Guangdong  519060
-				CN
-
-A0-22-4E   (hex)		Digifocus Technology Inc.
-D00000-DFFFFF     (base 16)		Digifocus Technology Inc.
-				6F, No.89, Xinhu 1st Rd., Neihu Dist.
-				Taipei City     11494
-				TW
-
-A0-22-4E   (hex)		Delta Tau Data Systems, Inc.
-900000-9FFFFF     (base 16)		Delta Tau Data Systems, Inc.
-				21314 Lassen St.
-				Chatsworth  CA  91311
-				US
-
-A0-22-4E   (hex)		Closed Joint-Stock Company NORSI-TRANS
-200000-2FFFFF     (base 16)		Closed Joint-Stock Company NORSI-TRANS
-				B.Novodmitrovskaya Street, house 12, building 15
-				Moscow    127015
-				RU
-
-A0-22-4E   (hex)		All Inspire Health Inc.
-B00000-BFFFFF     (base 16)		All Inspire Health Inc.
-				19 Morris Avenue, Building 128, Cumberland Gate
-				Brooklyn  NY  11205
-				US
-
-20-0A-0D   (hex)		Welzek (Beijing) Technologies  Co, Ltd
-900000-9FFFFF     (base 16)		Welzek (Beijing) Technologies  Co, Ltd
-				No 201,Building 12, Chaolai Science Park, No.36 Chuangyuan RoadLaiguangying, Chaoyang Disctrict
-				Beijing  Beijing  100012
-				CN
-
-20-0A-0D   (hex)		Virtium
-400000-4FFFFF     (base 16)		Virtium
-				30052 Tomas
-				Racho Santa MArgarita  CA  92688
-				US
-
-20-0A-0D   (hex)		halstrup-walcher GmbH
-000000-0FFFFF     (base 16)		halstrup-walcher GmbH
-				Stegener Straße 10
-				Kirchzarten    79199
-				DE
-
-40-2C-76   (hex)		gridX GmbH
-C00000-CFFFFF     (base 16)		gridX GmbH
-				Oppenhoffallee 143
-				Aachen    52066
-				DE
-
-50-DE-19   (hex)		OCEANCCTV LTD
-600000-6FFFFF     (base 16)		OCEANCCTV LTD
-				4F., No. 1, Ln. 297, Xinyi Rd.,Banqiao Dist.,
-				New Taipei City    220
-				TW
-
-40-2C-76   (hex)		LS Energy Solutions
-E00000-EFFFFF     (base 16)		LS Energy Solutions
-				9201 Forsyth Park Drive
-				Charlotte  NC  28273
-				US
-
-50-DE-19   (hex)		IVATIV, INC
-800000-8FFFFF     (base 16)		IVATIV, INC
-				6141 RUNNING SPRINGS RD
-				SAN JOSE  CA  95135
-				US
-
-3C-FA-D3   (hex)		Nox Medical
-600000-6FFFFF     (base 16)		Nox Medical
-				Katrinartun 2
-				Reykjavik    105
-				IS
--- a/hwdb.d/ma-small.txt
+++ b/hwdb.d/ma-small.txt
--- a/hwdb.d/meson.build
+++ b/hwdb.d/meson.build
@ -47,7 +47,3 @@ endif
 run_target(
        'hwdb-update',
        command : [hwdb_update_sh, meson.current_source_dir()])
-
-run_target(
-        'autosuspend-update',
-        command : [autosuspend_update_sh, project_source_root + '/tools/chromiumos'])
--- a/hwdb.d/pci.ids
+++ b/hwdb.d/pci.ids
@ -1,8 +1,8 @@
 #
 #	List of PCI ID's
 #
-#	Version: 2019.11.10
-#	Date:    2019-11-10 03:15:01
+#	Version: 2019.08.22
+#	Date:    2019-08-22 03:15:01
 #
 #	Maintained by Albert Pool, Martin Mares, and other volunteers from
 #	the PCI ID Project at https://pci-ids.ucw.cz/.
@ -13,10 +13,6 @@
 #	This file can be distributed under either the GNU General Public License
 #	(version 2 or higher) or the 3-clause BSD License.
 #
-#	The database is a compilation of factual data, and as such the copyright
-#	only covers the aggregation and formatting. The copyright is held by
-#	Martin Mares and Albert Pool.
-#

 # Vendors, devices and subsystems. Please keep sorted.

@ -495,7 +491,6 @@
 	006e  SAS2308 PCI-Express Fusion-MPT SAS-2
 	0070  SAS2004 PCI-Express Fusion-MPT SAS-2 [Spitfire]
 		1000 3010  SAS9211-4i
-		1014 040e  ServeRAID H1110
 	0071  MR SAS HBA 2004
 	0072  SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon]
 		1000 3040  9210-8i
@ -684,37 +679,17 @@
 	00e2  Fusion-MPT 12GSAS/PCIe Secure SAS39xx
 	00e3  Fusion-MPT 12GSAS/PCIe Unsupported SAS39xx
 	00e4  Fusion-MPT 12GSAS/PCIe Unsupported SAS38xx
+	00e5  Fusion-MPT 12GSAS/PCIe SAS38xx
 		1028 200b  HBA355i Adapter
 		1028 200c  HBA355i Front
 		1028 200d  HBA355e Adapter
 		1028 200e  HBA355i MX
-	00e5  Fusion-MPT 12GSAS/PCIe SAS38xx
-# Invalid part
-		1028 200b  HBA355i Adapter Invalid
-# Invalid part
-		1028 200c  HBA355i Front Invalid
-# Invalid part
-		1028 200d  HBA355e Adapter Invalid
-# Invalid part
-		1028 200e  HBA355i MX Invalid
 		1d49 0205  ThinkSystem 440-16i SAS/SATA PCIe Gen4 12Gb Internal HBA
 		1d49 0206  ThinkSystem 440-16e SAS/SATA PCIe Gen4 12Gb HBA
 	00e6  Fusion-MPT 12GSAS/PCIe Secure SAS38xx
-		1028 200b  HBA355i Adapter
-		1028 200c  HBA355i Front
-		1028 200d  HBA355e Adapter
-		1028 200e  HBA355i MX
 		1d49 0205  ThinkSystem 440-16i SAS/SATA PCIe Gen4 12Gb Internal HBA
 		1d49 0206  ThinkSystem 440-16e SAS/SATA PCIe Gen4 12Gb HBA
-	00e7  HBA355i MX
-# Tampered part
-		1028 200b  HBA355i Adapter Tampered
-# Tampered part
-		1028 200c  HBA355i Front Tampered
-# Tampered part
-		1028 200d  HBA355e Adapter Tampered
-# Tampered part
-		1028 200e  HBA355i MX Tampered
+	00e7  Fusion-MPT 12GSAS/PCIe Unsupported SAS38xx
 	02b0  Virtual Endpoint on PCIe Switch
 		1d49 0001  ThinkSystem 1610-4P NVMe Switch Adapter
 		1d49 0002  ThinkSystem 810-4P NVMe Switch Adapter
@ -791,10 +766,6 @@
 	0901  61C102
 	1000  63C815
 	10e0  MegaRAID 12GSAS/PCIe Unsupported SAS39xx
-		1028 1ae0  PERC H755 Adapter - Invalid Device
-		1028 1ae1  PERC H755 Front - Invalid Device
-		1028 1ae2  PERC H755N Front - Invalid Device
-		1028 1ae3  PERC H755 MX - Invalid Device
 	10e1  MegaRAID 12GSAS/PCIe SAS39xx
 		1028 1ae0  PERC H755 Adapter
 		1028 1ae1  PERC H755 Front
@ -818,10 +789,6 @@
 		1d49 060e  ThinkSystem RAID 940-32i 8GB Flash PCIe Gen4 12Gb Adapter
 		1d49 060f  ThinkSystem RAID 940-8e 4GB Flash PCIe Gen4 12Gb Adapter
 	10e3  MegaRAID 12GSAS/PCIe Unsupported SAS39xx
-		1028 1ae0  PERC H755 Adapter - Tampered Device
-		1028 1ae1  PERC H755 Front - Tampered Device
-		1028 1ae2  PERC H755N Front - Tampered Device
-		1028 1ae3  PERC H755 MX - Tampered Device
 	10e4  MegaRAID 12GSAS/PCIe Unsupported SAS38xx
 	10e5  MegaRAID 12GSAS/PCIe SAS38xx
 	10e6  MegaRAID 12GSAS/PCIe Secure SAS38xx
@ -885,14 +852,11 @@
 	1552  Pooky
 	1561  Anubis
 	15d8  Picasso
-		103c 8615  Pavilion Laptop 15-cw1xxx
 	15dd  Raven Ridge [Radeon Vega Series / Radeon Vega Mobile Series]
 		103c 83c6  Radeon Vega 8 Mobile
 		1458 d000  Radeon RX Vega 11
 	15de  Raven/Raven2/Fenghuang HDMI/DP Audio Controller
-		103c 8615  Pavilion Laptop 15-cw1xxx
 	15df  Raven/Raven2/Fenghuang/Renoir Cryptographic Coprocessor
-		103c 8615  Pavilion Laptop 15-cw1xxx
 	15ff  Fenghuang [Zhongshan Subor Z+]
 	1607  Arden
 	1636  Renoir
@ -2540,7 +2504,7 @@
 		1787 a480  Radeon RX 480
 		1849 5001  Phantom Gaming X RX 580 OC
 		1da2 e353  Radeon RX 570 Pulse 4GB
-		1da2 e366  Nitro+ Radeon RX 570/580/590
+		1da2 e366  Nitro+ Radeon RX 570/580
 	67e0  Baffin [Radeon Pro WX 4170]
 		103c 8270  Radeon Pro WX 4170
 		103c 8272  Radeon Pro WX 4170
@ -2558,7 +2522,6 @@
 	67e9  Baffin [Polaris11]
 	67eb  Baffin [Radeon Pro V5300X]
 	67ef  Baffin [Radeon RX 460/560D / Pro 450/455/460/555/555X/560/560X]
-		1028 1703  RX 560D OEM OC 2 GB
 		103c 3421  Radeon RX 460
 		106b 0160  Radeon Pro 460
 		106b 0166  Radeon Pro 455
@ -3480,7 +3443,6 @@
 		174b e329  Radeon R9 FURY
 	7310  Navi 10
 	731f  Navi 10 [Radeon RX 5700 / 5700 XT]
-	7340  Navi 14 [Radeon RX 5500 / 5500M]
 	7833  RS350 Host Bridge
 	7834  RS350 [Radeon 9100 PRO/XT IGP]
 	7835  RS350M [Mobility Radeon 9000 IGP]
@ -4621,9 +4583,7 @@
 	15bc  Stoney PCIe [GFX,GPP] Bridge [4:0]
 	15be  Stoney Audio Processor
 	15d0  Raven/Raven2 Root Complex
-		103c 8615  Pavilion Laptop 15-cw1xxx
 	15d1  Raven/Raven2 IOMMU
-		103c 8615  Pavilion Laptop 15-cw1xxx
 	15d2  Raven/Raven2 PCIe Dummy Host Bridge
 	15d3  Raven/Raven2 PCIe GPP Bridge [6:0]
 	15d4  FireFlight USB 3.1
@ -4634,16 +4594,12 @@
 	15de  Raven/Raven2/FireFlight HD Audio Controller
 	15df  Family 17h (Models 10h-1fh) Platform Security Processor
 	15e0  Raven USB 3.1
-		103c 8615  Pavilion Laptop 15-cw1xxx
 	15e1  Raven USB 3.1
-		103c 8615  Pavilion Laptop 15-cw1xxx
 	15e2  Raven/Raven2/FireFlight/Renoir Audio Processor
 	15e3  Family 17h (Models 10h-1fh) HD Audio Controller
-		103c 8615  Pavilion Laptop 15-cw1xxx
 	15e4  Raven/Raven2/Renoir Sensor Fusion Hub
 	15e5  Raven2 USB 3.1
 	15e6  Raven/Raven2/Renoir Non-Sensor Fusion Hub KMDF driver
-		1022 15e4  Raven/Raven2/Renoir Sensor Fusion Hub
 	15e8  Raven/Raven2 Device 24: Function 0
 	15e9  Raven/Raven2 Device 24: Function 1
 	15ea  Raven/Raven2 Device 24: Function 2
@ -4879,16 +4835,13 @@
 		103c 1985  Pavilion 17-e163sg Notebook PC
 	7900  FCH SATA Controller [IDE mode]
 	7901  FCH SATA Controller [AHCI mode]
-		103c 8615  Pavilion Laptop 15-cw1xxx
 	7902  FCH SATA Controller [RAID mode]
 	7903  FCH SATA Controller [RAID mode]
 	7904  FCH SATA Controller [AHCI mode]
 	7906  FCH SD Flash Controller
 	7908  FCH USB EHCI Controller
 	790b  FCH SMBus Controller
-		103c 8615  Pavilion Laptop 15-cw1xxx
 	790e  FCH LPC Bridge
-		103c 8615  Pavilion Laptop 15-cw1xxx
 	790f  FCH PCI Bridge
 	7914  FCH USB XHCI Controller
 	9600  RS780 Host Bridge
@ -6808,7 +6761,6 @@
 	1654  FastLinQ QL45000 Series 50GbE Controller
 		1077 0032  QL45212 Flex 50Gb 2-port Ethernet Adapter
 		1590 0223  Synergy 6810C 25/50Gb Ethernet Adapter
-		1590 0287  Synergy 6820C 25/50Gb CNA
 	1656  FastLinQ QL45000 Series 25GbE Controller
 		1077 0033  QL45214 Flex 25Gb 4-port Ethernet Adapter
 		1077 02a7  QL45212-DE 25GbE Adapter
@ -6873,8 +6825,6 @@
 		1077 02e4  QLE2772 Dual Port 32GFC PCIe Gen4 x8 Adapter
 		1077 02ee  QLE2870 Single Port 64GFC PCIe Gen4 x8 Adapter
 		1077 02f0  QLE2770 Single Port 32GFC PCIe Gen4 x8 Adapter
-		1590 02d3  SN1610Q - 1P Enhanced 32GFC Single Port Fibre Channel Host Bus Adapter
-		1590 02d4  SN1610Q – 2P Enhanced 32GFC Dual Port Fibre Channel Host Bus Adapter
 	2300  QLA2300 64-bit Fibre Channel Adapter
 	2312  ISP2312-based 2Gb Fibre Channel to PCI-X HBA
 		103c 0131  2Gb Fibre Channel - Single port [A7538A]
@ -6946,11 +6896,6 @@
 		1077 0012  FastLinQ QL41112H 10GbE Adapter
 		1077 0019  QL41232HOCU - Dual Port 25/10GbE SFP28 OCP Adapter
 		1077 0039  QLogic QL41262 PCIe 25Gb 2-Port SFP28 Ethernet Adapter
-		1077 0053  QLogic 2x25GE QL41232HQCU NIC
-		1077 0054  2x10GE QL41132HQRJ NIC
-		1077 0055  QLogic 2x10GE QL41132HQCU NIC
-		1077 0056  2x10GE QL41132HxRJ NIC
-		1077 0057  2x25GE QL41232HxCU NIC
 		1590 021a  10GbE 2P QL41162HLRJ-HP Adapter
 		1590 021b  10GbE 2P QL41162HLRJ-HP Adapter
 		1590 021d  10/25GbE 2P QL41222HLCU-HP Adapter
@ -7006,11 +6951,6 @@
 		1077 0010  2x25GE QL41232HMKR NIC
 		1077 0011  FastLinQ QL41212H 25GbE Adapter (SR-IOV VF)
 		1077 0012  FastLinQ QL41112H 10GbE Adapter (SR-IOV VF)
-		1077 0053  QLogic 2x25GE QL41232HQCU NIC
-		1077 0054  QLogic 2x10GE QL41132HQRJ NIC
-		1077 0055  QLogic 2x10GE QL41132HQCU NIC
-		1077 0056  2x10GE QL41132HxRJ NIC
-		1077 0057  2x25GE QL41232HxCU NIC
 		1590 021a  10GbE 2P QL41162HLRJ-HP Adapter
 		1590 021b  10GbE 2P QL41162HLRJ-HP Adapter
 		1590 021e  10/25GbE 2P QL41162HMRJ-HP Adapter
@ -7913,12 +7853,10 @@
 		1093 7802  PXIe-4302
 		1093 7803  PXIe-4303
 		1093 7805  PXIe-4305
-		1093 786f  PXIe-4163
 		1093 788e  PXIe-4304
 		1093 78f8  NI FlexRIO Module (KU035)
 		1093 78f9  NI FlexRIO Module (KU040)
 		1093 78fa  NI FlexRIO Module (KU060)
-		1093 78ff  PXIe-4162
 		1093 7995  PXIe-7911R
 		1093 7996  PXIe-7912R
 		1093 7997  PXIe-7915R
@ -10847,7 +10785,7 @@
 	0e0f  GK208 HDMI/DP Audio Controller
 	0e12  TegraK1 PCIe x4 Bridge
 	0e13  TegraK1 PCIe x1 Bridge
-	0e1a  GK110 High Definition Audio Controller
+	0e1a  GK110 HDMI Audio
 	0e1b  GK107 HDMI Audio Controller
 		103c 197b  ZBook 15
 		1043 8428  GTX650-DC-1GD5
@ -11435,7 +11373,8 @@
 		106b 010d  iMac 13,2
 	11a7  GK104M [GeForce GTX 675MX]
 	11af  GK104GLM [GRID IceCube]
-	11b0  GK104GL [GRID K240Q / K260Q vGPU]
+# GRID K2 Quadro USM
+	11b0  GK104GL [GRID K240Q\K260Q vGPU]
 		10de 101a  GRID K240Q
 		10de 101b  GRID K260Q
 	11b1  GK104GL [GRID K2 Tesla USM]
@ -11670,18 +11609,14 @@
 	17c2  GM200 [GeForce GTX TITAN X]
 	17c8  GM200 [GeForce GTX 980 Ti]
 	17f0  GM200GL [Quadro M6000]
-		10de 1141  VCA 6000
 	17f1  GM200GL [Quadro M6000 24GB]
 	17fd  GM200GL [Tesla M40]
-	1ad6  TU102 USB 3.1 Host Controller
+	1ad6  TU102 USB 3.1 Controller
 	1ad7  TU102 UCSI Controller
-	1ad8  TU104 USB 3.1 Host Controller
-	1ad9  TU104 USB Type-C UCSI Controller
 	1ada  TU106 USB 3.1 Host Controller
 		1043 8673  TURBO-RTX2070-8G
 	1adb  TU106 USB Type-C Port Policy Controller
 		1043 8673  TURBO-RTX2070-8G
-	1aeb  TU116 High Definition Audio Controller
 	1b00  GP102 [TITAN X]
 	1b01  GP102 [GeForce GTX 1080 Ti 10GB]
 	1b02  GP102 [TITAN Xp]
@ -11873,12 +11808,8 @@
 	e100  Proteus-X: LightPulse IOV Fibre Channel Host Adapter
 	e131  LightPulse 8Gb/s PCIe Shared I/O Fibre Channel Adapter
 	e180  Proteus-X: LightPulse IOV Fibre Channel Host Adapter
-	e200  LPe15000/LPe16000 Series 8Gb/16Gb Fibre Channel Adapter
-		1014 03f1  PCIe2 2-Port 16Gb Fibre Channel Adapter for POWER (FC EL5B; CCIN 577F)
-		1014 04e3  PCIe3 4-Port 10GbE SR Adapter for POWER (FC EN15/EN16; CCIN 2CE3)
-		1014 04e4  PCIe3 4-Port 10GbE SFP+ Adapter for POWER (FC EN18; CCIN 2CE4)
-		10df e280  LPe16002B-M6 2-Port 16Gb Fibre Channel Adapter
-		10df e281  LPe16000B-M6 1-Port 16Gb Fibre Channel Adapter
+	e200  Lancer: LPe16000 Fibre Channel Host Adapter
+		1014 03f1  PCIe2 16 Gb 2-port Fibre Channel Adapter (FC EL5B; CCIN 577F)
 		10df e282  Flex System FC5054 4-port 16Gb FC Adapter
 	e208  LightPulse 16Gb Fibre Channel Host Adapter (Lancer-VF)
 	e220  OneConnect NIC (Lancer)
@ -11887,29 +11818,15 @@
 	e240  OneConnect iSCSI Initiator (Lancer)
 	e260  OneConnect FCoE Initiator (Lancer)
 	e268  OneConnect 10Gb FCoE Converged Network Adapter (Lancer-VF)
-	e300  LPe31000/LPe32000 Series 16Gb/32Gb Fibre Channel Adapter
-		1014 0614  PCIe3 4-Port 16Gb Fibre Channel Adapter for POWER (FC EN1C/EN1D; CCIN 578E)
-		1014 0615  PCIe3 2-Port 32Gb Fibre Channel Adapter for POWER (FC EN1A/EN1B; CCIN 578F)
-		10df e300  LPe32002-M2 2-Port 32Gb Fibre Channel Adapter
-		10df e301  LPe32000-M2 1-Port 32Gb Fibre Channel Adapter
-		10df e310  LPe31002-M6 2-Port 16Gb Fibre Channel Adapter
-		10df e311  LPe31000-M6 1-Port 16Gb Fibre Channel Adapter
-		10df e312  LPe31004-M6 4-Port 16Gb Fibre Channel Adapter
-		10df e320  LPe32002-M2-D 2-Port 32Gb Fibre Channel Adapter
-		10df e321  LPe32000-M2-D 1-Port 32Gb Fibre Channel Adapter
-		10df e322  LPe31002-M6-D 2-Port 16Gb Fibre Channel Adapter
-		10df e323  LPe31000-M6-D 1-Port 16Gb Fibre Channel Adapter
-		10df e324  LPm32002-D 2-Port 32Gb Fibre Channel Mezz Card
-		10df e325  LPm31002-D 2-Port 16Gb Fibre Channel Mezz Card
-		10df e330  LPe32002-M2-L 2-Port 32Gb PCIe Fibre Channel Adapter
-		10df e331  LPe32000-M2-L 1-Port 32Gb PCIe Fibre Channel Adapter
-		10df e332  LPe31002-M6-L 2-Port 16Gb PCIe Fibre Channel Adapter
-		10df e333  LPe31000-M6-L 1-Port 16Gb PCIe Fibre Channel Adapter
-		1590 0201  StoreFabric SN1600E 1-Port 32Gb Fibre Channel Adapter
-		1590 0202  StoreFabric SN1600E 2-Port 32Gb Fibre Channel Adapter
-		1590 0213  StoreFabric SN1200E 1-Port 16Gb Fibre Channel Adapter
-		1590 0214  StoreFabric SN1200E 2-Port 16Gb Fibre Channel Adapter
-		1590 022e  Synergy 5330C 2-Port 32Gb Fibre Channel Mezz Card
+	e300  Lancer Gen6: LPe32000 Fibre Channel Host Adapter
+		10df e310  Lancer Gen6: LPe31000 Fibre Channel Host Adapter
+		10df e311  Lancer Gen6: LPe31000 Fibre Channel Host Adapter
+		10df e312  Lancer Gen6: LPe31000 Fibre Channel Host Adapter
+		10df e322  Lancer Gen6: LPe31000 Fibre Channel Host Adapter
+		10df e323  Lancer Gen6: LPe31000 Fibre Channel Host Adapter
+		10df e325  Lancer Gen6: LPe31000 Fibre Channel Host Adapter
+		10df e332  Lancer Gen6: LPe31000 Fibre Channel Host Adapter
+		10df e333  Lancer Gen6: LPe31000 Fibre Channel Host Adapter
 	f011  Saturn: LightPulse Fibre Channel Host Adapter
 	f015  Saturn: LightPulse Fibre Channel Host Adapter
 	f085  LP850 Fibre Channel Host Adapter
@ -11923,27 +11840,20 @@
 	f0e1  Zephyr LightPulse Fibre Channel Host Adapter
 	f0e5  Zephyr LightPulse Fibre Channel Host Adapter
 	f0f5  Neptune LightPulse Fibre Channel Host Adapter
-	f100  LPe12000 Series 8Gb Fibre Channel Adapter
+	f100  Saturn-X: LightPulse Fibre Channel Host Adapter
 		1014 038a  8Gb PCI Express Dual Port FC Adapter for POWER
 		103c 3282  8Gb Dual-port PCI-e FC HBA
-		10df f140  LPe12000-M8-L 1-Port 8Gb PCIe Fibre Channel Adapter
-		10df f141  LPe12002-M8-L 2-Port 8Gb PCIe Fibre Channel Adapter
 	f111  Saturn-X LightPulse Fibre Channel Host Adapter
 	f112  Saturn-X LightPulse Fibre Channel Host Adapter
 	f180  LPSe12002 EmulexSecure Fibre Channel Adapter
-	f400  LPe35000/LPe36000 Series 32Gb/64Gb Fibre Channel Adapter
-		10df f401  LPe35000-M2 1-Port 32Gb Fibre Channel Adapter
-		10df f402  LPe35002-M2 2-Port 32Gb Fibre Channel Adapter
-		10df f403  LPe36000-M64 1-Port 64Gb Fibre Channel Adapter
-		10df f404  LPe36002-M64 2-Port 64Gb Fibre Channel Adapter
-		10df f405  LPe35004-M2 4-Port 32Gb Fibre Channel Adapter
-		10df f406  LPe35004-X6 4-Port Fibre Channel Adapter
+	f400  LPe36000 Fibre Channel Host Adapter [Prism]
+		10df f401  LPe35000 Fibre Channel Host Adapter [Prism]
+		10df f402  LPe35000 Fibre Channel Host Adapter [Prism]
+		10df f405  LPe35000 Fibre Channel Host Adapter [Prism]
 		10df f410  LPe35002-M2-D 2-Port 32Gb Fibre Channel Adapter
 		10df f411  LPe35000-M2-D 1-Port 32Gb Fibre Channel Adapter
-		10df f418  LPe35000-M2-L 1-Port 32Gb PCIe Fibre Channel Adapter
-		10df f419  LPe35002-M2-L 2-Port 32Gb PCIe Fibre Channel Adapter
-		1590 02d5  StoreFabric SN1610E 1-Port 32Gb Fibre Channel Adapter
-		1590 02d6  StoreFabric SN1610E 2-Port 32Gb Fibre Channel Adapter
+		10df f418  LPe35000 Fibre Channel Host Adapter [Prism]
+		10df f419  LPe35000 Fibre Channel Host Adapter [Prism]
 	f700  LP7000 Fibre Channel Host Adapter
 	f701  LP7000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)
 	f800  LP8000 Fibre Channel Host Adapter
@ -12084,7 +11994,6 @@
 		1186 0300  DE-528
 		1259 2400  AT-2400
 		1af4 1100  QEMU Virtual Machine
-	8125  RTL8125 2.5GbE Controller
 	8129  RTL-8129
 		10ec 8129  RT8129 Fast Ethernet Adapter
 		11ec 8129  RTL8111/8168 PCIe Gigabit Ethernet (misconfigured)
@ -12159,13 +12068,10 @@
 		1028 0283  Vostro 220
 		1028 04b2  Vostro 3350
 		1028 04da  Vostro 3750
-		1028 06f2  Latitude 3470
 		1028 06f3  Latitude 3570
 		103c 1611  Pavilion DM1Z-3000
 		103c 1950  ProBook 450/455
 		103c 2a6f  Asus IPIBL-LB Motherboard
-		103c 8615  Pavilion Laptop 15-cw1xxx
-		1043 11f5  Notebook motherboard (one of many models)
 		1043 16d5  U6V/U31J laptop
 		1043 81aa  P5B
 		1043 82c6  M3A78 Series Motherboard
@ -12233,7 +12139,6 @@
 	b723  RTL8723BE PCIe Wireless Network Adapter
 		10ec 8739  Dell Wireless 1801
 	b822  RTL8822BE 802.11a/b/g/n/ac WiFi adapter
-		103c 831b  Realtek RTL8822BE 802.11ac 2 × 2 Wi-Fi + Bluetooth 4.2 Combo Adapter (MU-MIMO supported)
 	c821  RTL8821CE 802.11ac PCIe Wireless Network Adapter
 	d723  RTL8723DE 802.11b/g/n PCIe Adapter
 10ed  Ascii Corporation
@ -14183,7 +14088,7 @@
 1177  Silicon Engineering
 1178  Alfa, Inc.
 	afa1  Fast Ethernet Adapter
-1179  Toshiba Corporation
+1179  Toshiba America Info Systems
 	0102  Extended IDE Controller
 	0103  EX-IDE Type-B
 	010f  NVMe Controller
@ -14192,8 +14097,6 @@
 		1028 1ffc  Express Flash NVMe 1.92T (RI) U.2 (CD5)
 		1028 1ffd  Express Flash NVMe 3.84T (RI) U.2 (CD5)
 		1028 1ffe  Express Flash NVMe 7.68T (RI) U.2 (CD5)
-		1179 0001  KIOXIA CM5-R series SSD
-		1179 0021  KIOXIA CD5 series SSD
 		1d49 4039  Thinksystem U.2 CM5 NVMe SSD
 		1d49 403a  Thinksystem AIC CM5 NVMe SSD
 	0113  BG3 NVMe SSD Controller
@ -14333,7 +14236,6 @@
 		103c 30cf  Pavilion dv95xx/96xx/97xx/98xx series
 		1043 1237  A6J-Q008
 		1043 1967  V6800V
-		104d 9035  VAIO VGN-FW11ZRU
 		144d c018  X20 IV
 		17aa 20ca  ThinkPad T61/T400
 	0811  R5C811
@ -15093,7 +14995,7 @@
 11fb  Datel Inc
 11fc  Silicon Magic
 11fd  High Street Consultants
-11fe  Pepperl+Fuchs Comtrol, Inc.
+11fe  Comtrol Corporation
 	0001  RocketPort PCI 32-port w/external I/F
 	0002  RocketPort PCI 8-port w/external I/F
 	0003  RocketPort PCI 16-port w/external I/F
@ -15925,7 +15827,7 @@
 12b4  FutureTel Inc
 12b5  Granite Systems Inc.
 12b6  Natural Microsystems
-12b7  Cognex Corporation
+12b7  Cognex Modular Vision Systems Div. - Acumen Inc.
 12b8  Korg
 # Nee US Robotics
 12b9  3Com Corp, Modem Division
@ -16062,7 +15964,6 @@
 12d8  Pericom Semiconductor
 	01a7  7C21P100 2-port PCI-X to PCI-X Bridge
 	2304  PI7C9X2G304 EL/SL PCIe2 3-Port/4-Lane Packet Switch
-	2404  PI7C9X2G404 EL/SL PCIe2 4-Port/4-Lane Packet Switch
 	2608  PI7C9X2G608GP PCIe2 6-Port/8-Lane Packet Switch
 	400a  PI7C9X442SL PCI Express Bridge Port
 	400e  PI7C9X442SL USB OHCI Controller
@ -18639,7 +18540,6 @@
 		14e4 1202  BCM957412M4122C OCP 1x25G Type1 wRoCE
 		14e4 1402  BCM957414A4142CC 10Gb/25Gb Ethernet PCIe
 		14e4 1404  BCM957414M4142C OCP 2x25G Type1 wRoCE
-		14e4 4140  NetXtreme E-Series Advanced Dual-port 25Gb SFP28 Network Daughter Card
 		1590 020e  Ethernet 25Gb 2-port 631SFP28 Adapter
 		1590 0211  Ethernet 25Gb 2-port 631FLR-SFP28 Adapter
 	16d8  BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller
@ -18692,11 +18592,6 @@
 		1028 0209  XPS M1330
 		103c 30c0  Compaq 6710b
 		17aa 3a23  IdeaPad S10e
-	1750  BCM57508 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet
-	1751  BCM57504 NetXtreme-E 10Gb/25Gb/40Gb/50Gb/100Gb/200Gb Ethernet
-	1752  BCM57502 NetXtreme-E 10Gb/25Gb/40Gb/50Gb Ethernet
-	1806  BCM5750X NetXtreme-E Ethernet Virtual Function
-	1807  BCM5750X NetXtreme-E RDMA Virtual Function
 	3352  BCM3352
 	3360  BCM3360
 	4210  BCM4210 iLine10 HomePNA 2.0
@ -18881,7 +18776,6 @@
 	43bc  BCM43602 802.11ac Wireless LAN SoC
 	43d3  BCM43567 802.11ac Wireless Network Adapter
 	43d9  BCM43570 802.11ac Wireless Network Adapter
-	43dc  BCM4355 802.11ac Wireless LAN SoC
 	43df  BCM4354 802.11ac Wireless LAN SoC
 	43e9  BCM4358 802.11ac Wireless LAN SoC
 	43ec  BCM4356 802.11ac Wireless Network Adapter
@ -18898,7 +18792,7 @@
 	4412  BCM4412 10/100BaseT
 	4430  BCM44xx CardBus iLine32 HomePNA 2.0
 	4432  BCM4432 CardBus 10/100BaseT
-	4464  BCM4364 802.11ac Wireless Network Adapter
+	4464  BCM4464 802.11ac Wireless Network Adapter
 	4610  BCM4610 Sentry5 PCI to SB Bridge
 	4611  BCM4610 Sentry5 iLine32 HomePNA 1.0
 	4612  BCM4610 Sentry5 V.90 56k Modem
@ -18945,7 +18839,6 @@
 	5841  BCM5841 Crypto Accelerator
 	5850  BCM5850 Crypto Accelerator
 	5e87  Valkyrie offload engine
-	5e88  Viper Offload Engine
 	8602  BCM7400/BCM7405 Serial ATA Controller
 	9026  CN99xx [ThunderX2] Integrated USB 3.0 xHCI Host Controller
 	9027  CN99xx [ThunderX2] Integrated AHCI/SATA 3 Host Controller
@ -18970,8 +18863,6 @@
 	b880  BCM56880 Switch ASIC
 # Tomahawk
 	b960  Broadcom BCM56960 Switch ASIC
-# Tomahawk4
-	b990  BCM56990 Switch ASIC
 	d802  BCM58802 Stingray 50Gb Ethernet SoC
 		14e4 8021  Stingray Dual-Port 25Gb Ethernet PCIe SmartNIC w16GB DRAM (Part No BCM958802A8046C)
 		14e4 8023  PS410T-H04 NetXtreme-S 4x10G 10GBaseT PCIe SmartNIC
@ -19264,7 +19155,6 @@
 		0070 2259  WinTV HVR-1250
 		0070 6a18  WinTV-quadHD
 		0070 c108  WinTV-HVR-4400-HD model 1278
-		1461 3100  CE310B SD PCIe Video Capture Card
 		5654 2389  GoTView X5 DVD Hybrid PCI-E
 		5654 2390  GoTView X5 3D HYBRID PCI-E
 14f2  MOBILITY Electronics
@ -19483,7 +19373,6 @@
 	110f  PCI Express Core Reference Design Virtual Function
 	1110  XpressRich Reference Design
 	1113  XpressSwitch
-	be00  PCI Express Bridge
 1557  MEDIASTAR Co Ltd
 1558  CLEVO/KAPOK Computer
 1559  SI LOGIC Ltd
@ -19645,8 +19534,6 @@
 	0213  MT2892 Family [ConnectX-6 Dx Secure Flash Recovery]
 	0214  MT42822 Family [BlueField-2 SoC Flash Recovery]
 	0215  MT42822 Family [BlueField-2 Secure Flash Recovery]
-	0216  MT2894 Family [ConnectX-6 Lx Flash Recovery]
-	0217  MT2894 Family [ConnectX-6 Lx Secure Flash Recovery]
 	024e  MT53100 [Spectrum-2, Flash recovery mode]
 	024f  MT53100 [Spectrum-2, Secure Flash recovery mode]
 	0250  Spectrum-3, Flash recovery mode
@ -19710,7 +19597,6 @@
 		15b3 0003  Mellanox Technologies ConnectX-4 Stand-up single-port 40GbE MCX413A-BCAT
 		15b3 0005  Mellanox Technologies ConnectX-4 Stand-up single-port 40GbE MCX415A-BCAT
 		15b3 0006  MCX416A-BCAT, ConnectX-4 EN, 40/56GbE 2P, PCIe3.0 x16
-		15b3 0007  ConnectX-4 EN network interface card, 40/56GbE dual-port QSFP28, PCIe3.0 x16, tall bracket
 		15b3 0008  ConnectX-4 Stand-up dual-port 100GbE MCX416A-CCAT
 		15b3 0033  ConnectX-4 VPI IB EDR/100 GbE Single Port QSFP28 Adapter
 		15b3 0034  ConnectX-4 VPI IB EDR/100 GbE Dual Port QSFP28 Adapter
@ -19738,7 +19624,7 @@
 	101c  MT28908 Family [ConnectX-6 Virtual Function]
 	101d  MT2892 Family [ConnectX-6 Dx]
 	101e  ConnectX Family mlx5Gen Virtual Function
-	101f  MT2894 Family [ConnectX-6 Lx]
+	101f  MT28851
 	1020  MT28860
 	1021  MT28861
 	1974  MT28800 Family [ConnectX-5 PCIe Bridge]
@ -20322,7 +20208,6 @@
 		1a32 0303  EM303 802.11bgn Wireless Mini PCIe Card [AR9281]
 		1a32 0306  EM306 802.11bgn Wireless Half-size Mini PCIe Card [AR9283]
 		1a3b 1067  AW-NE771 802.11bgn Wireless Mini PCIe Card [AR9281]
-		1a3b 1071  AW-NE772 802.11abgn Wireless Mini PCIe Card [AR9280]
 		1a3b 1081  AW-NE773 802.11abgn Wireless Half-size Mini PCIe Card [AR9280]
 	002b  AR9285 Wireless Network Adapter (PCI-Express)
 		1028 0204  Wireless 1502 802.11bgn Half-size Mini PCIe Card
@ -21075,10 +20960,6 @@
 # HT1000 uses 3 IDs 1166:024a (Native SATA Mode), 1166:024b (PATA/IDE Mode), 182f:000b (RAID Mode) depends on SATA BIOS setting
 	000b  BCM5785 [HT1000] SATA (RAID Mode)
 1830  Credence Systems Corporation
-	8000  CPIn
-	8001  CPId
-	8002  CPIx
-	8003  CPIq
 183b  MikroM GmbH
 	08a7  MVC100 DVI
 	08a8  MVC101 SDI
@ -22304,7 +22185,6 @@
 1c5c  SK hynix
 	1283  PC300 NVMe Solid State Drive 256GB
 	1284  PC300 NVMe Solid State Drive 512GB
-	1285  PC300 NVMe Solid State Drive 1TB
 	1504  SC300 512GB M.2 2280 SATA Solid State Drive
 1c5f  Beijing Memblaze Technology Co. Ltd.
 	0540  PBlaze4 NVMe SSD
@ -22321,18 +22201,10 @@
 1c8c  Mobiveil, Inc.
 1cb0  Shannon Systems
 	d000  Venice NVMe SSD
-		1cb0 2f10  Venice-E Series U.2 SSD
-		1cb0 2f11  Venice Series U.2 SSD
-		1cb0 2f12  Venice-X Series U.2 SSD
-		1cb0 af10  Venice-E Series AIC SSD
-		1cb0 af11  Venice Series AIC SSD
-		1cb0 af12  Venice-X Series AIC SSD
 1cb1  Collion UG & Co.KG
 1cb5  Focusrite Audio Engineering Ltd
 	0002  Clarett
 1cb8  Dawning Information Industry Co., Ltd.
-1cc1  ADATA Technology Co., Ltd.
-	8201  XPG SX8200 Pro PCIe Gen3x4 M.2 2280 Solid State Drive
 1cc4  Union Memory (Shenzhen)
 	17ab  NVMe 256G SSD device
 1cc5  Embedded Intelligence, Inc.
@ -22348,8 +22220,6 @@
 	0303  Simulyzer-RT CompactPCI Serial PSI5-SIM-1 card
 	0304  Simulyzer-RT CompactPCI Serial PWR-ANA-1 card
 	0305  Simulyzer-RT CompactPCI Serial CAN-1 card
-# supports 8x CAN (-FD) interfaces
-	0306  Simulyzer-RT CompactPCI Serial CAN-2 card (CAN-FD)
 1cd7  Nanjing Magewell Electronics Co., Ltd.
 	0010  Pro Capture Endpoint
 	0014  PRO CAPTURE AIO 4K PLUS
@ -22399,7 +22269,6 @@
 	0722  ZX-200 PCIE P2C bridge
 	1000  ZX-D Standard Host Bridge
 	1001  ZX-D/ZX-E Miscellaneous Bus
-	1003  ZX-E Standard Host Bridge
 	3001  ZX-100 Standard Host Bridge
 	300a  ZX-100 Miscellaneous Bus
 	3038  ZX-100/ZX-200/ZX-E Standard Universal PCI to USB Host Controller
@ -22416,7 +22285,6 @@
 	345b  ZX-100/ZX-D/ZX-E Miscellaneous Bus
 	3a02  ZX-100 C-320 GPU
 	3a03  ZX-D C-860 GPU
-	3a04  ZX-E C-960 GPU
 	9002  ZX-100/ZX-200 EIDE Controller
 	9003  ZX-100/ZX-E EIDE Controller
 	9045  ZX-100/ZX-D/ZX-E RAID Accelerator 0
@ -22427,7 +22295,6 @@
 	9101  ZX-200 Traffic Controller
 	9141  ZX-100 High Definition Audio Controller
 	9142  ZX-D High Definition Audio Controller
-	9144  ZX-E High Definition Audio Controller
 	9180  ZX-200 Networking Gigabit Ethernet Adapter
 	9202  ZX-100 USB eXtensible Host Controller
 	9203  ZX-200 USB eXtensible Host Controller
@ -22495,17 +22362,12 @@
 		1d6c 2001  DPDK-Aware Virtual Function [Arkville VF]
 	100f  AR-ARKA-FX1 [Arkville 64B DPDK Data Mover for Versal]
 	1010  AR-ARKA-FX1 [Arkville 64B DPDK Data Mover for Agilex]
-	1011  AR-MAN-U50 [Manitou Class Accelerator for U50]
-	1012  AR-MAN-U200 [Manitou Class Accelerator for U200]
-	1013  AR-MAN-U250 [Manitou Class Accelerator for U250]
-	1014  AR-MAN-U280 [Manitou Class Accelerator for U280]
 	4200  A5PL-E1-10GETI [10 GbE Ethernet Traffic Instrument]
 1d72  Xiaomi
 1d78  DERA
 1d7c  Aerotech, Inc.
 1d82  NETINT Technologies Inc.
 	0101  Codensity D400 SSD
-	0102  Codensity D408 PCIe Gen4 NVMe SSD
 	0202  Codensity T408 Video Encoding-Decoding Accelerator
 1d87  Fuzhou Rockchip Electronics Co., Ltd
 	0100  RK3399 PCI Express Root Port
@ -22552,38 +22414,9 @@
 1da2  Sapphire Technology Limited
 1da3  Habana Labs Ltd.
 	0001  HL-1000 AI Inference Accelerator [Goya]
-# PCIe accelerator card for Deep Learning training tasks
-	1000  HL-2000 AI Training Accelerator [Gaudi]
 1dbb  NGD Systems, Inc.
 1dbf  Guizhou Huaxintong Semiconductor Technology Co., Ltd
 	0401  StarDragon4800 PCI Express Root Port
-1dd8  Pensando Systems Inc
-	1000  DSC Capri Upstream Port
-		1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
-		1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
-		1dd8 4002  Naples 25Gb 2-port SFP28 x8 4GB
-	1001  DSC Virtual Downstream Port
-		1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
-		1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
-		1dd8 4002  Naples 25Gb 2-port SFP28 x8 4GB
-	1002  DSC Ethernet Controller
-		1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
-		1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
-		1dd8 4002  Naples 25Gb 2-port SFP28 x8 4GB
-	1003  DSC Ethernet Controller VF
-		1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
-		1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
-		1dd8 4002  Naples 25Gb 2-port SFP28 x8 4GB
-	1004  DSC Management Controller
-		1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
-		1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
-		1dd8 4002  Naples 25Gb 2-port SFP28 x8 4GB
-	1007  DSC Storage Accelerator
-		1dd8 4000  Naples 100Gb 2-port QSFP28 x16 8GB
-		1dd8 4001  Naples 100Gb 2-port QSFP28 x16 4GB
-		1dd8 4002  Naples 25Gb 2-port SFP28 x8 4GB
-1de0  Groq
-	0000  Q100 Tensor Streaming Processor
 1de1  Tekram Technology Co.,Ltd.
 	0391  TRM-S1040 [DC-315 / DC-395 series]
 	2020  DC-390
@ -22638,12 +22471,14 @@
 1e26  Fujitsu Client Computing Limited
 1e38  Thinci, Inc
 1e3d  Burlywood, Inc
-1e49  Yangtze Memory Technologies Co.,Ltd
 1e4c  GSI Technology
 # Associative Processing Unit chip
 	0010  Gemini [ Lida ]
 		1e4c 0120  SE120
 1e57  Beijing Panyi Technology Co., Ltd
+	0001  PY8800
+	0100  PY8800
+		0000 0100  PY8800 64GB Accelerator
 1e6b  Axiado Corp.
 # nee Tumsan Oy
 1fc0  Ascom (Finland) Oy
@ -22720,7 +22555,6 @@
 2116  ZyDAS Technology Corp.
 21c3  21st Century Computer Corp.
 22b8  Flex-Logix Technologies
-	22a0  Flex Logix InferX X1 Inference Accelerator
 22db  Missing Link Electronics, Inc.
 2304  Colorgraphic Communications Corp.
 2348  Racore
@ -25141,7 +24975,6 @@
 		1043 849c  P8P67 Deluxe Motherboard
 	1507  Ethernet Express Module X520-P2
 	1508  82598EB Gigabit BX Network Connection
-	1509  82580 Gigabit Network Connection
 	150a  82576NS Gigabit Network Connection
 	150b  82598EB 10-Gigabit AT2 Server Adapter
 		8086 a10c  82598EB 10-Gigabit AT2 Server Adapter
@ -25213,7 +25046,6 @@
 		8086 00a1  Ethernet Server Adapter I350-T4
 		8086 00a2  Ethernet Server Adapter I350-T2
 		8086 00a3  Ethernet Network Adapter I350-T4 for OCP NIC 3.0
-		8086 00aa  Ethernet Network Adapter I350-T4 for OCP NIC 3.0
 		8086 5001  Ethernet Server Adapter I350-T4
 		8086 5002  Ethernet Server Adapter I350-T2
 		8086 5003  Ethernet 1G 4P I350-t OCP
@ -25273,7 +25105,6 @@
 	1531  I210 Gigabit Unprogrammed
 	1533  I210 Gigabit Network Connection
 		103c 0003  Ethernet I210-T1 GbE NIC
-		1059 0180  RD10019 1GbE interface
 		1093 7706  Compact Vision System Ethernet Adapter
 		10a9 802c  UV300 BaseIO single-port GbE
 		10a9 802d  UV3000 BaseIO GbE Network
@ -25483,18 +25314,7 @@
 		8086 4001  Ethernet Network Adapter XXV710-2
 	1591  Ethernet Controller E810-C for backplane
 	1592  Ethernet Controller E810-C for QSFP
-		8086 0002  Ethernet Network Adapter E810-C-Q2
-		8086 0004  Ethernet Network Adapter E810-C-Q2
-		8086 0005  Ethernet Network Adapter E810-C-Q1 for OCP3.0
-		8086 0006  Ethernet Network Adapter E810-C-Q2 for OCP3.0
-		8086 0009  Ethernet Network Adapter E810-C-Q1
 	1593  Ethernet Controller E810-C for SFP
-		8086 0002  Ethernet Network Adapter E810-L-2
-		8086 0005  Ethernet Network Adapter E810-XXV-4
-		8086 0006  Ethernet Network Adapter E810-XXV-4
-		8086 0007  Ethernet Network Adapter E810-XXV-4
-		8086 0008  Ethernet Network Adapter E810-XXV-2
-		8086 0009  Ethernet Network Adapter E810-XXV-2 for OCP 2.0
 	15a0  Ethernet Connection (2) I218-LM
 	15a1  Ethernet Connection (2) I218-V
 	15a2  Ethernet Connection (3) I218-LM
@ -25573,9 +25393,6 @@
 	15f0  JHL7540 Thunderbolt 3 USB Controller [Titan Ridge DD 2018]
 	15f6  I210 Gigabit Ethernet Connection
 	15ff  Ethernet Controller X710 for 10GBASE-T
-		1137 0000  X710TLG GbE RJ45 PCIe NIC
-		1137 02c1  X710T2LG 2x10 GbE RJ45 PCIe NIC
-		1137 02c2  X710T4LG 4x10 GbE RJ45 PCIe NIC
 		8086 0000  Ethernet Network Adapter X710-TL
 		8086 0001  Ethernet Network Adapter X710-T4L
 		8086 0002  Ethernet Network Adapter X710-T4L
@ -25585,11 +25402,6 @@
 		8086 0006  Ethernet 10G 4P X710-T4L-t Adapter
 		8086 0007  Ethernet 10G 2P X710-T2L-t OCP
 		8086 0008  Ethernet 10G 4P X710-T4L-t OCP
-		8086 0009  Ethernet Network Adapter X710-T4L for OCP 3.0
-		8086 000a  Ethernet Network Adapter X710-T4L for OCP 3.0
-		8086 000b  Ethernet Network Adapter X710-T2L for OCP 3.0
-		8086 000c  Ethernet Network Adapter X710-T2L for OCP 3.0
-		8086 000f  Ethernet Network Adapter X710-T2L for OCP 3.0
 	1600  Broadwell-U Host Bridge -OPI
 	1601  Broadwell-U PCI Express x16 Controller
 	1602  Broadwell-U Integrated Graphics
@ -25652,7 +25464,7 @@
 	190f  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
 	1910  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
 		1028 06e4  XPS 15 9550
-	1911  Xeon E3-1200 v5/v6 / E3-1500 v5 / 6th/7th/8th Gen Core Processor Gaussian Mixture Model
+	1911  Xeon E3-1200 v5/v6 / E3-1500 v5 / 6th/7th Gen Core Processor Gaussian Mixture Model
 		17aa 2247  ThinkPad T570
 		17aa 224f  ThinkPad X1 Carbon 5th Gen
 		17aa 225d  ThinkPad T480
@ -26246,7 +26058,7 @@
 	2241  Larrabee
 	2250  Xeon Phi coprocessor 5100 series
 	225c  Xeon Phi coprocessor SE10/7120 series
-	225d  Xeon Phi coprocessor 3120 series
+	225d  Xeon Phi coprocessor 3120 series 
 	225e  Xeon Phi coprocessor 31S1
 	2262  Xeon Phi coprocessor 7220
 	2280  Atom/Celeron/Pentium Processor x5-E8000/J3xxx/N3xxx Series SoC Transaction Register
@ -29267,7 +29079,6 @@
 		17aa 4022  Ethernet Connection X722 for 1GbE
 		17aa 4024  Ethernet Connection X722 for 1GbE
 	37d2  Ethernet Connection X722 for 10GBASE-T
-		1059 0180  RD10019 10GbE interface
 		1170 37d2  Ethernet Connection X722 for 10GBASE-T
 		14cd 0030  Ethernet OCP 2x10G RJ45 Phy Card [USI-X557-10GbaseT]
 		1590 0218  Ethernet 10Gb 2-port 568FLR-MMT Adapter
@ -29660,7 +29471,6 @@
 	3e91  8th Gen Core Processor Gaussian Mixture Model
 	3e92  UHD Graphics 630 (Desktop)
 	3e93  UHD Graphics 610
-	3e96  HD Graphics P630
 	3e98  UHD Graphics 630 (Desktop 9 Series)
 	3e9b  UHD Graphics 630 (Mobile)
 	3ea0  UHD Graphics 620 (Whiskey Lake)
@ -29879,7 +29689,6 @@
 	5926  Iris Plus Graphics 640
 	5927  Iris Plus Graphics 650
 	5a84  Celeron N3350/Pentium N4200/Atom E3900 Series Integrated Graphics Controller
-	5a85  HD Graphics 500
 	5a88  Celeron N3350/Pentium N4200/Atom E3900 Series Imaging Unit
 	5a98  Celeron N3350/Pentium N4200/Atom E3900 Series Audio Cluster
 	5a9a  Celeron N3350/Pentium N4200/Atom E3900 Series Trusted Execution Engine
@ -30700,15 +30509,11 @@
 	9da3  Cannon Point-LP SMBus Controller
 	9da4  Cannon Point-LP SPI Controller
 	9db0  Cannon Point-LP PCI Express Root Port #9
-	9db1  Cannon Point-LP PCI Express Root Port #10
 	9db4  Cannon Point-LP PCI Express Root Port #13
 		1028 089e  Inspiron 5482
 	9db6  Cannon Point-LP PCI Express Root Port #15
 	9db8  Cannon Point-LP PCI Express Root Port #1
 	9dbc  Cannon Point-LP PCI Express Root Port #5
-	9dbe  Cannon Point-LP PCI Express Root Port #7
-	9dbf  Cannon Point PCI Express Root Port #8
-	9dc5  Cannon Point-LP Serial IO I2C Host Controller
 	9dc8  Cannon Point-LP High Definition Audio Controller
 		1028 089e  Inspiron 5482
 	9dd3  Cannon Point-LP SATA Controller [AHCI Mode]
@ -30720,7 +30525,6 @@
 	9ded  Cannon Point-LP USB 3.1 xHCI Controller
 	9def  Cannon Point-LP Shared SRAM
 	9df0  Cannon Point-LP CNVi [Wireless-AC]
-	9df5  BayHubTech Integrated SD controller
 	9df9  Cannon Point-LP Thermal Controller
 	9dfc  Cannon Point-LP Integrated Sensor Hub
 	a000  Atom Processor D4xx/D5xx/N4xx/N5xx DMI Bridge
@ -30964,7 +30768,6 @@
 	a304  H370 Chipset LPC/eSPI Controller
 	a305  Z390 Chipset LPC/eSPI Controller
 	a306  Q370 Chipset LPC/eSPI Controller
-	a309  Cannon Point-LP LPC Controller
 	a30c  QM370 Chipset LPC/eSPI Controller
 	a323  Cannon Lake PCH SMBus Controller
 	a324  Cannon Lake PCH SPI Controller
@ -31651,7 +31454,6 @@ bdbd  Blackmagic Design
 	a1ff  eGPU RX580
 c001  TSI Telsys
 c0a9  Micron/Crucial Technology
-	2263  P1 NVMe PCIe SSD
 c0de  Motorola
 c0fe  Motion Engineering, Inc.
 ca3b  Cambrionix Ltd.
--- a/hwdb.d/pnp_id_registry.html
+++ b/hwdb.d/pnp_id_registry.html
@ -2447,17 +2447,6 @@
 <tr class="odd"><td>Shenzhen Dlodlo Technologies Co., Ltd.</td><td>DLO</td><td>04/29/2019</td> </tr>
 <tr class="even"><td>LENOVO BEIJING CO. LTD.</td><td>VLM</td><td>05/21/2019</td> </tr>
 <tr class="odd"><td>Cammegh Limited</td><td>CRW</td><td>06/18/2019</td> </tr>
- <tr class="even"><td>Beihai Century Joint Innovation Technology Co.,Ltd</td><td>LHC</td><td>09/10/2019</td> </tr>
- <tr class="odd"><td>Findex, Inc.</td><td>FDX</td><td>10/22/2019</td> </tr>
- <tr class="even"><td>Express Luck, Inc.</td><td>ELD</td><td>10/22/2019</td> </tr>
- <tr class="odd"><td>LLC SKTB “SKIT”</td><td>SKI</td><td>10/22/2019</td> </tr>
- <tr class="even"><td>WOLF Advanced Technology</td><td>WLF</td><td>10/22/2019</td> </tr>
- <tr class="odd"><td>BILD INNOVATIVE TECHNOLOGY LLC</td><td>BLD</td><td>10/22/2019</td> </tr>
- <tr class="even"><td>MIMO Monitors</td><td>MMT</td><td>10/22/2019</td> </tr>
- <tr class="odd"><td>Icron</td><td>ICR</td><td>10/22/2019</td> </tr>
- <tr class="even"><td>TECNART CO.,LTD.</td><td>PIS</td><td>10/22/2019</td> </tr>
- <tr class="odd"><td>Moxa Inc.</td><td>MHQ</td><td>10/22/2019</td> </tr>
- <tr class="even"><td>Disguise Technologies</td><td>DSG</td><td>10/22/2019</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: 2019.11.05
-# Date:    2019-11-05 20:34:06
+# Version: 2019.08.21
+# Date:    2019-08-21 20:34:05
 #

 # Vendors, devices and interfaces. Please keep sorted.
@ -75,7 +75,6 @@
 03e7  Intel
 	2150  Myriad VPU [Movidius Neural Compute Stick]
 	2485  Movidius MyriadX
-	f63b  Myriad VPU [Movidius Neural Compute Stick]
 03e8  EndPoints, Inc.
 	0004  SE401 Webcam
 	0008  101 Ethernet [klsi]
@ -253,7 +252,6 @@
 	0601  ScanJet 6300c
 	0604  DeskJet 840c
 	0605  ScanJet 2200c
-	0610  Z24i Monitor Hub
 	0611  OfficeJet K60xi
 	0612  business inkjet 3000
 	0624  Bluetooth Dongle
@ -276,7 +274,6 @@
 	0912  Printing Support
 	0917  LaserJet 3330
 	0924  Modular Smartcard Keyboard
-	0941  X500 Optical Mouse
 	094a  Optical Mouse [672662-001]
 	0a01  ScanJet 2400c
 	0a17  color LaserJet 3700
@ -964,7 +961,6 @@
 	1030  FV TouchCam N1 (Video)
 	3000  Optical dual-touch panel
 	3001  Optical Touch Screen
-	a060  HD Webcam
 0409  NEC Corp.
 	0011  PC98 Series Layout Keyboard Mouse
 	0012  ATerm IT75DSU ISDN TA
@ -1146,10 +1142,6 @@
 	402b  Photo Printer 6850
 	402e  605 Photo Printer
 	4034  805 Photo Printer
-	4035  7000 Photo Printer
-	4037  7010 Photo Printer
-	4038  7015 Photo Printer
-	404d  8810 Photo Printer
 	404f  305 Photo Printer
 	4056  ESP 7200 Series AiO
 	4109  EasyShare Printer Dock Series 3
@ -1302,7 +1294,6 @@
 	7721  Memory Stick Reader/Writer
 	7722  Memory Stick Reader/Writer
 	7723  SD Card Reader
-	c141  Barcode Scanner
 0417  Symbios Logic
 0418  AST Research
 0419  Samsung Info. Systems America, Inc.
@ -1618,7 +1609,7 @@
 	0301  2500H Tracer Trainer
 	030a  PETracer x1
 	1237  Andromeda Hub
-0424  Microchip Technology, Inc. (formerly SMSC)
+0424  Standard Microsystems Corp.
 	0001  Integrated Hub
 	0140  LPC47M14x hub
 	0acd  Sitecom Internal Multi Memory reader/writer MD-005
@ -1647,29 +1638,6 @@
 	4041  Hub and media card controller
 	4060  Ultra Fast Media Reader
 	4064  Ultra Fast Media Reader
-	4712  USB4712 high-speed hub
-	4713  USB4715 high-speed hub (2 ports disabled)
-	4714  USB4715 high-speed hub (1 port disabled)
-	4715  USB4715 high-speed hub
-	4910  USB491x hub integrated functions (primary)
-	4912  USB4912 high-speed hub (1 port disabled)
-	4914  USB4914 high-speed hub
-	4916  USB4916 high-speed hub
-	4920  USB491x hub integrated functions (secondary)
-	4925  USB4925 high-speed hub (primary upstream)
-	4927  USB4927 high-speed hub (primary upstream)
-	4931  USB4925/4927 high-speed hub (secondary upstream)
-	4940  USB47xx/49xx hub integrated WinUSB
-	4942  USB47xx/49xx hub integrated I2S audio port
-	4943  USB47xx/49xx hub integrated I2S audio + HID port
-	4944  USB47xx/49xx hub integrated serial port
-	4946  USB47xx/49xx hub integrated serial + I2S audio port
-	4947  USB47xx/49xx hub integrated serial + I2S audio + HID port
-	494a  USB47xx/49xx hub integrated WinUSB + I2S audio port
-	494b  USB47xx/49xx hub integrated WinUSB + I2S audio + HID port
-	494c  USB47xx/49xx hub integrated WinUSB + serial port
-	494e  USB47xx/49xx hub integrated WinUSB + serial + I2S audio port
-	494f  USB47xx/49xx hub integrated WinUSB + serial + I2S audio + HID port
 	5434  Hub
 	5534  Hub
 	5744  Hub
@ -1708,7 +1676,6 @@
 	0083  109 Japanese Keyboard
 	00a2  Type 7 Keyboard
 	0100  3-button Mouse
-	0502  Panasonic CF-19 HID Touch Panel
 	100e  24.1" LCD Monitor v4 / FID-638 Mouse
 	36ba  Bus Powered Hub
 	a101  remote key/mouse for P3 chip
@ -1732,7 +1699,6 @@
 	0005  CameraMate (DPCM_USB)
 0437  Framatome Connectors USA
 0438  Advanced Micro Devices, Inc.
-	7900  Root Hub
 0439  Voice Technologies Group
 043d  Lexmark International, Inc.
 	0001  Laser Printer
@ -1842,7 +1808,6 @@
 	008c  to CF/SM/SD/MS Card Reader
 	008e  InkJet Color Printer
 	008f  X422
-	0091  Laser Printer E232
 	0093  X5250
 	0095  E220 Printer
 	0096  2200 series
@ -2011,16 +1976,7 @@
 	e003  TI-84 Plus Calculator
 	e004  TI-89 Titanium Calculator
 	e008  TI-84 Plus Silver Calculator
-	e00e  TI-89 Titanium Presentation Link
-	e00f  TI-84 Plus Presentation Link
-	e010  TI SmartPad Keyboard
-	e011  Nspire CAS+ prototype
 	e012  TI-Nspire Calculator
-	e013  Network Bridge
-	e01c  Data Collection Sled [Nspire Lab Cradle, Nspire Datatracker Cradle]
-	e01f  Python Adapter (firmware install mode)
-	e020  Python Adapter
-	e022  Nspire CX II
 	f430  MSP-FET430UIF JTAG Tool
 	f432  eZ430 Development Tool
 	ffff  Bluetooth Device
@ -2077,7 +2033,6 @@
 	0100  EasyPen Tablet
 	0101  CueCat
 	011b  NetScroll T220
-	0186  Genius DX-120 Mouse
 	1001  Joystick
 	1002  Game Pad
 	1003  Genius VideoCam
@ -2110,15 +2065,11 @@
 	3018  Wireless 2.4Ghz Game Pad
 	3019  10-Button USB Joystick with Vibration
 	301a  MaxFire G-12U Vibration
-	301c  Genius MaxFighter F-16U
 	301d  Genius MaxFire MiniPad
 	400f  Genius TVGo DVB-T02Q MCE
 	4012  TVGo DVB-T03 [AF9015]
 	5003  G-pen 560 Tablet
 	5004  G-pen Tablet
-	5005  Genius EasyPen M406
-	5012  Genius EasyPen M406W
-	5014  Genius EasyPen 340
 	505e  Genius iSlim 330
 	6001  GF3000F Ethernet Adapter
 	7004  VideoCAM Express V2
@ -15214,7 +15165,7 @@
 10c3  Universal Laser Systems, Inc.
 	00a4  ULS PLS Series Laser Engraver Firmware Loader
 	00a5  ULS Print Support
-10c4  Silicon Labs
+10c4  Cygnal Integrated Products, Inc.
 	0002  F32x USBXpress Device
 	0003  CommandIR
 	800a  SPORTident
@ -15253,29 +15204,12 @@
 	8973  C8051F38x HDMI Extender [UHBX-8X]
 	89c6  SPORTident HID device
 	89e1  C8051F38x HDMI Extender [UHBX-SW3-WP]
-	89fb  Qivicon ZigBee Stick
-	8a3c  C8051F38x HDBaseT Receiver [UHBX-R-XT]
-	8a6c  C8051F38x 4K HDMI Audio Extractor [EMX-AMP]
-	8acb  C8051F38x HDBaseT Wall Plate Receiver with IR, RS-232, and PoH [UHBX-R-WP]
-	8af8  C8051F38x 4K HDMI Audio Extractor w/Audio Amplifier, HDBT Input, Line Audio Input RS-232 Ports and IP Control [VSA-X21]
-	8b8c  C8051F38x 4K HDMI Audio Extractor w/Audio Amplifier, HDBT Input, Line Audio Input RS-232 Ports and IP Control [SC-3H]
-	8db5  C8051F38x CATx HDMI Receiver with USB [EX-HDU-R]
-	8db6  C8051F38x CATx HDMI Receiver
-	ea60  CP210x UART Bridge
+	ea60  CP2102/CP2109 UART Bridge Controller [CP210x family]
 	ea61  CP210x UART Bridge
-	ea63  CP210x UART Bridge
-	ea70  CP2105 Dual UART Bridge
-	ea71  CP2108 Quad UART Bridge
-	ea80  CP2110 HID UART Bridge
-	ea90  CP2112 HID I2C Bridge
-	ea91  CP2112 HID SMBus/I2C Bridge for CP2614 Evaluation Kit
-	ea93  CP2112 HID SMBus/I2C Bridge for CP2615 Evaluation Kit
-	eab0  CP2114 I2S Audio Bridge
-	eac0  CP2614 MFi Accessory Digital Audio Bridge
-	eac1  CP2615 I2S Audio Bridge
+	ea70  CP210x UART Bridge
+	ea80  CP210x UART Bridge
 	eac9  EFM8UB1 Bootloader
 	eaca  EFM8UB2 Bootloader
-	eacb  EFM8UB3 Bootloader
 10c5  Sanei Electric, Inc.
 	819a  FM Radio
 10c6  Intec, Inc.
@ -16614,7 +16548,6 @@
 	001b  Emu [Ambit3 Peak]
 	001c  Finch [Ambit3 Sport]
 	001d  Greentit [Ambit2 R]
-	001e  Ibisbill [Ambit3 Run]
 1497  Panstrong Company Ltd.
 1498  Microtek International Inc.
 	a090  DVB-T Tuner
@ -18771,7 +18704,6 @@
 	2cf6  Pyra Mouse (wireless)
 	2d50  Kova+ Mouse
 	2d51  Kone+ Mouse
-	2e22  Kone XTD Mouse
 	30d4  Arvo Keyboard
 1ea7  SHARKOON Technologies GmbH
 	0066  [Mediatrack Edge Mini Keyboard]
@ -19414,17 +19346,6 @@
 	930c  CCD Webcam(PC370R)
 27b8  ThingM
 	01ed  blink(1)
-27c6  Shenzhen Goodix Technology Co.,Ltd.
-	5117  Fingerprint Reader
-	5201  Fingerprint Reader
-	5301  Fingerprint Reader
-	530c  Fingerprint Reader
-	5385  Fingerprint Reader
-	538c  Fingerprint Reader
-	5395  Fingerprint Reader
-	5584  Fingerprint Reader
-	55b4  Fingerprint Reader
-	5740  Fingerprint Reader
 2821  ASUSTek Computer Inc.
 	0161  WL-161 802.11b Wireless Adapter [SiS 162U]
 	160f  WL-160g 802.11g Wireless Adapter [Envara WiND512]
@ -19519,8 +19440,6 @@
 	0296  BG96 CAT-M1/NB-IoT modem
 	0306  EG06/EP06/EM06 LTE-A modem
 	0435  AG35 LTE modem
-2cdc  Sea & Sun Technology GmbH
-	f232  CTD48Mc CTD Probe
 2dcf  Dialog Semiconductor
 	c952  Audio Class 2.0 Devices
 2fb2  Fujitsu, Ltd
--- a/man/less-variables.xml
+++ b/man/less-variables.xml
@ -64,23 +64,5 @@
      the invoking terminal is determined to be UTF-8 compatible).</para></listitem>
    </varlistentry>

-    <varlistentry id='colors'>
-      <term><varname>$SYSTEMD_COLORS</varname></term>
-
-      <listitem><para>The value must be a boolean. Controls whether colorized output should be
-      generated. This can be specified to override the decision that <command>systemd</command> makes based
-      on <varname>$TERM</varname> and what the console is connected to.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id='urlify'>
-      <term><varname>$SYSTEMD_URLIFY</varname></term>
-
-      <listitem><para>The value must be a boolean. Controls whether clickable links should be generated in
-      the output for terminal emulators supporting this. This can be specified to override the decision that
-      <command>systemd</command> makes based on <varname>$TERM</varname> and other conditions.</para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
+    </variablelist>
 </refsect1>
--- a/man/systemd.xml
+++ b/man/systemd.xml
@ -37,22 +37,19 @@
  <refsect1>
    <title>Description</title>

-    <para>systemd is a system and service manager for Linux operating systems. When run as first process on
-    boot (as PID 1), it acts as init system that brings up and maintains userspace services. Seperate
-    instances are started for logged-in users to start their services.</para>
+    <para>systemd is a system and service manager for Linux operating
+    systems. When run as first process on boot (as PID 1), it acts as
+    init system that brings up and maintains userspace
+    services.</para>

-    <para><command>systemd</command> is usually not invoked directly by the user, but is installed as the
-    <filename>/sbin/init</filename> symlink and started during early boot. The user manager instances are
-    started automatically through the
-    <citerefentry><refentrytitle>user@.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-    service.</para>
-
-    <para>For compatibility with SysV, if the binary is called as <command>init</command> and is not the
-    first process on the machine (PID is not 1), it will execute <command>telinit</command> and pass all
-    command line arguments unmodified. That means <command>init</command> and <command>telinit</command> are
-    mostly equivalent when invoked from normal login sessions. See
-    <citerefentry><refentrytitle>telinit</refentrytitle><manvolnum>8</manvolnum></citerefentry> for more
-    information.</para>
+    <para>For compatibility with SysV, if systemd is called as
+    <command>init</command> and a PID that is not 1, it will execute
+    <command>telinit</command> and pass all command line arguments
+    unmodified. That means <command>init</command> and
+    <command>telinit</command> are mostly equivalent when invoked from
+    normal login sessions. See
+    <citerefentry><refentrytitle>telinit</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+    for more information.</para>

    <para>When run as a system instance, systemd interprets the
    configuration file <filename>system.conf</filename> and the files
@ -64,6 +61,210 @@
    for more information.</para>
  </refsect1>

+  <refsect1>
+    <title>Options</title>
+
+    <para>The following options are understood:</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--test</option></term>
+
+        <listitem><para>Determine the initial start-up transaction (i.e. the list of jobs enqueued at
+        start-up), dump it and exit — without actually executing any of the determined jobs. This option is
+        useful for debugging only. Note that during regular service manager start-up additional units not
+        shown by this operation may be started, because hardware, socket, bus or other kinds of activation
+        might add additional jobs as the transaction is executed. Use <option>--system</option> to request
+        the initial transaction of the system service manager (this is also the implied default), combine
+        with <option>--user</option> to request the initial transaction of the per-user service manager
+        instead.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dump-configuration-items</option></term>
+
+        <listitem><para>Dump understood unit configuration items. This
+        outputs a terse but complete list of configuration items
+        understood in unit definition files.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--dump-bus-properties</option></term>
+
+        <listitem><para>Dump exposed bus properties. This outputs a terse but complete list of properties
+        exposed on D-Bus.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--unit=</option></term>
+
+        <listitem><para>Set default unit to activate on startup. If
+        not specified, defaults to
+        <filename>default.target</filename>.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--system</option></term>
+        <term><option>--user</option></term>
+
+        <listitem><para>When used in conjunction with <option>--test</option>, selects whether to calculate
+        the initial transaction for the system instance or for a per-user instance. These options have no
+        effect when invoked without <option>--test</option>, as during regular
+        (i.e. non-<option>--test</option>) invocations the service manager will automatically detect whether
+        it shall operate in system or per-user mode, by checking whether the PID it is run as is 1 or
+        not. Note that it is not supported booting and maintaining a system with the service manager running
+        in <option>--system</option> mode but with a PID other than 1.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--dump-core</option></term>
+
+        <listitem><para>Enable core dumping on crash. This switch has
+        no effect when running as user instance. This setting may also
+        be enabled during boot on the kernel command line via the
+        <varname>systemd.dump_core=</varname> option, see
+        below.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--crash-vt=</option><replaceable>VT</replaceable></term>
+
+        <listitem><para>Switch to a specific virtual console (VT) on
+        crash. Takes a positive integer in the range 1–63, or a
+        boolean argument. If an integer is passed, selects which VT to
+        switch to. If <constant>yes</constant>, the VT kernel messages
+        are written to is selected. If <constant>no</constant>, no VT
+        switch is attempted. This switch has no effect when running as
+        user instance. This setting may also be enabled during boot,
+        on the kernel command line via the
+        <varname>systemd.crash_vt=</varname> option, see
+        <!-- FIXME: there is no crash_vt command line option? -->
+        below.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--crash-shell</option></term>
+
+        <listitem><para>Run a shell on crash. This switch has no
+        effect when running as user instance. This setting may also be
+        enabled during boot, on the kernel command line via the
+        <varname>systemd.crash_shell=</varname> option, see
+        below.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--crash-reboot</option></term>
+
+        <listitem><para>Automatically reboot the system on crash. This
+        switch has no effect when running as user instance. This
+        setting may also be enabled during boot, on the kernel command
+        line via the <varname>systemd.crash_reboot=</varname> option,
+        see below.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--confirm-spawn</option></term>
+
+        <listitem><para>Ask for confirmation when spawning processes.
+        This switch has no effect when run as user
+        instance.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--show-status=</option></term>
+
+        <listitem><para>Takes a boolean argument or the special value <constant>auto</constant>. If on, terse unit
+        status information is shown on the console during boot-up and shutdown. If off, no such status information is
+        shown. If set to <constant>auto</constant> behavior is similar to off, except that it is automatically switched
+        to on, as soon as the first unit failure or significant boot delay is encountered. This switch has no effect
+        when invoked as user instance. If specified, overrides both the kernel command line setting
+        <varname>systemd.show_status=</varname> (see below) and the configuration file option
+        <option>ShowStatus=</option>, see
+        <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--log-target=</option></term>
+
+        <listitem><para>Set log target. Argument must be one of
+        <option>console</option>,
+        <option>journal</option>,
+        <option>kmsg</option>,
+        <option>journal-or-kmsg</option>,
+        <option>null</option>.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--log-level=</option></term>
+
+        <listitem><para>Set log level. As
+        argument this accepts a numerical log
+        level or the well-known <citerefentry project='man-pages'><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+        symbolic names (lowercase):
+        <option>emerg</option>,
+        <option>alert</option>,
+        <option>crit</option>,
+        <option>err</option>,
+        <option>warning</option>,
+        <option>notice</option>,
+        <option>info</option>,
+        <option>debug</option>.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--log-color=</option></term>
+
+        <listitem><para>Highlight important log messages. Argument is
+        a boolean value. If the argument is omitted, it defaults to
+        <option>true</option>.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--log-location=</option></term>
+
+        <listitem><para>Include code location in log messages. This is
+        mostly relevant for debugging purposes. Argument is a boolean
+        value. If the argument is omitted it defaults to
+        <option>true</option>.</para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--default-standard-output=</option></term>
+        <term><option>--default-standard-error=</option></term>
+
+        <listitem><para>Sets the default output or error output for
+        all services and sockets, respectively. That is, controls the
+        default for <option>StandardOutput=</option> and
+        <option>StandardError=</option> (see
+        <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+        for details). Takes one of
+        <option>inherit</option>,
+        <option>null</option>,
+        <option>tty</option>,
+        <option>journal</option>,
+        <option>journal+console</option>,
+        <option>kmsg</option>,
+        <option>kmsg+console</option>.  If the
+        argument is omitted
+        <option>--default-standard-output=</option> defaults to
+        <option>journal</option> and
+        <option>--default-standard-error=</option> to
+        <option>inherit</option>.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--machine-id=</option></term>
+
+        <listitem><para>Override the machine-id set on the hard drive,
+        useful for network booting or for containers. May not be set
+        to all zeros.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--service-watchdogs=</option></term>
+
+        <listitem><para>Globally enable/disable all service watchdog timeouts and emergency
+        actions. This setting may also be specified during boot, on the kernel
+        command line via the <varname>systemd.service_watchdogs=</varname>
+        option, see below. Defaults to enabled.</para></listitem>
+      </varlistentry>
+
+      <xi:include href="standard-options.xml" xpointer="help" />
+      <xi:include href="standard-options.xml" xpointer="version" />
+    </variablelist>
+  </refsect1>
+
  <refsect1>
    <title>Concepts</title>

@ -669,8 +870,23 @@
        script runlevel link farms.</para></listitem>
      </varlistentry>

-      <xi:include href="less-variables.xml" xpointer="colors" />
-      <xi:include href="less-variables.xml" xpointer="urlify" />
+      <varlistentry>
+        <term><varname>$SYSTEMD_COLORS</varname></term>
+
+        <listitem><para>The value must be a boolean. Controls whether colorized output should be
+        generated. This can be specified to override the decision that <command>systemd</command>
+        makes based on <varname>$TERM</varname> and what the console is connected to.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><varname>$SYSTEMD_URLIFY</varname></term>
+
+        <listitem><para>The value must be a boolean. Controls whether clickable links should be generated in the output
+        for terminal emulators supporting this. This can be specified to override the decision that
+        <command>systemd</command> makes based on <varname>$TERM</varname> and other conditions.</para>
+        </listitem>
+      </varlistentry>

      <varlistentry>
        <term><varname>$LISTEN_PID</varname></term>
@ -806,7 +1022,9 @@
        it defaults to <constant>auto</constant>. If specified overrides the system
        manager configuration file option <option>ShowStatus=</option>, see
        <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
-        </para></listitem>
+        However, the process command line option <option>--show-status=</option>
+        takes precedence over both this kernel command line option and the
+        configuration file option.</para></listitem>
      </varlistentry>

      <varlistentry>
@ -837,15 +1055,11 @@
      <varlistentry>
        <term><varname>systemd.default_standard_output=</varname></term>
        <term><varname>systemd.default_standard_error=</varname></term>
-
-        <listitem><para>Controls default standard output and error output for services and sockets. That is,
-        controls the default for <option>StandardOutput=</option> and <option>StandardError=</option> (see
-        <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry> for
-        details). Takes one of <option>inherit</option>, <option>null</option>, <option>tty</option>,
-        <option>journal</option>, <option>journal+console</option>, <option>kmsg</option>,
-        <option>kmsg+console</option>. If the argument is omitted
-        <varname>systemd.default-standard-output=</varname> defaults to <option>journal</option> and
-        <varname>systemd.default-standard-error=</varname> to <option>inherit</option>.</para></listitem>
+        <listitem><para>Controls default standard output and error
+        output for services, with the same effect as the
+        <option>--default-standard-output=</option> and
+        <option>--default-standard-error=</option> command line
+        arguments described above, respectively.</para></listitem>
      </varlistentry>

      <varlistentry>
@ -995,188 +1209,6 @@
    <citerefentry><refentrytitle>kernel-command-line</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
  </refsect1>

-  <refsect1>
-    <title>Options</title>
-
-    <para><command>systemd</command> is only very rarely invoked directly, since it is started early and is
-    already running by the time users may interact with it. Normally, tools like
-    <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> are used to
-    give commands to the manager. Since <command>systemd</command> is usually not invoked directly, the
-    options listed below are mostly useful for debugging and special purposes.</para>
-
-    <refsect2>
-      <title>Introspection and debugging options</title>
-
-      <para>Those options are used for testing and introspection, and <command>systemd</command> may
-      be invoked with them at any time:</para>
-
-      <variablelist>
-        <varlistentry>
-          <term><option>--dump-configuration-items</option></term>
-
-          <listitem><para>Dump understood unit configuration items. This outputs a terse but complete list of
-          configuration items understood in unit definition files.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>--dump-bus-properties</option></term>
-
-          <listitem><para>Dump exposed bus properties. This outputs a terse but complete list of properties
-          exposed on D-Bus.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>--test</option></term>
-
-          <listitem><para>Determine the initial start-up transaction (i.e. the list of jobs enqueued at
-          start-up), dump it and exit — without actually executing any of the determined jobs. This option is
-          useful for debugging only. Note that during regular service manager start-up additional units not
-          shown by this operation may be started, because hardware, socket, bus or other kinds of activation
-          might add additional jobs as the transaction is executed. Use <option>--system</option> to request
-          the initial transaction of the system service manager (this is also the implied default), combine
-          with <option>--user</option> to request the initial transaction of the per-user service manager
-          instead.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>--system</option></term>
-          <term><option>--user</option></term>
-
-          <listitem><para>When used in conjunction with <option>--test</option>, selects whether to calculate
-          the initial transaction for the system instance or for a per-user instance. These options have no
-          effect when invoked without <option>--test</option>, as during regular
-          (i.e. non-<option>--test</option>) invocations the service manager will automatically detect
-          whether it shall operate in system or per-user mode, by checking whether the PID it is run as is 1
-          or not. Note that it is not supported booting and maintaining a system with the service manager
-          running in <option>--system</option> mode but with a PID other than 1.</para></listitem>
-        </varlistentry>
-
-        <xi:include href="standard-options.xml" xpointer="help" />
-        <xi:include href="standard-options.xml" xpointer="version" />
-      </variablelist>
-    </refsect2>
-
-    <refsect2>
-      <title>Options that duplicate kernel command line settings</title>
-
-      <para>Those options correspond directly to options listed above in "Kernel Command Line". Both forms
-      may be used equivalently for the system manager, but it is recommended to use the forms listed above in
-      this context, because they are properly namespaced. When an option is specified both on the kernel
-      command line, and as a normal command line argument, the latter has higher precedence.</para>
-
-      <para>When <command>systemd</command> is used a user manager, the kernel command line is ignored and
-      the options described are understood. Nevertheless, <command>systemd</command> is usually started in
-      this mode through the
-      <citerefentry><refentrytitle>user@.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-      service, which is shared between all users, and it may be more convenient to use configuration files to
-      modify settings, see
-      <citerefentry><refentrytitle>systemd-user.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      or a drop-in that specifies one of the environment variables listed above in "Environment, see
-      <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
-
-      <variablelist>
-        <varlistentry>
-          <term><option>--unit=</option></term>
-
-          <listitem><para>Set default unit to activate on startup. If not specified, defaults to
-          <filename>default.target</filename>. See <varname>systemd.unit=</varname> above.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>--dump-core</option></term>
-
-          <listitem><para>Enable core dumping on crash. This switch has no effect when running as user
-          instance. Same as <varname>systemd.dump_core=</varname> above.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>--crash-vt=</option><replaceable>VT</replaceable></term>
-
-          <listitem><para>Switch to a specific virtual console (VT) on crash. This switch has no effect when
-          running as user instance. Same as <varname>systemd.crash_chvt=</varname> above (but not the
-          different spelling!).</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>--crash-shell</option></term>
-
-          <listitem><para>Run a shell on crash. This switch has no effect when running as user instance. See
-          <varname>systemd.crash_shell=</varname> above.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>--crash-reboot</option></term>
-
-          <listitem><para>Automatically reboot the system on crash. This switch has no effect when running as
-          user instance. See <varname>systemd.crash_reboot</varname> above.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>--confirm-spawn</option></term>
-
-          <listitem><para>Ask for confirmation when spawning processes. This switch has no effect when run as
-          user instance. See <varname>systemd.confirm_spawn</varname> above.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>--show-status</option></term>
-
-          <listitem><para>Show terse unit status information is shown on the console during boot-up and
-          shutdown. See <varname>systemd.show_status</varname> above.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>--log-target=</option></term>
-
-          <listitem><para>Set log target. See <varname>systemd.log_target</varname> above.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>--log-level=</option></term>
-
-          <listitem><para>Set log level. See <varname>systemd.log_level</varname> above.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>--log-color</option></term>
-
-          <listitem><para>Highlight important log messages. See <varname>systemd.log_color</varname> above.
-          </para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>--log-location</option></term>
-
-          <listitem><para>Include code location in log messages. See <varname>systemd.log_location</varname>
-          above.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>--machine-id=</option></term>
-
-          <listitem><para>Override the machine-id set on the hard drive. See
-          <varname>systemd.machine_id=</varname> above.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>--service-watchdogs</option></term>
-
-          <listitem><para>Globally enable/disable all service watchdog timeouts and emergency actions. See
-          <varname>systemd.service_watchdogs</varname> above.</para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><option>--default-standard-output=</option></term>
-          <term><option>--default-standard-error=</option></term>
-
-          <listitem><para>Sets the default output or error output for all services and sockets,
-          respectively. See <varname>systemd.default_standard_output=</varname> and
-          <varname>systemd.default_standard_error=</varname> above.</para></listitem>
-        </varlistentry>
-      </variablelist>
-    </refsect2>
-  </refsect1>
-
  <refsect1>
    <title>Sockets and FIFOs</title>

--- a/meson.build
+++ b/meson.build
@ -2930,7 +2930,6 @@ make_directive_index_py = find_program('tools/make-directive-index.py')
 make_man_index_py = find_program('tools/make-man-index.py')
 xml_helper_py = find_program('tools/xml_helper.py')
 hwdb_update_sh = find_program('tools/meson-hwdb-update.sh')
-autosuspend_update_sh = find_program('tools/meson-autosuspend-update.sh')

 subdir('sysctl.d')
 subdir('sysusers.d')
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@ -117,8 +117,6 @@ static int detect_vm_device_tree(void) {
                return VIRTUALIZATION_KVM;
        else if (strstr(hvtype, "xen"))
                return VIRTUALIZATION_XEN;
-        else if (strstr(hvtype, "vmware"))
-                return VIRTUALIZATION_VMWARE;
        else
                return VIRTUALIZATION_VM_OTHER;
 #else
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@ -537,41 +537,29 @@ static int hello_callback(sd_bus_message *reply, void *userdata, sd_bus_error *e
        assert(IN_SET(bus->state, BUS_HELLO, BUS_CLOSING));

        r = sd_bus_message_get_errno(reply);
-        if (r > 0) {
-                r = -r;
-                goto fail;
-        }
+        if (r > 0)
+                return -r;

        r = sd_bus_message_read(reply, "s", &s);
        if (r < 0)
-                goto fail;
+                return r;

-        if (!service_name_is_valid(s) || s[0] != ':') {
-                r = -EBADMSG;
-                goto fail;
-        }
+        if (!service_name_is_valid(s) || s[0] != ':')
+                return -EBADMSG;

        r = free_and_strdup(&bus->unique_name, s);
        if (r < 0)
-                goto fail;
+                return r;

        if (bus->state == BUS_HELLO) {
                bus_set_state(bus, BUS_RUNNING);

                r = synthesize_connected_signal(bus);
                if (r < 0)
-                        goto fail;
+                        return r;
        }

        return 1;
-
-fail:
-        /* When Hello() failed, let's propagate this in two ways: first we return the error immediately here,
-         * which is the propagated up towards the event loop. Let's also invalidate the connection, so that
-         * if the user then calls back into us again we won't wait any longer. */
-
-        bus_set_state(bus, BUS_CLOSING);
-        return r;
 }

 static int bus_send_hello(sd_bus *bus) {
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@ -62,7 +62,7 @@ int mount_points_list_get(const char *mountinfo, MountPoint **head) {

        r = libmount_parse(mountinfo, NULL, &table, &iter);
        if (r < 0)
-                return log_error_errno(r, "Failed to parse %s: %m", mountinfo ?: "/proc/self/mountinfo");
+                return log_error_errno(r, "Failed to parse %s: %m", mountinfo);

        for (;;) {
                struct libmnt_fs *fs;
@ -77,7 +77,7 @@ int mount_points_list_get(const char *mountinfo, MountPoint **head) {
                if (r == 1)
                        break;
                if (r < 0)
-                        return log_error_errno(r, "Failed to get next entry from %s: %m", mountinfo ?: "/proc/self/mountinfo");
+                        return log_error_errno(r, "Failed to get next entry from %s: %m", mountinfo);

                path = mnt_fs_get_target(fs);
                if (!path)
@ -184,10 +184,8 @@ int swap_list_get(const char *swaps, MountPoint **head) {
                return log_oom();

        r = mnt_table_parse_swaps(t, swaps);
-        if (r == -ENOENT) /* no /proc/swaps is fine */
-                return 0;
        if (r < 0)
-                return log_error_errno(r, "Failed to parse %s: %m", swaps ?: "/proc/swaps");
+                return log_error_errno(r, "Failed to parse %s: %m", swaps);

        for (;;) {
                struct libmnt_fs *fs;
@ -198,7 +196,7 @@ int swap_list_get(const char *swaps, MountPoint **head) {
                if (r == 1)
                        break;
                if (r < 0)
-                        return log_error_errno(r, "Failed to get next entry from %s: %m", swaps ?: "/proc/swaps");
+                        return log_error_errno(r, "Failed to get next entry from %s: %m", swaps);

                source = mnt_fs_get_source(fs);
                if (!source)
@ -206,11 +204,11 @@ int swap_list_get(const char *swaps, MountPoint **head) {

                swap = new0(MountPoint, 1);
                if (!swap)
-                        return log_oom();
+                        return -ENOMEM;

                swap->path = strdup(source);
                if (!swap->path)
-                        return log_oom();
+                        return -ENOMEM;

                LIST_PREPEND(mount_point, *head, TAKE_PTR(swap));
        }
--- a/tools/chromiumos/gen_autosuspend_rules.py
+++ b/tools/chromiumos/gen_autosuspend_rules.py
--- a/tools/meson-autosuspend-update.sh
+++ b/tools/meson-autosuspend-update.sh
@ -1,7 +0,0 @@
-#!/bin/sh
-set -eu
-
-cd "$1"
-
-(curl -L 'https://chromium.googlesource.com/chromiumos/platform2/+/master/power_manager/udev/gen_autosuspend_rules.py?format=TEXT'; echo) \
-    | base64 -d > gen_autosuspend_rules.py