New upstream version 236

.github/CONTRIBUTING.md

@@ -28,7 +28,7 @@ If you discover a security vulnerability, we'd appreciate a non-public disclosur
 * Please make sure to test your change before submitting the PR. See [HACKING](https://raw.githubusercontent.com/systemd/systemd/master/HACKING) for details how to do this.
 * Make sure to run the test suite locally, before posting your PR. We use a CI system, meaning we don't even look at your PR, if the build and tests don't pass.
 * If you need to update the code in an existing PR, force-push into the same branch, overriding old commits with new versions.
-* After you have pushed a new version, add a comment about the new version (no notification is sent just for the commits, so it's easy to miss the update without an explicit comment). If you are a member of the systemd project on github, remove the `reviewed/needs-rework` label.
+* After you have pushed a new version, add a comment about the new version (no notification is sent just for the commits, so it's easy to miss the update without an explicit comment). If you are a member of the systemd project on GitHub, remove the `reviewed/needs-rework` label.
 
 ## Final Words
 

.gitignore

@@ -21,6 +21,7 @@
 /GSYMS
 /GTAGS
 /TAGS
+/ID
 /build*
 /coverage/
 /image.raw
@@ -28,5 +29,6 @@
 /image.raw.cache-pre-inst
 /install-tree
 /mkosi.builddir/
+/mkosi.output/
 /tags
 __pycache__/

.mailmap

@@ -132,3 +132,13 @@ Dmitriy Geels <dmitriy.geels@gmail.com>
 Beniamino Galvani <bgalvani@redhat.com> <bengal@users.noreply.github.com>
 Justin Capella <justincapella@gmail.com> <b1tninja@users.noreply.github.com>
 Daniel Șerbănescu <dasj19@users.noreply.github.com>
+Stanislav Angelovič <angelovic.s@gmail.com>
+Torsten Hilbrich <torsten.hilbrich@gmx.net>
+Tinu Weber <takeya@bluewin.ch>
+Gwendal Grignou <gwendal@chromium.org>
+José Bollo <jose.bollo@iot.bzh> <jobol@nonadev.net>
+Patryk Kocielnik <longer44@gmail.com>
+Lukáš Říha <cedel@centrum.cz>
+Alan Robertson <aroberts@zen.iomart.com> <alanjrobertson@gmail.com>
+Martin Steuer <martinsteuer@gmx.de>
+Matthias-Christian Ott <ott@mirix.org> <ott@users.noreply.github.com>

.mkosi/mkosi.arch

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 # This file is part of systemd.
 #
 # Copyright 2016 Zeal Jagannatha

.mkosi/mkosi.debian

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 # This file is part of systemd.
 #
 # Copyright 2016 Daniel Rusek

.mkosi/mkosi.fedora

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 # This file is part of systemd.
 #
 # Copyright 2016 Lennart Poettering
@@ -74,3 +76,6 @@ BuildPackages=
 
 Packages=
         libidn2
+
+BuildDirectory=mkosi.builddir
+Cache=mkosi.cache

.ycm_extra_conf.py

@@ -1,67 +1,250 @@
-import itertools
+#!/usr/bin/env python
+
+# SPDX-License-Identifier: Unlicense
+#
+# Based on the template file provided by the 'YCM-Generator' project authored by
+# Reuben D'Netto.
+# Jiahui Xie has re-reformatted and expanded the original script in accordance
+# to the requirements of the PEP 8 style guide and 'systemd' project,
+# respectively.
+#
+# The original license is preserved as it is.
+#
+#
+# This is free and unencumbered software released into the public domain.
+#
+# Anyone is free to copy, modify, publish, use, compile, sell, or
+# distribute this software, either in source code form or as a compiled
+# binary, for any purpose, commercial or non-commercial, and by any
+# means.
+#
+# In jurisdictions that recognize copyright laws, the author or authors
+# of this software dedicate any and all copyright interest in the
+# software to the public domain. We make this dedication for the benefit
+# of the public at large and to the detriment of our heirs and
+# successors. We intend this dedication to be an overt act of
+# relinquishment in perpetuity of all present and future rights to this
+# software under copyright law.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# For more information, please refer to <http://unlicense.org/>
+
+"""
+YouCompleteMe configuration file tailored to support the 'meson' build system
+used by the 'systemd' project.
+"""
+
+import glob
 import os
-import subprocess
+import ycm_core
-
-def GetFlagsFromMakefile(varname):
-  return subprocess.check_output([
-      "make", "-s", "print-%s" % varname]).decode().split()
 
 
-def Flatten(lists):
+SOURCE_EXTENSIONS = (".C", ".cpp", ".cxx", ".cc", ".c", ".m", ".mm")
-  return list(itertools.chain.from_iterable(lists))
+HEADER_EXTENSIONS = (".H", ".h", ".hxx", ".hpp", ".hh")
 
 
 def DirectoryOfThisScript():
-  return os.path.dirname(os.path.abspath(__file__))
+    """
+    Return the absolute path of the parent directory containing this
+    script.
+    """
+    return os.path.dirname(os.path.abspath(__file__))
+
+
+def GuessBuildDirectory():
+    """
+    Guess the build directory using the following heuristics:
+
+    1. Returns the current directory of this script plus 'build'
+    subdirectory in absolute path if this subdirectory exists.
+
+    2. Otherwise, probes whether there exists any directory
+    containing '.ninja_log' file two levels above the current directory;
+    returns this single directory only if there is one candidate.
+    """
+    result = os.path.join(DirectoryOfThisScript(), "build")
+
+    if os.path.exists(result):
+        return result
+
+    result = glob.glob(os.path.join(DirectoryOfThisScript(),
+                                    "..", "..", "*", ".ninja_log"))
+
+    if not result:
+        return ""
+
+    if 1 != len(result):
+        return ""
+
+    return os.path.split(result[0])[0]
+
+
+def TraverseByDepth(root, include_extensions):
+    """
+    Return a set of child directories of the 'root' containing file
+    extensions specified in 'include_extensions'.
+
+    NOTE:
+        1. The 'root' directory itself is excluded from the result set.
+        2. No subdirectories would be excluded if 'include_extensions' is left
+           to 'None'.
+        3. Each entry in 'include_extensions' must begin with string '.'.
+    """
+    is_root = True
+    result = set()
+    # Perform a depth first top down traverse of the given directory tree.
+    for root_dir, subdirs, file_list in os.walk(root):
+        if not is_root:
+            # print("Relative Root: ", root_dir)
+            # print(subdirs)
+            if include_extensions:
+                get_ext = os.path.splitext
+                subdir_extensions = {
+                    get_ext(f)[-1] for f in file_list if get_ext(f)[-1]
+                }
+                if subdir_extensions & include_extensions:
+                    result.add(root_dir)
+            else:
+                result.add(root_dir)
+        else:
+            is_root = False
+
+    return result
+
+
+_project_src_dir = os.path.join(DirectoryOfThisScript(), "src")
+_include_dirs_set = TraverseByDepth(_project_src_dir, frozenset({".h"}))
+flags = [
+    "-x",
+    "c"
+    # The following flags are partially redundant due to the existence of
+    # 'compile_commands.json'.
+    #    '-Wall',
+    #    '-Wextra',
+    #    '-Wfloat-equal',
+    #    '-Wpointer-arith',
+    #    '-Wshadow',
+    #    '-std=gnu99',
+]
+
+for include_dir in _include_dirs_set:
+    flags.append("-I" + include_dir)
+
+# Set this to the absolute path to the folder (NOT the file!) containing the
+# compile_commands.json file to use that instead of 'flags'. See here for
+# more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html
+#
+# You can get CMake to generate this file for you by adding:
+#   set( CMAKE_EXPORT_COMPILE_COMMANDS 1 )
+# to your CMakeLists.txt file.
+#
+# Most projects will NOT need to set this to anything; you can just change the
+# 'flags' list of compilation flags. Notice that YCM itself uses that approach.
+compilation_database_folder = GuessBuildDirectory()
+
+if os.path.exists(compilation_database_folder):
+    database = ycm_core.CompilationDatabase(compilation_database_folder)
+else:
+    database = None
 
 
 def MakeRelativePathsInFlagsAbsolute(flags, working_directory):
-  if not working_directory:
+    """
-    return flags
+    Iterate through 'flags' and replace the relative paths prefixed by
-  new_flags = []
+    '-isystem', '-I', '-iquote', '--sysroot=' with absolute paths
-  make_next_absolute = False
+    start with 'working_directory'.
-  path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ]
+    """
-  for flag in flags:
+    if not working_directory:
-    new_flag = flag
+        return list(flags)
+    new_flags = []
+    make_next_absolute = False
+    path_flags = ["-isystem", "-I", "-iquote", "--sysroot="]
+    for flag in flags:
+        new_flag = flag
 
-    if make_next_absolute:
+        if make_next_absolute:
-      make_next_absolute = False
+            make_next_absolute = False
-      if not flag.startswith('/'):
+            if not flag.startswith("/"):
-        new_flag = os.path.join(working_directory, flag)
+                new_flag = os.path.join(working_directory, flag)
 
-    for path_flag in path_flags:
+        for path_flag in path_flags:
-      if flag == path_flag:
+            if flag == path_flag:
-        make_next_absolute = True
+                make_next_absolute = True
-        break
+                break
 
-      if flag.startswith(path_flag):
+            if flag.startswith(path_flag):
-        path = flag[ len(path_flag): ]
+                path = flag[len(path_flag):]
-        new_flag = path_flag + os.path.join(working_directory, path)
+                new_flag = path_flag + os.path.join(working_directory, path)
-        break
+                break
 
-    if new_flag:
+        if new_flag:
-      new_flags.append(new_flag)
+            new_flags.append(new_flag)
-  return new_flags
+    return new_flags
 
 
-def FlagsForFile(filename):
+def IsHeaderFile(filename):
-  relative_to = DirectoryOfThisScript()
+    """
+    Check whether 'filename' is considered as a header file.
+    """
+    extension = os.path.splitext(filename)[1]
+    return extension in HEADER_EXTENSIONS
 
-  return {
-    'flags': MakeRelativePathsInFlagsAbsolute(flags, relative_to),
-    'do_cache': True
-  }
 
-flags = Flatten(map(GetFlagsFromMakefile, [
+def GetCompilationInfoForFile(filename):
-  'AM_CPPFLAGS',
+    """
-  'CPPFLAGS',
+    Helper function to look up compilation info of 'filename' in the 'database'.
-  'AM_CFLAGS',
+    """
-  'CFLAGS',
+    # The compilation_commands.json file generated by CMake does not have
-]))
+    # entries for header files. So we do our best by asking the db for flags for
+    # a corresponding source file, if any. If one exists, the flags for that
+    # file should be good enough.
+    if not database:
+        return None
 
-# these flags cause crashes in libclang, so remove them
+    if IsHeaderFile(filename):
-flags.remove('-Wlogical-op')
+        basename = os.path.splitext(filename)[0]
-flags.remove('-Wsuggest-attribute=noreturn')
+        for extension in SOURCE_EXTENSIONS:
-flags.remove('-Wdate-time')
+            replacement_file = basename + extension
+            if os.path.exists(replacement_file):
+                compilation_info = \
+                    database.GetCompilationInfoForFile(replacement_file)
+                if compilation_info.compiler_flags_:
+                    return compilation_info
+        return None
+    return database.GetCompilationInfoForFile(filename)
 
-# vim: set et ts=2 sw=2:
+
+def FlagsForFile(filename, **kwargs):
+    """
+    Callback function to be invoked by YouCompleteMe in order to get the
+    information necessary to compile 'filename'.
+
+    It returns a dictionary with a single element 'flags'. This element is a
+    list of compiler flags to pass to libclang for the file 'filename'.
+    """
+    if database:
+        # Bear in mind that compilation_info.compiler_flags_ does NOT return a
+        # python list, but a "list-like" StringVec object
+        compilation_info = GetCompilationInfoForFile(filename)
+        if not compilation_info:
+            return None
+
+        final_flags = MakeRelativePathsInFlagsAbsolute(
+            compilation_info.compiler_flags_,
+            compilation_info.compiler_working_dir_)
+
+    else:
+        relative_to = DirectoryOfThisScript()
+        final_flags = MakeRelativePathsInFlagsAbsolute(flags, relative_to)
+
+    return {
+        "flags": final_flags,
+        "do_cache": True
+    }

CODING_STYLE

@@ -218,7 +218,7 @@
 - We never use the POSIX version of basename() (which glibc defines it in
   libgen.h), only the GNU version (which glibc defines in string.h).
   The only reason to include libgen.h is because dirname()
-  is needed. Everytime you need that please immediately undefine
+  is needed. Every time you need that please immediately undefine
   basename(), and add a comment about it, so that no code ever ends up
   using the POSIX version!
 
@@ -350,8 +350,7 @@
   proper event, instead of doing time-based poll loops.
 
 - To determine the length of a constant string "foo", don't bother
-  with sizeof("foo")-1, please use strlen("foo") directly. gcc knows
+  with sizeof("foo")-1, please use STRLEN() instead.
-  strlen() anyway and turns it into a constant expression if possible.
 
 - If you want to concatenate two or more strings, consider using
   strjoin() rather than asprintf(), as the latter is a lot
@@ -363,7 +362,7 @@
   global variables. Why are global variables bad? They usually hinder
   generic reusability of code (since they break in threaded programs,
   and usually would require locking there), and as the code using them
-  has side-effects make programs intransparent. That said, there are
+  has side-effects make programs non-transparent. That said, there are
   many cases where they explicitly make a lot of sense, and are OK to
   use. For example, the log level and target in log.c is stored in a
   global variable, and that's OK and probably expected by most. Also
@@ -385,7 +384,7 @@
 
 - When exposing public C APIs, be careful what function parameters you make
   "const". For example, a parameter taking a context object should probably not
-  be "const", even if you are writing an other-wise read-only accessor function
+  be "const", even if you are writing an otherwise read-only accessor function
   for it. The reason is that making it "const" fixates the contract that your
   call won't alter the object ever, as part of the API. However, that's often
   quite a promise, given that this even prohibits object-internal caching or
@@ -395,14 +394,14 @@
 
 - Make sure to enforce limits on every user controllable resource. If the user
   can allocate resources in your code, your code must enforce some form of
-  limits after which it will refuse operation. It's fine if it is hardcoded (at
+  limits after which it will refuse operation. It's fine if it is hard-coded (at
   least initially), but it needs to be there. This is particularly important
   for objects that unprivileged users may allocate, but also matters for
   everything else any user may allocated.
 
 - htonl()/ntohl() and htons()/ntohs() are weird. Please use htobe32() and
   htobe16() instead, it's much more descriptive, and actually says what really
-  is happening, after all htonl() and htons() don't operation on longs and
+  is happening, after all htonl() and htons() don't operate on longs and
   shorts as their name would suggest, but on uint32_t and uint16_t. Also,
   "network byte order" is just a weird name for "big endian", hence we might
   want to call it "big endian" right-away.
@@ -434,3 +433,8 @@
   that interrupted system calls are automatically restarted, and we minimize
   hassles with handling EINTR (in particular as EINTR handling is pretty broken
   on Linux).
+
+- When applying C-style unescaping as well as specifier expansion on the same
+  string, always apply the C-style unescaping fist, followed by the specifier
+  expansion. When doing the reverse, make sure to escape '%' in specifier-style
+  first (i.e. '%' → '%%'), and then do C-style escaping where necessary.

HACKING

@@ -11,6 +11,15 @@ CODING_STYLE for details. Also have a look at our Contribution Guidelines:
 
         https://github.com/systemd/systemd/blob/master/.github/CONTRIBUTING.md
 
+When adding new functionality, tests should be added. For shared functionality
+(in src/basic and src/shared) unit tests should be sufficient. The general
+policy is to keep tests in matching files underneath src/test,
+e.g. src/test/test-path-util.c contains tests for any functions in
+src/basic/path-util.c. If adding a new source file, consider adding a matching
+test executable. For features at a higher level, tests in src/test/ are very
+strongly recommended. If that is no possible, integration tests in test/ are
+encouraged.
+
 Please always test your work before submitting a PR. For many of the components
 of systemd testing is straight-forward as you can simply compile systemd and
 run the relevant tool from the build directory.

NEWS

@@ -1,7 +1,259 @@
 systemd System and Service Manager
 
+CHANGES WITH 236:
+
+        * The modprobe.d/ drop-in for the bonding.ko kernel module introduced
+          in v235 has been extended to also set the dummy.ko module option
+          numdummies=0, preventing the kernel from automatically creating
+          dummy0. All dummy interfaces must now be explicitly created.
+
+        * Unknown '%' specifiers in configuration files are now rejected. This
+          applies to units and tmpfiles.d configuration. Any percent characters
+          that are followed by a letter or digit that are not supposed to be
+          interpreted as the beginning of a specifier should be escaped by
+          doubling ("%%").  (So "size=5%" is still accepted, as well as
+          "size=5%,foo=bar", but not "LABEL=x%y%z" since %y and %z are not
+          valid specifiers today.)
+
+        * systemd-resolved now maintains a new dynamic
+          /run/systemd/resolve/stub-resolv.conf compatibility file. It is
+          recommended to make /etc/resolv.conf a symlink to it. This file
+          points at the systemd-resolved stub DNS 127.0.0.53 resolver and
+          includes dynamically acquired search domains, achieving more correct
+          DNS resolution by software that bypasses local DNS APIs such as NSS.
+
+        * The "uaccess" udev tag has been dropped from /dev/kvm and
+          /dev/dri/renderD*.  These devices now have the 0666 permissions by
+          default (but this may be changed at build-time). /dev/dri/renderD*
+          will now be owned by the "render" group along with /dev/kfd.
+
+        * "DynamicUser=yes" has been enabled for systemd-timesyncd.service,
+          systemd-journal-gatewayd.service and
+          systemd-journal-upload.service. This means "nss-systemd" must be
+          enabled in /etc/nsswitch.conf to ensure the UIDs assigned to these
+          services are resolved properly.
+
+        * In /etc/fstab two new mount options are now understood:
+          x-systemd.makefs and x-systemd.growfs. The former has the effect that
+          the configured file system is formatted before it is mounted, the
+          latter that the file system is resized to the full block device size
+          after it is mounted (i.e. if the file system is smaller than the
+          partition it resides on, it's grown). This is similar to the fsck
+          logic in /etc/fstab, and pulls in systemd-makefs@.service and
+          systemd-growfs@.service as necessary, similar to
+          systemd-fsck@.service. Resizing is currently only supported on ext4
+          and btrfs.
+
+        * In systemd-networkd, the IPv6 RA logic now optionally may announce
+          DNS server and domain information.
+
+        * Support for the LUKS2 on-disk format for encrypted partitions has
+          been added. This requires libcryptsetup2 during compilation and
+          runtime.
+
+        * The systemd --user instance will now signal "readiness" when its
+          basic.target unit has been reached, instead of when the run queue ran
+          empty for the first time.
+
+        * Tmpfiles.d with user configuration are now also supported.
+          systemd-tmpfiles gained a new --user switch, and snippets placed in
+          ~/.config/user-tmpfiles.d/ and corresponding directories will be
+          executed by systemd-tmpfiles --user running in the new
+          systemd-tmpfiles-setup.service and systemd-tmpfiles-clean.service
+          running in the user session.
+
+        * Unit files and tmpfiles.d snippets learnt three new % specifiers:
+          %S resolves to the top-level state directory (/var/lib for the system
+          instance, $XDG_CONFIG_HOME for the user instance), %C resolves to the
+          top-level cache directory (/var/cache for the system instance,
+          $XDG_CACHE_HOME for the user instance), %L resolves to the top-level
+          logs directory (/var/log for the system instance,
+          $XDG_CONFIG_HOME/log/ for the user instance). This matches the
+          existing %t specifier, that resolves to the top-level runtime
+          directory (/run for the system instance, and $XDG_RUNTIME_DIR for the
+          user instance).
+
+        * journalctl learnt a new parameter --output-fields= for limiting the
+          set of journal fields to output in verbose and JSON output modes.
+
+        * systemd-timesyncd's configuration file gained a new option
+          RootDistanceMaxSec= for setting the maximum root distance of servers
+          it'll use, as well as the new options PollIntervalMinSec= and
+          PollIntervalMaxSec= to tweak the minimum and maximum poll interval.
+
+        * bootctl gained a new command "list" for listing all available boot
+          menu items on systems that follow the boot loader specification.
+
+        * systemctl gained a new --dry-run switch that shows what would be done
+          instead of doing it, and is currently supported by the shutdown and
+          sleep verbs.
+
+        * ConditionSecurity= can now detect the TOMOYO security module.
+
+        * Unit file [Install] sections are now also respected in unit drop-in
+          files. This is intended to be used by drop-ins under /usr/lib/.
+
+        * systemd-firstboot may now also set the initial keyboard mapping.
+
+        * Udev "changed" events for devices which are exposed as systemd
+          .device units are now propagated to units specified in
+          ReloadPropagatedFrom= as reload requests.
+
+        * If a udev device has a SYSTEMD_WANTS= property containing a systemd
+          unit template name (i.e. a name in the form of 'foobar@.service',
+          without the instance component between the '@' and - the '.'), then
+          the escaped sysfs path of the device is automatically used as the
+          instance.
+
+        * SystemCallFilter= in unit files has been extended so that an "errno"
+          can be specified individually for each system call. Example:
+          SystemCallFilter=~uname:EILSEQ.
+
+        * The cgroup delegation logic has been substantially updated. Delegate=
+          now optionally takes a list of controllers (instead of a boolean, as
+          before), which lists the controllers to delegate at least.
+
+        * The networkd DHCPv6 client now implements the FQDN option (RFC 4704).
+
+        * A new LogLevelMax= setting configures the maximum log level any
+          process of the service may log at (i.e. anything with a lesser
+          priority than what is specified is automatically dropped). A new
+          LogExtraFields= setting allows configuration of additional journal
+          fields to attach to all log records generated by any of the unit's
+          processes.
+
+        * New StandardInputData= and StandardInputText= settings along with the
+          new option StandardInput=data may be used to configure textual or
+          binary data that shall be passed to the executed service process via
+          standard input, encoded in-line in the unit file.
+
+        * StandardInput=, StandardOutput= and StandardError= may now be used to
+          connect stdin/stdout/stderr of executed processes directly with a
+          file or AF_UNIX socket in the file system, using the new "file:" option.
+
+        * A new unit file option CollectMode= has been added, that allows
+          tweaking the garbage collection logic for units. It may be used to
+          tell systemd to garbage collect units that have failed automatically
+          (normally it only GCs units that exited successfully). systemd-run
+          and systemd-mount expose this new functionality with a new -G option.
+
+        * "machinectl bind" may now be used to bind mount non-directories
+          (i.e. regularfiles, devices, fifos, sockets).
+
+        * systemd-analyze gained a new verb "calendar" for validating and
+          testing calendar time specifications to use for OnCalendar= in timer
+          units. Besides validating the expression it will calculate the next
+          time the specified expression would elapse.
+
+        * In addition to the pre-existing FailureAction= unit file setting
+          there's now SuccessAction=, for configuring a shutdown action to
+          execute when a unit completes successfully. This is useful in
+          particular inside containers that shall terminate after some workload
+          has been completed. Also, both options are now supported for all unit
+          types, not just services.
+
+        * networkds's IP rule support gained two new options
+          IncomingInterface= and OutgoingInterface= for configuring the incoming
+          and outgoing interfaces of configured rules. systemd-networkd also
+          gained support for "vxcan" network devices.
+
+        * networkd gained a new setting RequiredForOnline=, taking a
+          boolean. If set, systemd-wait-online will take it into consideration
+          when determining that the system is up, otherwise it will ignore the
+          interface for this purpose.
+
+        * The sd_notify() protocol gained support for a new operation: with
+          FDSTOREREMOVE=1 file descriptors may be removed from the per-service
+          store again, ahead of POLLHUP or POLLERR when they are removed
+          anyway.
+
+        * A new document UIDS-GIDS.md has been added to the source tree, that
+          documents the UID/GID range and assignment assumptions and
+          requirements of systemd.
+
+        * The watchdog device PID 1 will ping may now be configured through the
+          WatchdogDevice= configuration file setting, or by setting the
+          systemd.watchdog_service= kernel commandline option.
+
+        * systemd-resolved's gained support for registering DNS-SD services on
+          the local network using MulticastDNS. Services may either be
+          registered by dropping in a .dnssd file in /etc/systemd/dnssd/ (or
+          the same dir below /run, /usr/lib), or through its D-Bus API.
+
+        * The sd_notify() protocol can now with EXTEND_TIMEOUT_USEC=microsecond
+          extend the effective start, runtime, and stop time. The service must
+          continue to send EXTEND_TIMEOUT_USEC within the period specified to
+          prevent the service manager from making the service as timedout.
+
+        * systemd-resolved's DNSSEC support gained support for RFC 8080
+          (Ed25519 keys and signatures).
+
+        * The systemd-resolve command line tool gained a new set of options
+          --set-dns=, --set-domain=, --set-llmnr=, --set-mdns=, --set-dnssec=,
+          --set-nta= and --revert to configure per-interface DNS configuration
+          dynamically during runtime. It's useful for pushing DNS information
+          into systemd-resolved from DNS hook scripts that various interface
+          managing software supports (such as pppd).
+
+        * systemd-nspawn gained a new --network-namespace-path= command line
+          option, which may be used to make a container join an existing
+          network namespace, by specifying a path to a "netns" file.
+
+        Contributions from: Alan Jenkins, Alan Robertson, Alessandro Ghedini,
+        Andrew Jeddeloh, Antonio Rojas, Ari, asavah, bleep_blop, Carsten
+        Strotmann, Christian Brauner, Christian Hesse, Clinton Roy, Collin
+        Eggert, Cong Wang, Daniel Black, Daniel Lockyer, Daniel Rusek, Dimitri
+        John Ledkov, Dmitry Rozhkov, Dongsu Park, Edward A. James, Evgeny
+        Vereshchagin, Florian Klink, Franck Bui, Gwendal Grignou, Hans de
+        Goede, Harald Hoyer, Hristo Venev, Iago López Galeiras, Ikey Doherty,
+        Jakub Wilk, Jérémy Rosen, Jiahui Xie, John Lin, José Bollo, Josef
+        Andersson, juga0, Krzysztof Nowicki, Kyle Walker, Lars Karlitski, Lars
+        Kellogg-Stedman, Lauri Tirkkonen, Lennart Poettering, Lubomir Rintel,
+        Luca Bruno, Lucas Werkmeister, Lukáš Nykrýn, Lukáš Říha, Lukasz
+        Rubaszewski, Maciej S. Szmigiero, Mantas Mikulėnas, Marcus Folkesson,
+        Martin Steuer, Mathieu Trudel-Lapierre, Matija Skala,
+        Matthias-Christian Ott, Max Resch, Michael Biebl, Michael Vogt, Michal
+        Koutný, Michal Sekletar, Mike Gilbert, Muhammet Kara, Neil Brown, Olaf
+        Hering, Ondrej Kozina, Patrik Flykt, Patryk Kocielnik, Peter Hutterer,
+        Piotr Drąg, Razvan Cojocaru, Robin McCorkell, Roland Hieber, Saran
+        Tunyasuvunakool, Sergey Ptashnick, Shawn Landden, Shuang Liu, Simon
+        Arlott, Simon Peeters, Stanislav Angelovič, Stefan Agner, Susant
+        Sahani, Sylvain Plantefève, Thomas Blume, Thomas Haller, Tiago Salem
+        Herrmann, Tinu Weber, Tom Stellard, Topi Miettinen, Torsten Hilbrich,
+        Vito Caputo, Vladislav Vishnyakov, WaLyong Cho, Yu Watanabe, Zbigniew
+        Jędrzejewski-Szmek, Zeal Jagannatha
+
+        — Berlin, 2017-12-14
+
 CHANGES WITH 235:
 
+        * INCOMPATIBILITY: systemd-logind.service and other long-running
+          services now run inside an IPv4/IPv6 sandbox, prohibiting them any IP
+          communication with the outside. This generally improves security of
+          the system, and is in almost all cases a safe and good choice, as
+          these services do not and should not provide any network-facing
+          functionality. However, systemd-logind uses the glibc NSS API to
+          query the user database. This creates problems on systems where NSS
+          is set up to directly consult network services for user database
+          lookups. In particular, this creates incompatibilities with the
+          "nss-nis" module, which attempts to directly contact the NIS/YP
+          network servers it is configured for, and will now consistently
+          fail. In such cases, it is possible to turn off IP sandboxing for
+          systemd-logind.service (set IPAddressDeny= in its [Service] section
+          to the empty string, via a .d/ unit file drop-in). Downstream
+          distributions might want to update their nss-nis packaging to include
+          such a drop-in snippet, accordingly, to hide this incompatibility
+          from the user. Another option is to make use of glibc's nscd service
+          to proxy such network requests through a privilege-separated, minimal
+          local caching daemon, or to switch to more modern technologies such
+          sssd, whose NSS hook-ups generally do not involve direct network
+          access. In general, we think it's definitely time to question the
+          implementation choices of nss-nis, i.e. whether it's a good idea
+          today to embed a network-facing loadable module into all local
+          processes that need to query the user database, including the most
+          trivial and benign ones, such as "ls". For more details about
+          IPAddressDeny= see below.
+
         * A new modprobe.d drop-in is now shipped by default that sets the
           bonding module option max_bonds=0. This overrides the kernel default,
           to avoid conflicts and ambiguity as to whether or not bond0 should be

README

@@ -94,6 +94,10 @@ REQUIREMENTS:
         Required for CPUQuota= in resource control unit settings
           CONFIG_CFS_BANDWIDTH
 
+        Required for IPAddressDeny= and IPAddressAllow= in resource control
+        unit settings
+          CONFIG_CGROUP_BPF
+
         For UEFI systems:
           CONFIG_EFIVAR_FS
           CONFIG_EFI_PARTITION
@@ -149,6 +153,7 @@ REQUIREMENTS:
         libpython (optional)
         libidn2 or libidn (optional)
         elfutils >= 158 (optional)
+        polkit (optional)
         pkg-config
         gperf
         docbook-xsl (optional, required for documentation)
@@ -192,6 +197,16 @@ REQUIREMENTS:
         under all circumstances. In fact, systemd-hostnamed will warn
         if nss-myhostname is not installed.
 
+        nss-systemd must be enabled on systemd systems, as that's required for
+        DynamicUser= to work. Note that we ship services out-of-the-box that
+        make use of DynamicUser= now, hence enabling nss-systemd is not
+        optional.
+
+        Note that the build prefix for systemd must be /usr. -Dsplit-usr=false
+        (which is the default and does not need to be specified) is the
+        recommended setting, and -Dsplit-usr=true should be used on systems
+        which have /usr on a separate partition.
+
         Additional packages are necessary to run some tests:
         - busybox            (used by test/TEST-13-NSPAWN-SMOKE)
         - nc                 (used by test/TEST-12-ISSUE-3171)
@@ -206,7 +221,7 @@ USERS AND GROUPS:
         even in the very early boot stages, where no other databases
         and network are available:
 
-        audio, cdrom, dialout, disk, input, kmem, lp, tape, tty, video
+        audio, cdrom, dialout, disk, input, kmem, kvm, lp, render, tape, tty, video
 
         During runtime, the journal daemon requires the
         "systemd-journal" system group to exist. New journal files will
@@ -272,16 +287,16 @@ SYSV INIT.D SCRIPTS:
         needs to look like, and provide an implementation at the marked places.
 
 WARNINGS:
-        systemd will warn you during boot if /usr is on a different
+        systemd will warn during early boot if /usr is not already mounted at
-        file system than /. While in systemd itself very little will
+        this point (that means: either located on the same file system as / or
-        break if /usr is on a separate partition, many of its
+        already mounted in the initrd). While in systemd itself very little
-        dependencies very likely will break sooner or later in one
+        will break if /usr is on a separate, late-mounted partition, many of
-        form or another. For example, udev rules tend to refer to
+        its dependencies very likely will break sooner or later in one form or
-        binaries in /usr, binaries that link to libraries in /usr or
+        another. For example, udev rules tend to refer to binaries in /usr,
-        binaries that refer to data files in /usr. Since these
+        binaries that link to libraries in /usr or binaries that refer to data
-        breakages are not always directly visible, systemd will warn
+        files in /usr. Since these breakages are not always directly visible,
-        about this, since this kind of file system setup is not really
+        systemd will warn about this, since this kind of file system setup is
-        supported anymore by the basic set of Linux OS components.
+        not really supported anymore by the basic set of Linux OS components.
 
         systemd requires that the /run mount point exists. systemd also
         requires that /var/run is a symlink to /run.

README.md

@@ -3,7 +3,8 @@
 <a href="https://in.waw.pl/systemd-github-state/systemd-systemd-issues.svg"><img align="right" src="https://in.waw.pl/systemd-github-state/systemd-systemd-issues-small.svg" alt="Count of open issues over time"></a>
 <a href="https://in.waw.pl/systemd-github-state/systemd-systemd-pull-requests.svg"><img align="right" src="https://in.waw.pl/systemd-github-state/systemd-systemd-pull-requests-small.svg" alt="Count of open pull requests over time"></a>
 [![Build Status](https://semaphoreci.com/api/v1/projects/28a5a3ca-3c56-4078-8b5e-7ed6ef912e14/443470/shields_badge.svg)](https://semaphoreci.com/systemd/systemd)<br/>
-[![Coverity Scan Status](https://scan.coverity.com/projects/350/badge.svg)](https://scan.coverity.com/projects/350)
+[![Coverity Scan Status](https://scan.coverity.com/projects/350/badge.svg)](https://scan.coverity.com/projects/350)<br/>
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1369/badge)](https://bestpractices.coreinfrastructure.org/projects/1369)
 
 ## Details
 

TODO

@@ -24,6 +24,84 @@ Janitorial Clean-ups:
 
 Features:
 
+* make use of ethtool veth peer info in machined, for automatically finding out
+  host-side interface pointing to the container.
+
+* add some special mode to LogsDirectory=/StateDirectory=… that allows
+  declaring these directories without necessarily pulling in deps for them, or
+  creating them when starting up. That way, we could declare that
+  systemd-journald writes to /var/log/journal, which could be useful when we
+  doing disk usage calculations and so on.
+
+* taint systemd if there are fewer than 65536 users assigned to the system.
+
+* deprecate PermissionsStartOnly= and RootDirectoryStartOnly= in favour of the ExecStart= prefix chars
+
+* add a new RuntimeDirectoryPreserve= mode that defines a similar lifecycle for
+  the runtime dir as we maintain for the fdstore: i.e. keep it around as long
+  as the unit is running or has a job queued.
+
+* hook up sd-bus' creds stuff with SO_PEERGROUPS
+
+* add async version of sd_bus_add_match and make use of that
+
+* support projid-based quota in machinectl for containers, and then drop
+  implicit btrfs loopback magic in machined
+
+* Add NetworkNamespacePath= to specify a path to a network namespace
+
+* maybe use SOURCE_DATE_EPOCH (i.e. the env var the reproducible builds folks
+  introduced) as the RTC epoch, instead of the mtime of NEWS.
+
+* add a way to lock down cgroup migration: a boolean, which when set for a unit
+  makes sure the processes in it can never migrate out of it
+
+* blog about fd store and restartable services
+
+* document Environment=SYSTEMD_LOG_LEVEL=debug drop-in in debugging document
+
+* rework ExecOutput and ExecInput enums so that EXEC_OUTPUT_NULL loses its
+  magic meaning and is no longer upgraded to something else if set explicitly.
+
+* in the long run: permit a system with /etc/machine-id linked to /dev/null, to
+  make it lose its identity, i.e. be anonymous. For this we'd have to patch
+  through the whole tree to make all code deal with the case where no machine
+  ID is available.
+
+* optionally, collect cgroup resource data, and store it in per-unit RRD files,
+  suitable for processing with rrdtool. Add bus API to access this data, and
+  possibly implement a CPULoad property based on it.
+
+* beef up pam_systemd to take unit file settings such as cgroups properties as
+  parameters
+
+* a new "systemd-analyze security" tool outputting a checklist of security
+  features a service does and does not implement
+
+* maybe hook of xfs/ext4 quotactl() with services? i.e. automatically manage
+  the quota of a the user indicated in User= via unit file settings, like the
+  other resource management concepts. Would mix nicely with DynamicUser=1. Or
+  alternatively, do this with projids, so that we can also cover services
+  running as root. Quota should probably cover all the special dirs such as
+  StateDirectory=, LogsDirectory=, CacheDirectory=, as well as RootDirectory= if it
+  is set, plus the whole disk space any image configured with RootImage=.
+
+* Introduce "exit" as an EmergencyAction value, and allow to configure a
+  per-unit success/failure exit code to configure. This would be useful for
+  running commands inside of services inside of containers, which could then
+  propagate their failure state all the way up.
+
+* In DynamicUser= mode: before selecting a UID, use disk quota APIs on relevant
+  disks to see if the UID is already in use.
+
+* add dissect_image_warn() as a wrapper around dissect_image() that prints
+  friendly log messages for the returned errors, so that we don't have to
+  duplicate that in nspawn, systemd-dissect and PID 1.
+
+* add "systemctl wait" or so, which does what "systemd-run --wait" does, but
+  for all units. It should be both a way to pin units into memory as well as a
+  wait to retrieve their exit data.
+
 * maybe set a new set of env vars for services, based on RuntimeDirectory=,
   StateDirectory=, LogsDirectory=, CacheDirectory= and ConfigurationDirectory=
   automatically. For example, there could be $RUNTIME_DIRECTORY,
@@ -33,10 +111,6 @@ Features:
   taken if multiple dirs are configured. Maybe avoid setting the env vars in
   that case?
 
-* In a similar vein, consider adding unit specifiers that resolve to the root
-  directory used for state, logs, cache and configuration
-  directory. i.e. similar to %t, but for the root of the other special dirs.
-
 * expose IO accounting data on the bus, show it in systemd-run --wait and log
   about it in the resource log message
 
@@ -48,12 +122,6 @@ Features:
 
 * replace all uses of fgets() + LINE_MAX by read_line()
 
-* set IPAddressDeny=any on all services that shouldn't do networking (possibly
-  combined with IPAddressAllow=localhost).
-
-* dissect: when we discover squashfs, don't claim we had a "writable" partition
-  in systemd-dissect
-
 * Add AddUser= setting to unit files, similar to DynamicUser=1 which however
   creates a static, persistent user rather than a dynamic, transient user. We
   can leverage code from sysusers.d for this.
@@ -63,10 +131,6 @@ Features:
 
   ReadWritePaths=:/var/lib/foobar
 
-* sort generated hwdb files alphabetically when we import them, so that git
-  diffs remain minimal (in particular: the OUI databases we import are not
-  sorted, and not stable)
-
 * maybe add call sd_journal_set_block_timeout() or so to set SO_SNDTIMEO for
   the sd-journal logging socket, and, if the timeout is set to 0, sets
   O_NONBLOCK on it. That way people can control if and when to block for
@@ -88,15 +152,6 @@ Features:
   --as-pid2 switch, and sanely proxy sd_notify() messages dropping stuff such
   as MAINPID.
 
-* change the dependency Set* objects in Unit structures to become Hashmap*, and
-  then store a bit mask who created a specific dependency: the source unit via
-  fragment configuration, the destination unit via fragment configuration, or
-  the source unit via udev rules (in case of .device units), or any combination
-  thereof. This information can then be used to flush out old udev-created
-  dependencies when the udev properties change, and eventually to implement a
-  "systemctl refresh" operation for reloading the configuration of individual
-  units without reloading the whole set.
-
 * Add ExecMonitor= setting. May be used multiple times. Forks off a process in
   the service cgroup, which is supposed to monitor the service, and when it
   exits the service is considered failed by its monitor.
@@ -115,9 +170,6 @@ Features:
 
 * maybe introduce gpt auto discovery for /var/tmp?
 
-* fix PrivateNetwork= so that we fall back gracefully on kernels lacking
-  namespacing support (similar for the other namespacing options)
-
 * maybe add gpt-partition-based user management: each user gets his own
   LUKS-encrypted GPT partition with a new GPT type. A small nss module
   enumerates users via udev partition enumeration. UIDs are assigned in a fixed
@@ -138,31 +190,20 @@ Features:
   partition, that is mounted to / and is writable, and where the actual root's
   /usr is mounted into.
 
-* machined: add apis to query /etc/machine-info data of a container
-
-* .mount and .swap units: add Format=yes|no option that formats the partition before mounting/enabling it, implicitly
-
 * gpt-auto logic: support encrypted swap, add kernel cmdline option to force it, and honour a gpt bit about it, plus maybe a configuration file
 
 * drop nss-myhostname in favour of nss-resolve?
 
-* drop internal dlopen() based nss-dns fallback in nss-resolve, and rely on the
-  external nsswitch.conf based one
-
 * add a percentage syntax for TimeoutStopSec=, e.g. TimeoutStopSec=150%, and
   then use that for the setting used in user@.service. It should be understood
   relative to the configured default value.
 
-* on cgroupsv2 add DelegateControllers=, to pick the precise cgroup controllers to delegate
-
 * in networkd, when matching device types, fix up DEVTYPE rubbish the kernel passes to us
 
 * enable LockMLOCK to take a percentage value relative to physical memory
 
 * Permit masking specific netlink APIs with RestrictAddressFamily=
 
-* nspawn: start UID allocation loop from hash of container name
-
 * nspawn: support that /proc, /sys/, /dev are pre-mounted
 
 * define gpt header bits to select volatility mode
@@ -200,8 +241,6 @@ Features:
   a user/group for a service only has to exist on the host for the right
   mapping to work.
 
-* allow attaching additional journald log fields to cgroups
-
 * add bus API for creating unit files in /etc, reusing the code for transient units
 
 * add bus API to remove unit files from /etc
@@ -237,8 +276,6 @@ Features:
   the specified range and generates sane error messages for incorrect
   specifications.
 
-* do something about "/control" subcgroups in the unified cgroup hierarchy
-
 * when we detect that there are waiting jobs but no running jobs, do something
 
 * push CPUAffinity= also into the "cpuset" cgroup controller (only after the cpuset controller got ported to the unified hierarchy)
@@ -250,8 +287,6 @@ Features:
   prefixed with /sys generally special.
   http://lists.freedesktop.org/archives/systemd-devel/2015-June/032962.html
 
-* man: document that unless you use StandardError=null the shell >/dev/stderr won't work in shell scripts in services
-
 * fstab-generator: default to tmpfs-as-root if only usr= is specified on the kernel cmdline
 
 * docs: bring http://www.freedesktop.org/wiki/Software/systemd/MyServiceCantGetRealtime up to date
@@ -279,8 +314,6 @@ Features:
 
 * Rework systemctl's GetAll property parsing to use the generic bus_map_all_properties() API
 
-* implement a per-service firewall based on net_cls
-
 * Port various tools to make use of verbs.[ch], where applicable: busctl,
   coredumpctl, hostnamectl, localectl, systemd-analyze, timedatectl
 
@@ -317,8 +350,6 @@ Features:
 
 * introduce systemd-timesync-wait.service or so to sync on an NTP fix?
 
-* systemd --user should issue sd_notify() upon reaching basic.target, not on becoming idle
-
 * consider showing the unit names during boot up in the status output, not just the unit descriptions
 
 * maybe allow timer units with an empty Units= setting, so that they
@@ -374,8 +405,6 @@ Features:
 
 * figure out a nice way how we can let the admin know what child/sibling unit causes cgroup membership for a specific unit
 
-* mount_cgroup_controllers(): symlinks need to get the label applied
-
 * For timer units: add some mechanisms so that timer units that trigger immediately on boot do not have the services
   they run added to the initial transaction and thus confuse Type=idle.
 
@@ -510,8 +539,6 @@ Features:
 
 * shutdown logging: store to EFI var, and store to USB stick?
 
-* think about window-manager-run-as-user-service problem: exit 0 → activate shutdown.target; exit != 0 → restart service
-
 * merge unit_kill_common() and unit_kill_context()
 
 * introduce ExecCondition= in services
@@ -597,7 +624,6 @@ Features:
   - journald: when we drop syslog messages because the syslog socket is
     full, make sure to write how many messages are lost as first thing
     to syslog when it works again.
-  - journald: make sure ratelimit is actually really per-service with the new cgroup changes
   - change systemd-journal-flush into a service that stays around during
     boot, and causes the journal to be moved back to /run on shutdown,
     so that we do not keep /var busy. This needs to happen synchronously,
@@ -626,19 +652,21 @@ Features:
   - add journalctl -H that talks via ssh to a remote peer and passes through
     binary logs data
   - add a version of --merge which also merges /var/log/journal/remote
-  - log accumulated resource usage after each service invocation
   - journalctl: -m should access container journals directly by enumerating
     them via machined, and also watch containers coming and going.
     Benefit: nspawn --ephemeral would start working nicely with the journal.
   - assign MESSAGE_ID to log messages about failed services
 
+* add a test if all entries in the catalog are properly formatted.
+    (Adding dashes in a catalog entry currently results in the catalog entry
+     being silently skipped. journalctl --update-catalog must warn about this,
+     and we should also have a unit test to check that all our message are OK.)
+
 * document:
   - document that deps in [Unit] sections ignore Alias= fields in
     [Install] units of other units, unless those units are disabled
   - man: clarify that time-sync.target is not only sysv compat but also useful otherwise. Same for similar targets
-  - document the exit codes when services fail before they are exec()ed
   - document that service reload may be implemented as service reexec
-  - document in wiki how to map ical recurrence events to systemd timer unit calendar specifications
   - add a man page containing packaging guidelines and recommending usage of things like Documentation=, PrivateTmp=, PrivateNetwork= and ReadOnlyDirectories=/etc /usr.
   - document systemd-journal-flush.service properly
   - documentation: recommend to connect the timer units of a service to the service via Also= in [Install]
@@ -656,7 +684,6 @@ Features:
   - add new command to systemctl: "systemctl system-reexec" which reexecs as many daemons as virtually possible
   - systemctl enable: fail if target to alias into does not exist? maybe show how many units are enabled afterwards?
   - systemctl: "Journal has been rotated since unit was started." message is misleading
-  - better error message if you run systemctl without systemd running
   - systemctl status output should include list of triggering units and their status
 
 * unit install:
@@ -696,11 +723,8 @@ Features:
     https://github.com/systemd/systemd/pull/272#issuecomment-113153176
   - should optionally support receiving WATCHDOG=1 messages from its payload
     PID 1...
-  - should send out sd_notify("WATCHDOG=1") messages
   - optionally automatically add FORWARD rules to iptables whenever nspawn is
     running, remove them when shut down.
-  - Improve error message when --bind= is used on a non-existing source
-    directory
   - maybe make copying of /etc/resolv.conf optional, and skip it if --read-only
     is used
 
@@ -787,7 +811,6 @@ Features:
 * write blog stories about:
   - hwdb: what belongs into it, lsusb
   - enabling dbus services
-  - status update
   - how to make changes to sysctl and sysfs attributes
   - remote access
   - how to pass throw-away units to systemd, or dynamically change properties of existing units
@@ -942,8 +965,6 @@ Regularly:
 
 * check for strerror(r) instead of strerror(-r)
 
-* Use PR_SET_PROCTITLE_AREA if it becomes available in the kernel
-
 * pahole
 
 * set_put(), hashmap_put() return values check. i.e. == 0 does not free()!

TRANSIENT-SETTINGS.md

@@ -0,0 +1,447 @@
+# What settings are currently available for transient units?
+
+Our intention is to make all settings that are available as unit file settings
+also available for transient units, through the D-Bus API. At the moment, some
+unit types (socket, swap, path) are not supported at all via unit types, but
+most others are pretty well supported, with some notable omissions.
+
+The lists below contain all settings currently available in unit files. The
+ones currently available in transient units are prefixed with `✓`.
+
+## Generic Unit Settings
+
+Only the most important generic unit settings are available for transient units.
+
+```
+✓ Description=
+  Documentation=
+  SourcePath=
+✓ Requires=
+✓ Requisite=
+✓ Wants=
+✓ BindsTo=
+✓ Conflicts=
+✓ Before=
+✓ After=
+✓ OnFailure=
+✓ PropagatesReloadTo=
+✓ ReloadPropagatedFrom=
+✓ PartOf=
+  JoinsNamespaceOf=
+  RequiresMountsFor=
+  StopWhenUnneeded=
+  RefuseManualStart=
+  RefuseManualStop=
+  AllowIsolate=
+✓ DefaultDependencies=
+  OnFailureJobMode=
+  OnFailureIsolate=
+  IgnoreOnIsolate=
+  JobTimeoutSec=
+  JobRunningTimeoutSec=
+  JobTimeoutAction=
+  JobTimeoutRebootArgument=
+  StartLimitIntervalSec=SECONDS
+  StartLimitBurst=UNSIGNED
+  StartLimitAction=ACTION
+✓ FailureAction=
+✓ SuccessAction=
+✓ AddRef=
+  RebootArgument=STRING
+  ConditionPathExists=
+  ConditionPathExistsGlob=
+  ConditionPathIsDirectory=
+  ConditionPathIsSymbolicLink=
+  ConditionPathIsMountPoint=
+  ConditionPathIsReadWrite=
+  ConditionDirectoryNotEmpty=
+  ConditionFileNotEmpty=
+  ConditionFileIsExecutable=
+  ConditionNeedsUpdate=
+  ConditionFirstBoot=
+  ConditionKernelCommandLine=
+  ConditionArchitecture=
+  ConditionVirtualization=
+  ConditionSecurity=
+  ConditionCapability=
+  ConditionHost=
+  ConditionACPower=
+  ConditionUser=
+  ConditionGroup=
+  AssertPathExists=
+  AssertPathExistsGlob=
+  AssertPathIsDirectory=
+  AssertPathIsSymbolicLink=
+  AssertPathIsMountPoint=
+  AssertPathIsReadWrite=
+  AssertDirectoryNotEmpty=
+  AssertFileNotEmpty=
+  AssertFileIsExecutable=
+  AssertNeedsUpdate=
+  AssertFirstBoot=
+  AssertKernelCommandLine=
+  AssertArchitecture=
+  AssertVirtualization=
+  AssertSecurity=
+  AssertCapability=
+  AssertHost=
+  AssertACPower=
+  AssertUser=
+  AssertGroup=
+✓ CollectMode=
+```
+
+## Execution-Related Settings
+
+All execution-related settings are available for transient units.
+
+```
+✓ WorkingDirectory=
+✓ RootDirectory=
+✓ RootImage=
+✓ User=
+✓ Group=
+✓ SupplementaryGroups=
+✓ Nice=
+✓ OOMScoreAdjust=
+✓ IOSchedulingClass=
+✓ IOSchedulingPriority=
+✓ CPUSchedulingPolicy=
+✓ CPUSchedulingPriority=
+✓ CPUSchedulingResetOnFork=
+✓ CPUAffinity=
+✓ UMask=
+✓ Environment=
+✓ EnvironmentFile=
+✓ PassEnvironment=
+✓ UnsetEnvironment=
+✓ DynamicUser=
+✓ RemoveIPC=
+✓ StandardInput=
+✓ StandardOutput=
+✓ StandardError=
+✓ StandardInputText=
+✓ StandardInputData=
+✓ TTYPath=
+✓ TTYReset=
+✓ TTYVHangup=
+✓ TTYVTDisallocate=
+✓ SyslogIdentifier=
+✓ SyslogFacility=
+✓ SyslogLevel=
+✓ SyslogLevelPrefix=
+✓ LogLevelMax=
+✓ LogExtraFields=
+✓ SecureBits=
+✓ CapabilityBoundingSet=
+✓ AmbientCapabilities=
+✓ TimerSlackNSec=
+✓ NoNewPrivileges=
+✓ KeyringMode=
+✓ SystemCallFilter=
+✓ SystemCallArchitectures=
+✓ SystemCallErrorNumber=
+✓ MemoryDenyWriteExecute=
+✓ RestrictNamespaces=
+✓ RestrictRealtime=
+✓ RestrictAddressFamilies=
+✓ LockPersonality=
+✓ LimitCPU=
+✓ LimitFSIZE=
+✓ LimitDATA=
+✓ LimitSTACK=
+✓ LimitCORE=
+✓ LimitRSS=
+✓ LimitNOFILE=
+✓ LimitAS=
+✓ LimitNPROC=
+✓ LimitMEMLOCK=
+✓ LimitLOCKS=
+✓ LimitSIGPENDING=
+✓ LimitMSGQUEUE=
+✓ LimitNICE=
+✓ LimitRTPRIO=
+✓ LimitRTTIME=
+✓ ReadWritePaths=
+✓ ReadOnlyPaths=
+✓ InaccessiblePaths=
+✓ BindPaths=
+✓ BindReadOnlyPaths=
+✓ PrivateTmp=
+✓ PrivateDevices=
+✓ ProtectKernelTunables=
+✓ ProtectKernelModules=
+✓ ProtectControlGroups=
+✓ PrivateNetwork=
+✓ PrivateUsers=
+✓ ProtectSystem=
+✓ ProtectHome=
+✓ MountFlags=
+✓ MountAPIVFS=
+✓ Personality=
+✓ RuntimeDirectoryPreserve=
+✓ RuntimeDirectoryMode=
+✓ RuntimeDirectory=
+✓ StateDirectoryMode=
+✓ StateDirectory=
+✓ CacheDirectoryMode=
+✓ CacheDirectory=
+✓ LogsDirectoryMode=
+✓ LogsDirectory=
+✓ ConfigurationDirectoryMode=
+✓ ConfigurationDirectory=
+✓ PAMName=
+✓ IgnoreSIGPIPE=
+✓ UtmpIdentifier=
+✓ UtmpMode=
+✓ SELinuxContext=
+✓ SmackProcessLabel=
+✓ AppArmorProfile=
+✓ Slice=
+```
+
+## Resource Control Settings
+
+All cgroup/resource control settings are available for transient units
+
+```
+✓ CPUAccounting=
+✓ CPUWeight=
+✓ StartupCPUWeight=
+✓ CPUShares=
+✓ StartupCPUShares=
+✓ CPUQuota=
+✓ MemoryAccounting=
+✓ MemoryLow=
+✓ MemoryHigh=
+✓ MemoryMax=
+✓ MemorySwapMax=
+✓ MemoryLimit=
+✓ DeviceAllow=
+✓ DevicePolicy=
+✓ IOAccounting=
+✓ IOWeight=
+✓ StartupIOWeight=
+✓ IODeviceWeight=
+✓ IOReadBandwidthMax=
+✓ IOWriteBandwidthMax=
+✓ IOReadIOPSMax=
+✓ IOWriteIOPSMax=
+✓ BlockIOAccounting=
+✓ BlockIOWeight=
+✓ StartupBlockIOWeight=
+✓ BlockIODeviceWeight=
+✓ BlockIOReadBandwidth=
+✓ BlockIOWriteBandwidth=
+✓ TasksAccounting=
+✓ TasksMax=
+✓ Delegate=
+✓ IPAccounting=
+✓ IPAddressAllow=
+✓ IPAddressDeny=
+```
+
+## Process Killing Settings
+
+All process killing settings are available for transient units:
+
+```
+✓ SendSIGKILL=
+✓ SendSIGHUP=
+✓ KillMode=
+✓ KillSignal=
+```
+
+## Service Unit Settings
+
+Only the most important service settings are available for transient units.
+
+```
+  PIDFile=
+✓ ExecStartPre=
+✓ ExecStart=
+✓ ExecStartPost=
+✓ ExecReload=
+✓ ExecStop=
+✓ ExecStopPost=
+  RestartSec=
+  TimeoutStartSec=
+  TimeoutStopSec=
+  TimeoutSec=
+✓ RuntimeMaxSec=
+  WatchdogSec=
+✓ Type=
+✓ Restart=
+  PermissionsStartOnly=
+  RootDirectoryStartOnly=
+✓ RemainAfterExit=
+  GuessMainPID=
+  RestartPreventExitStatus=
+  RestartForceExitStatus=
+  SuccessExitStatus=
+✓ NonBlocking=
+  BusName=
+✓ FileDescriptorStoreMax=
+✓ NotifyAccess=
+  Sockets=
+  USBFunctionDescriptors=
+  USBFunctionStrings=
+```
+
+## Mount Unit Settings
+
+Only the most important mount unit settings are currently available to transient units:
+
+```
+✓ What=
+  Where=
+✓ Options=
+✓ Type=
+  TimeoutSec=
+  DirectoryMode=
+  SloppyOptions=
+  LazyUnmount=
+  ForceUnmount=
+```
+
+## Automount Unit Settings
+
+Only one automount unit setting is currently available to transient units:
+
+```
+  Where=
+  DirectoryMode=
+✓ TimeoutIdleSec=
+```
+
+## Timer Unit Settings
+
+Most timer unit settings are available to transient units.
+
+```
+✓ OnCalendar=
+✓ OnActiveSec=
+✓ OnBootSec=
+✓ OnStartupSec=
+✓ OnUnitActiveSec=
+✓ OnUnitInactiveSec=
+  Persistent=
+✓ WakeSystem=
+✓ RemainAfterElapse=
+✓ AccuracySec=
+✓ RandomizedDelaySec=
+  Unit=
+```
+
+## Slice Unit Settings
+
+Slice units are fully supported as transient units, but they have no settings
+of their own beyond the generic unit and resource control settings.
+
+## Scope Unit Settings
+
+Scope units are fully supported as transient units (in fact they only exist as
+such), but they have no settings of their own beyond the generic unit and
+resource control settings.
+
+## Socket Unit Settings
+
+Socket units are currently not available at all as transient units:
+
+```
+  ListenStream=
+  ListenDatagram=
+  ListenSequentialPacket=
+  ListenFIFO=
+  ListenNetlink=
+  ListenSpecial=
+  ListenMessageQueue=
+  ListenUSBFunction=
+  SocketProtocol=
+  BindIPv6Only=
+  Backlog=
+  BindToDevice=
+  ExecStartPre=
+  ExecStartPost=
+  ExecStopPre=
+  ExecStopPost=
+  TimeoutSec=
+  SocketUser=
+  SocketGroup=
+  SocketMode=
+  DirectoryMode=
+  Accept=
+  Writable=
+  MaxConnections=
+  MaxConnectionsPerSource=
+  KeepAlive=
+  KeepAliveTimeSec=
+  KeepAliveIntervalSec=
+  KeepAliveProbes=
+  DeferAcceptSec=
+  NoDelay=
+  Priority=
+  ReceiveBuffer=
+  SendBuffer=
+  IPTOS=
+  IPTTL=
+  Mark=
+  PipeSize=
+  FreeBind=
+  Transparent=
+  Broadcast=
+  PassCredentials=
+  PassSecurity=
+  TCPCongestion=
+  ReusePort=
+  MessageQueueMaxMessages=
+  MessageQueueMessageSize=
+  RemoveOnStop=
+  Symlinks=
+  FileDescriptorName=
+  Service=
+  TriggerLimitIntervalSec=
+  TriggerLimitBurst=
+  SmackLabel=
+  SmackLabelIPIn=
+  SmackLabelIPOut=
+  SELinuxContextFromNet=
+```
+
+## Swap Unit Settings
+
+Swap units are currently not available at all as transient units:
+
+```
+  What=
+  Priority=
+  Options=
+  TimeoutSec=
+```
+
+## Path Unit Settings
+
+Path units are currently not available at all as transient units:
+
+```
+  PathExists=
+  PathExistsGlob=
+  PathChanged=
+  PathModified=
+  DirectoryNotEmpty=
+  Unit=
+  MakeDirectory=
+  DirectoryMode=
+```
+
+## Install Section
+
+The `[Install]` section is currently not available at all for transient units, and it probably doesn't even make sense.
+
+```
+  Alias=
+  WantedBy=
+  RequiredBy=
+  Also=
+  DefaultInstance=
+```

UIDS-GIDS.md

@@ -0,0 +1,242 @@
+# Users, Groups, UIDs and GIDs on `systemd` systems
+
+Here's a summary of the requirements `systemd` (and Linux) make on UID/GID
+assignments and their ranges.
+
+Note that while in theory UIDs and GIDs are orthogonal concepts they really
+aren't IRL. With that in mind, when we discuss UIDs below it should be assumed
+that whatever we say about UIDs applies to GIDs in mostly the same way, and all
+the special assignments and ranges for UIDs always have mostly the same
+validity for GIDs too.
+
+## Special Linux UIDs
+
+In theory, the range of the C type `uid_t` is 32bit wide on Linux,
+i.e. 0…4294967295. However, four UIDs are special on Linux:
+
+1. 0 → The `root` super-user
+
+2. 65534 → The `nobody` UID, also called the "overflow" UID or similar. It's
+   where various subsystems map unmappable users to, for example NFS or user
+   namespacing. (The latter can be changed with a sysctl during runtime, but
+   that's not supported on `systemd`. If you do change it you void your
+   warranty.) Because Fedora is a bit confused the `nobody` user is called
+   `nfsnobody` there (and they have a different `nobody` user at UID 99). I
+   hope this will be corrected eventually though. (Also, some distributions
+   call the `nobody` group `nogroup`. I wish they didn't.)
+
+3. 4294967295, aka "32bit `(uid_t) -1`" → This UID is not a valid user ID, as
+   setresuid(), chown() and friends treat -1 as a special request to not change
+   the UID of the process/file. This UID is hence not available for assignment
+   to users in the user database.
+
+4. 65535, aka "16bit `(uid_t) -1`" → Once upon a time `uid_t` used to be 16bit, and
+   programs compiled for that would hence assume that `(uid_t) -1` is 65535. This
+   UID is hence not usable either.
+
+The `nss-systemd` glibc NSS module will synthesize user database records for
+the UIDs 0 and 65534 if the system user database doesn't list them. This means
+that any system where this module is enabled works to some minimal level
+without `/etc/passwd`.
+
+## Special Distribution UID ranges
+
+Distributions generally split the available UID range in two:
+
+1. 1…999 → System users. These are users that do not map to actual "human"
+   users, but are used as security identities for system daemons, to implement
+   privilege separation and run system daemons with minimal privileges.
+
+2. 1000…65533 and 65536…4294967294 → Everything else, i.e. regular (human) users.
+
+Note that most distributions allow changing the boundary between system and
+regular users, even during runtime as user configuration. Moreover, some older
+systems placed the boundary at 499/500, or even 99/100. In `systemd`, the
+boundary is configurable only during compilation time, as this should be a
+decision for distribution builders, not for users. Moreover, we strongly
+discourage downstreams to change the boundary from the upstream default of
+999/1000.
+
+Also note that programs such as `adduser` tend to allocate from a subset of the
+available regular user range only, usually 1000..60000. And it's also usually
+user-configurable, too.
+
+Note that systemd requires that system users and groups are resolvable without
+networking available — a requirement that is not made for regular users. This
+means regular users may be stored in remote LDAP or NIS databases, but system
+users may not (except when there's a consistent local cache kept, that is
+available during earliest boot, including in the initial RAM disk).
+
+## Special `systemd` GIDs
+
+`systemd` defines no special UIDs beyond what Linux already defines (see
+above). However, it does define some special group/GID assignments, which are
+primarily used for `systemd-udevd`'s device management. The precise list of the
+currently defined groups is found in this `sysusers.d` snippet:
+[basic.conf](https://raw.githubusercontent.com/systemd/systemd/master/sysusers.d/basic.conf.in)
+
+It's strongly recommended that downstream distributions include these groups in
+their default group databases.
+
+Note that the actual GID numbers assigned to these groups do not have to be
+constant beyond a specific system. There's one exception however: the `tty`
+group must have the GID 5. That's because it must be encoded in the `devpts`
+mount parameters during earliest boot, at a time where NSS lookups are not
+possible. (Note that the actual GID can be changed during `systemd` build time,
+but downstreams are strongly advised against doing that.)
+
+## Special `systemd` UID ranges
+
+`systemd` defines a number of special UID ranges:
+
+1. 61184…65519 → UIDs for dynamic users are allocated from this range (see the
+   `DynamicUser=` documentation in
+   [`systemd.exec(5)`](https://www.freedesktop.org/software/systemd/man/systemd.exec.html)). This
+   range has been chosen so that it is below the 16bit boundary (i.e. below
+   65535), in order to provide compatibility with container environments that
+   assign a 64K range of UIDs to containers using user namespacing. This range
+   is above the 60000 boundary, so that its allocations are unlikely to be
+   affected by `adduser` allocations (see above). And we leave some room
+   upwards for other purposes. (And if you wonder why precisely these numbers:
+   if you write them in hexadecimal, they might make more sense: 0xEF00 and
+   0xFFEF). The `nss-systemd` module will synthesize user records implicitly
+   for all currently allocated dynamic users from this range. Thus, NSS-based
+   user record resolving works correctly without those users being in
+   `/etc/passwd`.
+
+2. 524288…1879048191 → UID range for `systemd-nspawn`'s automatic allocation of
+   per-container UID ranges. When the `--private-users=pick` switch is used (or
+   `-U`) then it will automatically find a so far unused 16bit subrange of this
+   range and assign it to the container. The range is picked so that the upper
+   16bit of the 32bit UIDs are constant for all users of the container, while
+   the lower 16bit directly encode the 65536 UIDs assigned to the
+   container. This mode of allocation means that the upper 16bit of any UID
+   assigned to a container are kind of a "container ID", while the lower 16bit
+   directly expose the container's own UID numbers. If you wonder why precisely
+   these numbers, consider them in hexadecimal: 0x00080000…0x6FFFFFFF. This
+   range is above the 16bit boundary. Moreover it's below the 31bit boundary,
+   as some broken code (specifically: the kernel's `devpts` file system)
+   erroneously considers UIDs signed integers, and hence can't deal with values
+   above 2^31. The `nss-mymachines` glibc NSS module will synthesize user
+   database records for all UIDs assigned to a running container from this
+   range.
+
+Note for both allocation ranges: when an UID allocation takes place NSS is
+checked for collisions first, and a different UID is picked if an entry is
+found. Thus, the user database is used as synchronization mechanism to ensure
+exclusive ownership of UIDs and UID ranges. To ensure compatibility with other
+subsystems allocating from the same ranges it is hence essential that they
+ensure that whatever they pick shows up in the user/group databases, either by
+providing an NSS module, or by adding entries directly to `/etc/passwd` and
+`/etc/group`. For performance reasons, do note that `systemd-nspawn` will only
+do an NSS check for the first UID of the range it allocates, not all 65536 of
+them. Also note that while the allocation logic is operating, the glibc
+`lckpwdf()` user database lock is taken, in order to make this logic race-free.
+
+## Figuring out the system's UID boundaries
+
+The most important boundaries of the local system may be queried with
+`pkg-config`:
+
+```
+$ pkg-config --variable=systemuidmax systemd
+999
+$ pkg-config --variable=dynamicuidmin systemd
+61184
+$ pkg-config --variable=dynamicuidmax systemd
+65519
+$ pkg-config --variable=containeruidbasemin systemd
+524288
+$ pkg-config --variable=containeruidbasemax systemd
+1878982656
+```
+
+(Note that the latter encodes the maximum UID *base* `systemd-nspawn` might
+pick — given that 64K UIDs are assigned to each container according to this
+allocation logic, the maximum UID used for this range is hence
+1878982656+65535=1879048191.)
+
+Note that systemd does not make any of these values runtime-configurable. All
+these boundaries are chosen during build time. That said, the system UID/GID
+boundary is traditionally configured in /etc/login.defs, though systemd won't
+look there during runtime.
+
+## Considerations for container managers
+
+If you hack on a container manager, and wonder how and how many UIDs best to
+assign to your containers, here are a few recommendations:
+
+1. Definitely, don't assign less than 65536 UIDs/GIDs. After all the `nobody`
+user has magic properties, and hence should be available in your container, and
+given that it's assigned the UID 65534, you should really cover the full 16bit
+range in your container. Note that systemd will — as mentioned — synthesize
+user records for the `nobody` user, and assumes its availability in various
+other parts of its codebase, too, hence assigning fewer users means you lose
+compatibility with running systemd code inside your container. And most likely
+other packages make similar restrictions.
+
+2. While it's fine to assign more than 65536 UIDs/GIDs to a container, there's
+most likely not much value in doing so, as Linux distributions won't use the
+higher ranges by default (as mentioned neither `adduser` nor `systemd`'s
+dynamic user concept allocate from above the 16bit range). Unless you actively
+care for nested containers, it's hence probably a good idea to allocate exactly
+65536 UIDs per container, and neither less nor more. A pretty side-effect is
+that by doing so, you expose the same number of UIDs per container as Linux 2.2
+supported for the whole system, back in the days.
+
+3. Consider allocating UID ranges for containers so that the first UID you
+assign has the lower 16bits all set to zero. That way, the upper 16bits become
+a container ID of some kind, while the lower 16bits directly encode the
+internal container UID. This is the way `systemd-nspawn` allocates UID ranges
+(see above). Following this allocation logic ensures best compability with
+`systemd-nspawn` and all other container managers following the scheme, as it
+is sufficient then to check NSS for the first UID you pick regarding conflicts,
+as that's what they do, too. Moreover, it makes `chown()`ing container file
+system trees nicely robust to interruptions: as the external UID encodes the
+internal UID in a fixed way, it's very easy to adjust the container's base UID
+without the need to know the original base UID: to change the container base,
+just mask away the upper 16bit, and insert the upper 16bit of the new container
+base instead. Here are the easy conversions to derive the internal UID, the
+external UID, and the container base UID from each other:
+
+    ```
+    INTERNAL_UID = EXTERNAL_UID & 0x0000FFFF
+    CONTAINER_BASE_UID = EXTERNAL_UID & 0xFFFF0000
+    EXTERNAL_UID = INTERNAL_UID | CONTAINER_BASE_UID
+    ```
+
+4. When picking a UID range for containers, make sure to check NSS first, with
+a simple `getpwuid()` call: if there's already a user record for the first UID
+you want to pick, then it's already in use: pick a different one. Wrap that
+call in a `lckpwdf()` + `ulckpwdf()` pair, to make allocation
+race-free. Provide an NSS module that makes all UIDs you end up taking show up
+in the user database, and make sure that the NSS module returns up-to-date
+information before you release the lock, so that other system components can
+safely use the NSS user database as allocation check, too. Note that if you
+follow this scheme no changes to `/etc/passwd` need to be made, thus minimizing
+the artifacts the container manager persistently leaves in the system.
+
+## Summary
+
+|               UID/GID | Purpose               | Defined By    | Listed in                     |
+|-----------------------|-----------------------|---------------|-------------------------------|
+|                     0 | `root` user           | Linux         | `/etc/passwd` + `nss-systemd` |
+|                   1…4 | System users          | Distributions | `/etc/passwd`                 |
+|                     5 | `tty` group           | `systemd`     | `/etc/passwd`                 |
+|                 6…999 | System users          | Distributions | `/etc/passwd`                 |
+|            1000…60000 | Regular users         | Distributions | `/etc/passwd` + LDAP/NIS/…    |
+|           60001…61183 | Unused                |               |                               |
+|           61184…65519 | Dynamic service users | `systemd`     | `nss-systemd`                 |
+|           65520…65533 | Unused                |               |                               |
+|                 65534 | `nobody` user         | Linux         | `/etc/passwd` + `nss-systemd` |
+|                 65535 | 16bit `(uid_t) -1`    | Linux         |                               |
+|          65536…524287 | Unused                |               |                               |
+|     524288…1879048191 | Container UID ranges  | `systemd`     | `nss-mymachines`              |
+| 1879048192…4294967294 | Unused                |               |                               |
+|            4294967295 | 32bit `(uid_t) -1`    | Linux         |                               |
+
+Note that "Unused" in the table above doesn't meant that these ranges are
+really unused. It just means that these ranges have no well-established
+pre-defined purposes between Linux, generic low-level distributions and
+`systemd`. There might very well be other packages that allocate from these
+ranges.

catalog/meson.build

@@ -1,3 +1,20 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
+# Copyright 2017 Zbigniew Jędrzejewski-Szmek
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
 in_files = '''
         systemd.bg.catalog
         systemd.be.catalog
@@ -27,3 +44,7 @@ foreach file : in_files
                 install : true,
                 install_dir : catalogdir)
 endforeach
+
+meson.add_install_script('sh', '-c',
+                         'test -n "$DESTDIR" || @0@/journalctl --update-catalog'
+                         .format(rootbindir))

catalog/systemd.be.catalog.in

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  Copyright 2012 Lennart Poettering

catalog/systemd.be@latin.catalog.in

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  Copyright 2012 Lennart Poettering

catalog/systemd.bg.catalog.in

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  Copyright 2012 Lennart Poettering

catalog/systemd.catalog.in

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  Copyright 2012 Lennart Poettering
@@ -199,7 +201,7 @@ Subject: System shutdown initiated
 Defined-By: systemd
 Support: %SUPPORT_URL%
 
-Systemd shutdown has been initiated. The shutdown has now begun and
+System shutdown has been initiated. The shutdown has now begun and
 all system services are terminated and all file systems unmounted.
 
 -- 7d4958e842da4a758f6c1cdc7b36dcc5
@@ -357,3 +359,20 @@ Defined-By: systemd
 Support: %SUPPORT_URL%
 
 The unit @UNIT@ completed and consumed the indicated resources.
+
+-- 50876a9db00f4c40bde1a2ad381c3a1b
+Subject: The system is configured in a way that might cause problems
+Defined-By: systemd
+Support: %SUPPORT_URL%
+
+The following "tags" are possible:
+- "split-usr" — /usr is a separate file system and was not mounted when systemd
+  was booted
+- "cgroups-missing" — the kernel was compiled without cgroup support or access
+  to expected interface files is resticted
+- "var-run-bad" — /var/run is not a symlink to /run
+- "overflowuid-not-65534" — the kernel user ID used for "unknown" users (with
+  NFS or user namespaces) is not 65534
+- "overflowgid-not-65534" — the kernel group ID used for "unknown" users (with
+  NFS or user namespaces) is not 65534
+Current system is tagged as @TAINT@.

catalog/systemd.da.catalog.in

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  Copyright 2012 Lennart Poettering

catalog/systemd.de.catalog.in

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  Copyright 2012 Lennart Poettering

catalog/systemd.fr.catalog.in

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  Copyright 2012 Lennart Poettering
@@ -329,3 +331,18 @@ Documentation: man:systemd-resolved.service(8)
 Une ancre de confiance DNSSEC a été révoquée. Une nouvelle ancre de
 confiance doit être configurée, ou le système d'exploitation a besoin
 d'être mis à jour, pour fournir une version à jour de l'ancre de confiance.
+
+-- 5eb03494b6584870a536b337290809b3
+Subject: Le redémarrage automatique d'une unité (unit) a été planifié
+Defined-By: systemd
+Support: %SUPPORT_URL%
+
+Le redémarrage automatique de l'unité (unit) @UNIT@ a été planifié, en
+raison de sa configuration avec le paramètre Restart=.
+
+-- ae8f7b866b0347b9af31fe1c80b127c0
+Subject: Ressources consommées durant l'éxécution de l'unité (unit)
+Defined-By: systemd
+Support: %SUPPORT_URL%
+
+L'unité (unit) @UNIT@ s'est arrêtée et a consommé les ressources indiquées.

catalog/systemd.hr.catalog.in

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  Copyright 2012 Lennart Poettering

catalog/systemd.hu.catalog.in

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  Copyright 2012 Lennart Poettering

catalog/systemd.it.catalog.in

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  Copyright 2013 Daniele Medri

catalog/systemd.ko.catalog.in

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  Copyright 2012 Lennart Poettering

catalog/systemd.pl.catalog.in

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  Copyright 2012 Lennart Poettering

catalog/systemd.pt_BR.catalog.in

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  Copyright 2012 Lennart Poettering

catalog/systemd.ru.catalog.in

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  Copyright 2012 Lennart Poettering
@@ -377,3 +379,20 @@ Documentation: man:systemd-resolved.service(8)
 
 Открытый ключ (trust ahcnor) DNSSEC был отозван. Необходимо настроить новый
 открытый ключ, либо обновить систему, чтобы получить обновленный открытый ключ.
+
+# Subject: Automatic restarting of a unit has been scheduled
+-- 5eb03494b6584870a536b337290809b3
+Subject: Назначен автоматический перезапуск юнита
+Defined-By: systemd
+Support: %SUPPORT_URL%
+
+Назначен автоматический перезапуск юнита @UNIT@, так как для него был задан 
+параметр Restart=.
+
+# Subject: Resources consumed by unit runtime
+-- ae8f7b866b0347b9af31fe1c80b127c0
+Subject: Потребленные юнитом ресурсы
+Defined-By: systemd
+Support: %SUPPORT_URL%
+
+Юнит @UNIT@ завершен. Приводится статистика по потребленным им ресурсам.

catalog/systemd.sr.catalog.in

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  Copyright 2012 Lennart Poettering

catalog/systemd.zh_CN.catalog.in

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  Copyright 2012 Lennart Poettering

catalog/systemd.zh_TW.catalog.in

@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
 #  This file is part of systemd.
 #
 #  Copyright 2012 Lennart Poettering

coccinelle/const-strlen.cocci

@@ -0,0 +1,10 @@
+@@
+constant s;
+@@
+- sizeof(s)-1
++ STRLEN(s)
+@@
+constant s;
+@@
+- strlen(s)
++ STRLEN(s)

coccinelle/empty-to-null.cocci

@@ -0,0 +1,5 @@
+@@
+expression s;
+@@
+- isempty(s) ? NULL : s
++ empty_to_null(s)

coccinelle/equals-null.cocci

@@ -0,0 +1,14 @@
+@@
+expression e;
+statement s;
+@@
+- if (e == NULL)
++ if (!e)
+s
+@@
+expression e;
+statement s;
+@@
+- if (e != NULL)
++ if (e)
+s

coccinelle/in_set.cocci

@@ -1,35 +1,54 @@
 @@
 expression e;
-identifier n1, n2, n3, n4, n5, n6;
+constant n0, n1, n2, n3, n4, n5, n6, n7, n8, n9;
-statement s;
 @@
-- e == n1 || e == n2 || e == n3 || e == n4 || e == n5 || e == n6
+- e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5 || e == n6 || e == n7 || e == n8 || e == n9
-+ IN_SET(e, n1, n2, n3, n4, n5, n6)
++ IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9)
 @@
 expression e;
-identifier n1, n2, n3, n4, n5;
+constant n0, n1, n2, n3, n4, n5, n6, n7, n8;
-statement s;
 @@
-- e == n1 || e == n2 || e == n3 || e == n4 || e == n5
+- e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5 || e == n6 || e == n7 || e == n8
-+ IN_SET(e, n1, n2, n3, n4, n5)
++ IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8)
 @@
 expression e;
-identifier n1, n2, n3, n4;
+constant n0, n1, n2, n3, n4, n5, n6, n7;
-statement s;
 @@
-- e == n1 || e == n2 || e == n3 || e == n4
+- e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5 || e == n6 || e == n7
-+ IN_SET(e, n1, n2, n3, n4)
++ IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7)
 @@
 expression e;
-identifier n1, n2, n3;
+constant n0, n1, n2, n3, n4, n5, n6;
-statement s;
 @@
-- e == n1 || e == n2 || e == n3
+- e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5 || e == n6
-+ IN_SET(e, n1, n2, n3)
++ IN_SET(e, n0, n1, n2, n3, n4, n5, n6)
 @@
 expression e;
-identifier n, p;
+constant n0, n1, n2, n3, n4, n5;
-statement s;
 @@
-- e == n || e == p
+- e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5
-+ IN_SET(e, n, p)
++ IN_SET(e, n0, n1, n2, n3, n4, n5)
+@@
+expression e;
+constant n0, n1, n2, n3, n4;
+@@
+- e == n0 || e == n1 || e == n2 || e == n3 || e == n4
++ IN_SET(e, n0, n1, n2, n3, n4)
+@@
+expression e;
+constant n0, n1, n2, n3;
+@@
+- e == n0 || e == n1 || e == n2 || e == n3
++ IN_SET(e, n0, n1, n2, n3)
+@@
+expression e;
+constant n0, n1, n2;
+@@
+- e == n0 || e == n1 || e == n2
++ IN_SET(e, n0, n1, n2)
+@@
+expression e;
+constant n0, n1;
+@@
+- e == n0 || e == n1
++ IN_SET(e, n0, n1)

coccinelle/isempty.cocci

@@ -0,0 +1,15 @@
+@@
+expression s;
+@@
+- strv_length(s) == 0
++ strv_isempty(s)
+@@
+expression s;
+@@
+- strlen(s) == 0
++ isempty(s)
+@@
+expression s;
+@@
+- strlen_ptr(s) == 0
++ isempty(s)

coccinelle/not_in_set.cocci

@@ -1,147 +1,54 @@
 @@
 expression e;
-identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18, n19, n20;
+constant n0, n1, n2, n3, n4, n5, n6, n7, n8, n9;
-statement s;
-@@
-- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 && e != n15 && e != n16 && e != n17 && e != n18 && e != n19 && e != n20
-+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18, n19, n20)
-@@
-expression e;
-identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18, n19;
-statement s;
-@@
-- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 && e != n15 && e != n16 && e != n17 && e != n18 && e != n19
-+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18, n19)
-@@
-expression e;
-identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18;
-statement s;
-@@
-- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 && e != n15 && e != n16 && e != n17 && e != n18
-+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18)
-@@
-expression e;
-identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17;
-statement s;
-@@
-- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 && e != n15 && e != n16 && e != n17
-+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17)
-@@
-expression e;
-identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16;
-statement s;
-@@
-- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 && e != n15 && e != n16
-+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16)
-@@
-expression e;
-identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15;
-statement s;
-@@
-- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 && e != n15
-+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15)
-@@
-expression e;
-identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14;
-statement s;
-@@
-- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14
-+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14)
-@@
-expression e;
-identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13;
-statement s;
-@@
-- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13
-+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13)
-@@
-expression e;
-identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12;
-statement s;
-@@
-- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12
-+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12)
-@@
-expression e;
-identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11;
-statement s;
-@@
-- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11
-+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11)
-@@
-expression e;
-identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10;
-statement s;
-@@
-- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10
-+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10)
-@@
-expression e;
-identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9;
-statement s;
 @@
 - e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9
 + !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9)
 @@
 expression e;
-identifier n0, n1, n2, n3, n4, n5, n6, n7, n8;
+constant n0, n1, n2, n3, n4, n5, n6, n7, n8;
-statement s;
 @@
 - e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8
 + !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8)
 @@
 expression e;
-identifier n0, n1, n2, n3, n4, n5, n6, n7;
+constant n0, n1, n2, n3, n4, n5, n6, n7;
-statement s;
 @@
 - e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7
 + !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7)
 @@
 expression e;
-identifier n0, n1, n2, n3, n4, n5, n6;
+constant n0, n1, n2, n3, n4, n5, n6;
-statement s;
 @@
 - e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6
 + !IN_SET(e, n0, n1, n2, n3, n4, n5, n6)
 @@
 expression e;
-identifier n0, n1, n2, n3, n4, n5;
+constant n0, n1, n2, n3, n4, n5;
-statement s;
 @@
 - e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5
 + !IN_SET(e, n0, n1, n2, n3, n4, n5)
 @@
 expression e;
-identifier n1, n2, n3, n4, n5;
+constant n0, n1, n2, n3, n4;
-statement s;
 @@
-- e != n1 && e != n2 && e != n3 && e != n4 && e != n5
+- e != n0 && e != n1 && e != n2 && e != n3 && e != n4
-+ !IN_SET(e, n1, n2, n3, n4, n5)
++ !IN_SET(e, n0, n1, n2, n3, n4)
 @@
 expression e;
-identifier n1, n2, n3, n4;
+constant n0, n1, n2, n3;
-statement s;
 @@
-- e != n1 && e != n2 && e != n3 && e != n4
+- e != n0 && e != n1 && e != n2 && e != n3
-+ !IN_SET(e, n1, n2, n3, n4)
++ !IN_SET(e, n0, n1, n2, n3)
 @@
 expression e;
-identifier n1, n2, n3, n4;
+constant n0, n1, n2;
-statement s;
 @@
-- e != n1 && e != n2 && e != n3 && e != n4
+- e != n0 && e != n1 && e != n2
-+ !IN_SET(e, n1, n2, n3, n4)
++ !IN_SET(e, n0, n1, n2)
 @@
 expression e;
-identifier n1, n2, n3;
+constant n0, n1;
-statement s;
 @@
-- e != n1 && e != n2 && e != n3
+- e != n0 && e != n1
-+ !IN_SET(e, n1, n2, n3)
++ !IN_SET(e, n0, n1)
-@@
-expression e;
-identifier n, p;
-statement s;
-@@
-- e != n && e != p
-+ !IN_SET(e, n, p)

coccinelle/run-coccinelle.sh

@@ -0,0 +1,11 @@
+#!/bin/bash -e
+
+for SCRIPT in ${@-*.cocci} ; do
+        [ "$SCRIPT" = "empty-if.cocci" ] && continue
+        echo "--x-- Processing $SCRIPT --x--"
+        TMPFILE=`mktemp`
+        spatch --sp-file $SCRIPT --dir $(pwd)/.. 2> "$TMPFILE" || cat "$TMPFILE"
+        rm "$TMPFILE"
+        echo "--x-- Processed $SCRIPT --x--"
+        echo ""
+done

docs/sysvinit/meson.build

@@ -1,3 +1,20 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
+# Copyright 2017 Zbigniew Jędrzejewski-Szmek
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
 file = configure_file(
         input : 'README.in',
         output : 'README',

docs/var-log/meson.build

@@ -1,3 +1,20 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
+# Copyright 2017 Zbigniew Jędrzejewski-Szmek
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
 file = configure_file(
         input : 'README.in',
         output : 'README',

hwdb/20-acpi-vendor.hwdb

@@ -120,6 +120,9 @@ acpi:IHSE*:
 acpi:IMPJ*:
  ID_VENDOR_FROM_DATABASE=Impinj
 
+acpi:INSY*:
+ ID_VENDOR_FROM_DATABASE=Insyde Software
+
 acpi:INTC*:
  ID_VENDOR_FROM_DATABASE=Intel Corporation
 
@@ -171,6 +174,9 @@ acpi:NVDA*:
 acpi:NVTN*:
  ID_VENDOR_FROM_DATABASE=Nuvoton Technology Corporation
 
+acpi:NXGO*:
+ ID_VENDOR_FROM_DATABASE=Nexstgo Company Limited
+
 acpi:OBDA*:
  ID_VENDOR_FROM_DATABASE=REALTEK Semiconductor Corp.
 
@@ -882,6 +888,9 @@ acpi:AVO*:
 acpi:AVR*:
  ID_VENDOR_FROM_DATABASE=AVer Information Inc.
 
+acpi:AVS*:
+ ID_VENDOR_FROM_DATABASE=Avatron Software Inc.
+
 acpi:AVT*:
  ID_VENDOR_FROM_DATABASE=Avtek (Electronics) Pty Ltd
 
@@ -963,6 +972,9 @@ acpi:BBH*:
 acpi:BBL*:
  ID_VENDOR_FROM_DATABASE=Brain Boxes Limited
 
+acpi:BBV*:
+ ID_VENDOR_FROM_DATABASE=BlueBox Video Limited
+
 acpi:BBX*:
  ID_VENDOR_FROM_DATABASE=Black Box Corporation
 
@@ -1341,6 +1353,9 @@ acpi:CHO*:
 acpi:CHP*:
  ID_VENDOR_FROM_DATABASE=CH Products
 
+acpi:CHR*:
+ ID_VENDOR_FROM_DATABASE=christmann informationstechnik + medien GmbH & Co. KG
+
 acpi:CHS*:
  ID_VENDOR_FROM_DATABASE=Agentur Chairos
 
@@ -2736,6 +2751,9 @@ acpi:GFN*:
 acpi:GGL*:
  ID_VENDOR_FROM_DATABASE=Google Inc.
 
+acpi:GGT*:
+ ID_VENDOR_FROM_DATABASE=G2TOUCH KOREA
+
 acpi:GIC*:
  ID_VENDOR_FROM_DATABASE=General Inst. Corporation
 
@@ -4371,6 +4389,9 @@ acpi:MNL*:
 acpi:MNP*:
  ID_VENDOR_FROM_DATABASE=Microcom
 
+acpi:MOC*:
+ ID_VENDOR_FROM_DATABASE=Matrix Orbital Corporation
+
 acpi:MOD*:
  ID_VENDOR_FROM_DATABASE=Modular Technology
 
@@ -4548,6 +4569,9 @@ acpi:MVM*:
 acpi:MVN*:
  ID_VENDOR_FROM_DATABASE=Meta Company
 
+acpi:MVR*:
+ ID_VENDOR_FROM_DATABASE=MediCapture, Inc.
+
 acpi:MVS*:
  ID_VENDOR_FROM_DATABASE=Microvision
 
@@ -4758,6 +4782,9 @@ acpi:NPA*:
 acpi:NPI*:
  ID_VENDOR_FROM_DATABASE=Network Peripherals Inc
 
+acpi:NRI*:
+ ID_VENDOR_FROM_DATABASE=Noritake Itron Corporation
+
 acpi:NRL*:
  ID_VENDOR_FROM_DATABASE=U.S. Naval Research Lab
 
@@ -4791,6 +4818,9 @@ acpi:NTC*:
 acpi:NTI*:
  ID_VENDOR_FROM_DATABASE=New Tech Int'l Company
 
+acpi:NTK*:
+ ID_VENDOR_FROM_DATABASE=NewTek
+
 acpi:NTL*:
  ID_VENDOR_FROM_DATABASE=National Transcomm. Ltd
 
@@ -5259,6 +5289,9 @@ acpi:PNR*:
 acpi:PNS*:
  ID_VENDOR_FROM_DATABASE=PanaScope
 
+acpi:PNT*:
+ ID_VENDOR_FROM_DATABASE=HOYA Corporation PENTAX Lifecare Division
+
 acpi:PNX*:
  ID_VENDOR_FROM_DATABASE=Phoenix Technologies, Ltd.
 
@@ -5271,6 +5304,9 @@ acpi:PON*:
 acpi:POR*:
  ID_VENDOR_FROM_DATABASE=Portalis LC
 
+acpi:POS*:
+ ID_VENDOR_FROM_DATABASE=Positivo Tecnologia S.A.
+
 acpi:POT*:
  ID_VENDOR_FROM_DATABASE=Parrot
 
@@ -5308,7 +5344,7 @@ acpi:PRD*:
  ID_VENDOR_FROM_DATABASE=Praim S.R.L.
 
 acpi:PRF*:
- ID_VENDOR_FROM_DATABASE=Digital Electronics Corporation
+ ID_VENDOR_FROM_DATABASE=Schneider Electric Japan Holdings, Ltd.
 
 acpi:PRG*:
  ID_VENDOR_FROM_DATABASE=The Phoenix Research Group Inc
@@ -6513,12 +6549,18 @@ acpi:TEK*:
 acpi:TEL*:
  ID_VENDOR_FROM_DATABASE=Promotion and Display Technology Ltd.
 
+acpi:TEN*:
+ ID_VENDOR_FROM_DATABASE=Tencent
+
 acpi:TER*:
  ID_VENDOR_FROM_DATABASE=TerraTec Electronic GmbH
 
 acpi:TET*:
  ID_VENDOR_FROM_DATABASE=TETRADYNE CO., LTD.
 
+acpi:TEV*:
+ ID_VENDOR_FROM_DATABASE=Televés, S.A.
+
 acpi:TEX*:
  ID_VENDOR_FROM_DATABASE=Texas Instruments
 
@@ -7146,9 +7188,15 @@ acpi:VQ@*:
 acpi:VRC*:
  ID_VENDOR_FROM_DATABASE=Virtual Resources Corporation
 
+acpi:VRG*:
+ ID_VENDOR_FROM_DATABASE=VRgineers, Inc.
+
 acpi:VRM*:
  ID_VENDOR_FROM_DATABASE=VRmagic Holding AG
 
+acpi:VRS*:
+ ID_VENDOR_FROM_DATABASE=VRstudios, Inc.
+
 acpi:VSC*:
  ID_VENDOR_FROM_DATABASE=ViewSonic Corporation
 
@@ -7344,6 +7392,9 @@ acpi:XAD*:
 acpi:XDM*:
  ID_VENDOR_FROM_DATABASE=XDM Ltd.
 
+acpi:XES*:
+ ID_VENDOR_FROM_DATABASE=Extreme Engineering Solutions, Inc.
+
 acpi:XFG*:
  ID_VENDOR_FROM_DATABASE=Jan Strapko - FOTO
 

hwdb/20-acpi-vendor.hwdb.patch

@@ -1,5 +1,5 @@
---- 20-acpi-vendor.hwdb.base	2017-09-28 13:48:25.370636463 +0200
+--- 20-acpi-vendor.hwdb.base	2017-12-14 15:57:48.154005635 +0100
-+++ 20-acpi-vendor.hwdb	2017-09-28 13:48:25.375636571 +0200
++++ 20-acpi-vendor.hwdb	2017-12-14 15:57:48.160005689 +0100
 @@ -3,6 +3,8 @@
  # Data imported from:
  #     http://www.uefi.org/uefi-pnp-export
@@ -19,7 +19,7 @@
  acpi:AMDI*:
   ID_VENDOR_FROM_DATABASE=AMD
  
-@@ -244,6 +243,9 @@
+@@ -250,6 +249,9 @@
  acpi:AAA*:
   ID_VENDOR_FROM_DATABASE=Avolites Ltd
  
@@ -29,7 +29,7 @@
  acpi:AAE*:
   ID_VENDOR_FROM_DATABASE=Anatek Electronics Inc.
  
-@@ -271,6 +273,9 @@
+@@ -277,6 +279,9 @@
  acpi:ABO*:
   ID_VENDOR_FROM_DATABASE=D-Link Systems Inc
  
@@ -39,7 +39,7 @@
  acpi:ABS*:
   ID_VENDOR_FROM_DATABASE=Abaco Systems, Inc.
  
-@@ -316,7 +321,7 @@
+@@ -322,7 +327,7 @@
  acpi:ACO*:
   ID_VENDOR_FROM_DATABASE=Allion Computer Inc.
  
@@ -48,7 +48,7 @@
   ID_VENDOR_FROM_DATABASE=Aspen Tech Inc
  
  acpi:ACR*:
-@@ -586,6 +591,9 @@
+@@ -592,6 +597,9 @@
  acpi:AMT*:
   ID_VENDOR_FROM_DATABASE=AMT International Industry
  
@@ -58,7 +58,7 @@
  acpi:AMX*:
   ID_VENDOR_FROM_DATABASE=AMX LLC
  
-@@ -634,6 +642,9 @@
+@@ -640,6 +648,9 @@
  acpi:AOA*:
   ID_VENDOR_FROM_DATABASE=AOpen Inc.
  
@@ -68,7 +68,7 @@
  acpi:AOE*:
   ID_VENDOR_FROM_DATABASE=Advanced Optics Electronics, Inc.
  
-@@ -643,6 +654,9 @@
+@@ -649,6 +660,9 @@
  acpi:AOT*:
   ID_VENDOR_FROM_DATABASE=Alcatel
  
@@ -78,7 +78,7 @@
  acpi:APC*:
   ID_VENDOR_FROM_DATABASE=American Power Conversion
  
-@@ -818,7 +832,7 @@
+@@ -824,7 +838,7 @@
   ID_VENDOR_FROM_DATABASE=Alps Electric Inc
  
  acpi:AUO*:
@@ -87,7 +87,7 @@
  
  acpi:AUR*:
   ID_VENDOR_FROM_DATABASE=Aureal Semiconductor
-@@ -895,6 +909,9 @@
+@@ -904,6 +918,9 @@
  acpi:AXE*:
   ID_VENDOR_FROM_DATABASE=Axell Corporation
  
@@ -97,7 +97,7 @@
  acpi:AXI*:
   ID_VENDOR_FROM_DATABASE=American Magnetics
  
-@@ -1039,6 +1056,9 @@
+@@ -1051,6 +1068,9 @@
  acpi:BML*:
   ID_VENDOR_FROM_DATABASE=BIOMED Lab
  
@@ -107,7 +107,7 @@
  acpi:BMS*:
   ID_VENDOR_FROM_DATABASE=BIOMEDISYS
  
-@@ -1051,6 +1071,9 @@
+@@ -1063,6 +1083,9 @@
  acpi:BNO*:
   ID_VENDOR_FROM_DATABASE=Bang & Olufsen
  
@@ -117,7 +117,7 @@
  acpi:BNS*:
   ID_VENDOR_FROM_DATABASE=Boulder Nonlinear Systems
  
-@@ -1291,6 +1314,9 @@
+@@ -1303,6 +1326,9 @@
  acpi:CHA*:
   ID_VENDOR_FROM_DATABASE=Chase Research PLC
  
@@ -127,7 +127,7 @@
  acpi:CHD*:
   ID_VENDOR_FROM_DATABASE=ChangHong Electric Co.,Ltd
  
-@@ -1438,6 +1464,9 @@
+@@ -1453,6 +1479,9 @@
  acpi:COD*:
   ID_VENDOR_FROM_DATABASE=CODAN Pty. Ltd.
  
@@ -137,7 +137,7 @@
  acpi:COI*:
   ID_VENDOR_FROM_DATABASE=Codec Inc.
  
-@@ -1841,7 +1870,7 @@
+@@ -1856,7 +1885,7 @@
   ID_VENDOR_FROM_DATABASE=Dragon Information Technology
  
  acpi:DJE*:
@@ -146,7 +146,7 @@
  
  acpi:DJP*:
   ID_VENDOR_FROM_DATABASE=Maygay Machines, Ltd
-@@ -2161,6 +2190,9 @@
+@@ -2176,6 +2205,9 @@
  acpi:EIC*:
   ID_VENDOR_FROM_DATABASE=Eicon Technology Corporation
  
@@ -156,7 +156,7 @@
  acpi:EKA*:
   ID_VENDOR_FROM_DATABASE=MagTek Inc.
  
-@@ -2419,6 +2451,9 @@
+@@ -2434,6 +2466,9 @@
  acpi:FCG*:
   ID_VENDOR_FROM_DATABASE=First International Computer Ltd
  
@@ -166,7 +166,7 @@
  acpi:FCS*:
   ID_VENDOR_FROM_DATABASE=Focus Enhancements, Inc.
  
-@@ -2884,6 +2919,9 @@
+@@ -2902,6 +2937,9 @@
  acpi:HEC*:
   ID_VENDOR_FROM_DATABASE=Hisense Electric Co., Ltd.
  
@@ -176,7 +176,7 @@
  acpi:HEL*:
   ID_VENDOR_FROM_DATABASE=Hitachi Micro Systems Europe Ltd
  
-@@ -3013,6 +3051,9 @@
+@@ -3031,6 +3069,9 @@
  acpi:HSD*:
   ID_VENDOR_FROM_DATABASE=HannStar Display Corp
  
@@ -186,7 +186,7 @@
  acpi:HSM*:
   ID_VENDOR_FROM_DATABASE=AT&T Microelectronics
  
-@@ -3133,6 +3174,9 @@
+@@ -3151,6 +3192,9 @@
  acpi:ICI*:
   ID_VENDOR_FROM_DATABASE=Infotek Communication Inc
  
@@ -196,7 +196,7 @@
  acpi:ICM*:
   ID_VENDOR_FROM_DATABASE=Intracom SA
  
-@@ -3226,6 +3270,9 @@
+@@ -3244,6 +3288,9 @@
  acpi:IKE*:
   ID_VENDOR_FROM_DATABASE=Ikegami Tsushinki Co. Ltd.
  
@@ -206,7 +206,7 @@
  acpi:IKS*:
   ID_VENDOR_FROM_DATABASE=Ikos Systems Inc
  
-@@ -3268,6 +3315,9 @@
+@@ -3286,6 +3333,9 @@
  acpi:IMT*:
   ID_VENDOR_FROM_DATABASE=Inmax Technology Corporation
  
@@ -216,7 +216,7 @@
  acpi:INA*:
   ID_VENDOR_FROM_DATABASE=Inventec Corporation
  
-@@ -3769,6 +3819,9 @@
+@@ -3787,6 +3837,9 @@
  acpi:LAN*:
   ID_VENDOR_FROM_DATABASE=Sodeman Lancom Inc
  
@@ -226,7 +226,7 @@
  acpi:LAS*:
   ID_VENDOR_FROM_DATABASE=LASAT Comm. A/S
  
-@@ -3814,6 +3867,9 @@
+@@ -3832,6 +3885,9 @@
  acpi:LED*:
   ID_VENDOR_FROM_DATABASE=Long Engineering Design Inc
  
@@ -236,7 +236,7 @@
  acpi:LEG*:
   ID_VENDOR_FROM_DATABASE=Legerity, Inc
  
-@@ -3829,6 +3885,9 @@
+@@ -3847,6 +3903,9 @@
  acpi:LGC*:
   ID_VENDOR_FROM_DATABASE=Logic Ltd
  
@@ -246,7 +246,7 @@
  acpi:LGI*:
   ID_VENDOR_FROM_DATABASE=Logitech Inc
  
-@@ -3880,6 +3939,9 @@
+@@ -3898,6 +3957,9 @@
  acpi:LND*:
   ID_VENDOR_FROM_DATABASE=Land Computer Company Ltd
  
@@ -256,7 +256,7 @@
  acpi:LNK*:
   ID_VENDOR_FROM_DATABASE=Link Tech Inc
  
-@@ -3914,7 +3976,7 @@
+@@ -3932,7 +3994,7 @@
   ID_VENDOR_FROM_DATABASE=Design Technology
  
  acpi:LPL*:
@@ -265,7 +265,7 @@
  
  acpi:LSC*:
   ID_VENDOR_FROM_DATABASE=LifeSize Communications
-@@ -4084,6 +4146,9 @@
+@@ -4102,6 +4164,9 @@
  acpi:MCX*:
   ID_VENDOR_FROM_DATABASE=Millson Custom Solutions Inc.
  
@@ -275,7 +275,7 @@
  acpi:MDA*:
   ID_VENDOR_FROM_DATABASE=Media4 Inc
  
-@@ -4312,6 +4377,9 @@
+@@ -4333,6 +4398,9 @@
  acpi:MOM*:
   ID_VENDOR_FROM_DATABASE=Momentum Data Systems
  
@@ -285,7 +285,7 @@
  acpi:MOS*:
   ID_VENDOR_FROM_DATABASE=Moses Corporation
  
-@@ -4534,6 +4602,9 @@
+@@ -4558,6 +4626,9 @@
  acpi:NAL*:
   ID_VENDOR_FROM_DATABASE=Network Alchemy
  
@@ -295,7 +295,7 @@
  acpi:NAT*:
   ID_VENDOR_FROM_DATABASE=NaturalPoint Inc.
  
-@@ -5032,6 +5103,9 @@
+@@ -5062,6 +5133,9 @@
  acpi:PCX*:
   ID_VENDOR_FROM_DATABASE=PC Xperten
  
@@ -305,7 +305,7 @@
  acpi:PDM*:
   ID_VENDOR_FROM_DATABASE=Psion Dacom Plc.
  
-@@ -5095,9 +5169,6 @@
+@@ -5125,9 +5199,6 @@
  acpi:PHE*:
   ID_VENDOR_FROM_DATABASE=Philips Medical Systems Boeblingen GmbH
  
@@ -315,7 +315,7 @@
  acpi:PHL*:
   ID_VENDOR_FROM_DATABASE=Philips Consumer Electronics Company
  
-@@ -5182,9 +5253,6 @@
+@@ -5212,9 +5283,6 @@
  acpi:PNL*:
   ID_VENDOR_FROM_DATABASE=Panelview, Inc.
  
@@ -325,7 +325,7 @@
  acpi:PNR*:
   ID_VENDOR_FROM_DATABASE=Planar Systems, Inc.
  
-@@ -5314,15 +5382,9 @@
+@@ -5350,15 +5418,9 @@
  acpi:PTS*:
   ID_VENDOR_FROM_DATABASE=Plain Tree Systems Inc
  
@@ -341,7 +341,7 @@
  acpi:PVG*:
   ID_VENDOR_FROM_DATABASE=Proview Global Co., Ltd
  
-@@ -5629,9 +5691,6 @@
+@@ -5665,9 +5727,6 @@
  acpi:RTI*:
   ID_VENDOR_FROM_DATABASE=Rancho Tech Inc
  
@@ -351,7 +351,7 @@
  acpi:RTL*:
   ID_VENDOR_FROM_DATABASE=Realtek Semiconductor Company Ltd
  
-@@ -5794,9 +5853,6 @@
+@@ -5830,9 +5889,6 @@
  acpi:SEE*:
   ID_VENDOR_FROM_DATABASE=SeeColor Corporation
  
@@ -361,7 +361,7 @@
  acpi:SEI*:
   ID_VENDOR_FROM_DATABASE=Seitz & Associates Inc
  
-@@ -6247,6 +6303,9 @@
+@@ -6283,6 +6339,9 @@
  acpi:SVD*:
   ID_VENDOR_FROM_DATABASE=SVD Computer
  
@@ -371,7 +371,7 @@
  acpi:SVI*:
   ID_VENDOR_FROM_DATABASE=Sun Microsystems
  
-@@ -6328,6 +6387,9 @@
+@@ -6364,6 +6423,9 @@
  acpi:SZM*:
   ID_VENDOR_FROM_DATABASE=Shenzhen MTC Co., Ltd
  
@@ -381,7 +381,7 @@
  acpi:TAA*:
   ID_VENDOR_FROM_DATABASE=Tandberg
  
-@@ -6418,6 +6480,9 @@
+@@ -6454,6 +6516,9 @@
  acpi:TDG*:
   ID_VENDOR_FROM_DATABASE=Six15 Technologies
  
@@ -391,9 +391,9 @@
  acpi:TDM*:
   ID_VENDOR_FROM_DATABASE=Tandem Computer Europe Inc
  
-@@ -6454,6 +6519,9 @@
+@@ -6496,6 +6561,9 @@
- acpi:TET*:
+ acpi:TEV*:
-  ID_VENDOR_FROM_DATABASE=TETRADYNE CO., LTD.
+  ID_VENDOR_FROM_DATABASE=Televés, S.A.
  
 +acpi:TEX*:
 + ID_VENDOR_FROM_DATABASE=Texas Instruments
@@ -401,7 +401,7 @@
  acpi:TEZ*:
   ID_VENDOR_FROM_DATABASE=Tech Source Inc.
  
-@@ -6568,9 +6636,6 @@
+@@ -6610,9 +6678,6 @@
  acpi:TNC*:
   ID_VENDOR_FROM_DATABASE=TNC Industrial Company Ltd
  
@@ -411,7 +411,7 @@
  acpi:TNM*:
   ID_VENDOR_FROM_DATABASE=TECNIMAGEN SA
  
-@@ -6874,14 +6939,14 @@
+@@ -6916,14 +6981,14 @@
  acpi:UNC*:
   ID_VENDOR_FROM_DATABASE=Unisys Corporation
  
@@ -432,7 +432,7 @@
  
  acpi:UNI*:
   ID_VENDOR_FROM_DATABASE=Uniform Industry Corp.
-@@ -6916,6 +6981,9 @@
+@@ -6958,6 +7023,9 @@
  acpi:USA*:
   ID_VENDOR_FROM_DATABASE=Utimaco Safeware AG
  
@@ -442,7 +442,7 @@
  acpi:USD*:
   ID_VENDOR_FROM_DATABASE=U.S. Digital Corporation
  
-@@ -7144,9 +7212,6 @@
+@@ -7192,9 +7260,6 @@
  acpi:WAL*:
   ID_VENDOR_FROM_DATABASE=Wave Access
  
@@ -452,7 +452,7 @@
  acpi:WAV*:
   ID_VENDOR_FROM_DATABASE=Wavephore
  
-@@ -7265,7 +7330,7 @@
+@@ -7313,7 +7378,7 @@
   ID_VENDOR_FROM_DATABASE=Woxter Technology Co. Ltd
  
  acpi:WYS*:
@@ -461,17 +461,17 @@
  
  acpi:WYT*:
   ID_VENDOR_FROM_DATABASE=Wooyoung Image & Information Co.,Ltd.
-@@ -7279,9 +7344,6 @@
+@@ -7327,9 +7392,6 @@
  acpi:XDM*:
   ID_VENDOR_FROM_DATABASE=XDM Ltd.
  
 -acpi:XER*:
 - ID_VENDOR_FROM_DATABASE=DO NOT USE - XER
 -
- acpi:XFG*:
+ acpi:XES*:
-  ID_VENDOR_FROM_DATABASE=Jan Strapko - FOTO
+  ID_VENDOR_FROM_DATABASE=Extreme Engineering Solutions, Inc.
  
-@@ -7309,9 +7371,6 @@
+@@ -7360,9 +7422,6 @@
  acpi:XNT*:
   ID_VENDOR_FROM_DATABASE=XN Technologies, Inc.
  
@@ -481,7 +481,7 @@
  acpi:XQU*:
   ID_VENDOR_FROM_DATABASE=SHANGHAI SVA-DAV ELECTRONICS CO., LTD
  
-@@ -7378,6 +7437,9 @@
+@@ -7429,6 +7488,9 @@
  acpi:ZBX*:
   ID_VENDOR_FROM_DATABASE=Zebax Technologies
  

hwdb/20-usb-vendor-model.hwdb

@@ -125,6 +125,12 @@ usb:v03DA*
 usb:v03DAp0002*
  ID_MODEL_FROM_DATABASE=HD44780 LCD interface
 
+usb:v03E7*
+ ID_VENDOR_FROM_DATABASE=Intel
+
+usb:v03E7p2150*
+ ID_MODEL_FROM_DATABASE=Myriad VPU [Movidius Neural Compute Stick]
+
 usb:v03E8*
  ID_VENDOR_FROM_DATABASE=EndPoints, Inc.
 
@@ -269,6 +275,9 @@ usb:v03EBp2107*
 usb:v03EBp2109*
  ID_MODEL_FROM_DATABASE=STK541 ZigBee Development Board
 
+usb:v03EBp210A*
+ ID_MODEL_FROM_DATABASE=AT86RF230 [RZUSBSTICK] transceiver
+
 usb:v03EBp210D*
  ID_MODEL_FROM_DATABASE=XPLAIN evaluation kit (CDC ACM)
 
@@ -548,6 +557,9 @@ usb:v03F0p0218*
 usb:v03F0p0221*
  ID_MODEL_FROM_DATABASE=StreamSmart 400 [F2235AA]
 
+usb:v03F0p0223*
+ ID_MODEL_FROM_DATABASE=Digital Drive Flash Reader
+
 usb:v03F0p022A*
  ID_MODEL_FROM_DATABASE=Laserjet CP1525nw
 
@@ -650,6 +662,9 @@ usb:v03F0p0612*
 usb:v03F0p0624*
  ID_MODEL_FROM_DATABASE=Bluetooth Dongle
 
+usb:v03F0p0641*
+ ID_MODEL_FROM_DATABASE=X1200 Optical Mouse
+
 usb:v03F0p0701*
  ID_MODEL_FROM_DATABASE=ScanJet 5300c/5370c
 
@@ -884,6 +899,9 @@ usb:v03F0p1539*
 usb:v03F0p1541*
  ID_MODEL_FROM_DATABASE=Prime [G8X92AA]
 
+usb:v03F0p154A*
+ ID_MODEL_FROM_DATABASE=Laser Mouse
+
 usb:v03F0p1602*
  ID_MODEL_FROM_DATABASE=PhotoSmart 330 series
 
@@ -1526,6 +1544,9 @@ usb:v03F0p5311*
 usb:v03F0p5312*
  ID_MODEL_FROM_DATABASE=Officejet Pro 8500A
 
+usb:v03F0p5317*
+ ID_MODEL_FROM_DATABASE=Color LaserJet CP2025 series
+
 usb:v03F0p5411*
  ID_MODEL_FROM_DATABASE=OfficeJet 4300
 
@@ -1886,6 +1907,9 @@ usb:v03F0pA004*
 usb:v03F0pA011*
  ID_MODEL_FROM_DATABASE=Deskjet 3050A
 
+usb:v03F0pA407*
+ ID_MODEL_FROM_DATABASE=Wireless Optical Comfort Mouse
+
 usb:v03F0pB002*
  ID_MODEL_FROM_DATABASE=PhotoSmart 7200 series
 
@@ -2285,6 +2309,12 @@ usb:v0403pA9A0*
 usb:v0403pABB8*
  ID_MODEL_FROM_DATABASE=Lego Mindstorms NXTCam
 
+usb:v0403pB0C2*
+ ID_MODEL_FROM_DATABASE=iID contactless RFID device
+
+usb:v0403pB0C3*
+ ID_MODEL_FROM_DATABASE=iID contactless RFID device
+
 usb:v0403pB810*
  ID_MODEL_FROM_DATABASE=US Interface Navigator (CAT and 2nd PTT lines)
 
@@ -3284,6 +3314,9 @@ usb:v040B*
 usb:v040Bp0A68*
  ID_MODEL_FROM_DATABASE=Func MS-3 gaming mouse [WT6573F MCU]
 
+usb:v040Bp2367*
+ ID_MODEL_FROM_DATABASE=Human Interface Device [HP CalcPad 200 Calculator and Numeric Keypad]
+
 usb:v040Bp6510*
  ID_MODEL_FROM_DATABASE=Weltrend Bar Code Reader
 
@@ -4235,6 +4268,18 @@ usb:v0421p0105*
 usb:v0421p0106*
  ID_MODEL_FROM_DATABASE=ROM Parent
 
+usb:v0421p010D*
+ ID_MODEL_FROM_DATABASE=E75 (Storage Mode)
+
+usb:v0421p010E*
+ ID_MODEL_FROM_DATABASE=E75 (PC Suite mode)
+
+usb:v0421p010F*
+ ID_MODEL_FROM_DATABASE=E75 (Media transfer mode)
+
+usb:v0421p0110*
+ ID_MODEL_FROM_DATABASE=E75 (Imaging Mode)
+
 usb:v0421p0154*
  ID_MODEL_FROM_DATABASE=5800 XpressMusic (PC Suite mode)
 
@@ -6896,6 +6941,9 @@ usb:v045Ep0737*
 usb:v045Ep0745*
  ID_MODEL_FROM_DATABASE=Nano Transceiver v1.0 for Bluetooth
 
+usb:v045Ep074A*
+ ID_MODEL_FROM_DATABASE=LifeCam VX-500 [1357]
+
 usb:v045Ep0750*
  ID_MODEL_FROM_DATABASE=Wired Keyboard 600
 
@@ -6923,6 +6971,9 @@ usb:v045Ep076C*
 usb:v045Ep076D*
  ID_MODEL_FROM_DATABASE=LifeCam HD-5000
 
+usb:v045Ep0770*
+ ID_MODEL_FROM_DATABASE=LifeCam VX-700
+
 usb:v045Ep0772*
  ID_MODEL_FROM_DATABASE=LifeCam Studio
 
@@ -6938,6 +6989,9 @@ usb:v045Ep0780*
 usb:v045Ep0797*
  ID_MODEL_FROM_DATABASE=Optical Mouse 200
 
+usb:v045Ep0799*
+ ID_MODEL_FROM_DATABASE=Surface Pro embedded keyboard
+
 usb:v045Ep07A5*
  ID_MODEL_FROM_DATABASE=Wireless Receiver 1461C
 
@@ -7104,7 +7158,7 @@ usb:v0461p0A00*
  ID_MODEL_FROM_DATABASE=Micro Innovations Web Cam 320
 
 usb:v0461p4D01*
- ID_MODEL_FROM_DATABASE=Comfort Keyboard
+ ID_MODEL_FROM_DATABASE=Comfort Keyboard / Kensington Orbit Elite
 
 usb:v0461p4D02*
  ID_MODEL_FROM_DATABASE=Mouse-in-a-Box
@@ -7157,6 +7211,9 @@ usb:v0461p4D81*
 usb:v0461p4DE7*
  ID_MODEL_FROM_DATABASE=webcam
 
+usb:v0461p4E04*
+ ID_MODEL_FROM_DATABASE=Lenovo Keyboard KB1021
+
 usb:v0463*
  ID_VENDOR_FROM_DATABASE=MGE UPS Systems
 
@@ -7700,6 +7757,9 @@ usb:v046Dp0A4D*
 usb:v046Dp0A5B*
  ID_MODEL_FROM_DATABASE=G933 Wireless Headset Dongle
 
+usb:v046Dp0A66*
+ ID_MODEL_FROM_DATABASE=[G533 Wireless Headset Dongle]
+
 usb:v046Dp0B02*
  ID_MODEL_FROM_DATABASE=C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)
 
@@ -8216,6 +8276,9 @@ usb:v046DpC31D*
 usb:v046DpC31F*
  ID_MODEL_FROM_DATABASE=Comfort Keyboard K290
 
+usb:v046DpC328*
+ ID_MODEL_FROM_DATABASE=Corded Keyboard K280e
+
 usb:v046DpC332*
  ID_MODEL_FROM_DATABASE=G502 Proteus Spectrum Optical Mouse
 
@@ -9305,6 +9368,9 @@ usb:v0482p0204*
 usb:v0482p0408*
  ID_MODEL_FROM_DATABASE=FS-1320D Printer
 
+usb:v0482p069B*
+ ID_MODEL_FROM_DATABASE=ECOSYS M2635dn
+
 usb:v0483*
  ID_VENDOR_FROM_DATABASE=STMicroelectronics
 
@@ -9695,6 +9761,9 @@ usb:v0499p160F*
 usb:v0499p1613*
  ID_MODEL_FROM_DATABASE=Clavinova CLP535
 
+usb:v0499p1704*
+ ID_MODEL_FROM_DATABASE=Steinberg UR44
+
 usb:v0499p2000*
  ID_MODEL_FROM_DATABASE=DGP-7
 
@@ -10962,7 +11031,7 @@ usb:v04A9p2603*
  ID_MODEL_FROM_DATABASE=MultiPASS C755
 
 usb:v04A9p260A*
- ID_MODEL_FROM_DATABASE=CAPT Printer
+ ID_MODEL_FROM_DATABASE=LBP810
 
 usb:v04A9p260E*
  ID_MODEL_FROM_DATABASE=LBP-2000
@@ -10977,7 +11046,7 @@ usb:v04A9p2612*
  ID_MODEL_FROM_DATABASE=MultiPASS C855
 
 usb:v04A9p2617*
- ID_MODEL_FROM_DATABASE=CAPT Printer
+ ID_MODEL_FROM_DATABASE=LBP1210
 
 usb:v04A9p261A*
  ID_MODEL_FROM_DATABASE=iR1600
@@ -11142,13 +11211,13 @@ usb:v04A9p2673*
  ID_MODEL_FROM_DATABASE=iR 3170C EUR
 
 usb:v04A9p2674*
- ID_MODEL_FROM_DATABASE=L120
+ ID_MODEL_FROM_DATABASE=FAX-L120
 
 usb:v04A9p2675*
  ID_MODEL_FROM_DATABASE=iR2830
 
 usb:v04A9p2676*
- ID_MODEL_FROM_DATABASE=CAPT Device
+ ID_MODEL_FROM_DATABASE=LBP2900
 
 usb:v04A9p2677*
  ID_MODEL_FROM_DATABASE=iR C2570
@@ -11180,6 +11249,9 @@ usb:v04A9p2687*
 usb:v04A9p2688*
  ID_MODEL_FROM_DATABASE=LBP3460
 
+usb:v04A9p2689*
+ ID_MODEL_FROM_DATABASE=FAX-L180/L380S/L398S
+
 usb:v04A9p268C*
  ID_MODEL_FROM_DATABASE=iR C6870
 
@@ -11213,6 +11285,9 @@ usb:v04A9p26DA*
 usb:v04A9p26E6*
  ID_MODEL_FROM_DATABASE=iR1024
 
+usb:v04A9p271A*
+ ID_MODEL_FROM_DATABASE=LBP6000
+
 usb:v04A9p2736*
  ID_MODEL_FROM_DATABASE=I-SENSYS MF4550d
 
@@ -12143,6 +12218,9 @@ usb:v04A9p32B1*
 usb:v04A9p32B2*
  ID_MODEL_FROM_DATABASE=PowerShot G9 X
 
+usb:v04A9p32B4*
+ ID_MODEL_FROM_DATABASE=EOS Rebel T6
+
 usb:v04A9p32BB*
  ID_MODEL_FROM_DATABASE=EOS M5
 
@@ -13526,6 +13604,12 @@ usb:v04C5p1150*
 usb:v04C5p125A*
  ID_MODEL_FROM_DATABASE=PalmSecure Sensor Device - MP
 
+usb:v04C5p200F*
+ ID_MODEL_FROM_DATABASE=Sigma DP2 (Mass Storage)
+
+usb:v04C5p2010*
+ ID_MODEL_FROM_DATABASE=Sigma DP2 (PictBridge)
+
 usb:v04C5p201D*
  ID_MODEL_FROM_DATABASE=SATA 3.0 6Gbit/s Adaptor [GROOVY]
 
@@ -13841,6 +13925,9 @@ usb:v04CBp01C0*
 usb:v04CBp01C1*
  ID_MODEL_FROM_DATABASE=FinePix F31fd (PTP)
 
+usb:v04CBp01C3*
+ ID_MODEL_FROM_DATABASE=FinePix S5 Pro
+
 usb:v04CBp01C4*
  ID_MODEL_FROM_DATABASE=FinePix S5700 Zoom (PTP)
 
@@ -13880,6 +13967,12 @@ usb:v04CBp0241*
 usb:v04CBp0278*
  ID_MODEL_FROM_DATABASE=FinePix JV300
 
+usb:v04CBp02C5*
+ ID_MODEL_FROM_DATABASE=FinePix S9900W Digital Camera (PTP)
+
+usb:v04CBp5006*
+ ID_MODEL_FROM_DATABASE=ASK-300
+
 usb:v04CC*
  ID_VENDOR_FROM_DATABASE=ST-Ericsson
 
@@ -14177,6 +14270,9 @@ usb:v04D9pA050*
 usb:v04D9pA055*
  ID_MODEL_FROM_DATABASE=Keyboard
 
+usb:v04D9pA096*
+ ID_MODEL_FROM_DATABASE=Keyboard
+
 usb:v04D9pA09F*
  ID_MODEL_FROM_DATABASE=E-Signal LUOM G10 Mechanical Gaming Mouse
 
@@ -14186,6 +14282,9 @@ usb:v04D9pA100*
 usb:v04D9pA11B*
  ID_MODEL_FROM_DATABASE=Mouse [MX-3200]
 
+usb:v04D9pE002*
+ ID_MODEL_FROM_DATABASE=MCU
+
 usb:v04DA*
  ID_VENDOR_FROM_DATABASE=Panasonic (Matsushita)
 
@@ -15644,6 +15743,9 @@ usb:v04F2pB107*
 usb:v04F2pB14C*
  ID_MODEL_FROM_DATABASE=CNF8050 Webcam
 
+usb:v04F2pB159*
+ ID_MODEL_FROM_DATABASE=CNF8243 Webcam
+
 usb:v04F2pB15C*
  ID_MODEL_FROM_DATABASE=Sony Vaio Integrated Camera
 
@@ -15737,6 +15839,9 @@ usb:v04F3p000A*
 usb:v04F3p0103*
  ID_MODEL_FROM_DATABASE=ActiveJet K-2024 Multimedia Keyboard
 
+usb:v04F3p016F*
+ ID_MODEL_FROM_DATABASE=Touchscreen
+
 usb:v04F3p01A4*
  ID_MODEL_FROM_DATABASE=Wireless Keyboard
 
@@ -15902,6 +16007,9 @@ usb:v04F9p002D*
 usb:v04F9p0039*
  ID_MODEL_FROM_DATABASE=HL-5340 series
 
+usb:v04F9p0041*
+ ID_MODEL_FROM_DATABASE=HL-2250DN Laser Printer
+
 usb:v04F9p0042*
  ID_MODEL_FROM_DATABASE=HL-2270DW Laser Printer
 
@@ -16463,6 +16571,9 @@ usb:v04F9p021D*
 usb:v04F9p021E*
  ID_MODEL_FROM_DATABASE=DCP-9010CN
 
+usb:v04F9p021F*
+ ID_MODEL_FROM_DATABASE=DCP-8085DN
+
 usb:v04F9p0220*
  ID_MODEL_FROM_DATABASE=MFC-9010CN
 
@@ -16535,6 +16646,9 @@ usb:v04F9p0240*
 usb:v04F9p0248*
  ID_MODEL_FROM_DATABASE=DCP-7055 scanner/printer
 
+usb:v04F9p024E*
+ ID_MODEL_FROM_DATABASE=MFC-7460DN
+
 usb:v04F9p0253*
  ID_MODEL_FROM_DATABASE=DCP-J125
 
@@ -16592,6 +16706,9 @@ usb:v04F9p026E*
 usb:v04F9p026F*
  ID_MODEL_FROM_DATABASE=MFC-J270W
 
+usb:v04F9p0270*
+ ID_MODEL_FROM_DATABASE=MFC-7360N
+
 usb:v04F9p0273*
  ID_MODEL_FROM_DATABASE=DCP-7057 scanner/printer
 
@@ -17285,6 +17402,9 @@ usb:v04F9p2028*
 usb:v04F9p202B*
  ID_MODEL_FROM_DATABASE=PT-7600 P-touch Label Printer
 
+usb:v04F9p2041*
+ ID_MODEL_FROM_DATABASE=PT-2730 P-touch Label Printer
+
 usb:v04F9p2061*
  ID_MODEL_FROM_DATABASE=PT-P700 P-touch Label Printer
 
@@ -18428,6 +18548,9 @@ usb:v0547p2750*
 usb:v0547p2810*
  ID_MODEL_FROM_DATABASE=Cypress ATAPI Bridge
 
+usb:v0547p4018*
+ ID_MODEL_FROM_DATABASE=AmScope MU1803
+
 usb:v0547p4D90*
  ID_MODEL_FROM_DATABASE=AmScope MD1900 camera
 
@@ -19016,6 +19139,9 @@ usb:v054Cp06C3*
 usb:v054Cp07C4*
  ID_MODEL_FROM_DATABASE=ILCE-6000 (aka Alpha-6000) in Mass Storage mode
 
+usb:v054Cp0847*
+ ID_MODEL_FROM_DATABASE=WG-C10 Portable Wireless Server
+
 usb:v054Cp088C*
  ID_MODEL_FROM_DATABASE=Portable Headphone Amplifier
 
@@ -19934,6 +20060,12 @@ usb:v056Ap0357*
 usb:v056Ap0358*
  ID_MODEL_FROM_DATABASE=PTH-860 [Intuos Pro (L)]
 
+usb:v056Ap035A*
+ ID_MODEL_FROM_DATABASE=DTH-1152 tablet
+
+usb:v056Ap0368*
+ ID_MODEL_FROM_DATABASE=DTH-1152 touchscreen
+
 usb:v056Ap0400*
  ID_MODEL_FROM_DATABASE=PenPartner 4x5
 
@@ -19994,6 +20126,9 @@ usb:v056E*
 usb:v056Ep0002*
  ID_MODEL_FROM_DATABASE=29UO Mouse
 
+usb:v056Ep0057*
+ ID_MODEL_FROM_DATABASE=M-PGDL Mouse
+
 usb:v056Ep0072*
  ID_MODEL_FROM_DATABASE=Mouse
 
@@ -24941,6 +25076,9 @@ usb:v0657*
 usb:v0658*
  ID_VENDOR_FROM_DATABASE=Sigma Designs, Inc.
 
+usb:v0658p0200*
+ ID_MODEL_FROM_DATABASE=Aeotec Z-Stick Gen5 (ZW090) - UZB
+
 usb:v0659*
  ID_VENDOR_FROM_DATABASE=Aethra
 

hwdb/60-evdev.hwdb

@@ -161,10 +161,10 @@ evdev:name:AlpsPS/2 ALPS DualPoint TouchPad:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLati
 
 # Dell Latitude E7470
 evdev:name:AlpsPS/2 ALPS DualPoint TouchPad:dmi:bvn*:bvr*:bd*:svnDellInc.:pnLatitudeE7470*
- EVDEV_ABS_00=39:5856:59
+ EVDEV_ABS_00=29:2930:30
- EVDEV_ABS_01=10:1532:29
+ EVDEV_ABS_01=26:1533:29
- EVDEV_ABS_35=39:5856:59
+ EVDEV_ABS_35=29:2930:30
- EVDEV_ABS_36=10:1532:29
+ EVDEV_ABS_36=26:1533:29
 
 # Dell Precision 5510
 evdev:name:SynPS/2 Synaptics TouchPad:dmi:bvn*:bvr*:bd*:svnDellInc.:pnPrecision5510*

hwdb/60-input-id.hwdb

@@ -0,0 +1,64 @@
+# This file is part of systemd.
+#
+# The lookup keys are composed in:
+#   60-input-id.rules
+#
+# Note: The format of the "input-id:" prefix match key is a
+# contract between the rules file and the hardware data, it might
+# change in later revisions to support more or better matches, it
+# is not necessarily expected to be a stable ABI.
+#
+# Match string formats:
+# id-input:modalias:<modalias>
+#
+# To add local entries, create a new file
+#   /etc/udev/hwdb.d/61-input-id-local.hwdb
+# and add your rules there. To load the new rules execute (as root):
+#   systemd-hwdb update
+#   udevadm trigger /dev/input/eventXX
+# where /dev/input/eventXX is the device in question. If in
+# doubt, simply use /dev/input/event* to reload all input rules.
+#
+# If your changes are generally applicable, preferably send them as a pull
+# request to
+#   https://github.com/systemd/systemd
+# or create a bug report on https://github.com/systemd/systemd/issues and
+# include your new rules, a description of the device, and the output of
+#   udevadm info /dev/input/eventXX.
+#
+# This file must only be used where the input_id builtin assigns the wrong
+# properties or lacks the assignment of some properties. This is almost
+# always caused by a device not adhering to the standard of the device's
+# type.
+#
+# Allowed properties are:
+#    ID_INPUT
+#    ID_INPUT_ACCELEROMETER, ID_INPUT_MOUSE,
+#    ID_INPUT_POINTINGSTICK, ID_INPUT_TOUCHSCREEN, ID_INPUT_TOUCHPAD,
+#    ID_INPUT_TABLET, ID_INPUT_TABLET_PAD, ID_INPUT_JOYSTICK, ID_INPUT_KEY,
+#    ID_INPUT_KEYBOARD, ID_INPUT_SWITCH, ID_INPUT_TRACKBALL
+#
+#    ID_INPUT
+#       * MUST be set when ANY of ID_INPUT_* is set
+#       * MUST be unset when ALL of ID_INPUT_*  are unset
+#
+#    ID_INPUT_TABLET
+#       * MUST be set when setting ID_INPUT_TABLET_PAD
+#
+# Allowed values are 1 and 0 to set or unset, repsectively.
+#
+# NOT allowed in this file are:
+#    ID_INPUT_WIDTH_MM, ID_INPUT_HEIGHT_MM, ID_INPUT_TOUCHPAD_INTEGRATION
+#
+
+# Example:
+# id-input:modalias:input:b0003v1234pABCD*
+#  ID_INPUT_TOUCHPAD=1
+#  ID_INPUT=1
+
+# Sort by brand, model
+
+# UC-Logic TABLET 1060N Pad
+id-input:modalias:input:b0003v5543p0081*
+ ID_INPUT_TABLET=1
+ ID_INPUT_TABLET_PAD=1

hwdb/60-sensor.hwdb

@@ -38,12 +38,22 @@
 #
 # [1]: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dfc57732ad38f93ae6232a3b4e64fd077383a0f1
 #
+# Note for devices where the display (LCD panel) is mounted non upright
+# in the device's casing, e.g. mounted upside-down or 90 degree rotated,
+# the ACCEL_MOUNT_MATRIX should be such that the x and y axis matches the
+# x and y axis of the display, not those of the casing, so that desktop
+# environments using the accelerometer data for rotation will e.g.
+# automatically flip their output for an upside-down display when the device
+# is held upright.
 #
 # Sort by brand, model
 
 #########################################
 # Acer
 #########################################
+sensor:modalias:acpi:INVN6500*:dmi:*svn*Acer*:*pn*AspireSW5-012*
+ ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
+
 sensor:modalias:acpi:BMA250E*:dmi:*:svnAcer:pnIconiaW1-810:*
  ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
 
@@ -62,6 +72,12 @@ sensor:modalias:acpi:INVN6500*:dmi:*svn*ASUSTeK*:*pn*TP300LD*
 sensor:modalias:acpi:SMO8500*:dmi:*svn*ASUSTeK*:*pn*TP300LJ*
  ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
 
+#########################################
+# Axxo
+#########################################
+sensor:modalias:acpi:SMO8500*:dmi:*:svnStandard:pnWCBT1011:*
+ ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, 1, 0; 0, 0, 1
+
 #########################################
 # Chuwi
 #########################################
@@ -78,6 +94,13 @@ sensor:modalias:acpi:BOSC0200*:dmi:*:svnHampoo:pnX1D3_C806N:*
 sensor:modalias:acpi:KIOX000A*:dmi:svnChuwi*:pnHi13
  ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
 
+# Chuwi HiBook
+# Chuwi HiBook does not have its product name filled, so we
+# match the entire dmi-alias, assuming that the use of a BOSC0200 +
+# bios-version + bios-date combo is unique
+sensor:modalias:acpi:BOSC0200*:dmi:bvnAmericanMegatrendsInc.:bvr5.11:bd05/07/2016:svnDefaultstring:pnDefaultstring:pvrDefaultstring:rvnHampoo:rnCherryTrailCR:rvrDefaultstring:cvnDefaultstring:ct3:cvrDefaultstring:
+ ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
+
 #########################################
 # Cube
 #########################################
@@ -100,7 +123,7 @@ sensor:modalias:acpi:ACCE0001*:dmi:*svnEndless*:*pnELT-NL3*
 # GP-electronic
 #########################################
 sensor:modalias:acpi:KIOX000A*:dmi:bvnINSYDECorp.:bvrBYT70A.YNCHENG.WIN.007:*:svnInsyde:pnT701:*
- ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
+ ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
 
 #########################################
 # HP
@@ -110,6 +133,7 @@ sensor:modalias:platform:lis3lv02d:dmi:*svn*Hewlett-Packard*:*pn*HPEliteBook8560
   ACCEL_MOUNT_MATRIX=1, 0, 0; 0, 0, -1; 0, 1, 0
 
 sensor:modalias:acpi:SMO8500*:dmi:*:svnHewlett-Packard:pnHPStream7Tablet:*
+sensor:modalias:acpi:SMO8500*:dmi:*:svnHewlett-Packard:pnHPStream8Tablet:*
   ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
 
 #########################################
@@ -145,6 +169,9 @@ sensor:modalias:acpi:KIOX000A*:dmi:*svnLAMINA:pnT-1016BNORD*
 sensor:modalias:acpi:NCPE0388*:dmi:*:rnLenovoYOGA510-14IKB:*
  ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, -1, 0; 0, 0, 1
 
+sensor:modalias:acpi:BOSC0200:BOSC0200:dmi:*ThinkPadYoga11e3rdGen*
+ ACCEL_MOUNT_MATRIX=0, 1, 0; -1, 0, 0; 0, 0, 1
+
 #########################################
 # Peaq
 #########################################
@@ -184,4 +211,3 @@ sensor:modalias:acpi:BMA250*:dmi:*:bvrTREK.G.WI71C.JGBMRBA*:*:svnInsyde:pnST7041
 #########################################
 sensor:modalias:acpi:*KIOX000A*:dmi:*svn*CytrixTechnology:*pn*Complex11t*
  ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, 1, 0; 0, 0, 1
-

hwdb/70-mouse.hwdb

@@ -451,6 +451,15 @@ mouse:usb:v046dp4041:name:Logitech MX Master:
  MOUSE_WHEEL_CLICK_COUNT=24
  MOUSE_WHEEL_CLICK_COUNT_HORIZONTAL=14
 
+# Logitech MX Master 2s
+# Horiz wheel has 14 stops, angle is rounded up
+mouse:usb:v046dp4069:name:Logitech MX Master 2s:
+ MOUSE_DPI=1000@125
+ MOUSE_WHEEL_CLICK_ANGLE=15
+ MOUSE_WHEEL_CLICK_ANGLE_HORIZONTAL=26
+ MOUSE_WHEEL_CLICK_COUNT=24
+ MOUSE_WHEEL_CLICK_COUNT_HORIZONTAL=14
+
 # Logitech MK260 Wireless Combo Receiver aka M-R0011
 mouse:usb:v046dpc52e:name:Logitech USB Receiver:
  MOUSE_DPI=1000@200

hwdb/70-touchpad.hwdb

@@ -36,27 +36,15 @@
 
 touchpad:i8042:*
 touchpad:rmi:*
+touchpad:usb:*
  ID_INPUT_TOUCHPAD_INTEGRATION=internal
 
 touchpad:bluetooth:*
-touchpad:usb:*
  ID_INPUT_TOUCHPAD_INTEGRATION=external
 
-###########################################################
-# Apple
-###########################################################
-touchpad:usb:v05ac*
- ID_INPUT_TOUCHPAD_INTEGRATION=internal
-
 ###########################################################
 # Wacom
 ###########################################################
 touchpad:usb:v056a*
  ID_INPUT_TOUCHPAD_INTEGRATION=external
 
-###########################################################
-# Microsoft (Surface Type Covers)
-###########################################################
-touchpad:usb:v045ep07*
- ID_INPUT_TOUCHPAD_INTEGRATION=internal
- 

hwdb/acpi_id_registry.html

@@ -83,6 +83,8 @@
  <tr class="odd"><td>Coreboot Project</td><td>BOOT</td><td>02/28/2017</td> </tr>
  <tr class="even"><td>Marvell Technology Group Ltd.</td><td>MRVL</td><td>05/25/2017</td> </tr>
  <tr class="odd"><td>IHSE GmbH</td><td>IHSE</td><td>06/22/2017</td> </tr>
+ <tr class="even"><td>Insyde Software</td><td>INSY</td><td>11/10/2017</td> </tr>
+ <tr class="odd"><td>Nexstgo Company Limited</td><td>NXGO</td><td>11/13/2017</td> </tr>
       </tbody>
     </table>
   </body>

hwdb/ids_parser.py

@@ -344,17 +344,17 @@ if __name__ == '__main__':
     args = sys.argv[1:]
 
     if not args or 'usb' in args:
-        p = usb_ids_grammar().parseFile(open('usb.ids'))
+        p = usb_ids_grammar().parseFile(open('usb.ids', errors='replace'))
         usb_vendor_model(p)
         usb_classes(p)
 
     if not args or 'pci' in args:
-        p = pci_ids_grammar().parseFile(open('pci.ids'))
+        p = pci_ids_grammar().parseFile(open('pci.ids', errors='replace'))
         pci_vendor_model(p)
         pci_classes(p)
 
     if not args or 'sdio' in args:
-        p = pci_ids_grammar().parseFile(open('sdio.ids'))
+        p = pci_ids_grammar().parseFile(open('sdio.ids', errors='replace'))
         sdio_vendor_model(p)
         sdio_classes(p)
 

hwdb/ma-medium.txt

@@ -1718,9 +1718,6 @@ F00000-FFFFFF     (base 16)		Private
 90-C6-82   (hex)		Private
 F00000-FFFFFF     (base 16)		Private
 
-98-02-D8   (hex)		Private
-F00000-FFFFFF     (base 16)		Private
-
 D0-76-50   (hex)		Private
 F00000-FFFFFF     (base 16)		Private
 
@@ -2003,6 +2000,105 @@ F00000-FFFFFF     (base 16)		Private
 				NishiTokyo-city  Tokyo  202-0022
 				JP
 
+9C-43-1E   (hex)		HK ELEPHONE Communication Tech Co.,Limited
+D00000-DFFFFF     (base 16)		HK ELEPHONE Communication Tech Co.,Limited
+				Unit 04, 7/F Bright Way Tower No.33 Mong Kok Rd KL
+				Hong Kong     999077
+				HK
+
+9C-43-1E   (hex)		Wireless Environment, LLC
+400000-4FFFFF     (base 16)		Wireless Environment, LLC
+				600 Beta Drive Unit 100 Mayfield Village, OH 44143,US
+				Mayfield Village  OH  44143
+				US
+
+28-2C-02   (hex)		ThirdReality, Inc
+B00000-BFFFFF     (base 16)		ThirdReality, Inc
+				647 East Longhua Road, Huangpu District
+				Shanghai  Shanghai  200023
+				CN
+
+9C-43-1E   (hex)		HAESUNG DS
+200000-2FFFFF     (base 16)		HAESUNG DS
+				8F, Haesung 2 Building, 508, Teheran-ro, Gangnam-gu
+				Seoul    06178
+				KR
+
+28-2C-02   (hex)		Tokin Limited
+A00000-AFFFFF     (base 16)		Tokin Limited
+				Unit 513-4, Block A, Focal Industrial Centre, 21 Man Lok Street, Hung Hom
+				Kowloon    0000
+				HK
+
+F0-41-C8   (hex)		Shenzhen Medica Technology Development Co., Ltd.
+200000-2FFFFF     (base 16)		Shenzhen Medica Technology Development Co., Ltd.
+				2F Building A, Tongfang Information Harbor, No.11, East Langshan Road, Nanshan District
+				Shenzhen    518000
+				CN
+
+C4-FF-BC   (hex)		Danego BV
+000000-0FFFFF     (base 16)		Danego BV
+				Protonenlaan 24
+				Uden  NB  5405 NE
+				NL
+
+C4-FF-BC   (hex)		Critical Link
+700000-7FFFFF     (base 16)		Critical Link
+				6712 Brooklawn  Parkway
+				Syracuse    13211
+				US
+
+A4-DA-22   (hex)		Klashwerks Inc.
+B00000-BFFFFF     (base 16)		Klashwerks Inc.
+				441 Maclaren Street, Suite 408
+				Ottawa  ON  K2P2H3
+				CA
+
+88-A9-A7   (hex)		Sieper Lüdenscheid GmbH & Co. KG
+600000-6FFFFF     (base 16)		Sieper Lüdenscheid GmbH & Co. KG
+				Schlittenbacher Straße 60
+				Lüdenscheid    58511
+				DE
+
+98-02-D8   (hex)		Private
+F00000-FFFFFF     (base 16)		Private
+
+C4-FF-BC   (hex)		KyongBo Electric Co., Ltd.
+C00000-CFFFFF     (base 16)		KyongBo Electric Co., Ltd.
+				5, Seongsuil-ro 12-gagil Seongdong-gu
+				Seoul    04792
+				KR
+
+C4-FF-BC   (hex)		ShenZhen ZYT Technology co., Ltd
+800000-8FFFFF     (base 16)		ShenZhen ZYT Technology co., Ltd
+				Floor four,Build C,FuSen Industrial park, HangCheng Avenue,Baoan District
+				Shenzhen  GuangDong  518000
+				CN
+
+DC-E5-33   (hex)		SAN Engineering
+700000-7FFFFF     (base 16)		SAN Engineering
+				434-31 UTO Korea BD. 4F
+				Seongnam-si Jungwon-gu  Gyunggi-do  13230
+				KR
+
+DC-E5-33   (hex)		Suzhou ATES electronic technology co.LTD
+D00000-DFFFFF     (base 16)		Suzhou ATES electronic technology co.LTD
+				NO.2 aimin road,Xiangcheng district
+				 Suzhou city  Jiangsu Province  215002
+				CN
+
+88-A9-A7   (hex)		Zhejiang Haoteng Electronic Technology Co.,Ltd.
+A00000-AFFFFF     (base 16)		Zhejiang Haoteng Electronic Technology Co.,Ltd.
+				Zhejiang Lishui city streets Nanming mountain Shek road Liandu District No. 268 Building 2 block B
+				Lishui  Zhejiang  323000
+				CN
+
+F0-41-C8   (hex)		LINPA ACOUSTIC TECHNOLOGY CO.,LTD 
+000000-0FFFFF     (base 16)		LINPA ACOUSTIC TECHNOLOGY CO.,LTD 
+				2A,No60 , Lizhong Road,DaliQingxi Town
+				Dongguan  Guandong  523648
+				CN
+
 1C-87-76   (hex)		Strone Technology
 C00000-CFFFFF     (base 16)		Strone Technology
 				13 Ellis Street
@@ -3944,6 +4040,123 @@ F8-B5-68   (hex)		CloudMinds (Shenzhen) Holdings Co., Ltd
 10-07-23   (hex)		Private
 F00000-FFFFFF     (base 16)		Private
 
+28-2C-02   (hex)		LLC MICROTEH
+500000-5FFFFF     (base 16)		LLC MICROTEH
+				pl.5 bldg.2/3 Akademika Anokhina str. 
+				Moscow    119602
+				RU
+
+9C-43-1E   (hex)		Wunda Group plc
+800000-8FFFFF     (base 16)		Wunda Group plc
+				Unit 1-5, Hawthorn, Crick
+				Caldicot  Monmouthshire  NP26 5UT
+				GB
+
+9C-43-1E   (hex)		Advanced Logic Technology (ALT) sa
+300000-3FFFFF     (base 16)		Advanced Logic Technology (ALT) sa
+				Route de Niederpallen, 30H
+				Redange-sur-Attert  Luxembourg  8506
+				LU
+
+C4-FF-BC   (hex)		GSM Innovations Pty Ltd
+900000-9FFFFF     (base 16)		GSM Innovations Pty Ltd
+				142-144 Fullarton Road
+				Rose Park  SA  5067
+				AU
+
+C4-FF-BC   (hex)		SHENZHEN KALIF ELECTRONICS CO.,LTD
+300000-3FFFFF     (base 16)		SHENZHEN KALIF ELECTRONICS CO.,LTD
+				1、2 and 3 Floor, No.114, Haochong No.2 Industry Area, Hongxing Community, Songgang, Baoan, Shenzhen 
+				SHENZHEN  GuangDong  518105
+				CN
+
+C4-FF-BC   (hex)		Beijing  KDF information technology co. LTD.
+D00000-DFFFFF     (base 16)		Beijing  KDF information technology co. LTD.
+				Room14C,TowerA,,LindaBuilding,No.8,Dongtucheng Road,Chaoyang District, Beijing.
+				Beijing    100013
+				CN
+
+9C-43-1E   (hex)		Optris GmbH
+700000-7FFFFF     (base 16)		Optris GmbH
+				Ferdinand-Buisson-Str. 14
+				Berlin    13127
+				DE
+
+C4-FF-BC   (hex)		viRaTec GmbH
+E00000-EFFFFF     (base 16)		viRaTec GmbH
+				Phorusgasse 8/1
+				Wien    1040
+				AT
+
+DC-E5-33   (hex)		Controls Inc
+500000-5FFFFF     (base 16)		Controls Inc
+				5204 Portside Drive
+				Medina  OH  44256
+				US
+
+C4-FF-BC   (hex)		Shenzhen C & D Electronics Co., Ltd.
+600000-6FFFFF     (base 16)		Shenzhen C & D Electronics Co., Ltd.
+				9th FIoor, Building 9, No.1 Qingxiang road, BaoNeng Science and TechnoIogy Industrial Park, Longhua New District
+				ShenZhen  GuangDong  518000
+				CN
+
+DC-E5-33   (hex)		FLYHT Aerospace
+000000-0FFFFF     (base 16)		FLYHT Aerospace
+				300E 1144 - 29th St. N.E.
+				Calgary  AB  T2E7P1
+				CA
+
+DC-E5-33   (hex)		Private
+A00000-AFFFFF     (base 16)		Private
+
+A4-DA-22   (hex)		Shen Zhen City YaKun Electronics Co., Ltd
+D00000-DFFFFF     (base 16)		Shen Zhen City YaKun Electronics Co., Ltd
+				SOUTHERN BUILDING 5388 Shang Bu  Industrial Zone Huaqiang North Road Futian District
+				shen zhen city  Guang Dong Province  518000
+				CN
+
+A4-DA-22   (hex)		Abetechs GmbH
+A00000-AFFFFF     (base 16)		Abetechs GmbH
+				Niermannsweg 11
+				Erkrath   North Rhine-Westphalia  40699
+				DE
+
+A4-DA-22   (hex)		T2T System
+100000-1FFFFF     (base 16)		T2T System
+				#316, HYUNDAI Knowledge Industry Center, 70, Dusan-ro
+				Geumcheon-gu  Seoul  08584
+				KR
+
+A4-DA-22   (hex)		Quuppa Oy
+E00000-EFFFFF     (base 16)		Quuppa Oy
+				Keilaranta 1
+				Espoo    02150
+				FI
+
+88-A9-A7   (hex)		AndroVideo Inc.
+C00000-CFFFFF     (base 16)		AndroVideo Inc.
+				2f-4, 17, Lane 91, Nei Hu Rd., Sec. 1
+				Taipei    11441
+				TW
+
+F0-41-C8   (hex)		Shenzhen  Nufilo Electronic Technology Co., Ltd.
+900000-9FFFFF     (base 16)		Shenzhen  Nufilo Electronic Technology Co., Ltd.
+				Tianliao Building West Unit F1315, (New Materials Industrial Park),  Xueyuan Road,  Nanshan District
+				Shenzhen   Guangdong  518055
+				CN
+
+F0-41-C8   (hex)		SHENZHEN WISEWING INTERNET TECHNOLOGY CO.,LTD
+300000-3FFFFF     (base 16)		SHENZHEN WISEWING INTERNET TECHNOLOGY CO.,LTD
+				No.826,Zone 1,Block B,Famous industrial product display purchasing center,Baoyuan Road,Xixiang,Bao'an Dis., Shenzhen,P.R.China
+				shenzhen  China  518102
+				CN
+
+F0-41-C8   (hex)		 Shanghai Think-Force Electronic Technology Co. Ltd
+C00000-CFFFFF     (base 16)		 Shanghai Think-Force Electronic Technology Co. Ltd
+				North ZhongShan Road, No. 3000, Room 2608
+				Shanghai    200000
+				CN
+
 1C-87-76   (hex)		Zhuhai MYZR Technology Co.,Ltd
 500000-5FFFFF     (base 16)		Zhuhai MYZR Technology Co.,Ltd
 				Room 302,Area D2,National Hi-tech Zone,NO.1,Software Park Road
@@ -6005,6 +6218,156 @@ F8-B5-68   (hex)		Combiwins Technology Co.,Limited
 				Chennai  Tamilnadu  600035
 				IN
 
+28-2C-02   (hex)		SHENZHEN DOMENOR TECHNOLOGY LLC
+D00000-DFFFFF     (base 16)		SHENZHEN DOMENOR TECHNOLOGY LLC
+				F4, BUILDING A3, SILICON VALLEY POWER TECHNOLOGY PARK, SILI ROAD, KUKENG COMMUNITY, GUANLAN TOWN,LONGHUA DISTRICT
+				SHENZHEN  GUANGDONG  518110
+				CN
+
+9C-43-1E   (hex)		Symfun Telecom Ltd
+100000-1FFFFF     (base 16)		Symfun Telecom Ltd
+				Floor 4 Building 11 Xi Qi Dian Jia Yuan
+				Beijing    100083
+				CN
+
+9C-43-1E   (hex)		Antailiye Technology Co.,Ltd
+000000-0FFFFF     (base 16)		Antailiye Technology Co.,Ltd
+				7/F,Zhengjiyuan Buiding,2 Road,Qianjing, Xixiang, Baoan District,Shenzhen
+				SHEN ZHEN  GUANGDONG  518000
+				CN
+
+9C-43-1E   (hex)		ST Access Control System Corp.
+A00000-AFFFFF     (base 16)		ST Access Control System Corp.
+				3F., No. 111 Zhongzheng Rd., Banciao Dist., New Taipei City
+				New Taipei City    22054
+				TW
+
+C4-FF-BC   (hex)		Mobiletron Electronics Co., Ltd
+200000-2FFFFF     (base 16)		Mobiletron Electronics Co., Ltd
+				85, Sec.4, Chung-Ching Rd., Ta-Ya District
+				Taichung    428
+				TW
+
+C4-FF-BC   (hex)		iMageTech CO.,LTD.
+400000-4FFFFF     (base 16)		iMageTech CO.,LTD.
+				5F., No.16, Lane 15, Sec. 6, Mincyuan E. Rd., Neihu District,
+				TAIPEI    114
+				TW
+
+C4-FF-BC   (hex)		KAGA ELECTRONICS CO.,LTD.
+B00000-BFFFFF     (base 16)		KAGA ELECTRONICS CO.,LTD.
+				20 Kandamatsunaga-cho
+				Chiyoda-ku  TOKYO  101-8627
+				JP
+
+C4-FF-BC   (hex)		comtime GmbH
+500000-5FFFFF     (base 16)		comtime GmbH
+				Gutenbergring 22
+				Norderstedt    22848
+				US
+
+DC-E5-33   (hex)		Tintel Hongkong Co.Ltd
+B00000-BFFFFF     (base 16)		Tintel Hongkong Co.Ltd
+				FLAT C,23/F,LUCKY PLAZA,315-321 LOCKHART ROAD,WANCHAI,HONGKONG
+				HONGKONG  GUANG DONG PROVINCE  999077
+				HK
+
+DC-E5-33   (hex)		JB-Lighting Lichtanlagen GmbH
+800000-8FFFFF     (base 16)		JB-Lighting Lichtanlagen GmbH
+				Sallersteig 15
+				89134    89134
+				DE
+
+DC-E5-33   (hex)		Giant Power Technology Biomedical Corporation
+E00000-EFFFFF     (base 16)		Giant Power Technology Biomedical Corporation
+				Rm201, 2nd Educational Building, No. 84, Gongzhuan Rd, Taishan Dist
+				New Taipei City    24301
+				TW
+
+DC-E5-33   (hex)		shenzhen bangying electronics co,.ltd
+400000-4FFFFF     (base 16)		shenzhen bangying electronics co,.ltd
+				3/F Building 16,Hongfa industrialPark,Tangtou Shiyan Town
+				shenzhen  guangdong  518000
+				CN
+
+A4-DA-22   (hex)		AURANEXT
+600000-6FFFFF     (base 16)		AURANEXT
+				202 quai de clichy
+				CLICHY    92110
+				FR
+
+A4-DA-22   (hex)		Wyze Labs Inc
+200000-2FFFFF     (base 16)		Wyze Labs Inc
+				 22522 29TH DR SE L101
+				BOTHELL  WA  98021
+				US
+
+A4-DA-22   (hex)		LORIOT AG
+400000-4FFFFF     (base 16)		LORIOT AG
+				Zuercherstrasse 68
+				Thalwil  Zürich  8800
+				CH
+
+A4-DA-22   (hex)		DURATECH Enterprise,LLC
+300000-3FFFFF     (base 16)		DURATECH Enterprise,LLC
+				NO.1013,184,Gasan digital 2-ro,Geumcheon-gu,Seoul
+				Seoul    08501
+				KR
+
+A4-DA-22   (hex)		EHO.LINK
+C00000-CFFFFF     (base 16)		EHO.LINK
+				5 Avenue de Saint Menet, Imm. Axiome, Bat. B
+				Marseille    13011
+				FR
+
+A4-DA-22   (hex)		General Electric Company
+000000-0FFFFF     (base 16)		General Electric Company
+				Valle del Cedro #1551
+				Ciudad Juarez  Chih  32575
+				MX
+
+88-A9-A7   (hex)		Mikroelektronika
+300000-3FFFFF     (base 16)		Mikroelektronika
+				Batajnicki drum 23
+				Belgrade    11186
+				RS
+
+88-A9-A7   (hex)		kimura giken corporation
+700000-7FFFFF     (base 16)		kimura giken corporation
+				4-9-19 kamiyoga
+				Setagaya-ku  Tokyo  158-0098
+				JP
+
+88-A9-A7   (hex)		FlashForge Corporation
+900000-9FFFFF     (base 16)		FlashForge Corporation
+				 No.518, Xianyuan Road
+				Jinhua  Zhejiang  321000
+				CN
+
+88-A9-A7   (hex)		Thomas & Darden, Inc
+400000-4FFFFF     (base 16)		Thomas & Darden, Inc
+				916 Springdale Rd Bldg 4 #104
+				Austin    78702
+				US
+
+88-A9-A7   (hex)		Impact Distribution
+E00000-EFFFFF     (base 16)		Impact Distribution
+				Ter Heidelaan 50a
+				Aarschot    3200
+				BE
+
+88-A9-A7   (hex)		Honeywell spol. s.r.o. HTS CZ o.z. 
+200000-2FFFFF     (base 16)		Honeywell spol. s.r.o. HTS CZ o.z. 
+				Turanka 100/1387 
+				Brno    62700
+				CZ
+
+88-A9-A7   (hex)		Solaredge LTD.
+100000-1FFFFF     (base 16)		Solaredge LTD.
+				Hamada 1
+				Herzelia    4673335
+				IL
+
 1C-87-76   (hex)		Hekatron Vertriebs GmbH
 B00000-BFFFFF     (base 16)		Hekatron Vertriebs GmbH
 				Brühlmatten 9
@@ -7889,21 +8252,12 @@ F00000-FFFFFF     (base 16)		Private
 58-FC-DB   (hex)		Private
 F00000-FFFFFF     (base 16)		Private
 
-2C-26-5F   (hex)		Private
-F00000-FFFFFF     (base 16)		Private
-
-28-FD-80   (hex)		Private
-F00000-FFFFFF     (base 16)		Private
-
 2C-D1-41   (hex)		Private
 F00000-FFFFFF     (base 16)		Private
 
 2C-6A-6F   (hex)		Private
 F00000-FFFFFF     (base 16)		Private
 
-A0-BB-3E   (hex)		Private
-F00000-FFFFFF     (base 16)		Private
-
 BC-66-41   (hex)		Private
 F00000-FFFFFF     (base 16)		Private
 
@@ -8075,6 +8429,57 @@ D00000-DFFFFF     (base 16)		NOX Systems AG
 				Moscow    107258
 				RU
 
+28-2C-02   (hex)		Shenzhen Neoway Technology Co.,Ltd.
+800000-8FFFFF     (base 16)		Shenzhen Neoway Technology Co.,Ltd.
+				4F-2#,Lian Jian Science & Industry Park,Huarong Road,Dalang Street,Longhua District
+				Shenzhen  Guangdong  518000
+				CN
+
+C4-FF-BC   (hex)		VISATECH C0., LTD.
+100000-1FFFFF     (base 16)		VISATECH C0., LTD.
+				C-312 168, Gasan digital 1-ro
+				 Geumcheon-gu   Seoul  08507
+				KR
+
+DC-E5-33   (hex)		Tiertime Corporation
+900000-9FFFFF     (base 16)		Tiertime Corporation
+				2398 Walsh Avenue
+				Santa Clara  CA  95051
+				US
+
+A4-DA-22   (hex)		Hydro Electronic Devices, Inc.
+700000-7FFFFF     (base 16)		Hydro Electronic Devices, Inc.
+				2120 Constitution Ave
+				Hartford  WI  53027
+				US
+
+2C-26-5F   (hex)		Private
+F00000-FFFFFF     (base 16)		Private
+
+28-FD-80   (hex)		Private
+F00000-FFFFFF     (base 16)		Private
+
+A0-BB-3E   (hex)		Private
+F00000-FFFFFF     (base 16)		Private
+
+F0-41-C8   (hex)		ATN Media Group FZ LLC
+D00000-DFFFFF     (base 16)		ATN Media Group FZ LLC
+				Business Bay-alabrj st Business Towar By Damac.office-807
+				Dubai    25051
+				AE
+
+F0-41-C8   (hex)		XI'AN MEI SHANG MEI WIRELESS TECHNOLOGY.Co., Ltd.
+500000-5FFFFF     (base 16)		XI'AN MEI SHANG MEI WIRELESS TECHNOLOGY.Co., Ltd.
+				Xi'an Beilin District Yanta Middle Road No. 17A XIN QING YA YUAN 2-5C
+				XI'AN  shanxi  710000
+				CN
+
+F0-41-C8   (hex)		AED Engineering GmbH
+600000-6FFFFF     (base 16)		AED Engineering GmbH
+				Taunusstr. 51
+				Munich  Bavaria  80807
+				DE
+
 34-D0-B8   (hex)		Kongqiguanjia (Beijing)Technology co.，ltd
 E00000-EFFFFF     (base 16)		Kongqiguanjia (Beijing)Technology co.，ltd
 				Room 1201,Block A，Building of Fesco，Xidawang Road，Chaoyang district
@@ -8147,6 +8552,66 @@ F8-B5-68   (hex)		Beijing Wanji Techonology Co., Ltd.
 				beijing  beijing  100193
 				CN
 
+28-2C-02   (hex)		Dexin Digital Technology Corp. Ltd.
+300000-3FFFFF     (base 16)		Dexin Digital Technology Corp. Ltd.
+				No.10 and 12, Wuxing Fourth Road,Wuhou District Chengdu 610045 Sichuan, PR China
+				chengdu  Sichuan  610045
+				CN
+
+9C-43-1E   (hex)		ProMOS Technologies Inc.
+500000-5FFFFF     (base 16)		ProMOS Technologies Inc.
+				3A3, No.1, Lixing 1st Rd., East Dist.,
+				Hsinchu City  Taiwan  300
+				TW
+
+DC-E5-33   (hex)		Ambi Labs Limited
+100000-1FFFFF     (base 16)		Ambi Labs Limited
+				1903, 19/F, Loon Lee Building, 267-275 Des Voeux Road Central., Sheung Wan, Hong Kong
+				Hong Kong  Hong Kong  00000
+				HK
+
+DC-E5-33   (hex)		Remko GmbH & Co. KG
+200000-2FFFFF     (base 16)		Remko GmbH & Co. KG
+				Im Seelenkamp 12
+				Lage    32791
+				DE
+
+A4-DA-22   (hex)		SolidPro Technology Corporation
+800000-8FFFFF     (base 16)		SolidPro Technology Corporation
+				10F.-1, No.150, Jian 1st Rd.
+				Zhonghe Dist.  New Taipei City  23511
+				TW
+
+A4-DA-22   (hex)		Original Products Pvt. Ltd.
+500000-5FFFFF     (base 16)		Original Products Pvt. Ltd.
+				B-19, Shiv Park, School Road, Khanpur 
+				New Delhi  New Delhi  110062
+				IN
+
+88-A9-A7   (hex)		Shenzhenshi kechuangzhixian technology Co.LTD
+000000-0FFFFF     (base 16)		Shenzhenshi kechuangzhixian technology Co.LTD
+				Room 14G,14th Floor, Langshi Building , keji South Road 12 , High-tech Industrial Park , Nanshan District
+				Shenzhen    518000
+				CN
+
+88-A9-A7   (hex)		TWK-ELEKTRONIK
+B00000-BFFFFF     (base 16)		TWK-ELEKTRONIK
+				Heinrichstr. 85
+				Duesseldorf    40239
+				DE
+
+88-A9-A7   (hex)		psb intralogistics GmbH
+800000-8FFFFF     (base 16)		psb intralogistics GmbH
+				Blocksbergstrasse 145
+				Pirmasens    66955
+				DE
+
+F0-41-C8   (hex)		Nanchang BlackShark Co.,Ltd.
+700000-7FFFFF     (base 16)		Nanchang BlackShark Co.,Ltd.
+				Room 319, Jiaoqiao Town Office Building, Economic and Technical development zone, Nanchang City, Jiangxi Province.
+				Nanchang    330013
+				CN
+
 1C-87-74   (hex)		Philips Personal Health Solutions
 000000-0FFFFF     (base 16)		Philips Personal Health Solutions
 				High Tech Campus, HTC37 floor 0
@@ -10150,3 +10615,93 @@ F00000-FFFFFF     (base 16)		Private
 
 0C-EF-AF   (hex)		Private
 F00000-FFFFFF     (base 16)		Private
+
+28-2C-02   (hex)		EFENTO T P SZYDŁOWSKI K ZARĘBA SPÓŁKA JAWNA
+400000-4FFFFF     (base 16)		EFENTO T P SZYDŁOWSKI K ZARĘBA SPÓŁKA JAWNA
+				Dietla 93/6
+				Kraków    31-031
+				PL
+
+28-2C-02   (hex)		Capintec, Inc.
+E00000-EFFFFF     (base 16)		Capintec, Inc.
+				7 Vreeland Road
+				Florham Park  NJ  07932
+				US
+
+9C-43-1E   (hex)		R-S-I Elektrotechnik GmbH  CO KG
+600000-6FFFFF     (base 16)		R-S-I Elektrotechnik GmbH  CO KG
+				Woelkestrasse 11
+				Schweitenkirchen    85276
+				DE
+
+9C-43-1E   (hex)		CONTINENT Co. Ltd
+900000-9FFFFF     (base 16)		CONTINENT Co. Ltd
+				Bumazhnaya st., 16/3 lit B, of. 414
+				Saint-Petersburg    190020
+				RU
+
+9C-43-1E   (hex)		SuZhou Jinruiyang Information Technology CO.,LTD
+C00000-CFFFFF     (base 16)		SuZhou Jinruiyang Information Technology CO.,LTD
+				NO.1003 Room A1 Buliding Tengfei Business Park in Suzhou Industrial Park.
+				Suzhou  Jiangsu  215123
+				CN
+
+9C-43-1E   (hex)		JNL Technologies Inc
+B00000-BFFFFF     (base 16)		JNL Technologies Inc
+				W1205 Industrial Dr
+				Ixonia  WI  53036
+				US
+
+9C-43-1E   (hex)		Midas Technology DBA Phoenix Audio Technologies
+E00000-EFFFFF     (base 16)		Midas Technology DBA Phoenix Audio Technologies
+				16 Goodyear #120
+				Irvine  CA  92618
+				US
+
+C4-FF-BC   (hex)		Advanced Navigation
+A00000-AFFFFF     (base 16)		Advanced Navigation
+				Level 8, 37 Pitt Street
+				Sydney  NSW  2000
+				AU
+
+DC-E5-33   (hex)		ShenZhen C&D Electronics CO.Ltd.
+300000-3FFFFF     (base 16)		ShenZhen C&D Electronics CO.Ltd.
+				9th FIoor, Building 9, No.1 Qingxiang road, BaoNeng Science and TechnoIogy Industrial Park,  Longhua New District
+				ShenZhen  GuangDong  518000
+				CN
+
+DC-E5-33   (hex)		WECAN Solution Inc.
+600000-6FFFFF     (base 16)		WECAN Solution Inc.
+				71, Yulhadong-ro 8-gil, Dong-gu, Daegu, Republic of Korea
+				Daegu    41102
+				KR
+
+DC-E5-33   (hex)		BRCK
+C00000-CFFFFF     (base 16)		BRCK
+				PO Box 58275-00200, 2nd Floor Bishop Magua Center, George Padmore Lane, 2nd Floor Bishop Magua Center, George Padmore Lane
+				Nairobi  Nairobi  00200
+				KE
+
+A4-DA-22   (hex)		Malldon Technology Limited
+900000-9FFFFF     (base 16)		Malldon Technology Limited
+				607 Longsheng Technology Building, Longhua Dist
+				Shenzhen  Guangdong  518000
+				CN
+
+88-A9-A7   (hex)		AVLINK INDUSTRIAL CO., LTD
+D00000-DFFFFF     (base 16)		AVLINK INDUSTRIAL CO., LTD
+				7/F, A1 Bldg, 1st Shuichanjingwan Industrial Park, Nanchang Village, Gushu, Bao'an Dist 
+				Shenzhen  Guangdong  518126
+				CN
+
+88-A9-A7   (hex)		Volterman Inc.
+500000-5FFFFF     (base 16)		Volterman Inc.
+				Suite B2, Sunset Lake Road
+				Newark  DE  19702
+				US
+
+F0-41-C8   (hex)		Powervault Ltd
+B00000-BFFFFF     (base 16)		Powervault Ltd
+				29 Shand Street, London Bridge
+				London    SE1 2ES
+				GB

hwdb/ma-small.txt

@@ -620,12 +620,6 @@ F78000-F78FFF     (base 16)		Manvish eTech Pvt. Ltd.
 				SUMIDA-KU  TOKYO  1300026
 				JP
 
-70-B3-D5   (hex)		Vtron Pty Ltd
-341000-341FFF     (base 16)		Vtron Pty Ltd
-				Unit 6, 59 Township Drive
-				West Burleigh  Queensland  4219
-				AU
-
 70-B3-D5   (hex)		Peek Traffic
 875000-875FFF     (base 16)		Peek Traffic
 				2906 Corporate Way
@@ -2777,6 +2771,150 @@ B6C000-B6CFFF     (base 16)		GHM-Messtechnik GmbH (Standort IMTRON)
 				Kraków    31-031
 				PL
 
+70-B3-D5   (hex)		KST technology
+351000-351FFF     (base 16)		KST technology
+				KST B/D 4-5, Wiryeseong-daero 12-gil
+				Songpa-gu  Seoul  05636
+				KR
+
+70-B3-D5   (hex)		Vtron Pty Ltd
+15D000-15DFFF     (base 16)		Vtron Pty Ltd
+				Unit 2, 62 Township Drive West
+				West Burleigh  Queensland  4219
+				AU
+
+70-B3-D5   (hex)		Vtron Pty Ltd
+341000-341FFF     (base 16)		Vtron Pty Ltd
+				Unit 2, 62 Township Drive West
+				West Burleigh  Queensland  4219
+				AU
+
+70-B3-D5   (hex)		Kunshan excellent Intelligent Technology Co., Ltd.
+BE4000-BE4FFF     (base 16)		Kunshan excellent Intelligent Technology Co., Ltd.
+				Room 2002 Site B Modern Square No 8 Wei yi Road 
+				kunshan  Jiangsu Province   215301
+				CN
+
+70-B3-D5   (hex)		YUYAMA MFG Co.,Ltd
+E86000-E86FFF     (base 16)		YUYAMA MFG Co.,Ltd
+				3-3-1
+				TOYONAKASHI  OSAKA  561-0841
+				JP
+
+70-B3-D5   (hex)		QUANTAFLOW
+6EB000-6EBFFF     (base 16)		QUANTAFLOW
+				AVENUE DU CANADA
+				HONFLEUR    14600
+				FR
+
+70-B3-D5   (hex)		FLUDIA
+4A0000-4A0FFF     (base 16)		FLUDIA
+				4T rue honoré d'estienne d'orves
+				Suresnes    92150
+				FR
+
+70-B3-D5   (hex)		OLEDCOMM
+A43000-A43FFF     (base 16)		OLEDCOMM
+				10-12 avenue de l'Europe
+				Vélizy Villacoublay  Ile de France  78140
+				FR
+
+70-B3-D5   (hex)		Peter Huber Kaeltemaschinenbau AG
+D7B000-D7BFFF     (base 16)		Peter Huber Kaeltemaschinenbau AG
+				Werner-von-Siemens-Str. 1
+				Offenburg  Ba-Wue  77656
+				DE
+
+70-B3-D5   (hex)		TORGOVYY DOM  TEHNOLOGIY LLC
+7C0000-7C0FFF     (base 16)		TORGOVYY DOM  TEHNOLOGIY LLC
+				The village of Rumyantsevo,  Build.1
+				Moscow  Moscow  142784
+				RU
+
+70-B3-D5   (hex)		Cardinal Health
+75E000-75EFFF     (base 16)		Cardinal Health
+				444 McDonnell Blvd.
+				Hazelwood  MO  63042
+				US
+
+70-B3-D5   (hex)		Matrix Orbital Corporation
+2B7000-2B7FFF     (base 16)		Matrix Orbital Corporation
+				Suite 602, 4774 Westwinds Dr NE
+				Calgary  Alberta  T3J 0L7
+				CA
+
+70-B3-D5   (hex)		Stone Three
+7BF000-7BFFFF     (base 16)		Stone Three
+				24 Gardner Williams Ave
+				Somerset West  Western Cape  7130
+				ZA
+
+70-B3-D5   (hex)		Transas Marine Limited
+304000-304FFF     (base 16)		Transas Marine Limited
+				10 Eastgate Avenue, Eastgate Business Park
+				Little Island, Cork    0
+				IE
+
+70-B3-D5   (hex)		MonsoonRF, Inc.
+0F3000-0F3FFF     (base 16)		MonsoonRF, Inc.
+				7740 Garvey Ave, Unit D
+				Rosemead  CA  91770
+				US
+
+70-B3-D5   (hex)		SHINWA INDUSTRIES, INC.
+F87000-F87FFF     (base 16)		SHINWA INDUSTRIES, INC.
+				Daisan Nishi-Aoyama Bldg. 6F 1-8-1 Shibuya
+				Shibuya-ku  Tokyo  150-0002
+				JP
+
+70-B3-D5   (hex)		AmTote Australasia
+DAA000-DAAFFF     (base 16)		AmTote Australasia
+				Unit3, 28 LeightonPlace.
+				HORNSBY  NSW  2077
+				AU
+
+70-B3-D5   (hex)		EA Elektroautomatik GmbH & Co. KG
+743000-743FFF     (base 16)		EA Elektroautomatik GmbH & Co. KG
+				Helmholtzstraße 31-33
+				Viersen  NRW  41747
+				DE
+
+70-B3-D5   (hex)		MB connect line GmbH Fernwartungssysteme
+08A000-08AFFF     (base 16)		MB connect line GmbH Fernwartungssysteme
+				Winnettener Straße 6
+				Dinkelsbuehl  Bavaria  91550
+				DE
+
+70-B3-D5   (hex)		Prisma Telecom Testing Srl
+689000-689FFF     (base 16)		Prisma Telecom Testing Srl
+				Via Petrocchi, 4
+				Milano  MI  20127
+				IT
+
+70-B3-D5   (hex)		Plantiga Technologies Inc
+525000-525FFF     (base 16)		Plantiga Technologies Inc
+				324-611 Alexander Street
+				Vancouver  British Columbia  V6A 1E1
+				CA
+
+70-B3-D5   (hex)		Krontech
+6E9000-6E9FFF     (base 16)		Krontech
+				I.T.U ARI 3 Teknokent Kron Telekomunikasyon, Maslak
+				Istanbul    34467
+				TR
+
+70-B3-D5   (hex)		TRIDENT INFOSOL PVT LTD
+C8F000-C8FFFF     (base 16)		TRIDENT INFOSOL PVT LTD
+				NO1A , KUSHAL GARDEN , PEENYA INDUSTRIAL AREA
+				BANGALORE    560058
+				IN
+
+70-B3-D5   (hex)		Zamir Recognition Systems Ltd.
+981000-981FFF     (base 16)		Zamir Recognition Systems Ltd.
+				Manachat Tech Park 1/22
+				Jerusalem    96951
+				IL
+
 70-B3-D5   (hex)		Flintab AB
 D60000-D60FFF     (base 16)		Flintab AB
 				Kabelvägen 4
@@ -5582,6 +5720,171 @@ FF9000-FF9FFF     (base 16)		InOut Communication Systems
 				Udiner  UD  33100
 				IT
 
+70-B3-D5   (hex)		Neuron GmbH
+E1B000-E1BFFF     (base 16)		Neuron GmbH
+				Badenerstrasse 9
+				Brugg    5200
+				CH
+
+70-B3-D5   (hex)		HAVELSAN A.Ş.
+096000-096FFF     (base 16)		HAVELSAN A.Ş.
+				Mustafa Kemal Mah. 2120.Cad. No.39                   
+				ANKARA    06510 
+				TR
+
+70-B3-D5   (hex)		YG COMPANY CO., LTD
+63F000-63FFFF     (base 16)		YG COMPANY CO., LTD
+				65, Techno 3-ro
+				Daejeon  Yuseong-gu  34016
+				KR
+
+70-B3-D5   (hex)		Selex ES Inc.
+F5E000-F5EFFF     (base 16)		Selex ES Inc.
+				4221 Tudor Lane
+				Greensboro  NC  27410
+				US
+
+70-B3-D5   (hex)		DIMASTEC GESTAO DE PONTO E ACESSO EIRELI-ME
+F8F000-F8FFFF     (base 16)		DIMASTEC GESTAO DE PONTO E ACESSO EIRELI-ME
+				Praça Rotary Club, 355
+				Ribeirão Preto  São Paulo  14021-355
+				BR
+
+70-B3-D5   (hex)		Savari Inc
+207000-207FFF     (base 16)		Savari Inc
+				2005 De la cruz blvd, st 111,
+				santa clara  CA  95050
+				US
+
+70-B3-D5   (hex)		QIAGEN Instruments AG
+A29000-A29FFF     (base 16)		QIAGEN Instruments AG
+				Garstligweg 8
+				Hombrechtikon  Zurich  8634
+				CH
+
+70-B3-D5   (hex)		ONDEMAND LABORATORY Co., Ltd.
+069000-069FFF     (base 16)		ONDEMAND LABORATORY Co., Ltd.
+				Daiba 449 Space 369 Building 2F
+				Mishima  Shizuoka  411-0803
+				JP
+
+70-B3-D5   (hex)		EPSOFT Co., Ltd
+A3A000-A3AFFF     (base 16)		EPSOFT Co., Ltd
+				301, Bupyeong-daero, Bupyeong-gu
+				Incheon    21315
+				KR
+
+70-B3-D5   (hex)		Emergency Lighting Products Limited
+480000-480FFF     (base 16)		Emergency Lighting Products Limited
+				Gillmans Industrial Estate, Natts Lane
+				Billingshurst    RH14 9EZ
+				GB
+
+70-B3-D5   (hex)		CSM MACHINERY srl
+FE3000-FE3FFF     (base 16)		CSM MACHINERY srl
+				Via Cadore Mare, 25
+				Cimetta di Codognè  Treviso  31013
+				IT
+
+70-B3-D5   (hex)		X-Laser LLC
+711000-711FFF     (base 16)		X-Laser LLC
+				9125 Whiskey Bottom Rd Ste A
+				Laurel  MD  20723
+				US
+
+70-B3-D5   (hex)		GS Elektromedizinsiche Geräte G. Stemple GmbH
+144000-144FFF     (base 16)		GS Elektromedizinsiche Geräte G. Stemple GmbH
+				Hauswiesenstr. 26
+				Kaufering  Bayern  86916
+				DE
+
+70-B3-D5   (hex)		NESA SRL
+BFA000-BFAFFF     (base 16)		NESA SRL
+				Via Sartori, 6/8
+				Vidor  Treviso  31020
+				IT
+
+70-B3-D5   (hex)		Renesas Electronics
+340000-340FFF     (base 16)		Renesas Electronics
+				2801 Scott Blvd
+				Santa Clara  CA  95050
+				US
+
+70-B3-D5   (hex)		AEM Singapore Pte. Ltd.
+AC1000-AC1FFF     (base 16)		AEM Singapore Pte. Ltd.
+				52 Serangoon North Ave 4
+				Singapore  Singapore  555853
+				SG
+
+70-B3-D5   (hex)		Planewave Instruments
+CB4000-CB4FFF     (base 16)		Planewave Instruments
+				1819 Kona Dr.
+				Compton  CA  90220
+				US
+
+70-B3-D5   (hex)		Avionica 
+611000-611FFF     (base 16)		Avionica 
+				9941 West Jessamine St
+				Miami   FL  33157 
+				US
+
+70-B3-D5   (hex)		ELDES
+9A0000-9A0FFF     (base 16)		ELDES
+				Ukmerges 283B
+				Vilnius    06313
+				LT
+
+70-B3-D5   (hex)		Intesens
+B17000-B17FFF     (base 16)		Intesens
+				425 rue Jean Rostand
+				labege    31670
+				FR
+
+70-B3-D5   (hex)		Avant Technologies, Inc
+410000-410FFF     (base 16)		Avant Technologies, Inc
+				Road 156 Caguas West Ind. Park bldg 39
+				Caguas  PR  00726
+				US
+
+70-B3-D5   (hex)		Lab241 Co.,Ltd.
+21B000-21BFFF     (base 16)		Lab241 Co.,Ltd.
+				25Dong 241Ho, 97, Siheung-daero, Geumcheon-gu
+				Seoul  Seoul  08639
+				KR
+
+70-B3-D5   (hex)		HEITEC AG
+228000-228FFF     (base 16)		HEITEC AG
+				Dr.-Otto-Leich-Str. 16
+				Eckental  Bavaria  90542
+				DE
+
+70-B3-D5   (hex)		Alere Technologies AS
+2AE000-2AEFFF     (base 16)		Alere Technologies AS
+				Kjelsaasveien 161
+				Oslo  Oslo  0382
+				NO
+
+70-B3-D5   (hex)		Insitu, Inc
+B3B000-B3BFFF     (base 16)		Insitu, Inc
+				118 E Columbia River Way
+				Bingen  WA  98605
+				US
+
+70-B3-D5   (hex)		MatchX GmbH
+1CB000-1CBFFF     (base 16)		MatchX GmbH
+				Adalbert Str.8
+				Berlin    10999
+				DE
+
+70-B3-D5   (hex)		Metrum Sweden AB
+F98000-F98FFF     (base 16)		Metrum Sweden AB
+				Anders Personsgatan 16
+				Goteborg    41664
+				SE
+
+70-B3-D5   (hex)		Private
+DE9000-DE9FFF     (base 16)		Private
+
 70-B3-D5   (hex)		Schildknecht AG
 494000-494FFF     (base 16)		Schildknecht AG
 				Haugweg 26
@@ -7328,18 +7631,6 @@ AE7000-AE7FFF     (base 16)		E-T-A Elektrotechnische Apparate GmbH
 				Altdorf    90518
 				DE
 
-70-B3-D5   (hex)		Vtron Pty Ltd
-400000-400FFF     (base 16)		Vtron Pty Ltd
-				Unit 2, 62 Township Drive
-				Australia  Queensland  4219
-				AU
-
-70-B3-D5   (hex)		Vtron Pty Ltd
-E0F000-E0FFFF     (base 16)		Vtron Pty Ltd
-				Unit 6, 59 Township Drive
-				West Burleigh  Queensland  4219
-				AU
-
 70-B3-D5   (hex)		DSP4YOU LTd
 12F000-12FFFF     (base 16)		DSP4YOU LTd
 				Unit 1204, 106 How Ming Street
@@ -7784,12 +8075,6 @@ FFC000-FFCFFF     (base 16)		Symetrics Industries d.b.a. Extant Aerospace
 				Montoire sur le Loir  Loir et Cher  41800
 				FR
 
-70-B3-D5   (hex)		Vtron Pty Ltd
-B2B000-B2BFFF     (base 16)		Vtron Pty Ltd
-				Unit 2, 62 Township Drive
-				West Burleigh  Queensland  4219
-				AU
-
 70-B3-D5   (hex)		RJ45 Technologies
 9D0000-9D0FFF     (base 16)		RJ45 Technologies
 				7, rue Roland Martin
@@ -8039,12 +8324,6 @@ C14000-C14FFF     (base 16)		Grupo Epelsa S.L.
 				Alcala de Henares  Madrid  28805
 				ES
 
-70-B3-D5   (hex)		SENSO2ME bvba
-631000-631FFF     (base 16)		SENSO2ME bvba
-				Zandhoef  16
-				KASTERLEE  België  2460
-				BE
-
 70-B3-D5   (hex)		S Labs sp. z o.o.
 C53000-C53FFF     (base 16)		S Labs sp. z o.o.
 				Jasnogórska, 44
@@ -8294,6 +8573,120 @@ CFE000-CFEFFF     (base 16)		Secturion Systems
 				Centerville  UT  84014
 				US
 
+70-B3-D5   (hex)		Shenzhen INVT Electric Co.,Ltd
+1D0000-1D0FFF     (base 16)		Shenzhen INVT Electric Co.,Ltd
+				 INVT Bldg., GaoFa Scientific Park, Longjing, Nanshan, Shenzhen.
+				Shenzhen  Guangdong  518055
+				CN
+
+70-B3-D5   (hex)		Vtron Pty Ltd
+400000-400FFF     (base 16)		Vtron Pty Ltd
+				Unit 2, 62 Township Drive West
+				West Burleigh  Queensland  4219
+				AU
+
+70-B3-D5   (hex)		Vtron Pty Ltd
+B2B000-B2BFFF     (base 16)		Vtron Pty Ltd
+				Unit 2, 62 Township Drive West
+				West Burleigh  Queensland  4219
+				AU
+
+70-B3-D5   (hex)		Vtron Pty Ltd
+E0F000-E0FFFF     (base 16)		Vtron Pty Ltd
+				Unit 2, 62 Township Drive West
+				West Burleigh  Queensland  4219
+				AU
+
+70-B3-D5   (hex)		KRONOTECH SRL
+8C8000-8C8FFF     (base 16)		KRONOTECH SRL
+				VIALE UNGHERIA 125
+				UDINE  ITALY/UDINE  33100
+				IT
+
+70-B3-D5   (hex)		Particle sizing systems
+670000-670FFF     (base 16)		Particle sizing systems
+				8203 Kristel Cir
+				New Port Richey  FL  34652
+				US
+
+70-B3-D5   (hex)		Grupo Epelsa S.L.
+4E1000-4E1FFF     (base 16)		Grupo Epelsa S.L.
+				C/ Punto Net,3
+				Alcala de Henares  Madrid  28805
+				ES
+
+70-B3-D5   (hex)		Waterkotte GmbH
+7EA000-7EAFFF     (base 16)		Waterkotte GmbH
+				Gewerkenstr. 15
+				Herne    44628
+				DE
+
+70-B3-D5   (hex)		Imecon Engineering SrL
+5E3000-5E3FFF     (base 16)		Imecon Engineering SrL
+				via Gerola 13/15
+				Fiesco  CR  26010
+				IT
+
+70-B3-D5   (hex)		ELBIT SYSTEMS BMD AND LAND EW - ELISRA LTD
+24F000-24FFFF     (base 16)		ELBIT SYSTEMS BMD AND LAND EW - ELISRA LTD
+				Hamerchava 29
+				holon    58101
+				IL
+
+70-B3-D5   (hex)		HiDes, Inc.
+837000-837FFF     (base 16)		HiDes, Inc.
+				6F, No.86, Baozhong Rd., Xindian Dist.,
+				New Taipei City  New Taipei City  23144
+				TW
+
+70-B3-D5   (hex)		OptoPrecision GmbH
+4F9000-4F9FFF     (base 16)		OptoPrecision GmbH
+				Auf der Höhe 15
+				Bremen  Bremen  28357
+				DE
+
+70-B3-D5   (hex)		OSUNG LST CO.,LTD.
+B64000-B64FFF     (base 16)		OSUNG LST CO.,LTD.
+				#433-31, Sandong-ro, Eumbong-myeon
+				Asan-si  Chungcheongnam-do  31418
+				KR
+
+70-B3-D5   (hex)		Impulse Automation
+7A3000-7A3FFF     (base 16)		Impulse Automation
+				Obuhovskoy Oborony 120-B
+				Saint Petersburg  Saint Petersburg  192012
+				RU
+
+70-B3-D5   (hex)		SENSO2ME 
+631000-631FFF     (base 16)		SENSO2ME 
+				Zandhoef  16
+				KASTERLEE  België  2460
+				BE
+
+70-B3-D5   (hex)		Infodev Electronic Designers Intl.
+DBF000-DBFFFF     (base 16)		Infodev Electronic Designers Intl.
+				1995 rue Frank-Carrel Suite 202
+				Quebec  Quebec  G1N4H9
+				CA
+
+70-B3-D5   (hex)		SENSO2ME 
+F7A000-F7AFFF     (base 16)		SENSO2ME 
+				Zandhoef  16
+				KASTERLEE  België  2460
+				BE
+
+70-B3-D5   (hex)		KOSMEK.Ltd
+BB9000-BB9FFF     (base 16)		KOSMEK.Ltd
+				Murodani 2-1-5, Nishi-ku
+				Kobe-City  Hyogo Pref.  6512241
+				JP
+
+70-B3-D5   (hex)		Quantum Opus, LLC
+602000-602FFF     (base 16)		Quantum Opus, LLC
+				45211 Helm St
+				Plymouth  MI  48170
+				US
+
 70-B3-D5   (hex)		Innitive B.V.
 66B000-66BFFF     (base 16)		Innitive B.V.
 				Brouwerijstraat 20
@@ -9902,12 +10295,6 @@ B44000-B44FFF     (base 16)		ENTEC Electric & Electronic Co., LTD.
 				London     NW1 5QP 
 				GB
 
-70-B3-D5   (hex)		Vtron Pty Ltd
-3EF000-3EFFFF     (base 16)		Vtron Pty Ltd
-				Unit 6, 59 Township Drive
-				West Burleigh  Queensland  4219
-				AU
-
 70-B3-D5   (hex)		Morgan Schaffer Inc.
 7C2000-7C2FFF     (base 16)		Morgan Schaffer Inc.
 				8300 rue St-Patrick bureau 150
@@ -10925,6 +11312,54 @@ BA2000-BA2FFF     (base 16)		MAMAC Systems, Inc.
 				Chanhassen    55317-8002
 				US
 
+70-B3-D5   (hex)		Vtron Pty Ltd
+3EF000-3EFFFF     (base 16)		Vtron Pty Ltd
+				Unit 2, 62 Township Drive West
+				West Burleigh  Queensland  4219
+				AU
+
+70-B3-D5   (hex)		ELVA-1 MICROWAVE HANDELSBOLAG
+FA3000-FA3FFF     (base 16)		ELVA-1 MICROWAVE HANDELSBOLAG
+				c/o Hornlund, Kungsgatan 54
+				Furulund    244 62
+				SE
+
+70-B3-D5   (hex)		Collini Dienstleistungs GmbH
+C67000-C67FFF     (base 16)		Collini Dienstleistungs GmbH
+				Schweizerstr. 59
+				Hohenems    A 6845
+				AT
+
+70-B3-D5   (hex)		Richard Paul Russell Ltd
+98B000-98BFFF     (base 16)		Richard Paul Russell Ltd
+				The Lodge, Unit 1 Barnes Farm Business Park
+				Milford on Sea  Hampshire  SO41 0AP
+				GB
+
+70-B3-D5   (hex)		Association Romandix
+AEB000-AEBFFF     (base 16)		Association Romandix
+				rue de Sebeillon 9b
+				Lausanne  Vaud  1004
+				CH
+
+70-B3-D5   (hex)		Special Services Group, LLC
+0F8000-0F8FFF     (base 16)		Special Services Group, LLC
+				PO Box 825
+				Denair  CA  95316
+				US
+
+70-B3-D5   (hex)		Divigraph (Pty) LTD
+A86000-A86FFF     (base 16)		Divigraph (Pty) LTD
+				 Postnet Suite 72, Private Bag X7
+				Chempet    7442
+				ZA
+
+70-B3-D5   (hex)		Tunstall A/S
+A17000-A17FFF     (base 16)		Tunstall A/S
+				Niels Bohrs vej 42
+				Stilling  Skanderborg  8660
+				DK
+
 70-B3-D5   (hex)		Saline Lectronics, Inc.
 246000-246FFF     (base 16)		Saline Lectronics, Inc.
 				710 N Maple Rd
@@ -11009,6 +11444,84 @@ FD6000-FD6FFF     (base 16)		Visual Fan
 				Anyang-si  Gyeonggi-do  14067
 				KR
 
+70-B3-D5   (hex)		FactoryLab B.V.
+5DC000-5DCFFF     (base 16)		FactoryLab B.V.
+				Lindtsedijk 54
+				Zwijndrecht  Zuid Holland  3336LE
+				NL
+
+70-B3-D5   (hex)		True Networks Ltd.
+AF2000-AF2FFF     (base 16)		True Networks Ltd.
+				#401 51 Seongnam-Daero Bundang-gu
+				SEONGNAM-si  GYEONGGI-do  13636
+				KR
+
+70-B3-D5   (hex)		Storbyte, Inc.
+63D000-63DFFF     (base 16)		Storbyte, Inc.
+				1800 Washington Blvd Suite 412
+				Baltimore  MD  21230
+				US
+
+70-B3-D5   (hex)		HGH SYSTEMES INFRAROUGES
+853000-853FFF     (base 16)		HGH SYSTEMES INFRAROUGES
+				10 Rue Maryse Bastié
+				Igny  IDF  91430
+				FR
+
+70-B3-D5   (hex)		Shenzhen bayue software co. LTD
+784000-784FFF     (base 16)		Shenzhen bayue software co. LTD
+				B301, second phase of China merchants street technology building, nanshan district
+				ShenZhen    518000
+				CN
+
+70-B3-D5   (hex)		Preston Industries dba PolyScience
+3B5000-3B5FFF     (base 16)		Preston Industries dba PolyScience
+				6600 W. Touhy Ave
+				Niles  IL  60714-4588
+				US
+
+70-B3-D5   (hex)		KMtronic ltd
+0AF000-0AFFFF     (base 16)		KMtronic ltd
+				Dobri Czintulov 28A str.
+				 Gorna Oryahovica  VT  5100
+				BG
+
+70-B3-D5   (hex)		BLOCKSI LLC
+9E6000-9E6FFF     (base 16)		BLOCKSI LLC
+				228 Hamilton avenue 3rd floor
+				Palo Alto    94301
+				US
+
+70-B3-D5   (hex)		Fire4 Systems UK Ltd
+E69000-E69FFF     (base 16)		Fire4 Systems UK Ltd
+				8 Regent Street
+				Leeds  West Yorkshire  LS7 4PE
+				GB
+
+70-B3-D5   (hex)		RealD
+CCB000-CCBFFF     (base 16)		RealD
+				5700 Flatiron Parkway
+				Boulder  CO  80301
+				US
+
+70-B3-D5   (hex)		Melecs EWS GmbH
+704000-704FFF     (base 16)		Melecs EWS GmbH
+				GZO-Technologiestrasse 1
+				Siegendorf     7011
+				AT
+
+70-B3-D5   (hex)		Raft Technologies
+8D0000-8D0FFF     (base 16)		Raft Technologies
+				Habarzel 25
+				Tel aviv    6971035
+				IL
+
+70-B3-D5   (hex)		Jacarta Ltd
+09B000-09BFFF     (base 16)		Jacarta Ltd
+				Wagon Yard, London Road
+				Marlborough    SN8 1LH
+				GB
+
 70-B3-D5   (hex)		EMAC, Inc.
 8AB000-8ABFFF     (base 16)		EMAC, Inc.
 				2390 EMAC Way
@@ -11378,12 +11891,6 @@ A27000-A27FFF     (base 16)		HDL da Amazônia Industria Eletrônica Ltda
 				Manaus  MN  69075-010
 				BR
 
-70-B3-D5   (hex)		Insitu Inc
-7AD000-7ADFFF     (base 16)		Insitu Inc
-				118 E. Columbia River Way
-				Bingen  Washington  98605
-				US
-
 70-B3-D5   (hex)		LLVISION TECHNOLOGY CO.,LTD
 E21000-E21FFF     (base 16)		LLVISION TECHNOLOGY CO.,LTD
 				Room302,Building A Fuxing,No.30 He Tao Yuan,Guan Dong Dian Bei Jie
@@ -13699,3 +14206,123 @@ EF9000-EF9FFF     (base 16)		Critical Link LLC
 				Av. Onze de Setembre 19
 				Reus  Tarragona  43203
 				ES
+
+70-B3-D5   (hex)		Triax A/S
+963000-963FFF     (base 16)		Triax A/S
+				Bjornkaervej 3
+				Hornsyld  Denmark  8783
+				DK
+
+70-B3-D5   (hex)		White Matter LLC
+368000-368FFF     (base 16)		White Matter LLC
+				999 3rd Ave 700
+				Seattle    98104
+				US
+
+70-B3-D5   (hex)		iFreecomm Technology Co., Ltd
+032000-032FFF     (base 16)		iFreecomm Technology Co., Ltd
+				D401, NO.16 Langshan Road, Nanshan District
+				Shenzhen  Guangdong  518057
+				CN
+
+70-B3-D5   (hex)		RELISTE Ges.m.b.H.
+1B9000-1B9FFF     (base 16)		RELISTE Ges.m.b.H.
+				Enzersdorfer Strasse 8-10
+				Brunn am Gebirge    2345
+				AT
+
+70-B3-D5   (hex)		JUSTEK INC
+EB5000-EB5FFF     (base 16)		JUSTEK INC
+				613-9, DONGCHUN-RI, JINWI-MYEON
+				PYEONGTAEK-SI  GYEONGGI-DO  17711
+				KR
+
+70-B3-D5   (hex)		SHENZHEN WISEWING INTERNET TECHNOLOGY CO.,LTD
+94A000-94AFFF     (base 16)		SHENZHEN WISEWING INTERNET TECHNOLOGY CO.,LTD
+				No.826,Zone 1,Block B,Famous industrial product display purchasing center,Baoyuan Road,Xixiang,Bao'an Dis., Shenzhen,P.R.China
+				shenzhen  China  518102
+				CN
+
+70-B3-D5   (hex)		Mo-Sys Engineering Ltd
+075000-075FFF     (base 16)		Mo-Sys Engineering Ltd
+				Thames Bank House, Tunnel Avenue
+				London    SE100PA
+				GB
+
+70-B3-D5   (hex)		Abbas, a.s.
+B18000-B18FFF     (base 16)		Abbas, a.s.
+				Edisonova 5
+				Brno  CZ  61200
+				CZ
+
+70-B3-D5   (hex)		Shanghai Holystar Information Technology Co.,Ltd
+6E1000-6E1FFF     (base 16)		Shanghai Holystar Information Technology Co.,Ltd
+				8F Building A3 NO.1528 Gumei Rd Shanghai China PR
+				shanghai    200233
+				CN
+
+70-B3-D5   (hex)		Mimo Networks
+25D000-25DFFF     (base 16)		Mimo Networks
+				701 E Middlefield Road Mountain View, 
+				Mountain View  CA  94043
+				US
+
+70-B3-D5   (hex)		ATBiS Co.,Ltd
+C2F000-C2FFFF     (base 16)		ATBiS Co.,Ltd
+				#1603 5th. Ace High-end Tower, 226 Gasan Digital 1-ro, Geumcheon-gu
+				Seoul    08502
+				KR
+
+70-B3-D5   (hex)		Cyanview
+E3A000-E3AFFF     (base 16)		Cyanview
+				26, Rue de la Foire
+				Papignies    7861
+				BE
+
+70-B3-D5   (hex)		AdInte, inc.
+BAC000-BACFFF     (base 16)		AdInte, inc.
+				347-1, Shijo-cho, Shimogyo-ku, 7F CUBE Nishikarasuma BLDG.
+				Kyoto-shi  Kyoto  6008441
+				JP
+
+70-B3-D5   (hex)		Valk Welding B.V.
+5DA000-5DAFFF     (base 16)		Valk Welding B.V.
+				Staalindustrieweg 15
+				Alblasserdam  Zuid Holland  2952 AT
+				NL
+
+70-B3-D5   (hex)		VITEC
+CDA000-CDAFFF     (base 16)		VITEC
+				99 rue pierre sémard
+				Chatillon  France  92320
+				FR
+
+70-B3-D5   (hex)		Nortek Global HVAC
+4D4000-4D4FFF     (base 16)		Nortek Global HVAC
+				Fens Pool Ave
+				Brierley Hill  West Midlands  DY5 1QA
+				GB
+
+70-B3-D5   (hex)		Insitu, Inc
+7AD000-7ADFFF     (base 16)		Insitu, Inc
+				118 E Columbia River Way
+				Bingen  WA  98605
+				US
+
+70-B3-D5   (hex)		KWS-Electronic GmbH
+EB3000-EB3FFF     (base 16)		KWS-Electronic GmbH
+				Sportplatzstrasse 1
+				Grosskarolinenfeld    D-83109
+				DE
+
+70-B3-D5   (hex)		University Of Groningen
+700000-700FFF     (base 16)		University Of Groningen
+				Broerstraat 5
+				Groningen  Groningen  9712 CP
+				NL
+
+70-B3-D5   (hex)		Globalcom Engineering SPA
+A0D000-A0DFFF     (base 16)		Globalcom Engineering SPA
+				Via Volta 39
+				CARDANO AL CAMPO  VA  21010
+				IT

hwdb/meson.build

@@ -1,3 +1,20 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
+# Copyright 2017 Zbigniew Jędrzejewski-Szmek
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
 hwdb_files = files('''
         20-pci-vendor-model.hwdb
         20-pci-classes.hwdb

hwdb/parse_hwdb.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */
+#  SPDX-License-Identifier: MIT
 #
 # This file is part of systemd. It is distrubuted under the MIT license, see
 # below.
@@ -65,6 +66,7 @@ UDEV_TAG = Word(string.ascii_uppercase, alphanums + '_')
 
 TYPES = {'mouse':    ('usb', 'bluetooth', 'ps2', '*'),
          'evdev':    ('name', 'atkbd', 'input'),
+         'id-input': ('modalias'),
          'touchpad': ('i8042', 'rmi', 'bluetooth', 'usb'),
          'joystick': ('i8042', 'rmi', 'bluetooth', 'usb'),
          'keyboard': ('name', ),
@@ -105,6 +107,18 @@ def property_grammar():
              ('MOUSE_WHEEL_CLICK_ANGLE_HORIZONTAL', INTEGER),
              ('MOUSE_WHEEL_CLICK_COUNT', INTEGER),
              ('MOUSE_WHEEL_CLICK_COUNT_HORIZONTAL', INTEGER),
+             ('ID_INPUT', Literal('1')),
+             ('ID_INPUT_ACCELEROMETER', Literal('1')),
+             ('ID_INPUT_JOYSTICK', Literal('1')),
+             ('ID_INPUT_KEY', Literal('1')),
+             ('ID_INPUT_KEYBOARD', Literal('1')),
+             ('ID_INPUT_MOUSE', Literal('1')),
+             ('ID_INPUT_POINTINGSTICK', Literal('1')),
+             ('ID_INPUT_SWITCH', Literal('1')),
+             ('ID_INPUT_TABLET', Literal('1')),
+             ('ID_INPUT_TABLET_PAD', Literal('1')),
+             ('ID_INPUT_TOUCHPAD', Literal('1')),
+             ('ID_INPUT_TOUCHSCREEN', Literal('1')),
              ('ID_INPUT_TRACKBALL', Literal('1')),
              ('MOUSE_WHEEL_TILT_HORIZONTAL', Literal('1')),
              ('MOUSE_WHEEL_TILT_VERTICAL', Literal('1')),

hwdb/pci.ids

@@ -1,8 +1,8 @@
 #
 #	List of PCI ID's
 #
-#	Version: 2017.09.26
+#	Version: 2017.12.06
-#	Date:    2017-09-26 03:15:02
+#	Date:    2017-12-06 03:15:02
 #
 #	Maintained by Albert Pool, Martin Mares, and other volunteers from
 #	the PCI ID Project at http://pci-ids.ucw.cz/.
@@ -77,18 +77,18 @@
 0b0b  Rhino Equipment Corp.
 	0105  R1T1
 	0205  R4FXO
-	0206  RCB4FXO 4-channel FXO analog telphony card
+	0206  RCB4FXO 4-channel FXO analog telephony card
 	0305  R4T1
 	0405  R8FXX
-	0406  RCB8FXX 8-channel modular analog telphony card
+	0406  RCB8FXX 8-channel modular analog telephony card
 	0505  R24FXX
-	0506  RCB24FXS 24-Channel FXS analog telphony card
+	0506  RCB24FXS 24-Channel FXS analog telephony card
 	0605  R2T1
 	0705  R24FXS
-	0706  RCB24FXO 24-Channel FXO analog telphony card
+	0706  RCB24FXO 24-Channel FXO analog telephony card
 	0905  R1T3 Single T3 Digital Telephony Card
-	0906  RCB24FXX 24-channel modular analog telphony card
+	0906  RCB24FXX 24-channel modular analog telephony card
-	0a06  RCB672FXX 672-channel modular analog telphony card
+	0a06  RCB672FXX 672-channel modular analog telephony card
 0e11  Compaq Computer Corporation
 	0001  PCI to EISA Bridge
 	0002  PCI to ISA Bridge
@@ -249,6 +249,9 @@
 		1028 1fd4  PERC H745P MX
 		1d49 0602  ThinkSystem RAID 930-16i 4GB Flash PCIe 12Gb Adapter
 		1d49 0604  ThinkSystem RAID 930-8e 4GB Flash PCIe 12Gb Adapter
+		8086 352d  Integrated RAID Module RMSP3AD160F
+		8086 9460  RAID Controller RSP3TD160F
+		8086 9480  RAID Controller RSP3MD088F
 	0015  MegaRAID Tri-Mode SAS3416
 	0016  MegaRAID Tri-Mode SAS3508
 		1028 1fc9  PERC H840 Adapter
@@ -258,9 +261,15 @@
 		1d49 0601  ThinkSystem RAID 930-8i 2GB Flash PCIe 12Gb Adapter
 		1d49 0603  ThinkSystem RAID 930-24i 4GB Flash PCIe 12Gb Adapter
 		1d49 0604  ThinkSystem RAID 930-8e 4GB Flash PCIe 12Gb Adapter
+		8086 352e  Integrated RAID Module RMSP3CD080F
+		8086 352f  Integrated RAID Module RMSP3HD080E
+		8086 9461  RAID Controller RSP3DD080F
 	0017  MegaRAID Tri-Mode SAS3408
 		1d49 0500  ThinkSystem RAID 530-8i PCIe 12Gb Adapter
 		1d49 0502  ThinkSystem RAID 530-8i Dense Adapter
+		8086 3528  Integrated RAID RMSP3LD060
+		8086 3529  Integrated RAID RMSP3LD060
+		8086 9441  RAID Controller RSP3WD080E
 	001b  MegaRAID Tri-Mode SAS3504
 		1d49 0605  ThinkSystem RAID 930-4i 2GB Flash Flex Adapter
 	001c  MegaRAID Tri-Mode SAS3404
@@ -584,9 +593,12 @@
 		1028 1fd3  HBA330 MMZ
 		1bd4 0011  Inspur 12Gb 8i-3008 IT SAS HBA
 	00ab  SAS3516 Fusion-MPT Tri-Mode RAID On Chip (ROC)
+		8086 3530  Integrated RAID Module RMSP3JD160J
 	00ac  SAS3416 Fusion-MPT Tri-Mode I/O Controller Chip (IOC)
 		1d49 0201  ThinkSystem 430-16i SAS/SATA 12Gb HBA
 		1d49 0203  ThinkSystem 430-16e SAS/SATA 12Gb HBA
+		8086 3000  RAID Controller RSP3QD160J
+		8086 3020  RAID Controller RSP3GD016J
 	00ae  SAS3508 Fusion-MPT Tri-Mode RAID On Chip (ROC)
 	00af  SAS3408 Fusion-MPT Tri-Mode I/O Controller Chip (IOC)
 		1d49 0200  ThinkSystem 430-8i SAS/SATA 12Gb HBA
@@ -737,6 +749,7 @@
 	131b  Kaveri [Radeon R4 Graphics]
 	131c  Kaveri [Radeon R7 Graphics]
 	131d  Kaveri [Radeon R6 Graphics]
+	15dd  Radeon Vega 8 Mobile
 	1714  BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series]
 		103c 168b  ProBook 4535s
 	3150  RV380/M24 [Mobility Radeon X600]
@@ -905,6 +918,7 @@
 		1043 836c  M4A785TD Motherboard
 		1043 8410  M4A89GTD PRO/USB3 Motherboard
 		1043 841b  M5A88-V EVO
+		105b 0e13  N15235/A74MX mainboard / AMD SB700
 		1179 ff50  Satellite P305D-S8995E
 		1458 a022  GA-MA770-DS3rev2.0 Motherboard
 		17f2 5000  KI690-AM2 Motherboard
@@ -915,6 +929,7 @@
 		103c 280a  DC5750 Microtower
 		1043 82ef  M3A78-EH Motherboard
 		1043 8389  M4A785TD Motherboard
+		105b 0e13  N15235/A74MX mainboard / AMD SB700
 		1179 ff50  Satellite P305D-S8995E
 		1458 4385  GA-MA770-DS3rev2.0 Motherboard
 		1462 7368  K9AG Neo2
@@ -966,14 +981,17 @@
 	4390  SB7x0/SB8x0/SB9x0 SATA Controller [IDE mode]
 		1043 82ef  M3A78-EH Motherboard
 		1043 8389  M4A785TD Motherboard
+		105b 0e13  N15235/A74MX mainboard / AMD SB700
 		1458 b002  GA-MA770-DS3rev2.0 Motherboard
 		1849 4390  Motherboard (one of many)
 	4391  SB7x0/SB8x0/SB9x0 SATA Controller [AHCI mode]
 		103c 1611  Pavilion DM1Z-3000
 		1043 82ef  M3A78-EH Motherboard
 		1043 8443  M5A88-V EVO
+		105b 0e13  N15235/A74MX mainboard / AMD SB700
 		174b 1001  PURE Fusion Mini
 	4392  SB7x0/SB8x0/SB9x0 SATA Controller [Non-RAID5 mode]
+		105b 0e13  N15235/A74MX mainboard / AMD SB700
 	4393  SB7x0/SB8x0/SB9x0 SATA Controller [RAID5 mode]
 	4394  SB7x0/SB8x0/SB9x0 SATA Controller [AHCI mode]
 	4395  SB8x0/SB9x0 SATA Controller [Storage mode]
@@ -982,6 +1000,7 @@
 		103c 1611  Pavilion DM1Z-3000
 		1043 82ef  M3A78-EH Motherboard
 		1043 8443  M5A88-V EVO
+		105b 0e13  N15235/A74MX mainboard / AMD SB700
 		15d9 a811  H8DGU
 		174b 1001  PURE Fusion Mini
 	4397  SB7x0/SB8x0/SB9x0 USB OHCI0 Controller
@@ -989,25 +1008,30 @@
 		103c 1611  Pavilion DM1Z-3000
 		1043 82ef  M3A78-EH Motherboard
 		1043 8443  M5A88-V EVO
+		105b 0e13  N15235/A74MX mainboard / AMD SB700
 		15d9 a811  H8DGU
 		174b 1001  PURE Fusion Mini
 	4398  SB7x0 USB OHCI1 Controller
 		1019 2120  A785GM-M
 		1043 82ef  M3A78-EH Motherboard
+		105b 0e13  N15235/A74MX mainboard / AMD SB700
 		15d9 a811  H8DGU
 	4399  SB7x0/SB8x0/SB9x0 USB OHCI2 Controller
 		1019 2120  A785GM-M
 		1043 82ef  M3A78-EH Motherboard
 		1043 8443  M5A88-V EVO
+		105b 0e13  N15235/A74MX mainboard / AMD SB700
 		174b 1001  PURE Fusion Mini
 	439c  SB7x0/SB8x0/SB9x0 IDE Controller
 		1019 2120  A785GM-M
 		1043 82ef  M3A78-EH Motherboard
+		105b 0e13  N15235/A74MX mainboard / AMD SB700
 	439d  SB7x0/SB8x0/SB9x0 LPC host controller
 		1019 2120  A785GM-M
 		103c 1611  Pavilion DM1Z-3000
 		1043 82ef  M3A78-EH Motherboard
 		1043 8443  M5A88-V EVO
+		105b 0e13  N15235/A74MX mainboard / AMD SB700
 		174b 1001  PURE Fusion Mini
 	43a0  SB700/SB800/SB900 PCI to PCI bridge (PCIE port 0)
 	43a1  SB700/SB800/SB900 PCI to PCI bridge (PCIE port 1)
@@ -1575,6 +1599,7 @@
 		103c 8006  FirePro M4170
 		17aa 3643  Radeon R7 A360
 	6605  Opal PRO [Radeon R7 M260]
+		103c 2259  FirePro M4150
 	6606  Mars XTX [Radeon HD 8790M]
 		1028 0684  FirePro W4170M
 	6607  Mars LE [Radeon HD 8530M / R5 M240]
@@ -1603,6 +1628,7 @@
 	6623  Mars
 	6631  Oland
 	6640  Saturn XT [FirePro M6100]
+		106b 014b  Tropo XT [Radeon R9 M380 Mac Edition]
 	6641  Saturn PRO [Radeon HD 8930M]
 	6646  Bonaire XT [Radeon R9 M280X]
 	6647  Bonaire PRO [Radeon R9 M270X]
@@ -2344,7 +2370,8 @@
 	6828  Cape Verde PRO [FirePro W600]
 	6829  Cape Verde
 	682a  Venus PRO
-	682b  Venus LE [Radeon HD 8830M]
+	682b  Venus LE / Tropo PRO-L [Radeon HD 8830M / R7 M465X]
+		0128 079c  Radeon R7 465X
 	682c  Cape Verde GL [FirePro W4100]
 	682d  Chelsea XT GL [FirePro M4000]
 	682f  Chelsea LP [Radeon HD 7730M]
@@ -2478,6 +2505,7 @@
 		144d c0c7  Radeon HD 7550M
 	6842  Thames LE [Radeon HD 7000M Series]
 	6843  Thames [Radeon HD 7670M]
+	6861  Vega 10 XT [Radeon PRO WX 9100]
 	6863  Vega 10 XTX [Radeon Vega Frontier Edition]
 	687f  Vega 10 XT [Radeon RX Vega 64]
 	6888  Cypress XT [FirePro V8800]
@@ -3129,8 +3157,9 @@
 	7910  RS690 Host Bridge
 		1179 ff50  Satellite P305D-S8995E
 		17f2 5000  KI690-AM2 Motherboard
-	7911  RS690 Host Bridge
+	7911  RS690/RS740 Host Bridge
-	7912  RS690 PCI to PCI Bridge (Internal gfx)
+		1002 7910  RS690/RS740 Host Bridge
+	7912  RS690/RS740 PCI to PCI Bridge (Internal gfx)
 	7913  RS690 PCI to PCI Bridge (PCI Express Graphics Port 0)
 	7915  RS690 PCI to PCI Bridge (PCI Express Port 1)
 	7916  RS690 PCI to PCI Bridge (PCI Express Port 2)
@@ -3155,6 +3184,7 @@
 	7941  RS600 [Radeon Xpress 1250]
 	7942  RS600M [Radeon Xpress 1250]
 	796e  RS740 [Radeon 2100]
+		105b 0e13  N15235/A74MX mainboard
 	9400  R600 [Radeon HD 2900 PRO/XT]
 		1002 2552  Radeon HD 2900 XT
 		1002 3000  Radeon HD 2900 PRO
@@ -3372,6 +3402,7 @@
 	9840  Kabini HDMI/DP Audio
 	9850  Mullins [Radeon R3 Graphics]
 	9851  Mullins [Radeon R4/R5 Graphics]
+		1179 f928  Beema [Radeon R5 Graphics]
 	9852  Mullins [Radeon R2 Graphics]
 	9853  Mullins [Radeon R2 Graphics]
 	9854  Mullins [Radeon R3E Graphics]
@@ -4008,16 +4039,21 @@
 	141f  Family 15h (Models 30h-3fh) Processor Function 5
 	1422  Family 15h (Models 30h-3fh) Processor Root Complex
 	1423  Family 15h (Models 30h-3fh) I/O Memory Management Unit
+	1424  Family 15h (Models 30h-3fh) Processor Root Port
 	1426  Family 15h (Models 30h-3fh) Processor Root Port
 	1436  Liverpool Processor Root Complex
 	1437  Liverpool I/O Memory Management Unit
 	1438  Liverpool Processor Root Port
 	1439  Family 16h Processor Functions 5:1
 	1450  Family 17h (Models 00h-0fh) Root Complex
+	1451  Family 17h (Models 00h-0fh) I/O Memory Management Unit
 	1452  Family 17h (Models 00h-0fh) PCIe Dummy Host Bridge
+	1453  Family 17h (Models 00h-0fh) PCIe GPP Bridge
 	1454  Family 17h (Models 00h-0fh) Internal PCIe GPP Bridge 0 to Bus B
+	1456  Family 17h (Models 00h-0fh) Platform Security Processor
+	1457  Family 17h (Models 00h-0fh) HD Audio Controller
 	145b  Zeppelin Non-Transparent Bridge
-	145c  USB3 Host Controller
+	145c  Family 17h (Models 00h-0fh) USB 3.0 Host Controller
 	145f  USB 3.0 Host controller
 	1460  Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 0
 	1461  Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 1
@@ -4111,7 +4147,9 @@
 	43a1  Hudson PCI to PCI bridge (PCIE port 1)
 	43a2  Hudson PCI to PCI bridge (PCIE port 2)
 	43a3  Hudson PCI to PCI bridge (PCIE port 3)
-	43bb  USB 3.1 XHCI Controller
+	43b4  300 Series Chipset PCIe Port
+	43b7  300 Series Chipset SATA Controller
+	43bb  300 Series Chipset USB 3.1 xHCI Controller
 	7006  AMD-751 [Irongate] System Controller
 	7007  AMD-751 [Irongate] AGP Bridge
 	700a  AMD-IGR4 AGP Host to PCI Bridge
@@ -4607,7 +4645,7 @@
 		102b 0f84  Millennium G550 Dual Head DDR 32Mb
 		102b 1e41  Millennium G550
 		102b 2300  Millennium G550 LP PCIE
-	2537  Millenium P650/P750
+	2537  Millennium P650/P750
 		102b 1820  Millennium P750 64MB
 		102b 1830  Millennium P650 64MB
 		102b 1850  RAD2mp
@@ -4615,7 +4653,7 @@
 		102b 1880  Sono S10
 		102b 1c10  QID 128MB
 		102b 2811  Millennium P650 Low-profile PCI 64MB
-		102b 2821  Millenium P650 Low-profile PCI
+		102b 2821  Millennium P650 Low-profile PCI
 		102b 2841  RAD PCI
 		102b 2851  Spectrum PCI
 		102b 2871  EpicA TC2
@@ -4629,7 +4667,7 @@
 		102b 3051  RG-400SL
 		102b 3061  Extio F1420
 		102b 3081  Extio F1240
-	2538  Millenium P650 PCIe
+	2538  Millennium P650 PCIe
 		102b 0847  RAD PCIe
 		102b 08c7  Millennium P650 PCIe 128MB
 		102b 0907  Millennium P650 PCIe 64MB
@@ -4637,23 +4675,23 @@
 		102b 0987  ATC PCIe 4MP
 		102b 1047  Millennium P650 LP PCIe 128MB
 		102b 1087  Millennium P650 LP PCIe 64MB
-		102b 1801  Millenium P650 PCIe x1
+		102b 1801  Millennium P650 PCIe x1
 		102b 2538  Parhelia APVe
 		102b 3007  QID Low-profile PCIe
 		102b 3087  Aurora VX3mp
 		102b 30c7  QID LP PCIe
 	2539  Millennium P690
-		102b 0040  Millenium P690 PCIe x16
+		102b 0040  Millennium P690 PCIe x16
 		102b 0042  ONYX
 		102b 0043  SPECTRA
-		102b 0080  Millenium P690 Plus LP PCIe x16
+		102b 0080  Millennium P690 Plus LP PCIe x16
-		102b 0081  Millenium P690 LP PCIe x16
+		102b 0081  Millennium P690 LP PCIe x16
 		102b 0082  RAD LPX PCIe x16
-		102b 00c0  Millenium P690 Plus LP PCI
+		102b 00c0  Millennium P690 Plus LP PCI
-		102b 00c2  Millenium P690 LP PCI
+		102b 00c2  Millennium P690 LP PCI
 		102b 00c3  RAD LPX PCI
-		102b 0101  Millenium P690 PCI
+		102b 0101  Millennium P690 PCI
-		102b 0140  Millenium P690 LP PCIe x1
+		102b 0140  Millennium P690 LP PCIe x1
 		102b 0180  Display Wall IP Decode 128 MB
 	4164  Morphis QxT frame grabber
 	43b4  Morphis Qxt encoding engine
@@ -5168,11 +5206,9 @@
 	3308  Integrated Lights-Out Standard MS Watchdog Timer
 		103c 330e  iLO3
 		103c 3381  iLO4
-	402f  PCIe Root Port
 	4030  zx2 System Bus Adapter
 	4031  zx2 I/O Controller
 	4037  PCIe Local Bus Adapter
-	403b  PCIe Root Port
 103e  Solliday Engineering
 103f  Synopsys/Logic Modeling Group
 1040  Accelgraphics Inc.
@@ -5185,11 +5221,11 @@
 	3020  Samurai_IDE
 1043  ASUSTeK Computer Inc.
 	0464  Radeon R9 270x GPU
+	0521  RX580 [RX 580 Dual O8G]
 	0675  ISDNLink P-IN100-ST-D
 		0675 1704  ISDN Adapter (PCI Bus, D, C)
 		0675 1707  ISDN Adapter (PCI Bus, DV, W)
 		10cf 105e  ISDN Adapter (PCI Bus, DV, W)
-	13a0  Transformer Book T101HA-GR030R
 # Should be 1022:9602
 	9602  AMD RS780/RS880 PCI to PCI bridge (int gfx)
 		1043 83a2  M4A785TD Motherboard
@@ -6145,6 +6181,7 @@
 		103c 12dd  4Gb Fibre Channel [AB429A]
 	2432  ISP2432-based 4Gb Fibre Channel to PCI Express HBA
 		103c 7040  FC1142SR 4Gb 1-port PCIe Fibre Channel Host Bus Adapter [HPAE311A]
+		1077 0137  QLE2460 4 GB PCI-X Host-Bus-Adapter
 	2532  ISP2532-based 8Gb Fibre Channel to PCI Express HBA
 		1014 041e  FC EN0Y/EN12 PCIe2 LP 8 Gb 4-port Fibre Channel Adapter for POWER
 		103c 3262  StorageWorks 81Q
@@ -6154,6 +6191,7 @@
 		1077 015e  QLE2564 PCI Express to 8Gb FC Quad Channel
 		1077 0167  QME2572 Dual Port FC8 HBA Mezzanine
 		1590 00fc  StoreFabric 84Q 8Gb Quad Port Fibre Channel Host Bus Adapter
+	2971  ISP2684
 	3022  ISP4022-based Ethernet NIC
 	3032  ISP4032-based Ethernet IPv6 NIC
 	4010  ISP4010-based iSCSI TOE HBA
@@ -6195,6 +6233,10 @@
 		1077 000b  25GE 2P QL41262HxCU-DE Adapter
 		1077 0011  FastLinQ QL41212H 25GbE Adapter
 		1077 0012  FastLinQ QL41112H 10GbE Adapter
+		1590 021d  10/25GbE 2P QL41222HLCU-HP Adapter
+		1590 021e  10/25GbE 2P QL41162HMRJ-HP Adapter
+		1590 021f  10/25GbE 2P QL41262HMCU-HP Adapter
+		1590 0220  10/25GbE 2P QL41122HLRJ-HP Adapter
 	8080  FastLinQ QL41000 Series 10/25/40/50GbE Controller (FCoE)
 		1077 0001  10GE 2P QL41162HxRJ-DE Adapter
 		1077 0002  10GE 2P QL41112HxCU-DE Adapter
@@ -6215,6 +6257,8 @@
 		1077 000e  FastLinQ QL41162H 10GbE iSCSI Adapter (SR-IOV VF)
 		1077 0011  FastLinQ QL41212H 25GbE Adapter (SR-IOV VF)
 		1077 0012  FastLinQ QL41112H 10GbE Adapter (SR-IOV VF)
+		1590 021e  10/25GbE 2P QL41162HMRJ-HP Adapter
+		1590 021f  10/25GbE 2P QL41262HMCU-HP Adapter
 	8430  ISP8324 1/10GbE Converged Network Controller (NIC VF)
 	8431  8300 Series 10GbE Converged Network Adapter (FCoE VF)
 	8432  ISP2432M-based 10GbE Converged Network Adapter (CNA)
@@ -9256,19 +9300,19 @@
 	0533  C67 [GeForce 7000M / nForce 610M]
 	053a  C68 [GeForce 7050 PV / nForce 630a]
 	053b  C68 [GeForce 7050 PV / nForce 630a]
-		1043 8308  M2N68-AM Motherbord
+		1043 8308  M2N68-AM Motherboard
 	053e  C68 [GeForce 7025 / nForce 630a]
 	0541  MCP67 Memory Controller
 	0542  MCP67 SMBus
-		1043 8308  M2N68-AM Motherbord
+		1043 8308  M2N68-AM Motherboard
 	0543  MCP67 Co-processor
 	0547  MCP67 Memory Controller
-		1043 8308  M2N68-AM Motherbord
+		1043 8308  M2N68-AM Motherboard
 		1849 0547  ALiveNF7G-HDready
 	0548  MCP67 ISA Bridge
 		1043 8308  M2N68-AM Motherboard
 	054c  MCP67 Ethernet
-		1043 8308  M2N68-AM Motherbord
+		1043 8308  M2N68-AM Motherboard
 		1849 054c  ALiveNF7G-HDready, MCP67 Gigabit Ethernet
 	054d  MCP67 Ethernet
 	054e  MCP67 Ethernet
@@ -10690,10 +10734,10 @@
 	1282  GK208 [GeForce GT 640 Rev. 2]
 	1284  GK208 [GeForce GT 630 Rev. 2]
 	1286  GK208 [GeForce GT 720]
-	1287  GK208 [GeForce GT 730]
+	1287  GK208B [GeForce GT 730]
-	1288  GK208 [GeForce GT 720]
+	1288  GK208B [GeForce GT 720]
 	1289  GK208 [GeForce GT 710]
-	128b  GK208 [GeForce GT 710B]
+	128b  GK208B [GeForce GT 710]
 	1290  GK208M [GeForce GT 730M]
 		103c 2afa  GeForce GT 730A
 		103c 2b04  GeForce GT 730A
@@ -10717,11 +10761,12 @@
 		17aa 367c  GeForce 710A
 	1296  GK208M [GeForce 825M]
 	1298  GK208M [GeForce GT 720M]
-	1299  GK208M [GeForce 920M]
+	1299  GK208BM [GeForce 920M]
 		17aa 30bb  GeForce 920A
+		17aa 30df  GeForce 920A
 		17aa 36a7  GeForce 920A
 		17aa 36af  GeForce 920M
-	129a  GK208M [GeForce 910M]
+	129a  GK208BM [GeForce 910M]
 	12a0  GK208
 	12b9  GK208GLM [Quadro K610M]
 	12ba  GK208GLM [Quadro K510M]
@@ -10801,7 +10846,7 @@
 	13fb  GM204GLM [Quadro M5500]
 	1401  GM206 [GeForce GTX 960]
 	1402  GM206 [GeForce GTX 950]
-	1406  GM206 [GeForce GTX 960]
+	1406  GM206 [GeForce GTX 960 OEM]
 	1407  GM206 [GeForce GTX 750 v2]
 	1427  GM206M [GeForce GTX 965M]
 	1430  GM206GL [Quadro M2000]
@@ -10811,7 +10856,7 @@
 	15f1  GP100GL
 	15f7  GP100GL [Tesla P100 PCIe 12GB]
 	15f8  GP100GL [Tesla P100 PCIe 16GB]
-	15f9  GP100GL [Tesla P100 SMX2 16GB]
+	15f9  GP100GL [Tesla P100 SXM2 16GB]
 	1617  GM204M [GeForce GTX 980M]
 	1618  GM204M [GeForce GTX 970M]
 	1619  GM204M [GeForce GTX 965M]
@@ -10820,6 +10865,8 @@
 	1725  GP100
 	172e  GP100
 	172f  GP100
+	174d  GM108M [GeForce MX130]
+	174e  GM108M [GeForce MX110]
 	17c2  GM200 [GeForce GTX TITAN X]
 	17c8  GM200 [GeForce GTX 980 Ti]
 	17f0  GM200GL [Quadro M6000]
@@ -10835,7 +10882,7 @@
 	1b78  GP102GL
 	1b80  GP104 [GeForce GTX 1080]
 	1b81  GP104 [GeForce GTX 1070]
-	1b82  GP104
+	1b82  GP104 [GeForce GTX 1070 Ti]
 	1b83  GP104
 	1b84  GP104 [GeForce GTX 1060 3GB]
 	1b87  GP104 [P104-100]
@@ -10845,10 +10892,12 @@
 		1462 11e8  GeForce GTX 1070 Max-Q
 		1462 11e9  GeForce GTX 1070 Max-Q
 		1558 9501  GeForce GTX 1070 Max-Q
+	1bad  GP104 [GeForce GTX 1070 Engineering Sample]
 	1bb0  GP104GL [Quadro P5000]
 	1bb1  GP104GL [Quadro P4000]
 	1bb3  GP104GL [Tesla P4]
-	1bb4  GP104GL
+	1bb4  GP104GL [Tesla P6]
+	1bb5  GP104GLM [Quadro P5200 Mobile]
 	1bb6  GP104GLM [Quadro P5000 Mobile]
 	1bb7  GP104GLM [Quadro P4000 Mobile]
 		1462 11e9  Quadro P4000 Max-Q
@@ -10863,7 +10912,7 @@
 	1c03  GP106 [GeForce GTX 1060 6GB]
 	1c07  GP106 [P106-100]
 	1c09  GP106 [P106-090]
-	1c20  GP106M [GeForce GTX 1060 Mobile 3GB]
+	1c20  GP106M [GeForce GTX 1060 Mobile]
 		17aa 39b9  GeForce GTX 1060 Max-Q 3GB
 	1c21  GP106M [GeForce GTX 1050 Ti Mobile]
 	1c22  GP106M [GeForce GTX 1050 Mobile]
@@ -10889,6 +10938,8 @@
 	1d01  GP108 [GeForce GT 1030]
 	1d10  GP108M [GeForce MX150]
 	1d81  GV100
+	1db1  GV100 [Tesla V100 SXM2]
+	1db4  GV100 [Tesla V100 PCIe]
 10df  Emulex Corporation
 	0720  OneConnect NIC (Skyhawk)
 		103c 1934  FlexFabric 20Gb 2-port 650M Adapter
@@ -10896,6 +10947,7 @@
 		103c 21d4  StoreFabric CN1200E 10Gb Converged Network Adapter
 		103c 220a  FlexFabric 10Gb 2-port 556FLR-SFP+ Adapter
 		103c 803f  Ethernet 10Gb 2-port 557SFP+ Adapter
+		103c 8144  FlexFabric 10GB 2-port 556FLR-T Adapter
 		17aa 1056  ThinkServer OCm14102-UX-L AnyFabric
 		17aa 1057  ThinkServer OCm14104-UX-L AnyFabric
 		17aa 1059  ThinkServer OCm14104-UT-L AnyFabric
@@ -10946,6 +10998,9 @@
 	f111  Saturn-X LightPulse Fibre Channel Host Adapter
 	f112  Saturn-X LightPulse Fibre Channel Host Adapter
 	f180  LPSe12002 EmulexSecure 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]
 	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
@@ -11084,8 +11139,8 @@
 	8129  RTL-8129
 		10ec 8129  RT8129 Fast Ethernet Adapter
 		11ec 8129  RTL8111/8168 PCIe Gigabit Ethernet (misconfigured)
-	8136  RTL8101/2/6E PCI Express Fast/Gigabit Ethernet controller
+	8136  RTL8101/2/6E PCI Express Fast Ethernet controller
-		103c 1985  Pavilion 17-e163sg Notebook PC
+		103c 1985  RTL8106E on Pavilion 17-e163sg Notebook PC
 		103c 2a8c  Compaq 500B Microtower
 		103c 2ab1  Pavilion p6774
 		103c 30cc  Pavilion dv6700
@@ -11145,6 +11200,7 @@
 		8e2e 7100  KF-230TX/2
 		a0a0 0007  ALN-325C
 	8167  RTL-8110SC/8169SC Gigabit Ethernet
+		105b 0e10  RTL-8110SC-GR on a N15235/A74MX mainboard
 		1458 e000  GA-MA69G-S3H Motherboard
 		1462 235c  P965 Neo MS-7235 mainboard
 		1462 236c  945P Neo3-F motherboard
@@ -11222,6 +11278,7 @@
 	8821  RTL8821AE 802.11ac PCIe Wireless Network Adapter
 	b723  RTL8723BE PCIe Wireless Network Adapter
 		10ec 8739  Dell Wireless 1801
+	c821  RTL8821CE 802.11ac PCIe Wireless Network Adapter
 10ed  Ascii Corporation
 	7310  V7310
 10ee  Xilinx Corporation
@@ -12524,6 +12581,8 @@
 		1131 4f61  Activy DVB-S Budget Rev GR
 		1131 5f61  Activy DVB-T Budget
 		114b 2003  DVRaptor Video Edit/Capture Card
+		1159 0040  MuTech M-Vision 500 (MV-500 rev. E)
+		1159 0050  MuTech M-Vision 500 (MV-500 rev. F)
 		11bd 0006  DV500 Overlay
 		11bd 000a  DV500 Overlay
 		11bd 000f  DV500 Overlay
@@ -12980,7 +13039,7 @@
 	3011  Tokenet/vg 1001/10m anylan
 	9050  Lanfleet/Truevalue
 	9051  Lanfleet/Truevalue
-1159  Mutech Corp
+1159  MuTech Corporation
 	0001  MV-1000
 	0002  MV-1500
 115a  Harlequin Ltd
@@ -14922,6 +14981,7 @@
 12d7  Biotronic SRL
 12d8  Pericom Semiconductor
 	01a7  7C21P100 2-port PCI-X to PCI-X Bridge
+	2608  PI7C9X2G608GP PCIe2 6-Port/8-Lane Packet Switch
 	400a  PI7C9X442SL PCI Express Bridge Port
 	400e  PI7C9X442SL USB OHCI Controller
 	400f  PI7C9X442SL USB EHCI Controller
@@ -15276,7 +15336,7 @@
 	0040  QSC-200/300
 	0050  ESC-100D
 	0060  ESC-100M
-	00f0  MPAC-100 Syncronous Serial Card (Zilog 85230)
+	00f0  MPAC-100 Synchronous Serial Card (Zilog 85230)
 	0170  QSCLP-100
 	0180  DSCLP-100
 	0190  SSCLP-100
@@ -15438,9 +15498,9 @@
 1392  Medialight Inc
 1393  Moxa Technologies Co Ltd
 	0001  UC7000 Serial
-	1020  CP102 (2-port RS-232 PCI)
+	1020  CP-102 (2-port RS-232 PCI)
-	1021  CP102UL (2-port RS-232 Universal PCI)
+	1021  CP-102UL (2-port RS-232 Universal PCI)
-	1022  CP102U (2-port RS-232 Universal PCI)
+	1022  CP-102U (2-port RS-232 Universal PCI)
 	1023  CP-102UF
 	1024  CP-102E (2-port RS-232 Smart PCI Express Serial Board)
 	1025  CP-102EL (2-port RS-232 Smart PCI Express Serial Board)
@@ -15467,7 +15527,7 @@
 	1380  CP138U (8-port RS-232/422/485 Smart Universal PCI)
 	1680  Smartio C168H/PCI
 	1681  CP-168U V2 Smart Serial Board (8-port RS-232)
-	1682  CP168EL (8-port RS-232 Smart PCI Express)
+	1682  CP-168EL (8-port RS-232 Smart PCI Express)
 	1683  CP-168EL-A (8-port RS-232 PCI Express Serial Board)
 	2040  Intellio CP-204J
 	2180  Intellio C218 Turbo PCI
@@ -15745,6 +15805,7 @@
 		1043 838e  Virtuoso 66 (Xonar DS)
 		1043 8428  Virtuoso 100 (Xonar Xense)
 		1043 8467  CMI8786 (Xonar DG)
+		1043 8521  CMI8786 (Xonar DGX)
 		1043 85f4  Virtuoso 100 (Xonar Essence STX II)
 		13f6 8782  PCI 2.0 HD Audio
 		13f6 ffff  CMI8787-HG2PCI
@@ -16239,6 +16300,8 @@
 	50a7  T580-50A7 Unified Wire Ethernet Controller
 	50a8  T580-50A8 Unified Wire Ethernet Controller
 	50a9  T580-50A9 Unified Wire Ethernet Controller
+	50aa  T580-50AA Unified Wire Ethernet Controller
+	50ab  T520-50AB Unified Wire Ethernet Controller
 	5401  T520-CR Unified Wire Ethernet Controller
 	5402  T522-CR Unified Wire Ethernet Controller
 	5403  T540-CR Unified Wire Ethernet Controller
@@ -16299,6 +16362,8 @@
 	54a7  T580-50A7 Unified Wire Ethernet Controller
 	54a8  T580-50A8 Unified Wire Ethernet Controller
 	54a9  T580-50A9 Unified Wire Ethernet Controller
+	54aa  T580-50AA Unified Wire Ethernet Controller
+	54ab  T520-50AB Unified Wire Ethernet Controller
 	5501  T520-CR Unified Wire Storage Controller
 	5502  T522-CR Unified Wire Storage Controller
 	5503  T540-CR Unified Wire Storage Controller
@@ -16419,6 +16484,8 @@
 	56a7  T580-50A7 Unified Wire Storage Controller
 	56a8  T580-50A8 Unified Wire Storage Controller
 	56a9  T580-50A9 Unified Wire Storage Controller
+	56aa  T580-50AA Unified Wire Storage Controller
+	56ab  T520-50AB Unified Wire Storage Controller
 	5701  T520-CR Unified Wire Ethernet Controller
 	5702  T522-CR Unified Wire Ethernet Controller
 	5703  T540-CR Unified Wire Ethernet Controller
@@ -16518,6 +16585,8 @@
 	58a7  T580-50A7 Unified Wire Ethernet Controller [VF]
 	58a8  T580-50A8 Unified Wire Ethernet Controller [VF]
 	58a9  T580-50A9 Unified Wire Ethernet Controller [VF]
+	58aa  T580-50AA Unified Wire Ethernet Controller [VF]
+	58ab  T520-50AB Unified Wire Ethernet Controller [VF]
 	6001  T6225-CR Unified Wire Ethernet Controller
 	6002  T6225-SO-CR Unified Wire Ethernet Controller
 	6003  T6425-CR Unified Wire Ethernet Controller
@@ -16536,6 +16605,8 @@
 	6082  T6225-6082 Unified Wire Ethernet Controller
 	6083  T62100-6083 Unified Wire Ethernet Controller
 	6084  T64100-6084 Unified Wire Ethernet Controller
+	6085  T6240-6085 Unified Wire Ethernet Controller
+	6086  T6225-6086 Unified Wire Ethernet Controller
 	6401  T6225-CR Unified Wire Ethernet Controller
 	6402  T6225-SO-CR Unified Wire Ethernet Controller
 	6403  T6425-CR Unified Wire Ethernet Controller
@@ -16554,6 +16625,8 @@
 	6482  T6225-6082 Unified Wire Ethernet Controller
 	6483  T62100-6083 Unified Wire Ethernet Controller
 	6484  T64100-6084 Unified Wire Ethernet Controller
+	6485  T6240-6085 Unified Wire Ethernet Controller
+	6486  T6225-6086 Unified Wire Ethernet Controller
 	6501  T6225-CR Unified Wire Storage Controller
 	6502  T6225-SO-CR Unified Wire Storage Controller
 	6503  T6425-CR Unified Wire Storage Controller
@@ -16572,6 +16645,8 @@
 	6582  T6225-6082 Unified Wire Storage Controller
 	6583  T62100-6083 Unified Wire Storage Controller
 	6584  T64100-6084 Unified Wire Storage Controller
+	6585  T6240-6085 Unified Wire Storage Controller
+	6586  T6225-6086 Unified Wire Storage Controller
 	6601  T6225-CR Unified Wire Storage Controller
 	6602  T6225-SO-CR Unified Wire Storage Controller
 	6603  T6425-CR Unified Wire Storage Controller
@@ -16590,6 +16665,8 @@
 	6682  T6225-6082 Unified Wire Storage Controller
 	6683  T62100-6083 Unified Wire Storage Controller
 	6684  T64100-6084 Unified Wire Storage Controller
+	6685  T6240-6085 Unified Wire Storage Controller
+	6686  T6225-6086 Unified Wire Storage Controller
 	6801  T6225-CR Unified Wire Ethernet Controller [VF]
 	6802  T6225-SO-CR Unified Wire Ethernet Controller [VF]
 	6803  T6425-CR Unified Wire Ethernet Controller [VF]
@@ -16608,6 +16685,8 @@
 	6882  T6225-6082 Unified Wire Ethernet Controller [VF]
 	6883  T62100-6083 Unified Wire Ethernet Controller [VF]
 	6884  T64100-6084 Unified Wire Ethernet Controller [VF]
+	6885  T6240-6085 Unified Wire Ethernet Controller [VF]
+	6886  T6225-6086 Unified Wire Ethernet Controller [VF]
 	a000  PE10K Unified Wire Ethernet Controller
 1426  Storage Technology Corp.
 1427  Better On-Line Solutions
@@ -17247,6 +17326,7 @@
 	169d  NetLink BCM5789 Gigabit Ethernet PCI Express
 	16a0  NetLink BCM5785 Fast Ethernet
 	16a1  BCM57840 NetXtreme II 10 Gigabit Ethernet
+		1043 866e  PEB-10G/57840-2T 10GBase-T Network Adapter
 	16a2  BCM57840 NetXtreme II 10/20-Gigabit Ethernet
 		103c 1916  FlexFabric 20Gb 2-port 630FLB Adapter
 		103c 1917  FlexFabric 20Gb 2-port 630M Adapter
@@ -17371,7 +17451,8 @@
 		14e4 1404  BCM957414M4142 OCP 2x25G Type1 wRoCE
 		1590 020e  Ethernet 25Gb 2-port 631SFP28 Adapter
 		1590 0211  Ethernet 25Gb 2-port 631FLR-SFP28 Adapter
-	16d8  BCM57416 NetXtreme-E 10GBase-T RDMA Ethernet Controller
+	16d8  BCM57416 NetXtreme-E Dual-Media 10G RDMA Ethernet Controller
+		1028 1feb  NetXtreme-E 10Gb SFP+ Adapter
 		1590 020c  Ethernet 10Gb 2-port 535T Adapter
 		1590 0212  Ethernet 10Gb 2-port 535FLR-T Adapter
 	16d9  BCM57417 NetXtreme-E 10GBASE-T RDMA Ethernet Controller
@@ -19125,12 +19206,14 @@
 	7016  AP470 48-Channel TTL Level Digital Input/Output Module
 	7017  AP323 16-bit, 20 or 40 Channel Analog Input Module
 	7018  AP408: 32-Channel Digital I/O Module
+	7019  AP341 14-bit, 16-Channel Simultaneous Conversion Analog Input Module
 	701a  AP220-16 12-Bit, 16-Channel Analog Output Module
 	701b  AP231-16 16-Bit, 16-Channel Analog Output Module
 	7021  APA7-201 Reconfigurable Artix-7 FPGA module 48 TTL channels
 	7022  APA7-202 Reconfigurable Artix-7 FPGA module 24 RS485 channels
 	7023  APA7-203 Reconfigurable Artix-7 FPGA module 24 TTL & 12 RS485 channels
 	7024  APA7-204 Reconfigurable Artix-7 FPGA module 24 LVDS channels
+	7027  AP418 16-Channel High Voltage Digital Input/Output Module
 	7042  AP482 Counter Timer Module with TTL Level Input/Output
 	7043  AP483 Counter Timer Module with TTL Level and RS422 Input/Output
 	7044  AP484 Counter Timer Module with RS422 Input/Output
@@ -19539,6 +19622,7 @@
 1803  ProdaSafe GmbH
 1805  Euresys S.A.
 1809  Lumanate, Inc.
+180c  IEI Integration Corp
 1813  Ambient Technologies Inc
 	4000  HaM controllerless modem
 		16be 0001  V9x HAM Data Fax Modem
@@ -19985,6 +20069,7 @@
 		1924 8018  SFN8042-R2 8000 Series 10/40G Adapter
 		1924 8019  SFN8542-R2 8000 Series 10/40G Adapter
 		1924 801a  SFN8722-R1 8000 Series OCP 10G Adapter
+		1924 801b  SFN8522-R3 8000 Series 10G Adapter
 	1803  SFC9020 10G Ethernet Controller (Virtual Function)
 	1813  SFL9021 10GBASE-T Ethernet Controller (Virtual Function)
 	1903  SFC9120 10G Ethernet Controller (Virtual Function)
@@ -20170,6 +20255,7 @@
 # E2200, E2201, E2205
 	e091  Killer E220x Gigabit Ethernet Controller
 	e0a1  Killer E2400 Gigabit Ethernet Controller
+	e0b1  Killer E2500 Gigabit Ethernet Controller
 196a  Sensory Networks Inc.
 	0101  NodalCore C-1000 Content Classification Accelerator
 	0102  NodalCore C-2000 Content Classification Accelerator
@@ -20730,6 +20816,8 @@
 1cc7  Radian Memory Systems Inc.
 	0200  RMS-200
 	0250  RMS-250
+1ccf  Zoom Corporation
+	0001  TAC-2 Thunderbolt Audio Converter
 1cd2  SesKion GmbH
 	0301  Simulyzer-RT CompactPCI Serial DIO-1 card
 	0302  Simulyzer-RT CompactPCI Serial PSI5-ECU-1 card
@@ -20863,6 +20951,9 @@
 	2020  DC-390
 	690c  690c
 	dc29  DC290
+1de5  Eideticom, Inc
+	1000  IO Memory Controller
+	2000  NoLoad Hardware Development Kit
 # nee Tumsan Oy
 1fc0  Ascom (Finland) Oy
 	0300  E2200 Dual E1/Rawpipe Card
@@ -20897,6 +20988,7 @@
 		0000 3014  10-Giga TOE Dual Port CX4 Low Profile SmartNIC
 	4010  TN4010 Clean SROM
 	4020  TN9030 10GbE CX4 Ethernet Adapter
+		180c 2040  Mustang-200 10GbE Ethernet Adapter
 	4022  TN9310 10GbE SFP+ Ethernet Adapter
 		1043 8709  XG-C100F 10GbE SFP+ Ethernet Adapter
 		1186 4d00  DXE-810S 10GbE SFP+ Ethernet Adapter
@@ -21705,6 +21797,7 @@
 		17aa 21cf  ThinkPad T520
 	0150  Xeon E3-1200 v2/3rd Gen Core processor DRAM Controller
 		1043 84ca  P8 series motherboard
+		1458 d000  Ivy Bridge GT1 [HD Graphics]
 		15d9 0624  X9SCM-F Motherboard
 		1849 0150  Motherboard
 	0151  Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port
@@ -21916,6 +22009,7 @@
 	0897  Centrino Wireless-N 130
 		8086 5015  Centrino Wireless-N 130 BGN
 		8086 5017  Centrino Wireless-N 130 BG
+	08a7  Quark SoC X1000 SDIO / eMMC Controller
 	08ae  Centrino Wireless-N 100
 		8086 1005  Centrino Wireless-N 100 BGN
 		8086 1007  Centrino Wireless-N 100 BG
@@ -22114,6 +22208,12 @@
 		8086 8370  Dual Band Wireless AC 3160
 # PowerVR SGX 545
 	08cf  Atom Processor Z2760 Integrated Graphics Controller
+	0934  Quark SoC X1000 I2C Controller and GPIO Controller
+	0935  Quark SoC X1000 SPI Controller
+	0936  Quark SoC X1000 HS-UART
+	0937  Quark SoC X1000 10/100 Ethernet MAC
+	0939  Quark SoC X1000 USB EHCI Host Controller / USB 2.0 Device
+	093a  Quark SoC X1000 USB OHCI Host Controller
 	0953  PCIe Data Center SSD
 		8086 3702  DC P3700 SSD
 		8086 3703  DC P3700 SSD [2.5" SFF]
@@ -22123,6 +22223,7 @@
 		8086 370a  DC P3600 SSD [2.5" SFF]
 		8086 370d  SSD 750 Series [Add-in Card]
 		8086 370e  SSD 750 Series [2.5" SFF]
+	0958  Quark SoC X1000 Host Bridge
 	095a  Wireless 7265
 # Stone Peak 2 AC
 		8086 1010  Dual Band Wireless-AC 7265
@@ -22209,9 +22310,11 @@
 		8086 5310  Dual Band Wireless-AC 7265
 # Stone Peak 2 AGN
 		8086 9200  Dual Band Wireless-AC 7265
+	095e  Quark SoC X1000 Legacy Bridge
 	0960  80960RP (i960RP) Microprocessor/Bridge
 	0962  80960RM (i960RM) Bridge
 	0964  80960RP (i960RP) Microprocessor/Bridge
+	0a03  Haswell-ULT Thermal Subsystem
 	0a04  Haswell-ULT DRAM Controller
 		17aa 2214  ThinkPad X240
 	0a06  Haswell-ULT Integrated Graphics Controller
@@ -22225,7 +22328,16 @@
 	0a2e  Haswell-ULT Integrated Graphics Controller
 	0a53  DC P3520 SSD
 	0a54  Express Flash NVMe P4500
+		1028 1fe1  Express Flash NVMe 1TB 2.5" U.2 (P4500)
+		1028 1fe2  Express Flash NVMe 2TB 2.5" U.2 (P4500)
+		1028 1fe3  Express Flash NVMe 4TB 2.5" U.2 (P4500)
+		1028 1fe4  Express Flash NVMe 4TB HHHL AIC (P4500)
 	0a55  Express Flash NVMe P4600
+		1028 1fe5  Express Flash NVMe 1.6TB 2.5" U.2 (P4600)
+		1028 1fe6  Express Flash NVMe 2TB 2.5" U.2 (P4600)
+		1028 1fe7  Express Flash NVMe 3.2TB 2.5" U.2 (P4600)
+		1028 1fe8  Express Flash NVMe 2.0TB HHHL AIC (P4600)
+		1028 1fe9  Express Flash NVMe 4.0TB HHHL AIC (P4600)
 	0be0  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
 	0be1  Atom Processor D2xxx/N2xxx Integrated Graphics Controller
 		105b 0d7c  D270S/D250S Motherboard
@@ -22999,6 +23111,8 @@
 	11a1  Merrifield Power Management Unit
 	11a2  Merrifield Serial IO DMA Controller
 	11a5  Merrifield Serial IO PWM Controller
+	11c3  Quark SoC X1000 PCIe Root Port 0
+	11c4  Quark SoC X1000 PCIe Root Port 1
 	1200  IXP1200 Network Processor
 		172a 0000  AEP SSL Accelerator
 	1209  8255xER/82551IT Fast Ethernet Controller
@@ -23314,6 +23428,7 @@
 		108e 7b14  Sun Dual Port 10 GbE PCIe 2.0 ExpressModule, Base-T
 		108e 7b15  Sun Dual Port 10 GbE PCIe 2.0 Low Profile Adapter, Base-T
 		1137 00bf  Ethernet Converged Network Adapter X540-T2
+		1170 0052  Ethernet Controller 10-Gigabit X540-AT2
 		17aa 1073  ThinkServer X540-T2 AnyFabric
 		17aa 4006  Ethernet Controller 10-Gigabit X540-AT2
 		1bd4 001a  10G base-T DP ER102Ti3 Rack Adapter
@@ -23434,6 +23549,7 @@
 		8086 000b  Ethernet Server Adapter X710-DA2 for OCP
 		8086 000d  Ethernet Controller X710 for 10GbE SFP+
 		8086 000e  Ethernet Server Adapter OCP X710-2
+		8086 000f  Ethernet Server Adapter OCP X710-2
 		8086 0010  Ethernet Converged Network Adapter X710
 		8086 4005  Ethernet Controller X710 for 10GbE SFP+
 		8086 4006  Ethernet Controller X710 for 10GbE SFP+
@@ -23544,6 +23660,7 @@
 	15c8  Ethernet Connection X553/X557-AT 10GBASE-T
 	15ce  Ethernet Connection X553 10 GbE SFP+
 	15d0  Ethernet SDI Adapter FM10420-100GbE-QDA2
+		8086 0001  Ethernet SDI Adapter FM10420-100GbE-QDA2
 	15d1  Ethernet Controller 10G X550T
 		8086 0002  Ethernet Converged Network Adapter X550-T1
 		8086 001b  Ethernet Server Adapter X550-T1 for OCP
@@ -23626,7 +23743,7 @@
 		17aa 2247  ThinkPad T570
 		17aa 224f  ThinkPad X1 Carbon 5th Gen
 	1912  HD Graphics 530
-	1916  HD Graphics 520
+	1916  Skylake GT2 [HD Graphics 520]
 		1028 06f3  Latitude 3570
 	1918  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers
 	1919  Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Imaging Unit
@@ -24758,7 +24875,7 @@
 		8086 a000  D865PERL mainboard
 		8086 e000  D865PERL mainboard
 		8086 e001  Desktop Board D865GBF
-		8086 e002  SoundMax Intergrated Digital Audio
+		8086 e002  SoundMax Integrated Digital Audio
 	24d6  82801EB/ER (ICH5/ICH5R) AC'97 Modem Controller
 		103c 006a  NX9500
 	24d7  82801EB/ER (ICH5/ICH5R) USB UHCI Controller #3
@@ -25755,7 +25872,7 @@
 	2822  SATA Controller [RAID mode]
 		1028 020d  Inspiron 530
 		103c 2a6f  Asus IPIBL-LB Motherboard
-		1043 8277  P5K PRO Motherboard
+		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
 	2823  C610/X99 series chipset sSATA Controller [RAID mode]
 	2824  82801HB (ICH8) 4 port SATA Controller [AHCI mode]
 		1043 81ec  P5B
@@ -25930,7 +26047,7 @@
 	284b  82801H (ICH8 Family) HD Audio Controller
 		1025 011f  Realtek ALC268 audio codec
 		1025 0121  Aspire 5920G
-		1025 0145  Realtek ALC889 (Aspire 8920G w. Dolby Theather)
+		1025 0145  Realtek ALC889 (Aspire 8920G w. Dolby Theater)
 		1028 01da  OptiPlex 745
 		1028 01f3  Inspiron 1420
 		1028 01f9  Latitude D630
@@ -25985,14 +26102,14 @@
 		1028 0210  PowerEdge T300 onboard SATA Controller
 		1028 0211  Optiplex 755
 		1028 023c  PowerEdge R200 onboard SATA Controller
-		1043 8277  P5K PRO Motherboard
+		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
 	2921  82801IB (ICH9) 2 port SATA Controller [IDE mode]
 		1028 0235  PowerEdge R710 SATA IDE Controller
 		1028 0236  PowerEdge R610 SATA IDE Controller
 		1028 0237  PowerEdge T610 SATA IDE Controller
 		1462 7360  G33/P35 Neo
 	2922  82801IR/IO/IH (ICH9R/DO/DH) 6 port SATA Controller [AHCI mode]
-		1043 8277  P5K PRO Motherboard
+		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
 		1af4 1100  QEMU Virtual Machine
 		8086 5044  Desktop Board DP35DP
 	2923  82801IB (ICH9) 4 port SATA Controller [AHCI mode]
@@ -26004,7 +26121,7 @@
 		1028 020f  PowerEdge R300 onboard SATA Controller
 		1028 0210  PowerEdge T300 onboard SATA Controller
 		1028 0211  Optiplex 755
-		1043 8277  P5K PRO Motherboard
+		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
 		1462 7360  G33/P35 Neo
 	2928  82801IBM/IEM (ICH9M/ICH9M-E) 2 port SATA Controller [IDE mode]
 	2929  82801IBM/IEM (ICH9M/ICH9M-E) 4 port SATA Controller [AHCI mode]
@@ -26018,7 +26135,7 @@
 		1028 0211  Optiplex 755
 		103c 2a6f  Asus IPIBL-LB Motherboard
 		103c 3628  dv6-1190en
-		1043 8277  P5K PRO Motherboard
+		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
 		1462 7360  G33/P35 Neo
 		1af4 1100  QEMU Virtual Machine
 		8086 5044  Desktop Board DP35DP
@@ -26038,7 +26155,7 @@
 		1028 029c  PowerEdge M710 USB UHCI Controller
 		1028 2011  Optiplex 755
 		103c 2a6f  Asus IPIBL-LB Motherboard
-		1043 8277  P5K PRO Motherboard
+		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
 		1462 7360  G33/P35 Neo
 		1af4 1100  QEMU Virtual Machine
 		8086 5044  Desktop Board DP35DP
@@ -26055,7 +26172,7 @@
 		1028 0287  PowerEdge M610 onboard UHCI
 		1028 029c  PowerEdge M710 USB UHCI Controller
 		103c 2a6f  Asus IPIBL-LB Motherboard
-		1043 8277  P5K PRO Motherboard
+		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
 		1462 7360  G33/P35 Neo
 		1af4 1100  QEMU Virtual Machine
 		8086 5044  Desktop Board DP35DP
@@ -26070,7 +26187,7 @@
 		1028 0287  PowerEdge M610 onboard UHCI
 		1028 029c  PowerEdge M710 USB UHCI Controller
 		103c 2a6f  Asus IPIBL-LB Motherboard
-		1043 8277  P5K PRO Motherboard
+		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
 		1462 7360  G33/P35 Neo
 		1af4 1100  QEMU Virtual Machine
 		8086 5044  Desktop Board DP35DP
@@ -26085,7 +26202,7 @@
 		1028 029c  PowerEdge M710 USB UHCI Controller
 		1028 2011  Optiplex 755
 		103c 2a6f  Asus IPIBL-LB Motherboard
-		1043 8277  P5K PRO Motherboard
+		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
 		1462 7360  G33/P35 Neo
 		1af4 1100  QEMU Virtual Machine
 		8086 2937  Optiplex 755
@@ -26101,7 +26218,7 @@
 		1028 0287  PowerEdge M610 onboard UHCI
 		1028 029c  PowerEdge M710 USB UHCI Controller
 		103c 2a6f  Asus IPIBL-LB Motherboard
-		1043 8277  P5K PRO Motherboard
+		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
 		1462 7360  G33/P35 Neo
 		1af4 1100  QEMU Virtual Machine
 		8086 2938  Optiplex 755
@@ -26112,7 +26229,7 @@
 		1028 0210  PowerEdge T300 onboard UHCI
 		1028 0237  PowerEdge T610 USB UHCI Controller
 		103c 2a6f  Asus IPIBL-LB Motherboard
-		1043 8277  P5K PRO Motherboard
+		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
 		1462 7360  G33/P35 Neo
 		1af4 1100  QEMU Virtual Machine
 		8086 5044  Desktop Board DP35DP
@@ -26129,7 +26246,7 @@
 		1028 0287  PowerEdge M610 onboard EHCI
 		1028 029c  PowerEdge M710 USB EHCI Controller
 		103c 2a6f  Asus IPIBL-LB Motherboard
-		1043 8277  P5K PRO Motherboard
+		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
 		1462 7360  G33/P35 Neo
 		1af4 1100  QEMU Virtual Machine
 		8086 5044  Desktop Board DP35DP
@@ -26143,7 +26260,7 @@
 		1028 0287  PowerEdge M610 onboard EHCI
 		1028 029c  PowerEdge M710 USB EHCI Controller
 		103c 2a6f  Asus IPIBL-LB Motherboard
-		1043 8277  P5K PRO Motherboard
+		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
 		1462 7360  G33/P35 Neo
 		1af4 1100  QEMU Virtual Machine
 		8086 293c  Optiplex 755
@@ -26154,7 +26271,7 @@
 		1028 0211  Optiplex 755
 		103c 2a6f  Asus IPIBL-LB Motherboard
 		103c 3628  dv6-1190en
-		1043 829f  P5K PRO Motherboard
+		1043 829f  P5K PRO Motherboard: 82801IR [ICH9R]
 		1462 7360  G33/P35 Neo
 		1af4 1100  QEMU Virtual Machine
 		8086 293e  Optiplex 755
@@ -26164,8 +26281,7 @@
 		1028 020d  Inspiron 530
 		1028 0211  Optiplex 755
 		103c 2a6f  Asus IPIBL-LB Motherboard
-# same ID possibly also on other ASUS boards
+		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
-		1043 8277  P5K PRO Motherboard
 		8086 2940  Optiplex 755
 	2942  82801I (ICH9 Family) PCI Express Port 2
 		1028 020d  Inspiron 530
@@ -26176,12 +26292,10 @@
 		1028 020d  Inspiron 530
 	2948  82801I (ICH9 Family) PCI Express Port 5
 		1028 020d  Inspiron 530
-# same ID possibly also on other ASUS boards
+		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
-		1043 8277  P5K PRO Motherboard
 	294a  82801I (ICH9 Family) PCI Express Port 6
 		1028 020d  Inspiron 530
-# same ID possibly also on other ASUS boards
+		1043 8277  P5K PRO Motherboard: 82801IR [ICH9R]
-		1043 8277  P5K PRO Motherboard
 	294c  82566DC-2 Gigabit Network Connection
 		17aa 302e  82566DM-2 Gigabit Network Connection
 	2970  82946GZ/PL/GL Memory Controller Hub
@@ -26235,16 +26349,14 @@
 	29c0  82G33/G31/P35/P31 Express DRAM Controller
 		1028 020d  Inspiron 530
 		103c 2a6f  Asus IPIBL-LB Motherboard
-# same ID possibly also on other ASUS boards
+		1043 8276  P5K PRO Motherboard: Intel 82P35 Northbridge
-		1043 8276  P5K PRO Motherboard
 		1043 82b0  P5KPL-VM Motherboard
 		1462 7360  G33/P35 Neo
 		1af4 1100  QEMU Virtual Machine
 		8086 5044  Desktop Board DP35DP
 	29c1  82G33/G31/P35/P31 Express PCI Express Root Port
 		1028 020d  Inspiron 530
-# same ID possibly also on other ASUS boards
+		1043 8276  P5K PRO Motherboard: Intel 82P35 Northbridge
-		1043 8276  P5K PRO Motherboard
 	29c2  82G33/G31 Express Integrated Graphics Controller
 		1028 020d  Inspiron 530
 		1043 82b0  P5KPL-VM Motherboard
@@ -28906,6 +29018,34 @@
 		103c 0701  Smart Array P204i-b SR Gen10
 		103c 1100  Smart Array P816i-a SR Gen10
 		103c 1101  Smart Array P416ie-m SR G10
+		9005 0800  SmartRAID 3154-8i
+		9005 0801  SmartRAID 3152-8i
+		9005 0802  SmartRAID 3151-4i
+		9005 0803  SmartRAID 3101-4i
+		9005 0804  SmartRAID 3154-8e
+		9005 0805  SmartRAID 3102-8i
+		9005 0806  SmartRAID 3100
+		9005 0807  SmartRAID 3162-8i
+		9005 0900  SmartHBA 2100-8i
+		9005 0901  SmartHBA 2100-4i
+		9005 0902  HBA 1100-8i
+		9005 0903  HBA 1100-4i
+		9005 0904  SmartHBA 2100-8e
+		9005 0905  HBA 1100-8e
+		9005 0906  SmartHBA 2100-4i4e
+		9005 0907  HBA 1100
+		9005 0908  SmartHBA 2100
+		9005 090a  SmartHBA 2100A-8i
+		9005 1200  SmartRAID 3154-24i
+		9005 1201  SmartRAID 3154-8i16e
+		9005 1202  SmartRAID 3154-8i8e
+		9005 1280  HBA 1100-16i
+		9005 1281  HBA 1100-16e
+		9005 1300  HBA 1100-8i8e
+		9005 1301  HBA 1100-24i
+		9005 1302  SmartHBA 2100-8i8e
+		9005 1303  SmartHBA 2100-24i
+		9005 1380  SmartRAID 3154-16i
 	0410  AIC-9410W SAS (Razor HBA RAID)
 		9005 0410  ASC-48300(Spirit RAID)
 		9005 0411  ASC-58300 (Oakmont RAID)

hwdb/pnp_id_registry.html

@@ -579,7 +579,7 @@
  <tr class="odd"><td>Digital Audio Labs Inc</td><td>DAL</td><td>11/29/1996</td> </tr>
  <tr class="even"><td>Digital Communications Association</td><td>DCA</td><td>11/29/1996</td> </tr>
  <tr class="odd"><td>Digital Discovery</td><td>SHR</td><td>09/24/1997</td> </tr>
- <tr class="even"><td>Digital Electronics Corporation</td><td>PRF</td><td>01/02/2003</td> </tr>
+ <tr class="even"><td>Schneider Electric Japan Holdings, Ltd.</td><td>PRF</td><td>01/02/2003</td> </tr>
  <tr class="odd"><td>Digital Equipment Corporation</td><td>DEC</td><td>11/29/1996</td> </tr>
  <tr class="even"><td>Digital Processing Systems</td><td>DPS</td><td>11/29/1996</td> </tr>
  <tr class="odd"><td>Digital Projection Limited</td><td>DPL</td><td>07/09/2002</td> </tr>
@@ -2408,6 +2408,21 @@
  <tr class="even"><td>Televic Conference  </td><td>TCF</td><td>02/28/2017</td> </tr>
  <tr class="odd"><td>Shanghai Chai Ming Huang Info&amp;Tech Co, Ltd  </td><td>HYL</td><td>02/28/2017</td> </tr>
  <tr class="even"><td>Techlogix Networx</td><td>TLN</td><td>02/28/2017</td> </tr>
+ <tr class="odd"><td>G2TOUCH KOREA</td><td>GGT</td><td>05/25/2017</td> </tr>
+ <tr class="even"><td>MediCapture, Inc.</td><td>MVR</td><td>05/25/2017</td> </tr>
+ <tr class="odd"><td>HOYA Corporation PENTAX Lifecare Division</td><td>PNT</td><td>05/25/2017</td> </tr>
+ <tr class="even"><td>christmann informationstechnik + medien GmbH &amp; Co. KG</td><td>CHR</td><td>05/25/2017</td> </tr>
+ <tr class="odd"><td>Tencent</td><td>TEN</td><td>06/20/2017</td> </tr>
+ <tr class="even"><td>VRstudios, Inc.</td><td>VRS</td><td>06/22/2017</td> </tr>
+ <tr class="odd"><td>Extreme Engineering Solutions, Inc.</td><td>XES</td><td>06/22/2017</td> </tr>
+ <tr class="even"><td>NewTek</td><td>NTK</td><td>06/22/2017</td> </tr>
+ <tr class="odd"><td>BlueBox Video Limited</td><td>BBV</td><td>06/22/2017</td> </tr>
+ <tr class="even"><td>Televés, S.A.</td><td>TEV</td><td>06/22/2017</td> </tr>
+ <tr class="odd"><td>Avatron Software Inc.</td><td>AVS</td><td>08/23/2017</td> </tr>
+ <tr class="even"><td>Positivo Tecnologia S.A.</td><td>POS</td><td>09/01/2017</td> </tr>
+ <tr class="odd"><td>VRgineers, Inc.</td><td>VRG</td><td>09/07/2017</td> </tr>
+ <tr class="even"><td>Noritake Itron Corporation</td><td>NRI</td><td>11/13/2017</td> </tr>
+ <tr class="odd"><td>Matrix Orbital Corporation</td><td>MOC</td><td>11/13/2017</td> </tr>
       </tbody>
     </table>
   </body>

hwdb/usb.ids

@@ -9,8 +9,8 @@
 #	The latest version can be obtained from
 #		http://www.linux-usb.org/usb.ids
 #
-# Version: 2017.09.10
+# Version: 2017.11.27
-# Date:    2017-09-10 20:34:07
+# Date:    2017-11-27 20:34:05
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -61,6 +61,8 @@
 	0499  SE340D PC Remote Control
 03da  Bernd Walter Computer Technology
 	0002  HD44780 LCD interface
+03e7  Intel
+	2150  Myriad VPU [Movidius Neural Compute Stick]
 03e8  EndPoints, Inc.
 	0004  SE401 Webcam
 	0008  101 Ethernet [klsi]
@@ -109,6 +111,7 @@
 	2106  STK600 development board
 	2107  AVR Dragon
 	2109  STK541 ZigBee Development Board
+	210a  AT86RF230 [RZUSBSTICK] transceiver
 	210d  XPLAIN evaluation kit (CDC ACM)
 	2110  AVR JTAGICE3 Debugger and Programmer
 	2111  Xplained Pro board debugger and programmer
@@ -202,6 +205,7 @@
 	0217  LaserJet 2200
 	0218  APOLLO P2500/2600
 	0221  StreamSmart 400 [F2235AA]
+	0223  Digital Drive Flash Reader
 	022a  Laserjet CP1525nw
 	0241  Link-5 micro dongle
 	0304  DeskJet 810c/812c
@@ -236,6 +240,7 @@
 	0611  OfficeJet K60xi
 	0612  business inkjet 3000
 	0624  Bluetooth Dongle
+	0641  X1200 Optical Mouse
 	0701  ScanJet 5300c/5370c
 	0704  DeskJet 825c
 	0705  ScanJet 4400c
@@ -314,6 +319,7 @@
 	1524  Smart Card Keyboard - KR
 	1539  Mini Magnetic Stripe Reader
 	1541  Prime [G8X92AA]
+	154a  Laser Mouse
 	1602  PhotoSmart 330 series
 	1604  DeskJet 940c
 	1605  ScanJet 5530C PhotoSmart
@@ -528,6 +534,7 @@
 	5307  v165w Stick
 	5311  OfficeJet 6300
 	5312  Officejet Pro 8500A
+	5317  Color LaserJet CP2025 series
 	5411  OfficeJet 4300
 	5511  DeskJet F300 series
 	5611  PhotoSmart C3180
@@ -648,6 +655,7 @@
 	9c02  PhotoSmart M440 series
 	a004  DeskJet 5850c
 	a011  Deskjet 3050A
+	a407  Wireless Optical Comfort Mouse
 	b002  PhotoSmart 7200 series
 	b102  PhotoSmart 7200 series
 	b107  v255w/c310w Flash Drive
@@ -781,6 +789,8 @@
 	a951  HCP HIT GSM/GPRS modem [Cinterion MC55i]
 	a9a0  FT2232D - Dual UART/FIFO IC - FTDI
 	abb8  Lego Mindstorms NXTCam
+	b0c2  iID contactless RFID device
+	b0c3  iID contactless RFID device
 	b810  US Interface Navigator (CAT and 2nd PTT lines)
 	b811  US Interface Navigator (WKEY and FSK lines)
 	b812  US Interface Navigator (RS232 and CONFIG lines)
@@ -1114,6 +1124,7 @@
 	602a  i900
 040b  Weltrend Semiconductor
 	0a68  Func MS-3 gaming mouse [WT6573F MCU]
+	2367  Human Interface Device [HP CalcPad 200 Calculator and Numeric Keypad]
 	6510  Weltrend Bar Code Reader
 	6520  XBOX Xploder
 	6533  Speed-Link Competition Pro
@@ -1431,6 +1442,10 @@
 	0104  ADL Re-Flashing Engine Parent
 	0105  Nokia Firmware Upgrade Mode
 	0106  ROM Parent
+	010d  E75 (Storage Mode)
+	010e  E75 (PC Suite mode)
+	010f  E75 (Media transfer mode)
+	0110  E75 (Imaging Mode)
 	0154  5800 XpressMusic (PC Suite mode)
 	0155  5800 XpressMusic (Multimedia mode)
 	0156  5800 XpressMusic (Storage mode)
@@ -2318,6 +2333,7 @@
 	0736  Sidewinder X5 Mouse
 	0737  Compact Optical Mouse 500
 	0745  Nano Transceiver v1.0 for Bluetooth
+	074a  LifeCam VX-500 [1357]
 	0750  Wired Keyboard 600
 	0752  Wired Keyboard 400
 	075d  LifeCam Cinema
@@ -2327,11 +2343,13 @@
 	0768  Sidewinder X4
 	076c  Comfort Mouse 4500
 	076d  LifeCam HD-5000
+	0770  LifeCam VX-700
 	0772  LifeCam Studio
 	0779  LifeCam HD-3000
 	077f  LifeChat LX-6000 Headset
 	0780  Comfort Curve Keyboard 3000
 	0797  Optical Mouse 200
+	0799  Surface Pro embedded keyboard
 	07a5  Wireless Receiver 1461C
 	07b9  Wired Keyboard 200
 	07ca  Surface Pro 3 Docking Station Audio Device
@@ -2387,7 +2405,7 @@
 	081c  Elitegroup ECS-C11 Camera
 	081d  Elitegroup ECS-C11 Storage
 	0a00  Micro Innovations Web Cam 320
-	4d01  Comfort Keyboard
+	4d01  Comfort Keyboard / Kensington Orbit Elite
 	4d02  Mouse-in-a-Box
 	4d03  Kensington Mouse-in-a-box
 	4d04  Mouse
@@ -2405,6 +2423,7 @@
 	4d75  Rocketfish RF-FLBTAD Bluetooth Adapter
 	4d81  Dell N889 Optical Mouse
 	4de7  webcam
+	4e04  Lenovo Keyboard KB1021
 0463  MGE UPS Systems
 	0001  UPS
 	ffff  UPS
@@ -2586,6 +2605,7 @@
 	0a45  960 Headset
 	0a4d  G430 Surround Sound Gaming Headset
 	0a5b  G933 Wireless Headset Dongle
+	0a66  [G533 Wireless Headset Dongle]
 	0b02  C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode)
 	8801  Video Camera
 	b014  Bluetooth Mouse M336/M337/M535
@@ -2758,6 +2778,7 @@
 	c31c  Keyboard K120
 	c31d  Media Keyboard K200
 	c31f  Comfort Keyboard K290
+	c328  Corded Keyboard K280e
 	c332  G502 Proteus Spectrum Optical Mouse
 	c335  G910 Orion Spectrum Mechanical Keyboard
 	c401  TrackMan Marble Wheel
@@ -3121,6 +3142,7 @@
 	0203  AH-K3001V
 	0204  iBurst Terminal
 	0408  FS-1320D Printer
+	069b  ECOSYS M2635dn
 0483  STMicroelectronics
 	0137  BeWAN ADSL USB ST (blue or green)
 	0138  Unicorn II (ST70138B + MTC-20174TQ chipset)
@@ -3251,6 +3273,7 @@
 	1054  S90XS Keyboard/Music Synthesizer
 	160f  P-105
 	1613  Clavinova CLP535
+	1704  Steinberg UR44
 	2000  DGP-7
 	2001  DGP-5
 	3001  YST-MS55D USB Speaker
@@ -3673,12 +3696,12 @@
 	2229  CanoScan 8600F
 	2602  MultiPASS C555
 	2603  MultiPASS C755
-	260a  CAPT Printer
+	260a  LBP810
 	260e  LBP-2000
 	2610  MPC600F
 	2611  SmartBase MPC400
 	2612  MultiPASS C855
-	2617  CAPT Printer
+	2617  LBP1210
 	261a  iR1600
 	261b  iR1610
 	261c  iC2300
@@ -3733,9 +3756,9 @@
 	2671  iR5570/iR6570
 	2672  iR C3170
 	2673  iR 3170C EUR
-	2674  L120
+	2674  FAX-L120
 	2675  iR2830
-	2676  CAPT Device
+	2676  LBP2900
 	2677  iR C2570
 	2678  iR 2570C EUR
 	2679  CAPT Device
@@ -3746,6 +3769,7 @@
 	2686  MF6500 series
 	2687  iR4530
 	2688  LBP3460
+	2689  FAX-L180/L380S/L398S
 	268c  iR C6870
 	268d  iR 6870C EUR
 	268e  iR C5870
@@ -3757,6 +3781,7 @@
 	26b5  MF4200 series
 	26da  LBP3010B printer
 	26e6  iR1024
+	271a  LBP6000
 	2736  I-SENSYS MF4550d
 	2737  MF4410
 	3041  PowerShot S10
@@ -4067,6 +4092,7 @@
 	32ad  PowerShot SX410 IS
 	32b1  SELPHY CP1200
 	32b2  PowerShot G9 X
+	32b4  EOS Rebel T6
 	32bb  EOS M5
 	32bf  PowerShot SX420 IS
 	32c1  PowerShot ELPH 180 / IXUS 175
@@ -4528,6 +4554,8 @@
 	10fe  S500
 	1150  fi-6230
 	125a  PalmSecure Sensor Device - MP
+	200f  Sigma DP2 (Mass Storage)
+	2010  Sigma DP2 (PictBridge)
 	201d  SATA 3.0 6Gbit/s Adaptor [GROOVY]
 04c6  Toshiba America Electronic Components
 04c7  Micro Macro Technologies
@@ -4633,6 +4661,7 @@
 	01bf  FinePix F6000fd/S6500fd Zoom (PTP)
 	01c0  FinePix F20 (PTP)
 	01c1  FinePix F31fd (PTP)
+	01c3  FinePix S5 Pro
 	01c4  FinePix S5700 Zoom (PTP)
 	01c5  FinePix F40fd (PTP)
 	01c6  FinePix A820 Zoom (PTP)
@@ -4646,6 +4675,8 @@
 	0240  FinePix S2950 Digital Camera
 	0241  FinePix S3200 Digital Camera
 	0278  FinePix JV300
+	02c5  FinePix S9900W Digital Camera (PTP)
+	5006  ASK-300
 04cc  ST-Ericsson
 	1122  Hub
 	1520  USB 2.0 Hub (Avocent KVM)
@@ -4745,9 +4776,11 @@
 	a01c  wireless multimedia keyboard with trackball [Trust ADURA 17911]
 	a050  Chatman V1
 	a055  Keyboard
+	a096  Keyboard
 	a09f  E-Signal LUOM G10 Mechanical Gaming Mouse
 	a100  Mouse [HV-MS735]
 	a11b  Mouse [MX-3200]
+	e002  MCU
 04da  Panasonic (Matsushita)
 	0901  LS-120 Camera
 	0912  SDR-S10
@@ -5234,6 +5267,7 @@
 	b104  CNF7069 Webcam
 	b107  CNF7070 Webcam
 	b14c  CNF8050 Webcam
+	b159  CNF8243 Webcam
 	b15c  Sony Vaio Integrated Camera
 	b175  4-Port Hub
 	b1aa  Webcam-101
@@ -5265,6 +5299,7 @@
 04f3  Elan Microelectronics Corp.
 	000a  Touchscreen
 	0103  ActiveJet K-2024 Multimedia Keyboard
+	016f  Touchscreen
 	01a4  Wireless Keyboard
 	0201  Touchscreen
 	0210  Optical Mouse
@@ -5320,6 +5355,7 @@
 	002c  Printer
 	002d  Printer
 	0039  HL-5340 series
+	0041  HL-2250DN Laser Printer
 	0042  HL-2270DW Laser Printer
 	0100  MFC8600/9650 series
 	0101  MFC9600/9870 series
@@ -5507,6 +5543,7 @@
 	021c  MFC-9320CW
 	021d  MFC-9120CN
 	021e  DCP-9010CN
+	021f  DCP-8085DN
 	0220  MFC-9010CN
 	0222  DCP-195C
 	0223  DCP-365CN
@@ -5531,6 +5568,7 @@
 	023f  MFC-8680DN
 	0240  MFC-J950DN
 	0248  DCP-7055 scanner/printer
+	024e  MFC-7460DN
 	0253  DCP-J125
 	0254  DCP-J315W
 	0255  DCP-J515W
@@ -5550,6 +5588,7 @@
 	026d  MFC-J805D
 	026e  MFC-J855DN
 	026f  MFC-J270W
+	0270  MFC-7360N
 	0273  DCP-7057 scanner/printer
 	0276  MFC-5895CW
 	0278  MFC-J410W
@@ -5781,6 +5820,7 @@
 	2027  QL-560 P-touch Label Printer
 	2028  QL-570 P-touch Label Printer
 	202b  PT-7600 P-touch Label Printer
+	2041  PT-2730 P-touch Label Printer
 	2061  PT-P700 P-touch Label Printer
 	2064  PT-P700 P-touch Label Printer RemovableDisk
 	2100  Card Reader Writer
@@ -6162,6 +6202,7 @@
 	2727  Xircom PGUNET USB-USB Bridge
 	2750  EZ-Link (EZLNKUSB.SYS)
 	2810  Cypress ATAPI Bridge
+	4018  AmScope MU1803
 	4d90  AmScope MD1900 camera
 	6010  AmScope MU1000 camera
 	6510  Touptek UCMOS05100KPA
@@ -6358,6 +6399,7 @@
 	06bb  WALKMAN NWZ-F805
 	06c3  RC-S380
 	07c4  ILCE-6000 (aka Alpha-6000) in Mass Storage mode
+	0847  WG-C10 Portable Wireless Server
 	088c  Portable Headphone Amplifier
 	08b7  ILCE-6000 (aka Alpha-6000) in MTP mode
 	094e  ILCE-6000 (aka Alpha-6000) in PC Remote mode
@@ -6664,6 +6706,8 @@
 	0354  DTH-1620 [Cintiq Pro 16] touchscreen
 	0357  PTH-660 [Intuos Pro (M)]
 	0358  PTH-860 [Intuos Pro (L)]
+	035a  DTH-1152 tablet
+	0368  DTH-1152 touchscreen
 	0400  PenPartner 4x5
 	4001  TPC4001
 	4004  TPC4004
@@ -6684,6 +6728,7 @@
 	0003  Device Bay Controller
 056e  Elecom Co., Ltd
 	0002  29UO Mouse
+	0057  M-PGDL Mouse
 	0072  Mouse
 	200c  LD-USB/TX
 	4002  Laneed 100Mbps Ethernet LD-USB/TX [pegasus]
@@ -8334,6 +8379,7 @@
 0656  Glory Mark Electronic, Ltd
 0657  Tekcon Electronics Corp.
 0658  Sigma Designs, Inc.
+	0200  Aeotec Z-Stick Gen5 (ZW090) - UZB
 0659  Aethra
 065a  Optoelectronics Co., Ltd
 	0001  Opticon OPR-2001 / NLV-1001 (keyboard mode)
@@ -19915,7 +19961,7 @@ HUT 07  Keyboard
 	031  \ and | (Backslash and Bar)
 	032  # and ~ (Hash and Tilde, Non-US Keyboard near right shift)
 	033  ; and : (Semicolon and Colon)
-	034  ´ and " (Accent Acute and Double Quotes)
+	034  ´ and " (Accent Acute and Double Quotes)
 	035  ` and ~ (Accent Grace and Tilde)
 	036  , and < (Comma and Less)
 	037  . and > (Period and Greater)

man/binfmt.d.xml

@@ -2,6 +2,8 @@
 <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2011 Lennart Poettering

man/bootctl.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   systemd is free software; you can redistribute it and/or modify it
@@ -49,6 +51,9 @@
     <cmdsynopsis>
       <command>bootctl <arg choice="opt" rep="repeat">OPTIONS</arg> status</command>
     </cmdsynopsis>
+    <cmdsynopsis>
+      <command>bootctl <arg choice="opt" rep="repeat">OPTIONS</arg> list</command>
+    </cmdsynopsis>
     <cmdsynopsis>
       <command>bootctl <arg choice="opt" rep="repeat">OPTIONS</arg> update</command>
     </cmdsynopsis>
@@ -71,6 +76,9 @@
     currently installed versions of the boot loader binaries and
     all current EFI boot variables.</para>
 
+    <para><command>bootctl list</command> displays all configured boot loader entries.
+    </para>
+
     <para><command>bootctl update</command> updates all installed versions of systemd-boot, if the current version is
     newer than the version installed in the EFI system partition. This also includes the EFI default/fallback loader at
     <filename>/EFI/BOOT/BOOT*.EFI</filename>. A systemd-boot entry in the EFI boot variables is created if there is no
@@ -102,6 +110,14 @@
         the ESP to <filename>/boot</filename>, if possible.</para></listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><option>-p</option></term>
+        <term><option>--print-path</option></term>
+        <listitem><para>This option modifies the behaviour of <command>status</command>.
+        Just print the path to the EFI System Partition (ESP) to standard output and
+        exit.</para></listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><option>--no-variables</option></term>
         <listitem><para>Do not touch the EFI boot variables.</para></listitem>
@@ -119,7 +135,7 @@
     <title>See Also</title>
     <para>
       <ulink url="https://www.freedesktop.org/wiki/Specifications/BootLoaderSpec">Boot loader specification</ulink>
-      <ulink url="https://www.freedesktop.org/wiki/Software/systemd/BootLoaderInterface">Systemd boot loader interface</ulink>
+      <ulink url="https://www.freedesktop.org/wiki/Software/systemd/BootLoaderInterface">systemd boot loader interface</ulink>
     </para>
   </refsect1>
 </refentry>

man/bootup.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2012 Lennart Poettering

man/busctl.xml

@@ -3,6 +3,8 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2014 Zbigniew Jędrzejewski-Szmek
@@ -145,6 +147,7 @@
       </varlistentry>
 
       <varlistentry>
+        <term><option>-q</option></term>
         <term><option>--quiet</option></term>
 
         <listitem>

man/coredump.conf.xml

@@ -3,6 +3,8 @@
         "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2014 Zbigniew Jędrzejewski-Szmek

man/coredumpctl.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2012 Zbigniew Jędrzejewski-Szmek
@@ -142,7 +144,7 @@
         <term><option>-q</option></term>
         <term><option>--quiet</option></term>
 
-        <listitem><para>Suppresses info messages about lack
+        <listitem><para>Suppresses informational messages about lack
         of access to journal files and possible in-flight coredumps.
         </para></listitem>
       </varlistentry>

man/crypttab.xml

@@ -2,6 +2,8 @@
 <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2012 Lennart Poettering
@@ -198,10 +200,19 @@
         started after the network is available, similarly to
         <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>
         units marked with <option>_netdev</option>. The service unit to set up this device
-        will be ordered between <filename>remote-cryptsetup-pre.target</filename> and
+        will be ordered between <filename>remote-fs-pre.target</filename> and
         <filename>remote-cryptsetup.target</filename>, instead of
         <filename>cryptsetup-pre.target</filename> and
-        <filename>cryptsetup.target</filename>.</para></listitem>
+        <filename>cryptsetup.target</filename>.</para>
+
+        <para>Hint: if this device is used for a mount point that is specified in
+        <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+        the <option>_netdev</option> option should also be used for the mount
+        point. Otherwise, a dependency loop might be created where the mount point
+        will be pulled in by <filename>local-fs.target</filename>, while the
+        service to configure the network is usually only started <emphasis>after</emphasis>
+        the local file system has been mounted.</para>
+        </listitem>
       </varlistentry>
 
       <varlistentry>
@@ -433,6 +444,7 @@ hidden     /mnt/tc_hidden  /dev/null    tcrypt-hidden,tcrypt-keyfile=/etc/keyfil
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemd-cryptsetup@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemd-cryptsetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+      <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry project='die-net'><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
       <citerefentry project='man-pages'><refentrytitle>mkswap</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
       <citerefentry project='man-pages'><refentrytitle>mke2fs</refentrytitle><manvolnum>8</manvolnum></citerefentry>

man/custom-entities.ent.in

@@ -5,3 +5,4 @@
 <!ENTITY usergeneratordir @USER_GENERATOR_PATH@>
 <!ENTITY systemenvgeneratordir @SYSTEM_ENV_GENERATOR_PATH@>
 <!ENTITY userenvgeneratordir @USER_ENV_GENERATOR_PATH@>
+<!ENTITY CERTIFICATE_ROOT @CERTIFICATE_ROOT@>

man/custom-html.xsl

@@ -1,6 +1,8 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2011 Lennart Poettering

man/custom-man.xsl

@@ -1,6 +1,8 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2013 Zbigniew Jędrzejewski-Szmek

man/daemon.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2010 Lennart Poettering
@@ -505,10 +507,10 @@
 
   </refsect1>
   <refsect1>
-    <title>Integration with Systemd</title>
+    <title>Integration with systemd</title>
 
     <refsect2>
-      <title>Writing Systemd Unit Files</title>
+      <title>Writing systemd Unit Files</title>
 
       <para>When writing systemd unit files, it is recommended to
       consider the following suggestions:</para>
@@ -560,7 +562,7 @@
     </refsect2>
 
     <refsect2>
-      <title>Installing Systemd Service Files</title>
+      <title>Installing systemd Service Files</title>
 
       <para>At the build installation time (e.g. <command>make
       install</command> during package build), packages are

man/dnssec-trust-anchors.d.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2016 Lennart Poettering

man/environment.d.xml

@@ -2,6 +2,8 @@
 <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2016 Red Hat, Inc.
@@ -90,7 +92,7 @@
     <literal>${<replaceable>FOO</replaceable>}</literal> would have expanded to a non-empty value.
     No other elements of shell syntax are supported.</para>
 
-    <para>Each<replaceable>KEY</replaceable> must be a valid variable name. Empty lines
+    <para>Each <replaceable>KEY</replaceable> must be a valid variable name. Empty lines
     and lines beginning with the comment character <literal>#</literal> are ignored.</para>
 
     <refsect2>

man/file-hierarchy.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2014 Lennart Poettering

man/glib-event-glue.c

@@ -1,4 +1,6 @@
 /***
+  SPDX-License-Identifier: MIT
+
   Copyright 2014 Tom Gundersen
 
   Permission is hereby granted, free of charge, to any person

man/halt.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2010 Lennart Poettering
@@ -112,8 +114,13 @@
         <term><option>-f</option></term>
         <term><option>--force</option></term>
 
-        <listitem><para>Force immediate halt, power-off, reboot. Do
+        <listitem><para>Force immediate halt, power-off, or reboot. When
-        not contact the init system.</para></listitem>
+        specified once, this results in an immediate but clean shutdown
+        by the system manager. When specified twice, this results in an
+        immediate shutdown without contacting the system manager. See the
+        description of <option>--force</option> in
+        <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+        for more details.</para></listitem>
       </varlistentry>
 
       <varlistentry>

man/hostname.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2010 Lennart Poettering

man/hostnamectl.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2012 Lennart Poettering

man/hwdb.xml

@@ -2,6 +2,28 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
+<!--
+  SPDX-License-Identifier: LGPL-2.1+
+
+  This file is part of systemd.
+
+  Copyright 2014 Tom Gundersen
+  Copyright 2016 Zbigniew Jędrzejewski-Szmek
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+
 <refentry id="hwdb" conditional="ENABLE_HWDB">
   <refentryinfo>
     <title>hwdb</title>

man/journal-remote.conf.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2015 Chris Morgan

man/journal-upload.conf.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2016 Zbigniew Jędrzejewski-Szmek

man/journalctl.xml

@@ -3,6 +3,8 @@
         "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2012 Lennart Poettering
@@ -384,6 +386,20 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><option>--output-fields=</option></term>
+
+        <listitem><para>A comma separated list of the fields which should
+        be included in the output. This only has an effect for the output modes
+        which would normally show all fields (<option>verbose</option>,
+        <option>export</option>, <option>json</option>,
+        <option>json-pretty</option>, and <option>json-sse</option>). The
+        <literal>__CURSOR</literal>, <literal>__REALTIME_TIMESTAMP</literal>,
+        <literal>__MONOTONIC_TIMESTAMP</literal>, and
+        <literal>_BOOT_ID</literal> fields are always
+        printed.</para></listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><option>--utc</option></term>
 
@@ -423,7 +439,7 @@
         <term><option>-q</option></term>
         <term><option>--quiet</option></term>
 
-        <listitem><para>Suppresses all info messages
+        <listitem><para>Suppresses all informational messages
         (i.e. "-- Logs begin at …", "-- Reboot --"),
         any warning messages regarding
         inaccessible system journals when run as a normal

man/journald.conf.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2010 Lennart Poettering
@@ -379,7 +381,7 @@
         <listitem><para>The maximum line length to permit when converting stream logs into record logs. When a systemd
         unit's standard output/error are connected to the journal via a stream socket, the data read is split into
         individual log records at newline (<literal>\n</literal>, ASCII 10) and NUL characters. If no such delimiter is
-        read for the specified number of bytes a hard log record boundary is artifically inserted, breaking up overly
+        read for the specified number of bytes a hard log record boundary is artificially inserted, breaking up overly
         long lines into multiple log records. Selecting overly large values increases the possible memory usage of the
         Journal daemon for each stream client, as in the worst case the journal daemon needs to buffer the specified
         number of bytes in memory before it can flush a new log record to disk. Also note that permitting overly large

man/kernel-command-line.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2012 Lennart Poettering
@@ -380,6 +382,15 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><varname>systemd.watchdog_device=</varname></term>
+
+        <listitem>
+          <para>Overwrites the watchdog device path <varname>WatchdogDevice=</varname>. For details, see
+          <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><varname>modules_load=</varname></term>
         <term><varname>rd.modules_load=</varname></term>

man/kernel-install.xml

@@ -3,6 +3,8 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2013 Harald Hoyer

man/less-variables.xml

@@ -2,6 +2,27 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
                  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
+<!--
+  SPDX-License-Identifier: LGPL-2.1+
+
+  This file is part of systemd.
+
+  Copyright 2016 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+
 <refsect1>
   <title>Environment</title>
 

man/libsystemd-pkgconfig.xml

@@ -2,6 +2,27 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
           "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
+<!--
+  SPDX-License-Identifier: LGPL-2.1+
+
+  This file is part of systemd.
+
+  Copyright 2014 Zbigniew Jędrzejewski-Szmek
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+
 <refsect1>
   <title>Notes</title>
 

man/libudev.xml

@@ -6,6 +6,8 @@
 ]>
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2015 David Herrmann <dh.herrmann@gmail.com>

man/locale.conf.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2010 Lennart Poettering

man/localectl.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2012 Lennart Poettering
@@ -110,6 +112,7 @@
       </varlistentry>
 
       <xi:include href="user-system-options.xml" xpointer="host" />
+      <xi:include href="user-system-options.xml" xpointer="machine" />
 
       <xi:include href="standard-options.xml" xpointer="help" />
       <xi:include href="standard-options.xml" xpointer="version" />

man/localtime.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2010 Lennart Poettering

man/loginctl.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2010 Lennart Poettering
@@ -280,11 +282,10 @@
         one or more logged in users, followed by the most recent log
         data from the journal. Takes one or more user names or numeric
         user IDs as parameters. If no parameters are passed, the status
-        of the caller's user is shown. This function is intended to
+        is shown for the user of the session of the caller. This
-        generate human-readable output. If you are looking for
+        function is intended to generate human-readable output. If you
-        computer-parsable output, use <command>show-user</command>
+        are looking for computer-parsable output, use
-        instead. Users may be specified by their usernames or numeric
+        <command>show-user</command> instead.</para></listitem>
-        user IDs. </para></listitem>
       </varlistentry>
 
       <varlistentry>

man/logind.conf.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2010 Lennart Poettering

man/machine-id.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2010 Lennart Poettering
@@ -53,18 +55,26 @@
   <refsect1>
     <title>Description</title>
 
-    <para>The <filename>/etc/machine-id</filename> file contains the unique machine ID of the local
+    <para>The <filename>/etc/machine-id</filename> file contains the unique machine ID of
-    system that is set during installation. The machine ID is a single newline-terminated,
+    the local system that is set during installation or boot. The machine ID is a single
-    hexadecimal, 32-character, lowercase ID. When decoded from hexadecimal, this corresponds to a
+    newline-terminated, hexadecimal, 32-character, lowercase ID. When decoded from
-    16-byte/128-bit value.</para>
+    hexadecimal, this corresponds to a 16-byte/128-bit value. This ID may not be all
+    zeros.</para>
 
-    <para>The machine ID is usually generated from a random source
+    <para>The machine ID is usually generated from a random source during system
-    during system installation and stays constant for all subsequent
+    installation or first boot and stays constant for all subsequent boots. Optionally,
-    boots. Optionally, for stateless systems, it is generated during
+    for stateless systems, it is generated during runtime during early boot if necessary.
-    runtime at early boot if it is found to be empty.</para>
+    </para>
 
-    <para>The machine ID does not change based on local or network configuration or when hardware is
+    <para>The machine ID may be set, for example when network booting, with the
-    replaced. Due to this and its greater length, it is a more useful replacement for the
+    <varname>systemd.machine_id=</varname> kernel command line parameter or by passing the
+    option <option>--machine-id=</option> to systemd. An ID is specified in this manner
+    has higher priority and will be used instead of the ID stored in
+    <filename>/etc/machine-id</filename>.</para>
+
+    <para>The machine ID does not change based on local or network configuration or when
+    hardware is replaced. Due to this and its greater length, it is a more useful
+    replacement for the
     <citerefentry project='man-pages'><refentrytitle>gethostid</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     call that POSIX specifies.</para>
 
@@ -79,19 +89,59 @@
     the original machine ID from the application-specific one. The
     <citerefentry><refentrytitle>sd_id128_get_machine_app_specific</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     API provides an implementation of such an algorithm.</para>
+  </refsect1>
 
-    <para>The
+  <refsect1>
+    <title>Initialization</title>
+
+    <para>Each machine should have a non-empty ID in normal operation. The ID of each
+    machine should be unique. To achive those objectives,
+    <filename>/etc/machine-id</filename> can be initialized in a few different ways.
+    </para>
+
+    <para>For normal operating system installations, where a custom image is created for a
+    specific machine, <filename>/etc/machine-id</filename> should be populated during
+    installation.</para>
+
+    <para>
     <citerefentry><refentrytitle>systemd-machine-id-setup</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    tool may be used by installer tools to initialize the machine ID
+    may be used by installer tools to initialize the machine ID at install time, but
-    at install time. Use
+    <filename>/etc/machine-id</filename> may also be written using any other means.
-    <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    </para>
-    to initialize it on mounted (but not booted) system images.</para>
 
-    <para>The machine-id may also be set, for example when network
+    <para>For operating system images which are created once and used on multiple
-    booting, by setting the <varname>systemd.machine_id=</varname>
+    machines, for example for containers or in the cloud,
-    kernel command line parameter or passing the option
+    <filename>/etc/machine-id</filename> should be an empty file in the generic file
-    <option>--machine-id=</option> to systemd. A machine-id may not
+    system image. An ID will be generated during boot and saved to this file if
-    be set to all zeros.</para>
+    possible. Having an empty file in place is useful because it allows a temporary file
+    to be bind-mounted over the real file, in case the image is used read-only.</para>
+
+    <para><citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    may be used to to initialize <filename>/etc/machine-id</filename> on mounted (but not
+    booted) system images.</para>
+
+    <para>When a machine is booted with
+    <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    the ID of the machine will be established. If <varname>systemd.machine_id=</varname>
+    or <option>--machine-id=</option> options (see first section) are specified, this
+    value will be used. Otherwise, the value in <filename>/etc/machine-id</filename> will
+    be used. If this file is empty or missing, <filename>systemd</filename> will attempt
+    to use the D-Bus machine ID from <filename>/var/lib/dbus/machine-id</filename>, the
+    value of the kernel command line option <varname>container_uuid</varname>, the KVM DMI
+    <filename>product_uuid</filename> (on KVM systems), and finally a randomly generated
+    UUID.</para>
+
+    <para>After the machine ID is established,
+    <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    will attempt to save it to <filename>/etc/machine-id</filename>. If this fails, it
+    will attempt to bind-mount a temporary file over <filename>/etc/machine-id</filename>.
+    It is an error if the file system is read-only and does not contain a (possibly empty)
+    <filename>/etc/machine-id</filename> file.</para>
+
+    <para><citerefentry><refentrytitle>systemd-machine-id-commit.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+    will attempt to write the machine ID to the file system if
+    <filename>/etc/machine-id</filename> or <filename>/etc</filename> are read-only during
+    early boot but become writable later on.</para>
   </refsect1>
 
   <refsect1>

man/machine-info.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2010 Lennart Poettering

man/machinectl.xml

@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2013 Zbigniew Jędrzejewski-Szmek
@@ -208,16 +210,16 @@
       <varlistentry>
         <term><option>--mkdir</option></term>
 
-        <listitem><para>When used with <command>bind</command>, creates
+        <listitem><para>When used with <command>bind</command>, creates the destination file or directory before
-        the destination directory before applying the bind
+        applying the bind mount. Note that even though the name of this option suggests that it is suitable only for
-        mount.</para></listitem>
+        directories, this option also creates the destination file node to mount over if the the object to mount is not
+        a directory, but a regular file, device node, socket or FIFO.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term><option>--read-only</option></term>
 
-        <listitem><para>When used with <command>bind</command>, applies
+        <listitem><para>When used with <command>bind</command>, creates a read-only bind mount.</para>
-        a read-only bind mount.</para>
 
         <para>When used with <command>clone</command>, <command>import-raw</command> or <command>import-tar</command> a
         read-only container or VM image is created.</para></listitem>
@@ -299,6 +301,13 @@
         <literal>,</literal> if another address will be output afterwards. </para></listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><option>-q</option></term>
+        <term><option>--quiet</option></term>
+
+        <listitem><para>Suppresses additional informational output while running.</para></listitem>
+      </varlistentry>
+
       <xi:include href="user-system-options.xml" xpointer="host" />
 
       <varlistentry>
@@ -528,14 +537,16 @@
       <varlistentry>
         <term><command>bind</command> <replaceable>NAME</replaceable> <replaceable>PATH</replaceable> [<replaceable>PATH</replaceable>]</term>
 
-        <listitem><para>Bind mounts a directory from the host into the specified container. The first directory
+        <listitem><para>Bind mounts a file or directory from the host into the specified container. The first path
-        argument is the source directory on the host, the second directory argument is the destination directory in the
+        argument is the source file or directory on the host, the second path argument is the destination file or
-        container. When the latter is omitted, the destination path in the container is the same as the source path on
+        directory in the container. When the latter is omitted, the destination path in the container is the same as
-        the host. When combined with the <option>--read-only</option> switch, a ready-only bind mount is created. When
+        the source path on the host. When combined with the <option>--read-only</option> switch, a ready-only bind
-        combined with the <option>--mkdir</option> switch, the destination path is first created before the mount is
+        mount is created. When combined with the <option>--mkdir</option> switch, the destination path is first created
-        applied. Note that this option is currently only supported for
+        before the mount is applied. Note that this option is currently only supported for
         <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry> containers,
-        and only if user namespacing (<option>--private-users</option>) is not used.</para></listitem>
+        and only if user namespacing (<option>--private-users</option>) is not used. This command supports bind
+        mounting directories, regular files, device nodes, <constant>AF_UNIX</constant> socket nodes, as well as
+        FIFOs.</para></listitem>
       </varlistentry>
 
       <varlistentry>

man/meson.build

@@ -1,3 +1,20 @@
+# SPDX-License-Identifier: LGPL-2.1+
+#
+# Copyright 2017 Zbigniew Jędrzejewski-Szmek
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
 # This is lame, I know, but meson has no other include mechanism
 subdir('rules')
 
@@ -32,7 +49,7 @@ custom_entities_ent = configure_file(
 man_pages = []
 html_pages = []
 source_xml_files = []
-foreach tuple : manpages
+foreach tuple : xsltproc.found() ? manpages : []
         stem = tuple[0]
         section = tuple[1]
         aliases = tuple[2]
@@ -115,8 +132,8 @@ systemd_index_xml = custom_target(
         output : 'systemd.index.xml',
         command : [make_man_index_py, '@OUTPUT@'] + nonindex_xml_files)
 
-foreach tuple : [['systemd.directives', '7', systemd_directives_xml],
+foreach tuple : want_man or want_html ? [['systemd.directives', '7', systemd_directives_xml],
-                 ['systemd.index',      '7', systemd_index_xml]]
+                                         ['systemd.index',      '7', systemd_index_xml]] : []
         stem = tuple[0]
         section = tuple[1]
         xml = tuple[2]

man/modules-load.d.xml

@@ -2,6 +2,8 @@
 <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2011 Lennart Poettering