diff --git a/0001-acpi-fptd-fix-memory-leak-in-acpi_get_boot_usec.patch b/0001-acpi-fptd-fix-memory-leak-in-acpi_get_boot_usec.patch
index a27dc1a..6227555 100644
--- a/0001-acpi-fptd-fix-memory-leak-in-acpi_get_boot_usec.patch
+++ b/0001-acpi-fptd-fix-memory-leak-in-acpi_get_boot_usec.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] acpi-fptd: fix memory leak in acpi_get_boot_usec
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
-index b094f34..a7c83ed 100644
+index b094f34a5f..a7c83ed855 100644
--- a/src/shared/acpi-fpdt.c
+++ b/src/shared/acpi-fpdt.c
@@ -81,7 +81,7 @@ struct acpi_fpdt_boot {
diff --git a/0002-fix-lingering-references-to-var-lib-backlight-random.patch b/0002-fix-lingering-references-to-var-lib-backlight-random.patch
index f49a902..36d6f31 100644
--- a/0002-fix-lingering-references-to-var-lib-backlight-random.patch
+++ b/0002-fix-lingering-references-to-var-lib-backlight-random.patch
@@ -11,7 +11,7 @@ This should have been part of ef5bfcf668e6029faa78534dfe.
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/man/systemd-backlight@.service.xml b/man/systemd-backlight@.service.xml
-index 2b73625..4318964 100644
+index 2b73625e91..4318964dca 100644
--- a/man/systemd-backlight@.service.xml
+++ b/man/systemd-backlight@.service.xml
@@ -58,7 +58,7 @@
@@ -24,7 +24,7 @@ index 2b73625..4318964 100644
saved/restored.
diff --git a/man/systemd-random-seed.service.xml b/man/systemd-random-seed.service.xml
-index 8cd14b7..e5cd037 100644
+index 8cd14b74cb..e5cd03719f 100644
--- a/man/systemd-random-seed.service.xml
+++ b/man/systemd-random-seed.service.xml
@@ -61,7 +61,7 @@
@@ -37,7 +37,7 @@ index 8cd14b7..e5cd037 100644
diff --git a/units/systemd-backlight@.service.in b/units/systemd-backlight@.service.in
-index b0e75db..5caa5d5 100644
+index b0e75db39e..5caa5d531f 100644
--- a/units/systemd-backlight@.service.in
+++ b/units/systemd-backlight@.service.in
@@ -9,7 +9,7 @@
diff --git a/0003-acpi-make-sure-we-never-free-an-uninitialized-pointe.patch b/0003-acpi-make-sure-we-never-free-an-uninitialized-pointe.patch
index 6bcdfbe..7104137 100644
--- a/0003-acpi-make-sure-we-never-free-an-uninitialized-pointe.patch
+++ b/0003-acpi-make-sure-we-never-free-an-uninitialized-pointe.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] acpi: make sure we never free an uninitialized pointer
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
-index a7c83ed..af58c7c 100644
+index a7c83ed855..af58c7cca6 100644
--- a/src/shared/acpi-fpdt.c
+++ b/src/shared/acpi-fpdt.c
@@ -81,7 +81,7 @@ struct acpi_fpdt_boot {
diff --git a/0004-systemctl-fix-name-mangling-for-sysv-units.patch b/0004-systemctl-fix-name-mangling-for-sysv-units.patch
index a1e1922..9a1861d 100644
--- a/0004-systemctl-fix-name-mangling-for-sysv-units.patch
+++ b/0004-systemctl-fix-name-mangling-for-sysv-units.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] systemctl: fix name mangling for sysv units
1 file changed, 18 insertions(+), 27 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index bb7ada9..d75281f 100644
+index bb7ada9f32..d75281f5f6 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4218,11 +4218,10 @@ static int set_environment(DBusConnection *bus, char **args) {
diff --git a/0005-cryptsetup-fix-OOM-handling-when-parsing-mount-optio.patch b/0005-cryptsetup-fix-OOM-handling-when-parsing-mount-optio.patch
index 1db0d68..c3d5f7e 100644
--- a/0005-cryptsetup-fix-OOM-handling-when-parsing-mount-optio.patch
+++ b/0005-cryptsetup-fix-OOM-handling-when-parsing-mount-optio.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] cryptsetup: fix OOM handling when parsing mount options
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
-index 22b5eea..769c3e4 100644
+index 22b5eead72..769c3e4f31 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -74,7 +74,7 @@ static int parse_one_option(const char *option) {
diff --git a/0006-journald-add-missing-error-check.patch b/0006-journald-add-missing-error-check.patch
index a237365..69b6189 100644
--- a/0006-journald-add-missing-error-check.patch
+++ b/0006-journald-add-missing-error-check.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] journald: add missing error check
1 file changed, 2 insertions(+)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 1236403..81c344f 100644
+index 12364030d9..81c344fe5a 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -907,6 +907,8 @@ static int journal_file_append_field(
diff --git a/0007-bus-fix-potentially-uninitialized-memory-access.patch b/0007-bus-fix-potentially-uninitialized-memory-access.patch
index 0261499..48bae73 100644
--- a/0007-bus-fix-potentially-uninitialized-memory-access.patch
+++ b/0007-bus-fix-potentially-uninitialized-memory-access.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] bus: fix potentially uninitialized memory access
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libsystemd-bus/bus-internal.c b/src/libsystemd-bus/bus-internal.c
-index 0e66f3d..cac948e 100644
+index 0e66f3d355..cac948e875 100644
--- a/src/libsystemd-bus/bus-internal.c
+++ b/src/libsystemd-bus/bus-internal.c
@@ -63,7 +63,7 @@ bool object_path_is_valid(const char *p) {
diff --git a/0008-dbus-fix-return-value-of-dispatch_rqueue.patch b/0008-dbus-fix-return-value-of-dispatch_rqueue.patch
index a3e8234..d744fdc 100644
--- a/0008-dbus-fix-return-value-of-dispatch_rqueue.patch
+++ b/0008-dbus-fix-return-value-of-dispatch_rqueue.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] dbus: fix return value of dispatch_rqueue()
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c
-index 3f766fb..db0880f 100644
+index 3f766fb519..db0880f21c 100644
--- a/src/libsystemd-bus/sd-bus.c
+++ b/src/libsystemd-bus/sd-bus.c
@@ -1215,11 +1215,11 @@ static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) {
diff --git a/0009-modules-load-fix-error-handling.patch b/0009-modules-load-fix-error-handling.patch
index e6c4be0..9f6f066 100644
--- a/0009-modules-load-fix-error-handling.patch
+++ b/0009-modules-load-fix-error-handling.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] modules-load: fix error handling
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
-index 7b19ee0..49ee420 100644
+index 7b19ee02ef..49ee4203dd 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -302,8 +302,8 @@ int main(int argc, char *argv[]) {
diff --git a/0010-efi-never-call-qsort-on-potentially-NULL-arrays.patch b/0010-efi-never-call-qsort-on-potentially-NULL-arrays.patch
index 1f6766b..541831c 100644
--- a/0010-efi-never-call-qsort-on-potentially-NULL-arrays.patch
+++ b/0010-efi-never-call-qsort-on-potentially-NULL-arrays.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] efi: never call qsort on potentially NULL arrays
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/shared/efivars.c b/src/shared/efivars.c
-index 1d5b6f9..c015b16 100644
+index 1d5b6f9e72..c015b16857 100644
--- a/src/shared/efivars.c
+++ b/src/shared/efivars.c
@@ -384,7 +384,8 @@ int efi_get_boot_options(uint16_t **options) {
diff --git a/0011-strv-don-t-access-potentially-NULL-string-arrays.patch b/0011-strv-don-t-access-potentially-NULL-string-arrays.patch
index 3249142..c4162cd 100644
--- a/0011-strv-don-t-access-potentially-NULL-string-arrays.patch
+++ b/0011-strv-don-t-access-potentially-NULL-string-arrays.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] strv: don't access potentially NULL string arrays
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/shared/env-util.c b/src/shared/env-util.c
-index 5e29629..7976881 100644
+index 5e29629efd..7976881ef6 100644
--- a/src/shared/env-util.c
+++ b/src/shared/env-util.c
@@ -405,7 +405,9 @@ char **strv_env_clean_log(char **e, const char *message) {
diff --git a/0012-mkdir-pass-a-proper-function-pointer-to-mkdir_safe_i.patch b/0012-mkdir-pass-a-proper-function-pointer-to-mkdir_safe_i.patch
index b5cb2fd..b4d0aa7 100644
--- a/0012-mkdir-pass-a-proper-function-pointer-to-mkdir_safe_i.patch
+++ b/0012-mkdir-pass-a-proper-function-pointer-to-mkdir_safe_i.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] mkdir: pass a proper function pointer to mkdir_safe_internal
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/mkdir.c b/src/shared/mkdir.c
-index b7e5c6e..43c6ea6 100644
+index b7e5c6e67b..43c6ea6d4a 100644
--- a/src/shared/mkdir.c
+++ b/src/shared/mkdir.c
@@ -53,7 +53,7 @@ int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, mkd
diff --git a/0013-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch b/0013-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch
index daae0a7..4264200 100644
--- a/0013-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch
+++ b/0013-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch
@@ -12,7 +12,7 @@ ref: https://bugs.archlinux.org/task/37170
1 file changed, 2 insertions(+)
diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
-index b630440..a05c657 100644
+index b6304401fe..a05c6577d2 100644
--- a/tmpfiles.d/systemd.conf
+++ b/tmpfiles.d/systemd.conf
@@ -26,3 +26,5 @@ F /run/nologin 0644 - - - "System is booting up. See pam_nologin(8)"
diff --git a/0014-execute.c-always-set-SHELL.patch b/0014-execute.c-always-set-SHELL.patch
index 0086f7b..386006d 100644
--- a/0014-execute.c-always-set-SHELL.patch
+++ b/0014-execute.c-always-set-SHELL.patch
@@ -13,7 +13,7 @@ instead provide it to all units which have a user.
4 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/TODO b/TODO
-index 07269f4..425f673 100644
+index 07269f47d2..425f6736c0 100644
--- a/TODO
+++ b/TODO
@@ -54,8 +54,6 @@ CGroup Rework Completion:
@@ -26,7 +26,7 @@ index 07269f4..425f673 100644
* move config_parse_path_strv() out of conf-parser.c
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index f50161f..e213ec4 100644
+index f50161f30c..e213ec4f3c 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -1021,10 +1021,13 @@
@@ -67,7 +67,7 @@ index f50161f..e213ec4 100644
Additional variables may be configured by the
diff --git a/src/core/execute.c b/src/core/execute.c
-index a53ef48..3979f35 100644
+index a53ef48ef8..3979f35988 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1094,7 +1094,7 @@ int exec_spawn(ExecCommand *command,
@@ -153,7 +153,7 @@ index a53ef48..3979f35 100644
final_env = strv_env_merge(5,
environment,
diff --git a/units/user@.service.in b/units/user@.service.in
-index 3718a57..3f8b59d 100644
+index 3718a57087..3f8b59d07f 100644
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -13,7 +13,6 @@ After=systemd-user-sessions.service
diff --git a/0015-man-Improve-the-description-of-parameter-X-in-tmpfil.patch b/0015-man-Improve-the-description-of-parameter-X-in-tmpfil.patch
index 47dfad0..1190449 100644
--- a/0015-man-Improve-the-description-of-parameter-X-in-tmpfil.patch
+++ b/0015-man-Improve-the-description-of-parameter-X-in-tmpfil.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] man: Improve the description of parameter X in tmpfiles.d
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
-index 9fc4b7c..e8b630d 100644
+index 9fc4b7cd8f..e8b630da24 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -184,15 +184,18 @@ L /tmp/foobar - - - - /dev/null
diff --git a/0016-execute-more-debugging-messages.patch b/0016-execute-more-debugging-messages.patch
index 92276a2..0aeb468 100644
--- a/0016-execute-more-debugging-messages.patch
+++ b/0016-execute-more-debugging-messages.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] execute: more debugging messages
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/src/core/execute.c b/src/core/execute.c
-index 3979f35..3f7ca52 100644
+index 3979f35988..3f7ca52139 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -317,12 +317,12 @@ static int setup_input(const ExecContext *context, int socket_fd, bool apply_tty
@@ -106,7 +106,7 @@ index 3979f35..3f7ca52 100644
strv_free(e);
diff --git a/src/login/pam-module.c b/src/login/pam-module.c
-index 49296b5..973daf7 100644
+index 49296b5d63..973daf703e 100644
--- a/src/login/pam-module.c
+++ b/src/login/pam-module.c
@@ -199,7 +199,8 @@ _public_ PAM_EXTERN int pam_sm_open_session(
diff --git a/0017-gpt-auto-generator-exit-immediately-if-in-container.patch b/0017-gpt-auto-generator-exit-immediately-if-in-container.patch
index b4e382d..73b9bb9 100644
--- a/0017-gpt-auto-generator-exit-immediately-if-in-container.patch
+++ b/0017-gpt-auto-generator-exit-immediately-if-in-container.patch
@@ -10,7 +10,7 @@ a container.
1 file changed, 8 insertions(+)
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
-index ca54925..d2b4213 100644
+index ca54925da4..d2b4213af2 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -38,6 +38,7 @@
diff --git a/0018-systemd-order-remote-mounts-from-mountinfo-before-re.patch b/0018-systemd-order-remote-mounts-from-mountinfo-before-re.patch
index 4e894d2..f03d682 100644
--- a/0018-systemd-order-remote-mounts-from-mountinfo-before-re.patch
+++ b/0018-systemd-order-remote-mounts-from-mountinfo-before-re.patch
@@ -14,7 +14,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=70002
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/core/mount.c b/src/core/mount.c
-index 3d46557..93bfa99 100644
+index 3d46557fb1..93bfa99f3f 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1440,6 +1440,9 @@ static int mount_add_one(
diff --git a/0019-manager-when-verifying-whether-clients-may-change-en.patch b/0019-manager-when-verifying-whether-clients-may-change-en.patch
index 8f9193a..64b4907 100644
--- a/0019-manager-when-verifying-whether-clients-may-change-en.patch
+++ b/0019-manager-when-verifying-whether-clients-may-change-en.patch
@@ -10,7 +10,7 @@ This appears to be a copy/paste error.
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
-index 676a07f..8f4d017 100644
+index 676a07ffa5..8f4d01737a 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -1397,7 +1397,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
diff --git a/0020-logind-fix-bus-introspection-data-for-TakeControl.patch b/0020-logind-fix-bus-introspection-data-for-TakeControl.patch
index 1312109..a28c9a0 100644
--- a/0020-logind-fix-bus-introspection-data-for-TakeControl.patch
+++ b/0020-logind-fix-bus-introspection-data-for-TakeControl.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] logind: fix bus introspection data for TakeControl()
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
-index 5f6bafb..be4e01c 100644
+index 5f6bafbc6a..be4e01c5e3 100644
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -41,7 +41,7 @@
diff --git a/0021-mount-check-for-NULL-before-reading-pm-what.patch b/0021-mount-check-for-NULL-before-reading-pm-what.patch
index 56506e1..67c3f39 100644
--- a/0021-mount-check-for-NULL-before-reading-pm-what.patch
+++ b/0021-mount-check-for-NULL-before-reading-pm-what.patch
@@ -12,7 +12,7 @@ ref: https://bugs.freedesktop.org/show_bug.cgi?id=70148
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/mount.c b/src/core/mount.c
-index 93bfa99..db055f0 100644
+index 93bfa99f3f..db055f0a00 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -182,7 +182,7 @@ static int mount_add_mount_links(Mount *m) {
diff --git a/0022-core-do-not-add-what-to-RequiresMountsFor-for-networ.patch b/0022-core-do-not-add-what-to-RequiresMountsFor-for-networ.patch
index 7310f50..e73d2b0 100644
--- a/0022-core-do-not-add-what-to-RequiresMountsFor-for-networ.patch
+++ b/0022-core-do-not-add-what-to-RequiresMountsFor-for-networ.patch
@@ -15,7 +15,7 @@ up, but patch is really one line.
1 file changed, 70 insertions(+), 67 deletions(-)
diff --git a/src/core/mount.c b/src/core/mount.c
-index db055f0..70cd372 100644
+index db055f0a00..70cd372e10 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -59,6 +59,72 @@ static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = {
diff --git a/0023-utf8-fix-utf8_is_printable.patch b/0023-utf8-fix-utf8_is_printable.patch
index 35ec82d..a646d43 100644
--- a/0023-utf8-fix-utf8_is_printable.patch
+++ b/0023-utf8-fix-utf8_is_printable.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] utf8: fix utf8_is_printable
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/shared/utf8.c b/src/shared/utf8.c
-index a8e28ac..31120af 100644
+index a8e28accd3..31120af046 100644
--- a/src/shared/utf8.c
+++ b/src/shared/utf8.c
@@ -141,14 +141,15 @@ bool utf8_is_printable(const char* str, size_t length) {
@@ -31,7 +31,7 @@ index a8e28ac..31120af 100644
return true;
diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
-index 7bd0db1..f0182ee 100644
+index 7bd0db173a..f0182ee9af 100644
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -26,6 +26,7 @@ static void test_utf8_is_printable(void) {
diff --git a/0024-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch b/0024-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
index b8983d1..bb0f361 100644
--- a/0024-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
+++ b/0024-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
@@ -11,7 +11,7 @@ character to be escaped, e.g. "LABEL=/".
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 9be6acf..748f1bb 100644
+index 9be6acfc8f..748f1bbe02 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -3527,7 +3527,7 @@ static char *tag_to_udev_node(const char *tagvalue, const char *by) {
@@ -24,7 +24,7 @@ index 9be6acf..748f1bb 100644
if (t == NULL)
return NULL;
diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c
-index 2f3dedb..59ba4be 100644
+index 2f3dedb90f..59ba4be087 100644
--- a/src/test/test-device-nodes.c
+++ b/src/test/test-device-nodes.c
@@ -26,7 +26,7 @@
diff --git a/0025-systemd-serialize-deserialize-forbid_restart-value.patch b/0025-systemd-serialize-deserialize-forbid_restart-value.patch
index 2620ed3..38362ab 100644
--- a/0025-systemd-serialize-deserialize-forbid_restart-value.patch
+++ b/0025-systemd-serialize-deserialize-forbid_restart-value.patch
@@ -18,7 +18,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=69800
1 file changed, 11 insertions(+)
diff --git a/src/core/service.c b/src/core/service.c
-index 6792024..98b1599 100644
+index 67920248d3..98b1599a32 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2651,6 +2651,9 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) {
diff --git a/0026-core-unify-the-way-we-denote-serialization-attribute.patch b/0026-core-unify-the-way-we-denote-serialization-attribute.patch
index dc4b0c9..8d54fa0 100644
--- a/0026-core-unify-the-way-we-denote-serialization-attribute.patch
+++ b/0026-core-unify-the-way-we-denote-serialization-attribute.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] core: unify the way we denote serialization attributes
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/core/service.c b/src/core/service.c
-index 98b1599..96ed2d3 100644
+index 98b1599a32..96ed2d303a 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2652,7 +2652,7 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) {
diff --git a/0027-journald-fix-minor-memory-leak.patch b/0027-journald-fix-minor-memory-leak.patch
index b0dc489..a010b28 100644
--- a/0027-journald-fix-minor-memory-leak.patch
+++ b/0027-journald-fix-minor-memory-leak.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] journald: fix minor memory leak
1 file changed, 2 insertions(+)
diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c
-index c73ad8f..8d5effb 100644
+index c73ad8f393..8d5effb45c 100644
--- a/src/journal/journal-vacuum.c
+++ b/src/journal/journal-vacuum.c
@@ -278,6 +278,8 @@ int journal_directory_vacuum(
diff --git a/0028-keymap-Fix-Samsung-900X-34-C.patch b/0028-keymap-Fix-Samsung-900X-34-C.patch
index 640c1f5..6b5bb1f 100644
--- a/0028-keymap-Fix-Samsung-900X-34-C.patch
+++ b/0028-keymap-Fix-Samsung-900X-34-C.patch
@@ -17,7 +17,7 @@ Thanks to Anatoly Markov for reporting and testing!
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index 20d398f..b497f92 100644
+index 20d398f7d9..b497f924a8 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -904,6 +904,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*550P*:pvr*
diff --git a/0029-do-not-accept-garbage-from-acpi-firmware-performance.patch b/0029-do-not-accept-garbage-from-acpi-firmware-performance.patch
index 61eb12e..bf6566b 100644
--- a/0029-do-not-accept-garbage-from-acpi-firmware-performance.patch
+++ b/0029-do-not-accept-garbage-from-acpi-firmware-performance.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] do not accept "garbage" from acpi firmware performance data
1 file changed, 5 insertions(+)
diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
-index af58c7c..75648b4 100644
+index af58c7cca6..75648b4d86 100644
--- a/src/shared/acpi-fpdt.c
+++ b/src/shared/acpi-fpdt.c
@@ -146,6 +146,11 @@ int acpi_get_boot_usec(usec_t *loader_start, usec_t *loader_exit) {
diff --git a/0030-journald-remove-rotated-file-from-hashmap-when-rotat.patch b/0030-journald-remove-rotated-file-from-hashmap-when-rotat.patch
index a88ff88..6b63b86 100644
--- a/0030-journald-remove-rotated-file-from-hashmap-when-rotat.patch
+++ b/0030-journald-remove-rotated-file-from-hashmap-when-rotat.patch
@@ -19,7 +19,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=890463
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 4f47eb1..e03e413 100644
+index 4f47eb1c11..e03e413aef 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -321,8 +321,10 @@ void server_rotate(Server *s) {
diff --git a/0031-login-fix-invalid-free-in-sd_session_get_vt.patch b/0031-login-fix-invalid-free-in-sd_session_get_vt.patch
index 0bb0e77..f039480 100644
--- a/0031-login-fix-invalid-free-in-sd_session_get_vt.patch
+++ b/0031-login-fix-invalid-free-in-sd_session_get_vt.patch
@@ -10,7 +10,7 @@ error-paths might corrupt random memory.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/login/sd-login.c b/src/login/sd-login.c
-index 71d8c29..6c27dfe 100644
+index 71d8c2942e..6c27dfeb75 100644
--- a/src/login/sd-login.c
+++ b/src/login/sd-login.c
@@ -350,7 +350,7 @@ _public_ int sd_session_get_tty(const char *session, char **tty) {
diff --git a/0032-login-make-sd_session_get_vt-actually-work.patch b/0032-login-make-sd_session_get_vt-actually-work.patch
index 50f230c..b6f4d0c 100644
--- a/0032-login-make-sd_session_get_vt-actually-work.patch
+++ b/0032-login-make-sd_session_get_vt-actually-work.patch
@@ -10,7 +10,7 @@ an error.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/login/sd-login.c b/src/login/sd-login.c
-index 6c27dfe..7e25041 100644
+index 6c27dfeb75..7e25041f6d 100644
--- a/src/login/sd-login.c
+++ b/src/login/sd-login.c
@@ -354,7 +354,7 @@ _public_ int sd_session_get_vt(const char *session, unsigned *vtnr) {
diff --git a/0033-udevadm.xml-document-resolve-names-option-for-test.patch b/0033-udevadm.xml-document-resolve-names-option-for-test.patch
index a24e184..d349d1e 100644
--- a/0033-udevadm.xml-document-resolve-names-option-for-test.patch
+++ b/0033-udevadm.xml-document-resolve-names-option-for-test.patch
@@ -10,7 +10,7 @@ exist.
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/man/udevadm.xml b/man/udevadm.xml
-index d0b257d..b959216 100644
+index d0b257dec9..b959216d90 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -462,9 +462,13 @@
diff --git a/0034-Never-call-qsort-on-potentially-NULL-arrays.patch b/0034-Never-call-qsort-on-potentially-NULL-arrays.patch
index a944a21..17464a3 100644
--- a/0034-Never-call-qsort-on-potentially-NULL-arrays.patch
+++ b/0034-Never-call-qsort-on-potentially-NULL-arrays.patch
@@ -27,7 +27,7 @@ is not obvious that the count is non-zero.
17 files changed, 74 insertions(+), 53 deletions(-)
diff --git a/src/analyze/systemd-analyze.c b/src/analyze/systemd-analyze.c
-index 27d063c..a4f15eb 100644
+index 27d063c548..a4f15eb646 100644
--- a/src/analyze/systemd-analyze.c
+++ b/src/analyze/systemd-analyze.c
@@ -768,7 +768,7 @@ static int list_dependencies_one(DBusConnection *bus, const char *name, unsigned
@@ -40,7 +40,7 @@ index 27d063c..a4f15eb 100644
r = acquire_boot_times(bus, &boot);
if (r < 0)
diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
-index cacf705..293a211 100644
+index cacf705a0a..293a2113bd 100644
--- a/src/cgtop/cgtop.c
+++ b/src/cgtop/cgtop.c
@@ -461,7 +461,7 @@ static int display(Hashmap *a) {
@@ -53,7 +53,7 @@ index cacf705..293a211 100644
/* Find the longest names in one run */
for (j = 0; j < n; j++) {
diff --git a/src/core/namespace.c b/src/core/namespace.c
-index 16b132b..936f368 100644
+index 16b132ba56..936f36839b 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -222,7 +222,7 @@ int setup_namespace(char** read_write_dirs,
@@ -113,7 +113,7 @@ index 16b132b..936f368 100644
shows up in the parent */
if (mount(NULL, "/", NULL, MS_SLAVE|MS_REC, NULL) < 0)
diff --git a/src/journal/catalog.c b/src/journal/catalog.c
-index 7738d24..90ca008 100644
+index 7738d243a5..90ca008064 100644
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -399,7 +399,7 @@ int catalog_update(const char* database, const char* root, const char* const* di
@@ -126,7 +126,7 @@ index 7738d24..90ca008 100644
r = write_catalog(database, h, sb, items, n);
if (r < 0)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 81c344f..425e38a 100644
+index 81c344fe5a..425e38a990 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1344,7 +1344,7 @@ int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const st
@@ -139,7 +139,7 @@ index 81c344f..425e38a 100644
r = journal_file_append_entry_internal(f, ts, xor_hash, items, n_iovec, seqnum, ret, offset);
diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c
-index 8d5effb..d4a1c6c 100644
+index 8d5effb45c..d4a1c6c933 100644
--- a/src/journal/journal-vacuum.c
+++ b/src/journal/journal-vacuum.c
@@ -299,8 +299,7 @@ int journal_directory_vacuum(
@@ -153,7 +153,7 @@ index 8d5effb..d4a1c6c 100644
for (i = 0; i < n_list; i++) {
struct statvfs ss;
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 9a2d255..0876ee6 100644
+index 9a2d255361..0876ee60f8 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -755,7 +755,7 @@ static int get_relative_boot_id(sd_journal *j, sd_id128_t *boot_id, int relative
@@ -166,7 +166,7 @@ index 9a2d255..0876ee6 100644
if (sd_id128_equal(*boot_id, SD_ID128_NULL)) {
if (relative > (int) count || relative <= -(int)count)
diff --git a/src/libsystemd-bus/bus-match.c b/src/libsystemd-bus/bus-match.c
-index 1411167..916682a 100644
+index 1411167a7f..916682aa62 100644
--- a/src/libsystemd-bus/bus-match.c
+++ b/src/libsystemd-bus/bus-match.c
@@ -768,7 +768,7 @@ int bus_match_parse(
@@ -179,7 +179,7 @@ index 1411167..916682a 100644
/* Check for duplicates */
for (i = 0; i+1 < n_components; i++)
diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c
-index 8146f27..e71d766 100644
+index 8146f27e4f..e71d766c02 100644
--- a/src/libudev/libudev-enumerate.c
+++ b/src/libudev/libudev-enumerate.c
@@ -276,7 +276,7 @@ _public_ struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enume
@@ -192,7 +192,7 @@ index 8146f27..e71d766 100644
max = udev_enumerate->devices_cur;
for (i = 0; i < max; i++) {
diff --git a/src/nss-myhostname/netlink.c b/src/nss-myhostname/netlink.c
-index b1ef912..47a41f5 100644
+index b1ef912c8a..47a41f55e6 100644
--- a/src/nss-myhostname/netlink.c
+++ b/src/nss-myhostname/netlink.c
@@ -197,7 +197,8 @@ finish:
@@ -206,7 +206,7 @@ index b1ef912..47a41f5 100644
*_list = list;
*_n_list = n_list;
diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c
-index 32888ad..6b74866 100644
+index 32888add01..6b748664c3 100644
--- a/src/readahead/readahead-collect.c
+++ b/src/readahead/readahead-collect.c
@@ -536,8 +536,7 @@ done:
@@ -267,7 +267,7 @@ index 32888ad..6b74866 100644
log_debug("Finalizing...");
diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c
-index e971f36..cc44ab4 100644
+index e971f36190..cc44ab4ea9 100644
--- a/src/shared/cgroup-show.c
+++ b/src/shared/cgroup-show.c
@@ -44,6 +44,8 @@ static void show_pid_array(int pids[], unsigned n_pids, const char *prefix, unsi
@@ -280,7 +280,7 @@ index e971f36..cc44ab4 100644
m = 0;
for (i = 0; i < n_pids; i++) {
diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c
-index 6d99739..ed4070c 100644
+index 6d99739353..ed4070c662 100644
--- a/src/shared/conf-files.c
+++ b/src/shared/conf-files.c
@@ -127,7 +127,7 @@ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const
@@ -293,7 +293,7 @@ index 6d99739..ed4070c 100644
hashmap_free(fh);
diff --git a/src/shared/efivars.c b/src/shared/efivars.c
-index c015b16..f3eb6a6 100644
+index c015b16857..f3eb6a6e5d 100644
--- a/src/shared/efivars.c
+++ b/src/shared/efivars.c
@@ -384,8 +384,7 @@ int efi_get_boot_options(uint16_t **options) {
@@ -307,7 +307,7 @@ index c015b16..f3eb6a6 100644
*options = list;
return count;
diff --git a/src/shared/fileio.c b/src/shared/fileio.c
-index 603a1c7..733b320 100644
+index 603a1c7b38..733b320388 100644
--- a/src/shared/fileio.c
+++ b/src/shared/fileio.c
@@ -662,6 +662,7 @@ int get_status_field(const char *filename, const char *pattern, char **field) {
@@ -319,7 +319,7 @@ index 603a1c7..733b320 100644
r = read_full_file(filename, &status, NULL);
diff --git a/src/shared/util.h b/src/shared/util.h
-index 1b845b3..222abe0 100644
+index 1b845b3803..222abe0018 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -764,3 +764,15 @@ bool id128_is_valid(const char *s) _pure_;
@@ -339,7 +339,7 @@ index 1b845b3..222abe0 100644
+ }
+}
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index d75281f..036828b 100644
+index d75281f5f6..036828b5dd 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -471,7 +471,7 @@ static int list_units(DBusConnection *bus, char **args) {
diff --git a/0035-dbus-common-avoid-leak-in-error-path.patch b/0035-dbus-common-avoid-leak-in-error-path.patch
index 0e19801..c6b32da 100644
--- a/0035-dbus-common-avoid-leak-in-error-path.patch
+++ b/0035-dbus-common-avoid-leak-in-error-path.patch
@@ -11,7 +11,7 @@ src/shared/dbus-common.c:968:33: warning: Potential leak of memory pointed to by
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/shared/dbus-common.c b/src/shared/dbus-common.c
-index c727cae..3ba2d87 100644
+index c727cae7cd..3ba2d87c4d 100644
--- a/src/shared/dbus-common.c
+++ b/src/shared/dbus-common.c
@@ -934,7 +934,7 @@ int bus_parse_strv_iter(DBusMessageIter *iter, char ***_l) {
diff --git a/0036-drop-ins-check-return-value.patch b/0036-drop-ins-check-return-value.patch
index 6058de6..e5aa061 100644
--- a/0036-drop-ins-check-return-value.patch
+++ b/0036-drop-ins-check-return-value.patch
@@ -11,7 +11,7 @@ would obscure the real error and is a bit sloppy.
1 file changed, 3 insertions(+)
diff --git a/src/core/unit.c b/src/core/unit.c
-index 4b97710..1db7d06 100644
+index 4b9771076a..1db7d061c4 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2908,6 +2908,9 @@ int unit_remove_drop_in(Unit *u, UnitSetPropertiesMode mode, const char *name) {
diff --git a/0037-Make-sure-that-we-don-t-dereference-NULL.patch b/0037-Make-sure-that-we-don-t-dereference-NULL.patch
index 075ca31..ab8ac79 100644
--- a/0037-Make-sure-that-we-don-t-dereference-NULL.patch
+++ b/0037-Make-sure-that-we-don-t-dereference-NULL.patch
@@ -12,7 +12,7 @@ loop above, so it's better to also check here for symmetry.
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index 44920d6..f01843d 100644
+index 44920d6449..f01843d65e 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1860,7 +1860,8 @@ int config_parse_documentation(const char *unit,
diff --git a/0038-gitignore-ignore-clang-analyze-output.patch b/0038-gitignore-ignore-clang-analyze-output.patch
index b5154f4..6293a86 100644
--- a/0038-gitignore-ignore-clang-analyze-output.patch
+++ b/0038-gitignore-ignore-clang-analyze-output.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] gitignore: ignore clang --analyze output
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
-index 5b38c0b..56e10a6 100644
+index 5b38c0b2e9..56e10a6962 100644
--- a/.gitignore
+++ b/.gitignore
@@ -162,6 +162,7 @@
diff --git a/0039-man-add-more-markup-to-udevadm-8.patch b/0039-man-add-more-markup-to-udevadm-8.patch
index bc60114..9d7c7ab 100644
--- a/0039-man-add-more-markup-to-udevadm-8.patch
+++ b/0039-man-add-more-markup-to-udevadm-8.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] man: add more markup to udevadm(8)
1 file changed, 33 insertions(+), 16 deletions(-)
diff --git a/man/udevadm.xml b/man/udevadm.xml
-index b959216..a1ffe42 100644
+index b959216d90..a1ffe4219c 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -61,9 +61,10 @@
diff --git a/0040-shared-util-Fix-glob_extend-argument.patch b/0040-shared-util-Fix-glob_extend-argument.patch
index 107ce08..2cf7fde 100644
--- a/0040-shared-util-Fix-glob_extend-argument.patch
+++ b/0040-shared-util-Fix-glob_extend-argument.patch
@@ -11,7 +11,7 @@ as it used the global variable, instead of the passed parameters.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 748f1bb..6c88040 100644
+index 748f1bbe02..6c88040d75 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -4391,7 +4391,7 @@ int glob_extend(char ***strv, const char *path) {
diff --git a/0041-Fix-bad-assert-in-show_pid_array.patch b/0041-Fix-bad-assert-in-show_pid_array.patch
index 056b524..b83e513 100644
--- a/0041-Fix-bad-assert-in-show_pid_array.patch
+++ b/0041-Fix-bad-assert-in-show_pid_array.patch
@@ -12,7 +12,7 @@ Reported-by: Oleksii Shevchuk
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c
-index cc44ab4..aa0f017 100644
+index cc44ab4ea9..aa0f017d71 100644
--- a/src/shared/cgroup-show.c
+++ b/src/shared/cgroup-show.c
@@ -44,8 +44,6 @@ static void show_pid_array(int pids[], unsigned n_pids, const char *prefix, unsi
diff --git a/0042-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch b/0042-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch
index 6e7de85..dc4ccb2 100644
--- a/0042-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch
+++ b/0042-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch
@@ -17,7 +17,7 @@ initialized structure returned.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bootchart/store.c b/src/bootchart/store.c
-index f8c97c2..7f86cfe 100644
+index f8c97c2324..7f86cfe976 100644
--- a/src/bootchart/store.c
+++ b/src/bootchart/store.c
@@ -275,7 +275,7 @@ schedstat_next:
diff --git a/0043-man-document-the-b-special-boot-option.patch b/0043-man-document-the-b-special-boot-option.patch
index 68627ed..4f0866a 100644
--- a/0043-man-document-the-b-special-boot-option.patch
+++ b/0043-man-document-the-b-special-boot-option.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] man: document the -b special boot option
2 files changed, 2 insertions(+)
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
-index cc267a3..abe68e5 100644
+index cc267a3ecc..abe68e5496 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -123,6 +123,7 @@
@@ -21,7 +21,7 @@ index cc267a3..abe68e5 100644
single
s
diff --git a/man/systemd.xml b/man/systemd.xml
-index fe6e331..85c06d3 100644
+index fe6e331f25..85c06d3866 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -1149,6 +1149,7 @@
diff --git a/0044-logind-allow-unprivileged-session-device-access.patch b/0044-logind-allow-unprivileged-session-device-access.patch
index 1d83a5b..4652ab3 100644
--- a/0044-logind-allow-unprivileged-session-device-access.patch
+++ b/0044-logind-allow-unprivileged-session-device-access.patch
@@ -14,7 +14,7 @@ use the API. Furthermore, only a single API user gets access at a time.
1 file changed, 20 insertions(+)
diff --git a/src/login/org.freedesktop.login1.conf b/src/login/org.freedesktop.login1.conf
-index 0407609..04e735e 100644
+index 0407609c19..04e735eb59 100644
--- a/src/login/org.freedesktop.login1.conf
+++ b/src/login/org.freedesktop.login1.conf
@@ -148,6 +148,26 @@
diff --git a/0045-rules-expose-loop-block-devices-to-systemd.patch b/0045-rules-expose-loop-block-devices-to-systemd.patch
index f67e788..eb78636 100644
--- a/0045-rules-expose-loop-block-devices-to-systemd.patch
+++ b/0045-rules-expose-loop-block-devices-to-systemd.patch
@@ -11,7 +11,7 @@ benefit that mount dependencies on loop devices start to work.
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
-index bbb7d0c..3c99475 100644
+index bbb7d0c2c3..3c99475318 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -11,12 +11,12 @@ SUBSYSTEM=="tty", KERNEL=="tty[a-zA-Z]*|hvc*|xvc*|hvsi*", TAG+="systemd"
diff --git a/0046-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch b/0046-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch
index eb3b594..ef939a8 100644
--- a/0046-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch
+++ b/0046-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch
@@ -14,7 +14,7 @@ Conflicts:
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
-index 3c99475..307f18f 100644
+index 3c99475318..307f18f70d 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -53,12 +53,12 @@ ACTION=="add", SUBSYSTEM=="net", KERNEL!="lo", RUN+="@rootlibexecdir@/systemd-sy
diff --git a/0047-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch b/0047-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch
index 9a54a4a..8e3533e 100644
--- a/0047-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch
+++ b/0047-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] tmpfiles: log unaccessible FUSE mount points only as debug
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 8122d6a..239e56b 100644
+index 8122d6af6a..239e56ba9c 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -275,12 +275,15 @@ static int dir_cleanup(
diff --git a/0048-hwdb-update.patch b/0048-hwdb-update.patch
index 32c82a0..860bc87 100644
--- a/0048-hwdb-update.patch
+++ b/0048-hwdb-update.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] hwdb: update
2 files changed, 578 insertions(+), 29 deletions(-)
diff --git a/hwdb/20-OUI.hwdb b/hwdb/20-OUI.hwdb
-index e913b28..5067167 100644
+index e913b28203..5067167cbb 100644
--- a/hwdb/20-OUI.hwdb
+++ b/hwdb/20-OUI.hwdb
@@ -12278,7 +12278,7 @@ OUI:40D85501B*
@@ -1113,7 +1113,7 @@ index e913b28..5067167 100644
ID_OUI_FROM_DATABASE=Sunplus Technology Co., Ltd.
diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb/20-pci-vendor-model.hwdb
-index fdb534d..289f81c 100644
+index fdb534d7e8..289f81c738 100644
--- a/hwdb/20-pci-vendor-model.hwdb
+++ b/hwdb/20-pci-vendor-model.hwdb
@@ -4158,7 +4158,7 @@ pci:v00001002d00005F57*
diff --git a/0049-rules-remove-pointless-MODE-settings.patch b/0049-rules-remove-pointless-MODE-settings.patch
index c421a31..95827d3 100644
--- a/0049-rules-remove-pointless-MODE-settings.patch
+++ b/0049-rules-remove-pointless-MODE-settings.patch
@@ -15,7 +15,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=70665
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules
-index f764789..679dfdf 100644
+index f7647893d4..679dfdfcf4 100644
--- a/rules/50-udev-default.rules
+++ b/rules/50-udev-default.rules
@@ -20,9 +20,7 @@ KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP=
diff --git a/0050-analyze-set-white-backgound.patch b/0050-analyze-set-white-backgound.patch
index 742738d..0cf22a7 100644
--- a/0050-analyze-set-white-backgound.patch
+++ b/0050-analyze-set-white-backgound.patch
@@ -12,7 +12,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=70720
1 file changed, 2 insertions(+)
diff --git a/src/analyze/systemd-analyze.c b/src/analyze/systemd-analyze.c
-index a4f15eb..9a69795 100644
+index a4f15eb646..9a69795906 100644
--- a/src/analyze/systemd-analyze.c
+++ b/src/analyze/systemd-analyze.c
@@ -507,6 +507,7 @@ static int analyze_plot(DBusConnection *bus) {
diff --git a/0051-shell-completion-dump-has-moved-to-systemd-analyze.patch b/0051-shell-completion-dump-has-moved-to-systemd-analyze.patch
index 21b60b3..9323f6f 100644
--- a/0051-shell-completion-dump-has-moved-to-systemd-analyze.patch
+++ b/0051-shell-completion-dump-has-moved-to-systemd-analyze.patch
@@ -12,7 +12,7 @@ Rename NO_OPTION to STANDALONE for consistency with other files.
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/shell-completion/bash/systemctl b/shell-completion/bash/systemctl
-index e335ee8..eea4b6d 100644
+index e335ee871c..eea4b6dbf9 100644
--- a/shell-completion/bash/systemctl
+++ b/shell-completion/bash/systemctl
@@ -137,7 +137,7 @@ _systemctl () {
@@ -25,7 +25,7 @@ index e335ee8..eea4b6d 100644
list-sockets list-units list-unit-files poweroff reboot rescue
show-environment suspend get-default'
diff --git a/shell-completion/bash/systemd-analyze b/shell-completion/bash/systemd-analyze
-index 5bd6768..b65466b 100644
+index 5bd676866b..b65466ba47 100644
--- a/shell-completion/bash/systemd-analyze
+++ b/shell-completion/bash/systemd-analyze
@@ -31,7 +31,7 @@ _systemd_analyze() {
@@ -47,7 +47,7 @@ index 5bd6768..b65466b 100644
comps='--help --version --system --user'
fi
diff --git a/shell-completion/zsh/_systemctl b/shell-completion/zsh/_systemctl
-index 298e97e..3959cd5 100644
+index 298e97ed61..3959cd551c 100644
--- a/shell-completion/zsh/_systemctl
+++ b/shell-completion/zsh/_systemctl
@@ -38,7 +38,6 @@
@@ -68,7 +68,7 @@ index 298e97e..3959cd5 100644
# list-unit-files poweroff reboot rescue show-environment'
# [NAME]='snapshot load'
diff --git a/shell-completion/zsh/_systemd-analyze b/shell-completion/zsh/_systemd-analyze
-index 37c60f5..2eda5fe 100644
+index 37c60f5b40..2eda5fe8a9 100644
--- a/shell-completion/zsh/_systemd-analyze
+++ b/shell-completion/zsh/_systemd-analyze
@@ -15,6 +15,7 @@ _systemd_analyze_command(){
diff --git a/0052-systemd-use-unit-name-in-PrivateTmp-directories.patch b/0052-systemd-use-unit-name-in-PrivateTmp-directories.patch
index 62e96b5..2336bdb 100644
--- a/0052-systemd-use-unit-name-in-PrivateTmp-directories.patch
+++ b/0052-systemd-use-unit-name-in-PrivateTmp-directories.patch
@@ -17,7 +17,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=957439
create mode 100644 src/test/test-namespace.c
diff --git a/Makefile.am b/Makefile.am
-index 8d9c587..5e3e5d2 100644
+index 8d9c58758f..5e3e5d2680 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1130,6 +1130,7 @@ tests += \
@@ -42,7 +42,7 @@ index 8d9c587..5e3e5d2 100644
src/test/test-hashmap.c
diff --git a/src/core/execute.c b/src/core/execute.c
-index 3f7ca52..58be72a 100644
+index 3f7ca52139..58be72a224 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1089,7 +1089,7 @@ int exec_spawn(ExecCommand *command,
@@ -55,7 +55,7 @@ index 3f7ca52..58be72a 100644
return r;
}
diff --git a/src/core/namespace.c b/src/core/namespace.c
-index 936f368..b453f8d 100644
+index 936f36839b..b453f8dc09 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -184,26 +184,29 @@ static int make_read_only(BindMount *m) {
@@ -95,7 +95,7 @@ index 936f368..b453f8d 100644
*tmp_dir = NULL;
diff --git a/src/core/namespace.h b/src/core/namespace.h
-index ddb5794..ee7416b 100644
+index ddb579468d..ee7416b7bd 100644
--- a/src/core/namespace.h
+++ b/src/core/namespace.h
@@ -23,7 +23,10 @@
@@ -112,7 +112,7 @@ index ddb5794..ee7416b 100644
char **inaccessible_dirs,
diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c
new file mode 100644
-index 0000000..1c04676
+index 0000000000..1c04676cc4
--- /dev/null
+++ b/src/test/test-namespace.c
@@ -0,0 +1,56 @@
diff --git a/0053-catalog-remove-links-to-non-existent-wiki-pages.patch b/0053-catalog-remove-links-to-non-existent-wiki-pages.patch
index 48fa36f..5c15c46 100644
--- a/0053-catalog-remove-links-to-non-existent-wiki-pages.patch
+++ b/0053-catalog-remove-links-to-non-existent-wiki-pages.patch
@@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1017161
1 file changed, 9 deletions(-)
diff --git a/catalog/systemd.catalog b/catalog/systemd.catalog
-index 892b2ad..3c2fe64 100644
+index 892b2adf78..3c2fe644e7 100644
--- a/catalog/systemd.catalog
+++ b/catalog/systemd.catalog
@@ -204,7 +204,6 @@ Unit @UNIT@ has begun shutting down.
diff --git a/0054-journalctl-add-list-boots-to-show-boot-IDs-and-times.patch b/0054-journalctl-add-list-boots-to-show-boot-IDs-and-times.patch
index d9e140b..baaec05 100644
--- a/0054-journalctl-add-list-boots-to-show-boot-IDs-and-times.patch
+++ b/0054-journalctl-add-list-boots-to-show-boot-IDs-and-times.patch
@@ -18,7 +18,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=967521:
4 files changed, 113 insertions(+), 6 deletions(-)
diff --git a/man/journalctl.xml b/man/journalctl.xml
-index b5a0c53..c0cc96d 100644
+index b5a0c539ca..c0cc96d800 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -478,6 +478,17 @@
@@ -40,7 +40,7 @@ index b5a0c53..c0cc96d 100644
diff --git a/shell-completion/bash/journalctl b/shell-completion/bash/journalctl
-index 3c40d57..942a253 100644
+index 3c40d57a98..942a25357f 100644
--- a/shell-completion/bash/journalctl
+++ b/shell-completion/bash/journalctl
@@ -42,7 +42,7 @@ _journalctl() {
@@ -53,7 +53,7 @@ index 3c40d57..942a253 100644
-o --output -u --unit --user-unit'
[ARGUNKNOWN]='-c --cursor --interval -n --lines -p --priority --since --until
diff --git a/shell-completion/zsh/_journalctl b/shell-completion/zsh/_journalctl
-index 73646b5..29ff3e3 100644
+index 73646b57f5..29ff3e34ee 100644
--- a/shell-completion/zsh/_journalctl
+++ b/shell-completion/zsh/_journalctl
@@ -70,6 +70,7 @@ _arguments -s \
@@ -65,7 +65,7 @@ index 73646b5..29ff3e3 100644
{-u+,--unit=}'[Show data only from the specified unit]:units:_journal_fields _SYSTEMD_UNIT' \
'--user-unit=[Show data only from the specified user session unit]:units:_journal_fields USER_UNIT' \
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 0876ee6..a5c4779 100644
+index 0876ee60f8..a5c4779460 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -104,12 +104,14 @@ static enum {
diff --git a/0055-udev-builtin-path_id-add-support-for-bcma-bus.patch b/0055-udev-builtin-path_id-add-support-for-bcma-bus.patch
index aa6fda3..e6a3021 100644
--- a/0055-udev-builtin-path_id-add-support-for-bcma-bus.patch
+++ b/0055-udev-builtin-path_id-add-support-for-bcma-bus.patch
@@ -12,7 +12,7 @@ so we never need to match on the latter.
1 file changed, 16 insertions(+)
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
-index 0659967..763f3c3 100644
+index 0659967c68..763f3c3113 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -452,6 +452,19 @@ static struct udev_device *handle_usb(struct udev_device *parent, char **path)
diff --git a/0056-udev-ata_id-log-faling-ioctls-as-debug.patch b/0056-udev-ata_id-log-faling-ioctls-as-debug.patch
index 7b27d81..75c954a 100644
--- a/0056-udev-ata_id-log-faling-ioctls-as-debug.patch
+++ b/0056-udev-ata_id-log-faling-ioctls-as-debug.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] udev: ata_id: log faling ioctls as "debug"
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
-index 68a06b9..d375d43 100644
+index 68a06b93b8..d375d43491 100644
--- a/src/udev/ata_id/ata_id.c
+++ b/src/udev/ata_id/ata_id.c
@@ -501,7 +501,7 @@ int main(int argc, char *argv[])
diff --git a/0057-libudev-default-log_priority-to-INFO.patch b/0057-libudev-default-log_priority-to-INFO.patch
index 43fd16c..0e55114 100644
--- a/0057-libudev-default-log_priority-to-INFO.patch
+++ b/0057-libudev-default-log_priority-to-INFO.patch
@@ -9,7 +9,7 @@ This brings it in sync with the default config file.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c
-index 208039a..bc73a5a 100644
+index 208039a1b2..bc73a5a08c 100644
--- a/src/libudev/libudev.c
+++ b/src/libudev/libudev.c
@@ -125,7 +125,7 @@ _public_ struct udev *udev_new(void)
diff --git a/0058-nspawn-only-pass-in-slice-setting-if-it-is-set.patch b/0058-nspawn-only-pass-in-slice-setting-if-it-is-set.patch
index 5e54415..24024a5 100644
--- a/0058-nspawn-only-pass-in-slice-setting-if-it-is-set.patch
+++ b/0058-nspawn-only-pass-in-slice-setting-if-it-is-set.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] nspawn: only pass in slice setting if it is set
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index eb9605c..9616dbf 100644
+index eb9605c356..9616dbf3c2 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1202,7 +1202,7 @@ static int register_machine(void) {
diff --git a/0059-zsh-completion-add-systemd-run.patch b/0059-zsh-completion-add-systemd-run.patch
index 3434010..53ca8bd 100644
--- a/0059-zsh-completion-add-systemd-run.patch
+++ b/0059-zsh-completion-add-systemd-run.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] zsh-completion: add systemd-run
create mode 100644 shell-completion/zsh/_systemd-run
diff --git a/Makefile.am b/Makefile.am
-index 5e3e5d2..7ab345a 100644
+index 5e3e5d2680..7ab345a141 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -352,6 +352,7 @@ dist_zshcompletion_DATA = \
@@ -23,7 +23,7 @@ index 5e3e5d2..7ab345a 100644
shell-completion/zsh/_systemd
diff --git a/shell-completion/zsh/_systemd-run b/shell-completion/zsh/_systemd-run
new file mode 100644
-index 0000000..0c81c54
+index 0000000000..0c81c543c5
--- /dev/null
+++ b/shell-completion/zsh/_systemd-run
@@ -0,0 +1,31 @@
diff --git a/0060-man-explain-NAME-in-systemctl-man-page.patch b/0060-man-explain-NAME-in-systemctl-man-page.patch
index aa93495..c83658e 100644
--- a/0060-man-explain-NAME-in-systemctl-man-page.patch
+++ b/0060-man-explain-NAME-in-systemctl-man-page.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] man: explain NAME in systemctl man page
1 file changed, 13 insertions(+)
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index e789d4b..166282c 100644
+index e789d4b629..166282cecc 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -63,6 +63,19 @@ along with systemd; If not, see .
diff --git a/0061-virt-move-caching-of-virtualization-check-results-in.patch b/0061-virt-move-caching-of-virtualization-check-results-in.patch
index de8c5f6..f267d39 100644
--- a/0061-virt-move-caching-of-virtualization-check-results-in.patch
+++ b/0061-virt-move-caching-of-virtualization-check-results-in.patch
@@ -13,7 +13,7 @@ since the latter is only a wrapper around the former.
2 files changed, 87 insertions(+), 95 deletions(-)
diff --git a/src/detect-virt/detect-virt.c b/src/detect-virt/detect-virt.c
-index bd3ee45..72ff2a8 100644
+index bd3ee452c1..72ff2a8585 100644
--- a/src/detect-virt/detect-virt.c
+++ b/src/detect-virt/detect-virt.c
@@ -114,8 +114,8 @@ static int parse_argv(int argc, char *argv[]) {
@@ -27,7 +27,7 @@ index bd3ee45..72ff2a8 100644
/* This is mostly intended to be used for scripts which want
* to detect whether we are being run in a virtualized
diff --git a/src/shared/virt.c b/src/shared/virt.c
-index 4f8134a..537ccda 100644
+index 4f8134a773..537ccda654 100644
--- a/src/shared/virt.c
+++ b/src/shared/virt.c
@@ -60,6 +60,9 @@ int detect_vm(const char **id) {
diff --git a/0062-systemctl-fix-typo-in-help-text.patch b/0062-systemctl-fix-typo-in-help-text.patch
index fdc6f82..25e0685 100644
--- a/0062-systemctl-fix-typo-in-help-text.patch
+++ b/0062-systemctl-fix-typo-in-help-text.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] systemctl: fix typo in help text
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 036828b..36040db 100644
+index 036828b5dd..36040db1fa 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4743,7 +4743,7 @@ static int systemctl_help(void) {
diff --git a/0063-analyze-plot-place-the-text-on-the-side-with-most-sp.patch b/0063-analyze-plot-place-the-text-on-the-side-with-most-sp.patch
index d92c591..a4bbb8c 100644
--- a/0063-analyze-plot-place-the-text-on-the-side-with-most-sp.patch
+++ b/0063-analyze-plot-place-the-text-on-the-side-with-most-sp.patch
@@ -14,7 +14,7 @@ the left to save the svg from being wider that it has to.
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/analyze/systemd-analyze.c b/src/analyze/systemd-analyze.c
-index 9a69795..f4c7f68 100644
+index 9a69795906..f4c7f68fcd 100644
--- a/src/analyze/systemd-analyze.c
+++ b/src/analyze/systemd-analyze.c
@@ -462,7 +462,7 @@ static int analyze_plot(DBusConnection *bus) {
diff --git a/0064-detect_virtualization-returns-NULL-pass-empty-string.patch b/0064-detect_virtualization-returns-NULL-pass-empty-string.patch
index 96926e2..edf45cc 100644
--- a/0064-detect_virtualization-returns-NULL-pass-empty-string.patch
+++ b/0064-detect_virtualization-returns-NULL-pass-empty-string.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] detect_virtualization() returns NULL; pass empty string to
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
-index 8f4d017..536f2ea 100644
+index 8f4d01737a..536f2ea4db 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -466,7 +466,7 @@ static int bus_manager_append_progress(DBusMessageIter *i, const char *property,
diff --git a/0065-rules-load-path_id-on-DRM-devices.patch b/0065-rules-load-path_id-on-DRM-devices.patch
index 0f2623a..94a347f 100644
--- a/0065-rules-load-path_id-on-DRM-devices.patch
+++ b/0065-rules-load-path_id-on-DRM-devices.patch
@@ -17,7 +17,7 @@ this alias.
create mode 100644 rules/60-drm.rules
diff --git a/Makefile.am b/Makefile.am
-index 7ab345a..34de7f2 100644
+index 7ab345a141..34de7f2b58 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2209,6 +2209,7 @@ dist_udevrules_DATA += \
@@ -30,7 +30,7 @@ index 7ab345a..34de7f2 100644
rules/60-persistent-serial.rules \
diff --git a/rules/60-drm.rules b/rules/60-drm.rules
new file mode 100644
-index 0000000..de038c1
+index 0000000000..de038c1191
--- /dev/null
+++ b/rules/60-drm.rules
@@ -0,0 +1,8 @@
diff --git a/0066-rules-simply-60-drm.rules.patch b/0066-rules-simply-60-drm.rules.patch
index 66930c0..f98d266 100644
--- a/0066-rules-simply-60-drm.rules.patch
+++ b/0066-rules-simply-60-drm.rules.patch
@@ -9,7 +9,7 @@ We don't need any GOTO, if we merge all matches into a single line.
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/rules/60-drm.rules b/rules/60-drm.rules
-index de038c1..1ed3e44 100644
+index de038c1191..1ed3e445f2 100644
--- a/rules/60-drm.rules
+++ b/rules/60-drm.rules
@@ -1,8 +1,3 @@
diff --git a/0067-udev-builtin-keyboard-Fix-large-scan-codes-on-32-bit.patch b/0067-udev-builtin-keyboard-Fix-large-scan-codes-on-32-bit.patch
index 0233d16..7897768 100644
--- a/0067-udev-builtin-keyboard-Fix-large-scan-codes-on-32-bit.patch
+++ b/0067-udev-builtin-keyboard-Fix-large-scan-codes-on-32-bit.patch
@@ -17,7 +17,7 @@ https://launchpad.net/bugs/1247676
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
-index ddd8535..8f457ab 100644
+index ddd853594e..8f457ab4a2 100644
--- a/src/udev/udev-builtin-keyboard.c
+++ b/src/udev/udev-builtin-keyboard.c
@@ -88,7 +88,7 @@ static int builtin_keyboard(struct udev_device *dev, int argc, char *argv[], boo
diff --git a/0068-nspawn-log-out-of-memory-errors.patch b/0068-nspawn-log-out-of-memory-errors.patch
index 406c222..45353bc 100644
--- a/0068-nspawn-log-out-of-memory-errors.patch
+++ b/0068-nspawn-log-out-of-memory-errors.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] nspawn: log out of memory errors
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 9616dbf..db47fbd 100644
+index 9616dbf3c2..db47fbd3f4 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -224,6 +224,9 @@ static int parse_argv(int argc, char *argv[]) {
diff --git a/0069-Configurable-Timeouts-Restarts-default-values.patch b/0069-Configurable-Timeouts-Restarts-default-values.patch
index a0597cc..e7f0af4 100644
--- a/0069-Configurable-Timeouts-Restarts-default-values.patch
+++ b/0069-Configurable-Timeouts-Restarts-default-values.patch
@@ -26,7 +26,7 @@ configuration options to manager configuration file.
15 files changed, 59 insertions(+), 17 deletions(-)
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
-index e8cf8a9..c1f2648 100644
+index e8cf8a9cb2..c1f26484ee 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -61,7 +61,6 @@
@@ -68,7 +68,7 @@ index e8cf8a9..c1f2648 100644
Configures the initial
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
-index 48af1ca..71a5736 100644
+index 48af1caace..71a5736094 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -260,8 +260,8 @@
@@ -83,7 +83,7 @@ index 48af1ca..71a5736 100644
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index 5e1ddf7..df04048 100644
+index 5e1ddf7188..df04048334 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -524,7 +524,8 @@
@@ -107,7 +107,7 @@ index 5e1ddf7..df04048 100644
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
-index 8c88d9f..1c78562 100644
+index 8c88d9f8aa..1c78562e8a 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -679,8 +679,8 @@
@@ -122,7 +122,7 @@ index 8c88d9f..1c78562 100644
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
-index 813ae6c..13f6c84 100644
+index 813ae6c942..13f6c8441a 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -186,8 +186,8 @@
@@ -137,7 +137,7 @@ index 813ae6c..13f6c84 100644
diff --git a/src/core/device.c b/src/core/device.c
-index 9fca82a..5397bd6 100644
+index 9fca82ab16..5397bd6354 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -70,7 +70,7 @@ static void device_init(Unit *u) {
@@ -150,7 +150,7 @@ index 9fca82a..5397bd6 100644
UNIT(d)->ignore_on_isolate = true;
UNIT(d)->ignore_on_snapshot = true;
diff --git a/src/core/main.c b/src/core/main.c
-index fe291f8..937994c 100644
+index fe291f8410..937994cb94 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -90,6 +90,9 @@ static bool arg_switched_root = false;
@@ -184,7 +184,7 @@ index fe291f8..937994c 100644
m->shutdown_watchdog = arg_shutdown_watchdog;
m->userspace_timestamp = userspace_timestamp;
diff --git a/src/core/manager.h b/src/core/manager.h
-index a3049b5..e74c609 100644
+index a3049b5e5b..e74c609701 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -230,6 +230,9 @@ struct Manager {
@@ -198,7 +198,7 @@ index a3049b5..e74c609 100644
/* non-zero if we are reloading or reexecuting, */
diff --git a/src/core/mount.c b/src/core/mount.c
-index 70cd372..c0445a6 100644
+index 70cd372e10..c0445a6113 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -131,7 +131,7 @@ static void mount_init(Unit *u) {
@@ -211,7 +211,7 @@ index 70cd372..c0445a6 100644
exec_context_init(&m->exec_context);
diff --git a/src/core/scope.c b/src/core/scope.c
-index 50e5dba..41da3b9 100644
+index 50e5dbacb4..41da3b9378 100644
--- a/src/core/scope.c
+++ b/src/core/scope.c
@@ -46,7 +46,7 @@ static void scope_init(Unit *u) {
@@ -224,7 +224,7 @@ index 50e5dba..41da3b9 100644
watch_init(&s->timer_watch);
diff --git a/src/core/service.c b/src/core/service.c
-index 96ed2d3..e81aa1f 100644
+index 96ed2d303a..e81aa1fa58 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -124,9 +124,9 @@ static void service_init(Unit *u) {
@@ -241,7 +241,7 @@ index 96ed2d3..e81aa1f 100644
watch_init(&s->watchdog_watch);
diff --git a/src/core/socket.c b/src/core/socket.c
-index 6c0ac1a..d368f7e 100644
+index 6c0ac1a898..d368f7ee94 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -73,7 +73,7 @@ static void socket_init(Unit *u) {
@@ -254,7 +254,7 @@ index 6c0ac1a..d368f7e 100644
s->socket_mode = 0666;
diff --git a/src/core/swap.c b/src/core/swap.c
-index a68ab7c..147f710 100644
+index a68ab7cdf8..147f710b66 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -86,7 +86,7 @@ static void swap_init(Unit *u) {
@@ -267,7 +267,7 @@ index a68ab7c..147f710 100644
exec_context_init(&s->exec_context);
s->exec_context.std_output = u->manager->default_std_output;
diff --git a/src/core/system.conf b/src/core/system.conf
-index 7b03c87..3c6cc03 100644
+index 7b03c8782b..3c6cc0349b 100644
--- a/src/core/system.conf
+++ b/src/core/system.conf
@@ -24,6 +24,9 @@
@@ -281,7 +281,7 @@ index 7b03c87..3c6cc03 100644
#DefaultLimitCPU=
#DefaultLimitFSIZE=
diff --git a/src/core/user.conf b/src/core/user.conf
-index 4a0129a..b030701 100644
+index 4a0129a984..b030701840 100644
--- a/src/core/user.conf
+++ b/src/core/user.conf
@@ -14,3 +14,6 @@
diff --git a/0070-man-fix-typo.patch b/0070-man-fix-typo.patch
index fb4fc47..6c00c60 100644
--- a/0070-man-fix-typo.patch
+++ b/0070-man-fix-typo.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] man: fix typo
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
-index e76a402..252335b 100644
+index e76a402003..252335b3c5 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -60,7 +60,7 @@ along with systemd; If not, see .
diff --git a/0071-man-do-not-use-term-in-para.patch b/0071-man-do-not-use-term-in-para.patch
index 9a9ea2e..f7fdd6d 100644
--- a/0071-man-do-not-use-term-in-para.patch
+++ b/0071-man-do-not-use-term-in-para.patch
@@ -9,7 +9,7 @@ Element term in namespace '' encountered in para, but no template matches.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
-index 71a5736..df5a79e 100644
+index 71a5736094..df5a79e2b8 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -261,7 +261,7 @@
diff --git a/0072-cgroup-run-PID-1-in-the-root-cgroup.patch b/0072-cgroup-run-PID-1-in-the-root-cgroup.patch
index 7266ea0..e38647b 100644
--- a/0072-cgroup-run-PID-1-in-the-root-cgroup.patch
+++ b/0072-cgroup-run-PID-1-in-the-root-cgroup.patch
@@ -16,7 +16,7 @@ slices.
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
-index 8bf4d89..42c0b3f 100644
+index 8bf4d896de..42c0b3fb1f 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -589,8 +589,8 @@ pid_t unit_search_main_pid(Unit *u) {
diff --git a/0073-shutdown-trim-the-cgroup-tree-on-loop-iteration.patch b/0073-shutdown-trim-the-cgroup-tree-on-loop-iteration.patch
index 1721729..1df182d 100644
--- a/0073-shutdown-trim-the-cgroup-tree-on-loop-iteration.patch
+++ b/0073-shutdown-trim-the-cgroup-tree-on-loop-iteration.patch
@@ -13,7 +13,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=988883
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/core/shutdown.c b/src/core/shutdown.c
-index 4709746..ea02b60 100644
+index 4709746de4..ea02b60456 100644
--- a/src/core/shutdown.c
+++ b/src/core/shutdown.c
@@ -46,6 +46,7 @@
diff --git a/0074-nspawn-split-out-pty-forwaring-logic-into-ptyfwd.c.patch b/0074-nspawn-split-out-pty-forwaring-logic-into-ptyfwd.c.patch
index de83e49..50d8326 100644
--- a/0074-nspawn-split-out-pty-forwaring-logic-into-ptyfwd.c.patch
+++ b/0074-nspawn-split-out-pty-forwaring-logic-into-ptyfwd.c.patch
@@ -16,7 +16,7 @@ Conflicts:
create mode 100644 src/shared/ptyfwd.h
diff --git a/Makefile.am b/Makefile.am
-index 34de7f2..b4fc33b 100644
+index 34de7f2b58..b4fc33b203 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -724,7 +724,9 @@ libsystemd_shared_la_SOURCES = \
@@ -31,7 +31,7 @@ index 34de7f2..b4fc33b 100644
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index db47fbd..cda6c82 100644
+index db47fbd3f4..cda6c82050 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -63,6 +63,7 @@
@@ -302,7 +302,7 @@ index db47fbd..cda6c82 100644
if (saved_attr_valid)
diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c
new file mode 100644
-index 0000000..1e2852b
+index 0000000000..1e2852b1af
--- /dev/null
+++ b/src/shared/ptyfwd.c
@@ -0,0 +1,252 @@
@@ -560,7 +560,7 @@ index 0000000..1e2852b
+}
diff --git a/src/shared/ptyfwd.h b/src/shared/ptyfwd.h
new file mode 100644
-index 0000000..8b65702
+index 0000000000..8b657023a9
--- /dev/null
+++ b/src/shared/ptyfwd.h
@@ -0,0 +1,27 @@
diff --git a/0075-nspawn-explicitly-terminate-machines-when-we-exit-ns.patch b/0075-nspawn-explicitly-terminate-machines-when-we-exit-ns.patch
index a268d32..7a51c4b 100644
--- a/0075-nspawn-explicitly-terminate-machines-when-we-exit-ns.patch
+++ b/0075-nspawn-explicitly-terminate-machines-when-we-exit-ns.patch
@@ -13,7 +13,7 @@ Conflicts:
1 file changed, 65 insertions(+), 5 deletions(-)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index cda6c82..85bbadf 100644
+index cda6c82050..85bbadf811 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -43,9 +43,9 @@
diff --git a/0076-run-support-system-to-match-other-commands-even-if-r.patch b/0076-run-support-system-to-match-other-commands-even-if-r.patch
index e8b70d8..2e03db7 100644
--- a/0076-run-support-system-to-match-other-commands-even-if-r.patch
+++ b/0076-run-support-system-to-match-other-commands-even-if-r.patch
@@ -13,7 +13,7 @@ Conflicts:
2 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
-index 252335b..48a0715 100644
+index 252335b3c5..48a0715499 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -113,6 +113,15 @@ along with systemd; If not, see .
@@ -33,7 +33,7 @@ index 252335b..48a0715 100644
diff --git a/src/run/run.c b/src/run/run.c
-index 18a4920..a6abead 100644
+index 18a4920f03..a6abead8ba 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -61,6 +61,7 @@ static int parse_argv(int argc, char *argv[]) {
diff --git a/0077-acpi-fpdt-break-on-zero-or-negative-length-read.patch b/0077-acpi-fpdt-break-on-zero-or-negative-length-read.patch
index 752e107..86ed442 100644
--- a/0077-acpi-fpdt-break-on-zero-or-negative-length-read.patch
+++ b/0077-acpi-fpdt-break-on-zero-or-negative-length-read.patch
@@ -9,7 +9,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1027478
1 file changed, 2 insertions(+)
diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
-index 75648b4..7bae47f 100644
+index 75648b4d86..7bae47f85f 100644
--- a/src/shared/acpi-fpdt.c
+++ b/src/shared/acpi-fpdt.c
@@ -109,6 +109,8 @@ int acpi_get_boot_usec(usec_t *loader_start, usec_t *loader_exit) {
diff --git a/0078-man-add-rationale-into-systemd-halt-8.patch b/0078-man-add-rationale-into-systemd-halt-8.patch
index 0e0d539..e2478c4 100644
--- a/0078-man-add-rationale-into-systemd-halt-8.patch
+++ b/0078-man-add-rationale-into-systemd-halt-8.patch
@@ -10,7 +10,7 @@ http://people.debian.org/~stapelberg/docs/systemd-dependencies.html
1 file changed, 6 insertions(+)
diff --git a/man/systemd-halt.service.xml b/man/systemd-halt.service.xml
-index 812281e..90b443f 100644
+index 812281e60d..90b443ffa8 100644
--- a/man/systemd-halt.service.xml
+++ b/man/systemd-halt.service.xml
@@ -83,6 +83,12 @@
diff --git a/0079-systemd-python-convert-keyword-value-to-string.patch b/0079-systemd-python-convert-keyword-value-to-string.patch
index 91a5ff1..5fe2101 100644
--- a/0079-systemd-python-convert-keyword-value-to-string.patch
+++ b/0079-systemd-python-convert-keyword-value-to-string.patch
@@ -13,7 +13,7 @@ and requires passing PRIORITY value as string to work.
1 file changed, 2 insertions(+)
diff --git a/src/python-systemd/journal.py b/src/python-systemd/journal.py
-index d0bcd24..9c7e004 100644
+index d0bcd24d15..9c7e0045e5 100644
--- a/src/python-systemd/journal.py
+++ b/src/python-systemd/journal.py
@@ -352,6 +352,8 @@ def get_catalog(mid):
diff --git a/0080-systemctl-make-LOAD-column-width-dynamic.patch b/0080-systemctl-make-LOAD-column-width-dynamic.patch
index e1e126c..297a2bb 100644
--- a/0080-systemctl-make-LOAD-column-width-dynamic.patch
+++ b/0080-systemctl-make-LOAD-column-width-dynamic.patch
@@ -9,7 +9,7 @@ Otherwise 'not-found' overflows into the ACTIVE column.
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 36040db..906982a 100644
+index 36040db1fa..906982a762 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -287,14 +287,16 @@ static bool output_show_unit(const struct unit_info *u) {
diff --git a/0081-Make-hibernation-test-work-for-swap-files.patch b/0081-Make-hibernation-test-work-for-swap-files.patch
index 8630a35..1a8352a 100644
--- a/0081-Make-hibernation-test-work-for-swap-files.patch
+++ b/0081-Make-hibernation-test-work-for-swap-files.patch
@@ -11,7 +11,7 @@ https://www.kernel.org/doc/Documentation/power/swsusp-and-swap-files.txt
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
-index d068bfc..2bb0493 100644
+index d068bfce3c..2bb0493812 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -206,7 +206,7 @@ static int hibernation_partition_size(size_t *size, size_t *used) {
diff --git a/0082-man-add-docs-for-sd_is_special-and-some-man-page-sym.patch b/0082-man-add-docs-for-sd_is_special-and-some-man-page-sym.patch
index adfcb18..6b52662 100644
--- a/0082-man-add-docs-for-sd_is_special-and-some-man-page-sym.patch
+++ b/0082-man-add-docs-for-sd_is_special-and-some-man-page-sym.patch
@@ -12,7 +12,7 @@ Conflicts:
3 files changed, 34 insertions(+)
diff --git a/Makefile-man.am b/Makefile-man.am
-index c8a4342..b8c8acc 100644
+index c8a4342396..b8c8acc0b4 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -138,6 +138,7 @@ MANPAGES_ALIAS += \
@@ -78,7 +78,7 @@ index c8a4342..b8c8acc 100644
$(html-alias)
diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
-index 2bc860c..4d9cd79 100644
+index 2bc860c373..4d9cd79600 100644
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -48,6 +48,7 @@
@@ -120,7 +120,7 @@ index 2bc860c..4d9cd79 100644
diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml
-index 1610d3e..cd87696 100644
+index 1610d3efe8..cd8769698c 100644
--- a/man/sd_seat_get_active.xml
+++ b/man/sd_seat_get_active.xml
@@ -46,6 +46,8 @@
diff --git a/0083-systemctl-return-r-instead-of-always-returning-0.patch b/0083-systemctl-return-r-instead-of-always-returning-0.patch
index 7bba18a..e9c8797 100644
--- a/0083-systemctl-return-r-instead-of-always-returning-0.patch
+++ b/0083-systemctl-return-r-instead-of-always-returning-0.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] systemctl: return r instead of always returning 0
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 906982a..db584b2 100644
+index 906982a762..db584b2703 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -1365,7 +1365,7 @@ static int list_jobs(DBusConnection *bus, char **args) {
diff --git a/0084-journal-fix-minor-memory-leak.patch b/0084-journal-fix-minor-memory-leak.patch
index 2841e08..6331e5a 100644
--- a/0084-journal-fix-minor-memory-leak.patch
+++ b/0084-journal-fix-minor-memory-leak.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] journal: fix minor memory leak
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index 7700d6c..9676f0f 100644
+index 7700d6cb12..9676f0f041 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1276,7 +1276,7 @@ static void check_network(sd_journal *j, int fd) {
diff --git a/0085-manager-configurable-StartLimit-default-values.patch b/0085-manager-configurable-StartLimit-default-values.patch
index 88cbb8c..64f49a3 100644
--- a/0085-manager-configurable-StartLimit-default-values.patch
+++ b/0085-manager-configurable-StartLimit-default-values.patch
@@ -16,7 +16,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=821723
8 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
-index c1f2648..9a1a99f 100644
+index c1f26484ee..9a1a99fecf 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -115,6 +115,19 @@
@@ -40,7 +40,7 @@ index c1f2648..9a1a99f 100644
CPUAffinity=
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index df04048..3f31c11 100644
+index df04048334..3f31c11506 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -863,12 +863,15 @@
@@ -63,7 +63,7 @@ index df04048..3f31c11 100644
useful in conjunction with
Restart=, however
diff --git a/src/core/main.c b/src/core/main.c
-index 937994c..00fd394 100644
+index 937994cb94..00fd39486b 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -93,6 +93,8 @@ static ExecOutput arg_default_std_error = EXEC_OUTPUT_INHERIT;
@@ -94,7 +94,7 @@ index 937994c..00fd394 100644
m->shutdown_watchdog = arg_shutdown_watchdog;
m->userspace_timestamp = userspace_timestamp;
diff --git a/src/core/manager.h b/src/core/manager.h
-index e74c609..ee42c5e 100644
+index e74c609701..ee42c5e00a 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -233,6 +233,9 @@ struct Manager {
@@ -108,7 +108,7 @@ index e74c609..ee42c5e 100644
/* non-zero if we are reloading or reexecuting, */
diff --git a/src/core/service.c b/src/core/service.c
-index e81aa1f..5662180 100644
+index e81aa1fa58..5662180381 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -143,7 +143,9 @@ static void service_init(Unit *u) {
@@ -123,7 +123,7 @@ index e81aa1f..5662180 100644
s->control_command_id = _SERVICE_EXEC_COMMAND_INVALID;
}
diff --git a/src/core/system.conf b/src/core/system.conf
-index 3c6cc03..38bbca5 100644
+index 3c6cc0349b..38bbca5b41 100644
--- a/src/core/system.conf
+++ b/src/core/system.conf
@@ -27,6 +27,8 @@
@@ -136,7 +136,7 @@ index 3c6cc03..38bbca5 100644
#DefaultLimitCPU=
#DefaultLimitFSIZE=
diff --git a/src/core/user.conf b/src/core/user.conf
-index b030701..923ca66 100644
+index b030701840..923ca66991 100644
--- a/src/core/user.conf
+++ b/src/core/user.conf
@@ -17,3 +17,5 @@
@@ -146,7 +146,7 @@ index b030701..923ca66 100644
+#DefaultStartLimitInterval=10s
+#DefaultStartLimitBurst=5
diff --git a/src/shared/def.h b/src/shared/def.h
-index edd0bcf..e4ef735 100644
+index edd0bcf7a4..e4ef73555d 100644
--- a/src/shared/def.h
+++ b/src/shared/def.h
@@ -27,6 +27,9 @@
diff --git a/0086-man-units-fix-installation-of-systemd-nspawn-.servic.patch b/0086-man-units-fix-installation-of-systemd-nspawn-.servic.patch
index d9d230f..9725e63 100644
--- a/0086-man-units-fix-installation-of-systemd-nspawn-.servic.patch
+++ b/0086-man-units-fix-installation-of-systemd-nspawn-.servic.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] man,units: fix installation of systemd-nspawn@.service and
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/TODO b/TODO
-index 425f673..42ba030 100644
+index 425f6736c0..42ba0304a2 100644
--- a/TODO
+++ b/TODO
@@ -491,6 +491,7 @@ Features:
@@ -23,7 +23,7 @@ index 425f673..42ba030 100644
* cryptsetup:
- cryptsetup-generator: allow specification of passwords in crypttab itself
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
-index 7d450f9..ba9e516 100644
+index 7d450f912c..ba9e51686a 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -428,6 +428,18 @@
@@ -46,7 +46,7 @@ index 7d450f9..ba9e516 100644
The exit code of the program executed in the
diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
-index eca62e3..8e00736 100644
+index eca62e3b17..8e00736498 100644
--- a/units/systemd-nspawn@.service.in
+++ b/units/systemd-nspawn@.service.in
@@ -14,4 +14,4 @@ ExecStart=@bindir@/systemd-nspawn -bjD /var/lib/container/%i
diff --git a/0087-systemd-fix-memory-leak-in-cgroup-code.patch b/0087-systemd-fix-memory-leak-in-cgroup-code.patch
index 3908431..7e130f7 100644
--- a/0087-systemd-fix-memory-leak-in-cgroup-code.patch
+++ b/0087-systemd-fix-memory-leak-in-cgroup-code.patch
@@ -9,7 +9,7 @@ If the unit already was in the hashmap, path would be leaked.
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
-index 42c0b3f..32e2599 100644
+index 42c0b3fb1f..32e2599a2c 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -376,23 +376,23 @@ static CGroupControllerMask unit_get_siblings_mask(Unit *u) {
diff --git a/0088-button-don-t-exit-if-we-cannot-handle-a-button-press.patch b/0088-button-don-t-exit-if-we-cannot-handle-a-button-press.patch
index 250bef2..c189e56 100644
--- a/0088-button-don-t-exit-if-we-cannot-handle-a-button-press.patch
+++ b/0088-button-don-t-exit-if-we-cannot-handle-a-button-press.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] button: don't exit if we cannot handle a button press
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/login/logind-button.c b/src/login/logind-button.c
-index ea45c28..4f456d2 100644
+index ea45c28eef..4f456d21af 100644
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -172,7 +172,7 @@ static int button_handle(
diff --git a/0089-timer-properly-format-relative-timestamps-in-the-fut.patch b/0089-timer-properly-format-relative-timestamps-in-the-fut.patch
index 73e669a..afdfa80 100644
--- a/0089-timer-properly-format-relative-timestamps-in-the-fut.patch
+++ b/0089-timer-properly-format-relative-timestamps-in-the-fut.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] timer: properly format relative timestamps in the future
1 file changed, 44 insertions(+), 25 deletions(-)
diff --git a/src/shared/time-util.c b/src/shared/time-util.c
-index 860be61..b8a6bd7 100644
+index 860be61e8b..b8a6bd7f16 100644
--- a/src/shared/time-util.c
+++ b/src/shared/time-util.c
@@ -191,55 +191,62 @@ char *format_timestamp_us(char *buf, size_t l, usec_t t) {
diff --git a/0090-timer-consider-usec_t-1-an-invalid-timestamp.patch b/0090-timer-consider-usec_t-1-an-invalid-timestamp.patch
index a45702d..8b0f418 100644
--- a/0090-timer-consider-usec_t-1-an-invalid-timestamp.patch
+++ b/0090-timer-consider-usec_t-1-an-invalid-timestamp.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] timer: consider (usec_t) -1 an invalid timestamp
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/shared/time-util.c b/src/shared/time-util.c
-index b8a6bd7..81d4ede 100644
+index b8a6bd7f16..81d4ede1b8 100644
--- a/src/shared/time-util.c
+++ b/src/shared/time-util.c
@@ -157,7 +157,7 @@ char *format_timestamp(char *buf, size_t l, usec_t t) {
@@ -31,7 +31,7 @@ index b8a6bd7..81d4ede 100644
sec = (time_t) (t / USEC_PER_SEC);
diff --git a/src/shared/time-util.h b/src/shared/time-util.h
-index 7660fe1..bc10d22 100644
+index 7660fe1872..bc10d2237b 100644
--- a/src/shared/time-util.h
+++ b/src/shared/time-util.h
@@ -64,7 +64,10 @@ dual_timestamp* dual_timestamp_get(dual_timestamp *ts);
diff --git a/0091-udev-usb_id-remove-obsoleted-bInterfaceSubClass-5-ma.patch b/0091-udev-usb_id-remove-obsoleted-bInterfaceSubClass-5-ma.patch
index 0b6f54f..4cbe3ed 100644
--- a/0091-udev-usb_id-remove-obsoleted-bInterfaceSubClass-5-ma.patch
+++ b/0091-udev-usb_id-remove-obsoleted-bInterfaceSubClass-5-ma.patch
@@ -10,7 +10,7 @@ QIC-157 interface as "generic".
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c
-index e3bbd05..3e2f43e 100644
+index e3bbd05e4b..3e2f43e1a6 100644
--- a/src/udev/udev-builtin-usb_id.c
+++ b/src/udev/udev-builtin-usb_id.c
@@ -91,6 +91,9 @@ static int set_usb_mass_storage_ifsubtype(char *to, const char *from, size_t len
diff --git a/0092-Add-support-for-saving-restoring-keyboard-backlights.patch b/0092-Add-support-for-saving-restoring-keyboard-backlights.patch
index 1622449..e22a9d7 100644
--- a/0092-Add-support-for-saving-restoring-keyboard-backlights.patch
+++ b/0092-Add-support-for-saving-restoring-keyboard-backlights.patch
@@ -21,7 +21,7 @@ Conflicts:
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
-index 307f18f..a00ffed 100644
+index 307f18f70d..a00ffed4c0 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -51,9 +51,11 @@ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:
@@ -38,7 +38,7 @@ index 307f18f..a00ffed 100644
# Asynchronously mount file systems implemented by these modules as
# soon as they are loaded.
diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
-index 9b2eada..f22deed 100644
+index 9b2eada397..f22deed4e0 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -56,9 +56,11 @@ int main(int argc, char *argv[]) {
diff --git a/0093-static-nodes-don-t-call-mkdir.patch b/0093-static-nodes-don-t-call-mkdir.patch
index 794c862..15fbd5c 100644
--- a/0093-static-nodes-don-t-call-mkdir.patch
+++ b/0093-static-nodes-don-t-call-mkdir.patch
@@ -11,7 +11,7 @@ This is no longer necessary with kmod-15. Bump the requirement.
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/README b/README
-index b39cd37..cf0a18d 100644
+index b39cd377df..cf0a18de2e 100644
--- a/README
+++ b/README
@@ -95,7 +95,7 @@ REQUIREMENTS:
@@ -24,7 +24,7 @@ index b39cd37..cf0a18d 100644
libcryptsetup (optional)
libaudit (optional)
diff --git a/configure.ac b/configure.ac
-index 4f26092..5bc31c5 100644
+index 4f26092e91..5bc31c519a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -269,7 +269,7 @@ AC_ARG_ENABLE(kmod, AS_HELP_STRING([--disable-kmod], [disable loadable modules s
@@ -37,7 +37,7 @@ index 4f26092..5bc31c5 100644
AC_MSG_ERROR([*** kmod version >= 14 not found]))
fi
diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in
-index ff4017b..368f980 100644
+index ff4017bada..368f980fd1 100644
--- a/units/kmod-static-nodes.service.in
+++ b/units/kmod-static-nodes.service.in
@@ -15,5 +15,4 @@ ConditionPathExists=/lib/modules/%v/modules.devname
diff --git a/0094-Fix-kmod-error-message-to-have-correct-version-requi.patch b/0094-Fix-kmod-error-message-to-have-correct-version-requi.patch
index 099bb52..e361724 100644
--- a/0094-Fix-kmod-error-message-to-have-correct-version-requi.patch
+++ b/0094-Fix-kmod-error-message-to-have-correct-version-requi.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Fix kmod error message to have correct version requirement
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 5bc31c5..9904e25 100644
+index 5bc31c519a..9904e25e99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -271,7 +271,7 @@ if test "x$enable_kmod" != "xno"; then
diff --git a/0095-systemd-python-fix-booted-and-add-two-functions-to-d.patch b/0095-systemd-python-fix-booted-and-add-two-functions-to-d.patch
index c847312..673432e 100644
--- a/0095-systemd-python-fix-booted-and-add-two-functions-to-d.patch
+++ b/0095-systemd-python-fix-booted-and-add-two-functions-to-d.patch
@@ -9,7 +9,7 @@ For some reason sphinx doesn't want to show inherited C functions.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/python-systemd/_daemon.c b/src/python-systemd/_daemon.c
-index 6b84fb8..f0ab16f 100644
+index 6b84fb81c7..f0ab16f659 100644
--- a/src/python-systemd/_daemon.c
+++ b/src/python-systemd/_daemon.c
@@ -51,7 +51,7 @@ static PyObject* booted(PyObject *self, PyObject *args) {
diff --git a/0096-activate-mention-E-in-the-help-text.patch b/0096-activate-mention-E-in-the-help-text.patch
index 36519d7..7fcba76 100644
--- a/0096-activate-mention-E-in-the-help-text.patch
+++ b/0096-activate-mention-E-in-the-help-text.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] activate: mention -E in the help text
1 file changed, 2 insertions(+)
diff --git a/src/activate/activate.c b/src/activate/activate.c
-index 83d25b1..fc581b9 100644
+index 83d25b13af..fc581b927e 100644
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -316,6 +316,8 @@ static int help(void) {
diff --git a/0097-activate-fix-crash-when-s-is-passed.patch b/0097-activate-fix-crash-when-s-is-passed.patch
index b3fa83c..fb8972b 100644
--- a/0097-activate-fix-crash-when-s-is-passed.patch
+++ b/0097-activate-fix-crash-when-s-is-passed.patch
@@ -9,7 +9,7 @@ getopt_long() was told to accept -s which was never implemented.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/activate/activate.c b/src/activate/activate.c
-index fc581b9..a9461bc 100644
+index fc581b927e..a9461bc56b 100644
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -346,7 +346,7 @@ static int parse_argv(int argc, char *argv[]) {
diff --git a/0098-journal-timestamp-support-on-console-messages.patch b/0098-journal-timestamp-support-on-console-messages.patch
index 31613f2..0c49fea 100644
--- a/0098-journal-timestamp-support-on-console-messages.patch
+++ b/0098-journal-timestamp-support-on-console-messages.patch
@@ -10,7 +10,7 @@ journald mimics the kernel here: timestamps will be printed if
1 file changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c
-index be55f94..1ee3afe 100644
+index be55f94878..1ee3afeacc 100644
--- a/src/journal/journald-console.c
+++ b/src/journal/journald-console.c
@@ -19,13 +19,30 @@
diff --git a/0099-man-add-bootctl-8.patch b/0099-man-add-bootctl-8.patch
index 628ab5c..02bce95 100644
--- a/0099-man-add-bootctl-8.patch
+++ b/0099-man-add-bootctl-8.patch
@@ -11,7 +11,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1014303
create mode 100644 man/bootctl.xml
diff --git a/Makefile-man.am b/Makefile-man.am
-index b8c8acc..3f626e8 100644
+index b8c8acc0b4..3f626e8b6d 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -650,6 +650,15 @@ MANPAGES_ALIAS += \
@@ -32,7 +32,7 @@ index b8c8acc..3f626e8 100644
man/hostnamectl.1 \
diff --git a/man/bootctl.xml b/man/bootctl.xml
new file mode 100644
-index 0000000..28f1b92
+index 0000000000..28f1b9203f
--- /dev/null
+++ b/man/bootctl.xml
@@ -0,0 +1,125 @@
diff --git a/0100-zsh-completion-add-bootctl.patch b/0100-zsh-completion-add-bootctl.patch
index 70178b0..fe7b125 100644
--- a/0100-zsh-completion-add-bootctl.patch
+++ b/0100-zsh-completion-add-bootctl.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] zsh-completion: add bootctl
create mode 100644 shell-completion/zsh/_bootctl
diff --git a/Makefile.am b/Makefile.am
-index b4fc33b..efe5aa3 100644
+index b4fc33b203..efe5aa3ebb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1743,6 +1743,10 @@ bootctl_LDADD = \
@@ -26,7 +26,7 @@ index b4fc33b..efe5aa3 100644
# ------------------------------------------------------------------------------
diff --git a/shell-completion/zsh/_bootctl b/shell-completion/zsh/_bootctl
new file mode 100644
-index 0000000..7d2453c
+index 0000000000..7d2453cc2c
--- /dev/null
+++ b/shell-completion/zsh/_bootctl
@@ -0,0 +1,25 @@
diff --git a/0101-Resolve-dev-console-to-the-active-tty-instead-of-jus.patch b/0101-Resolve-dev-console-to-the-active-tty-instead-of-jus.patch
index 7560582..12dda5f 100644
--- a/0101-Resolve-dev-console-to-the-active-tty-instead-of-jus.patch
+++ b/0101-Resolve-dev-console-to-the-active-tty-instead-of-jus.patch
@@ -11,7 +11,7 @@ determining whether or not PID1 can output to the console.
1 file changed, 10 insertions(+)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 6c88040..3fc080a 100644
+index 6c88040d75..3fc080ad7f 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -3621,6 +3621,16 @@ char *resolve_dev_console(char **active) {
diff --git a/0102-Only-disable-output-on-console-during-boot-if-needed.patch b/0102-Only-disable-output-on-console-during-boot-if-needed.patch
index 3ff5dac..e93d94e 100644
--- a/0102-Only-disable-output-on-console-during-boot-if-needed.patch
+++ b/0102-Only-disable-output-on-console-during-boot-if-needed.patch
@@ -10,7 +10,7 @@ If there are no more jobs on console, no need/we shouldn't disable output.
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 58dacdc..ce32baf 100644
+index 58dacdc8b5..ce32baf6ab 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1761,7 +1761,7 @@ static int process_event(Manager *m, struct epoll_event *ev) {
@@ -23,7 +23,7 @@ index 58dacdc..ce32baf 100644
manager_unwatch_idle_pipe(m);
close_idle_pipe(m);
diff --git a/src/core/unit.c b/src/core/unit.c
-index 1db7d06..717ce84 100644
+index 1db7d061c4..717ce849ea 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1454,7 +1454,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
diff --git a/0103-Fix-possible-lack-of-status-messages-on-shutdown-reb.patch b/0103-Fix-possible-lack-of-status-messages-on-shutdown-reb.patch
index c3bbc4a..a7080b2 100644
--- a/0103-Fix-possible-lack-of-status-messages-on-shutdown-reb.patch
+++ b/0103-Fix-possible-lack-of-status-messages-on-shutdown-reb.patch
@@ -11,7 +11,7 @@ shutdown/reboot.
1 file changed, 3 insertions(+)
diff --git a/src/core/job.c b/src/core/job.c
-index bf1d956..dc3bc12 100644
+index bf1d956908..dc3bc1220e 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -1097,6 +1097,9 @@ void job_shutdown_magic(Job *j) {
diff --git a/0104-fsck-modernization.patch b/0104-fsck-modernization.patch
index 8bafa4d..dfb7b84 100644
--- a/0104-fsck-modernization.patch
+++ b/0104-fsck-modernization.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] fsck: modernization
1 file changed, 18 insertions(+), 25 deletions(-)
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
-index f298cf7..e23ddc5 100644
+index f298cf7b9a..e23ddc58ac 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -175,7 +175,7 @@ static double percent(int pass, unsigned long cur, unsigned long max) {
diff --git a/0105-Introduce-udev-object-cleanup-functions.patch b/0105-Introduce-udev-object-cleanup-functions.patch
index 3359219..736c4aa 100644
--- a/0105-Introduce-udev-object-cleanup-functions.patch
+++ b/0105-Introduce-udev-object-cleanup-functions.patch
@@ -29,7 +29,7 @@ Conflicts:
create mode 100644 src/shared/udev-util.h
diff --git a/Makefile.am b/Makefile.am
-index efe5aa3..910e780 100644
+index efe5aa3ebb..910e780fa2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -648,6 +648,7 @@ libsystemd_shared_la_SOURCES = \
@@ -41,7 +41,7 @@ index efe5aa3..910e780 100644
src/shared/virt.h \
src/shared/efivars.c \
diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
-index f22deed..c45b2d0 100644
+index f22deed4e0..c45b2d0b6b 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -19,15 +19,15 @@
@@ -172,7 +172,7 @@ index f22deed..c45b2d0 100644
+ return EXIT_SUCCESS;
}
diff --git a/src/core/umount.c b/src/core/umount.c
-index 1e95ad7..99dbe27 100644
+index 1e95ad70dd..99dbe27c8f 100644
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -27,7 +27,6 @@
@@ -403,7 +403,7 @@ index 1e95ad7..99dbe27 100644
static int delete_loopback(const char *device) {
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
-index 769c3e4..39f7db7 100644
+index 769c3e4f31..39f7db7e3f 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -25,7 +25,6 @@
@@ -477,7 +477,7 @@ index 769c3e4..39f7db7 100644
static char *disk_mount_point(const char *label) {
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
-index e23ddc5..9b4e555 100644
+index e23ddc58ac..9b4e5558f7 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -27,7 +27,6 @@
@@ -522,7 +522,7 @@ index e23ddc5..9b4e555 100644
return r;
diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
-index 5bc6535..1bc912c 100644
+index 5bc653537c..1bc912c977 100644
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -135,11 +135,8 @@ struct sd_journal {
@@ -540,7 +540,7 @@ index 5bc6535..1bc912c 100644
#define JOURNAL_FOREACH_DATA_RETVAL(j, data, l, retval) \
for (sd_journal_restart_data(j); ((retval) = sd_journal_enumerate_data((j), &(data), &(l))) > 0; )
diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c
-index 3c03bd1..7c1adfa 100644
+index 3c03bd1f2e..7c1adfaaca 100644
--- a/src/login/sysfs-show.c
+++ b/src/login/sysfs-show.c
@@ -26,6 +26,7 @@
@@ -602,7 +602,7 @@ index 3c03bd1..7c1adfa 100644
return r;
}
diff --git a/src/readahead/readahead-common.c b/src/readahead/readahead-common.c
-index a234a89..aea1fbe 100644
+index a234a89954..aea1fbeea4 100644
--- a/src/readahead/readahead-common.c
+++ b/src/readahead/readahead-common.c
@@ -27,13 +27,14 @@
@@ -735,7 +735,7 @@ index a234a89..aea1fbe 100644
bool enough_ram(void) {
diff --git a/src/shared/fdset.h b/src/shared/fdset.h
-index a7bd5e2..d0dc875 100644
+index a7bd5e2b40..d0dc875a4e 100644
--- a/src/shared/fdset.h
+++ b/src/shared/fdset.h
@@ -47,3 +47,6 @@ int fdset_iterate(FDSet *s, Iterator *i);
@@ -746,7 +746,7 @@ index a7bd5e2..d0dc875 100644
+define_trivial_cleanup_func(FDSet*, fdset_free)
+#define _cleanup_fdset_free_ _cleanup_(fdset_freep)
diff --git a/src/shared/install.c b/src/shared/install.c
-index 9722ed4..b9c85b7 100644
+index 9722ed4e1c..b9c85b729c 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -44,10 +44,8 @@ typedef struct {
@@ -763,7 +763,7 @@ index 9722ed4..b9c85b7 100644
static int lookup_paths_init_from_scope(LookupPaths *paths, UnitFileScope scope) {
assert(paths);
diff --git a/src/shared/set.h b/src/shared/set.h
-index e5d46e9..a291470 100644
+index e5d46e9a8f..a291470c19 100644
--- a/src/shared/set.h
+++ b/src/shared/set.h
@@ -28,19 +28,13 @@
@@ -796,7 +796,7 @@ index e5d46e9..a291470 100644
#define _cleanup_set_free_ _cleanup_(set_freep)
#define _cleanup_set_free_free_ _cleanup_(set_free_freep)
diff --git a/src/shared/strv.h b/src/shared/strv.h
-index d1f2a0e..4d117f8 100644
+index d1f2a0ef32..4d117f82c5 100644
--- a/src/shared/strv.h
+++ b/src/shared/strv.h
@@ -24,16 +24,13 @@
@@ -820,7 +820,7 @@ index d1f2a0e..4d117f8 100644
char **strv_copy(char * const *l);
diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h
new file mode 100644
-index 0000000..bff8f5f
+index 0000000000..bff8f5fbf7
--- /dev/null
+++ b/src/shared/udev-util.h
@@ -0,0 +1,37 @@
@@ -862,7 +862,7 @@ index 0000000..bff8f5f
+#define _cleanup_udev_event_unref_ _cleanup_(udev_event_unrefp)
+#define _cleanup_udev_rules_unref_ _cleanup_(udev_rules_unrefp)
diff --git a/src/shared/util.h b/src/shared/util.h
-index 222abe0..2c41765 100644
+index 222abe0018..2c41765f6d 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -39,6 +39,7 @@
@@ -926,7 +926,7 @@ index 222abe0..2c41765 100644
_malloc_ _alloc_(1, 2) static inline void *malloc_multiply(size_t a, size_t b) {
if (_unlikely_(b == 0 || a > ((size_t) -1) / b))
diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c
-index 716767b..ab7d5a9 100644
+index 716767ba5f..ab7d5a9ab2 100644
--- a/src/test/test-libudev.c
+++ b/src/test/test-libudev.c
@@ -29,6 +29,7 @@
@@ -971,7 +971,7 @@ index 716767b..ab7d5a9 100644
return 0;
}
diff --git a/src/test/test-udev.c b/src/test/test-udev.c
-index 52b61b4..17825f1 100644
+index 52b61b4206..17825f12b4 100644
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -34,6 +34,7 @@
@@ -1023,7 +1023,7 @@ index 52b61b4..17825f1 100644
+ return err ? EXIT_FAILURE : EXIT_SUCCESS;
}
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 239e56b..7e873af 100644
+index 239e56ba9c..7e873af864 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -998,10 +998,7 @@ static void item_free(Item *i) {
diff --git a/0106-util-allow-trailing-semicolons-on-define_trivial_cle.patch b/0106-util-allow-trailing-semicolons-on-define_trivial_cle.patch
index 3056976..afdcec8 100644
--- a/0106-util-allow-trailing-semicolons-on-define_trivial_cle.patch
+++ b/0106-util-allow-trailing-semicolons-on-define_trivial_cle.patch
@@ -32,7 +32,7 @@ Conflicts:
8 files changed, 78 insertions(+), 120 deletions(-)
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
-index d2b4213..25440e7 100644
+index d2b4213af2..25440e771e 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -36,6 +36,7 @@
@@ -370,7 +370,7 @@ index d2b4213..25440e7 100644
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
-index 1bc912c..3355fca 100644
+index 1bc912c977..3355fca6b8 100644
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -135,7 +135,7 @@ struct sd_journal {
@@ -383,7 +383,7 @@ index 1bc912c..3355fca 100644
#define JOURNAL_FOREACH_DATA_RETVAL(j, data, l, retval) \
diff --git a/src/shared/fdset.h b/src/shared/fdset.h
-index d0dc875..b91b430 100644
+index d0dc875a4e..b91b4309a7 100644
--- a/src/shared/fdset.h
+++ b/src/shared/fdset.h
@@ -48,5 +48,5 @@ int fdset_iterate(FDSet *s, Iterator *i);
@@ -394,7 +394,7 @@ index d0dc875..b91b430 100644
+DEFINE_TRIVIAL_CLEANUP_FUNC(FDSet*, fdset_free);
#define _cleanup_fdset_free_ _cleanup_(fdset_freep)
diff --git a/src/shared/set.h b/src/shared/set.h
-index a291470..5612478 100644
+index a291470c19..5612478d4e 100644
--- a/src/shared/set.h
+++ b/src/shared/set.h
@@ -73,7 +73,7 @@ char **set_get_strv(Set *s);
@@ -408,7 +408,7 @@ index a291470..5612478 100644
#define _cleanup_set_free_ _cleanup_(set_freep)
#define _cleanup_set_free_free_ _cleanup_(set_free_freep)
diff --git a/src/shared/strv.h b/src/shared/strv.h
-index 4d117f8..f6fb033 100644
+index 4d117f82c5..f6fb033a8c 100644
--- a/src/shared/strv.h
+++ b/src/shared/strv.h
@@ -30,7 +30,7 @@ char *strv_find(char **l, const char *name) _pure_;
@@ -421,7 +421,7 @@ index 4d117f8..f6fb033 100644
char **strv_copy(char * const *l);
diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h
-index bff8f5f..27677af 100644
+index bff8f5fbf7..27677af876 100644
--- a/src/shared/udev-util.h
+++ b/src/shared/udev-util.h
@@ -24,11 +24,11 @@
@@ -442,7 +442,7 @@ index bff8f5f..27677af 100644
#define _cleanup_udev_unref_ _cleanup_(udev_unrefp)
#define _cleanup_udev_device_unref_ _cleanup_(udev_device_unrefp)
diff --git a/src/shared/util.h b/src/shared/util.h
-index 2c41765..bdbdca3 100644
+index 2c41765f6d..bdbdca3b57 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -555,11 +555,12 @@ static inline void freep(void *p) {
@@ -479,7 +479,7 @@ index 2c41765..bdbdca3 100644
#define _cleanup_free_ _cleanup_(freep)
#define _cleanup_close_ _cleanup_(closep)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 7e873af..e23847b 100644
+index 7e873af864..e23847bbea 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -998,7 +998,7 @@ static void item_free(Item *i) {
diff --git a/0107-fsck-fstab-generator-be-lenient-about-missing-fsck.-.patch b/0107-fsck-fstab-generator-be-lenient-about-missing-fsck.-.patch
index 713b51d..48e6ffc 100644
--- a/0107-fsck-fstab-generator-be-lenient-about-missing-fsck.-.patch
+++ b/0107-fsck-fstab-generator-be-lenient-about-missing-fsck.-.patch
@@ -22,7 +22,7 @@ Conflicts:
2 files changed, 83 insertions(+), 8 deletions(-)
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
-index 9b4e555..1189fe7 100644
+index 9b4e5558f7..1189fe76bf 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -244,10 +244,11 @@ int main(int argc, char *argv[]) {
@@ -101,7 +101,7 @@ index 9b4e555..1189fe7 100644
if (pipe(progress_pipe) < 0) {
log_error("pipe(): %m");
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
-index 9efccb9..795a24c 100644
+index 9efccb983d..795a24c992 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -147,6 +147,52 @@ static bool mount_in_initrd(struct mntent *me) {
diff --git a/0108-fstab-generator-use-RequiresOverridable-for-fsck-uni.patch b/0108-fstab-generator-use-RequiresOverridable-for-fsck-uni.patch
index 0980bbd..e2659d9 100644
--- a/0108-fstab-generator-use-RequiresOverridable-for-fsck-uni.patch
+++ b/0108-fstab-generator-use-RequiresOverridable-for-fsck-uni.patch
@@ -23,7 +23,7 @@ Failed to start local-fs.target: Unit systemd-fsck@xxx.service is masked.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
-index 795a24c..4137796 100644
+index 795a24c992..41377962fa 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -184,7 +184,7 @@ static int add_fsck(FILE *f, const char *what, const char *where, const char *ty
diff --git a/0109-bash-completion-journalctl-file.patch b/0109-bash-completion-journalctl-file.patch
index 0013351..c5d2bc6 100644
--- a/0109-bash-completion-journalctl-file.patch
+++ b/0109-bash-completion-journalctl-file.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] bash-completion: journalctl --file
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/shell-completion/bash/journalctl b/shell-completion/bash/journalctl
-index 942a253..e4b2f4a 100644
+index 942a25357f..e4b2f4ac84 100644
--- a/shell-completion/bash/journalctl
+++ b/shell-completion/bash/journalctl
@@ -43,7 +43,7 @@ _journalctl() {
diff --git a/0110-random-seed-improve-debugging-messages-a-bit.patch b/0110-random-seed-improve-debugging-messages-a-bit.patch
index 84c97f9..4829f7b 100644
--- a/0110-random-seed-improve-debugging-messages-a-bit.patch
+++ b/0110-random-seed-improve-debugging-messages-a-bit.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] random-seed: improve debugging messages a bit
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 910e780..16a5c3c 100644
+index 910e780fa2..16a5c3cb3a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -159,6 +159,7 @@ AM_CPPFLAGS = \
@@ -29,7 +29,7 @@ index 910e780..16a5c3c 100644
'|prefix=$(prefix)|' \
'|exec_prefix=$(exec_prefix)|' \
diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c
-index afbd500..af79ecf 100644
+index afbd5002dd..af79ecf2a9 100644
--- a/src/random-seed/random-seed.c
+++ b/src/random-seed/random-seed.c
@@ -72,7 +72,7 @@ int main(int argc, char *argv[]) {
diff --git a/0111-Fix-RemainAfterExit-services-keeping-a-hold-on-conso.patch b/0111-Fix-RemainAfterExit-services-keeping-a-hold-on-conso.patch
index 07902e9..bfb6138 100644
--- a/0111-Fix-RemainAfterExit-services-keeping-a-hold-on-conso.patch
+++ b/0111-Fix-RemainAfterExit-services-keeping-a-hold-on-conso.patch
@@ -12,7 +12,7 @@ didn't change.
2 files changed, 19 insertions(+)
diff --git a/src/core/service.c b/src/core/service.c
-index 5662180..62ae8f0 100644
+index 5662180381..62ae8f0119 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1570,6 +1570,22 @@ static void service_set_state(Service *s, ServiceState state) {
@@ -39,7 +39,7 @@ index 5662180..62ae8f0 100644
log_debug_unit(UNIT(s)->id,
"%s changed %s -> %s", UNIT(s)->id,
diff --git a/src/core/unit.c b/src/core/unit.c
-index 717ce84..b65e798 100644
+index 717ce849ea..b65e798621 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1446,6 +1446,9 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
diff --git a/0112-tmpfiles-adjust-excludes-for-the-new-per-service-pri.patch b/0112-tmpfiles-adjust-excludes-for-the-new-per-service-pri.patch
index 4584e57..2e093f2 100644
--- a/0112-tmpfiles-adjust-excludes-for-the-new-per-service-pri.patch
+++ b/0112-tmpfiles-adjust-excludes-for-the-new-per-service-pri.patch
@@ -11,7 +11,7 @@ I forgot to update the tmpfiles config.
1 file changed, 17 insertions(+)
diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf
-index 3b534a1..f0312ef 100644
+index 3b534a1f75..f0312efe90 100644
--- a/tmpfiles.d/tmp.conf
+++ b/tmpfiles.d/tmp.conf
@@ -12,6 +12,23 @@ d /tmp 1777 root root 10d
diff --git a/0113-core-socket-fix-SO_REUSEPORT.patch b/0113-core-socket-fix-SO_REUSEPORT.patch
index 112c087..a51e0e7 100644
--- a/0113-core-socket-fix-SO_REUSEPORT.patch
+++ b/0113-core-socket-fix-SO_REUSEPORT.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] core/socket: fix SO_REUSEPORT
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
-index 31fb7bc..d65bcc1 100644
+index 31fb7bcd3f..d65bcc1a77 100644
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -211,6 +211,7 @@ Socket.Broadcast, config_parse_bool, 0,
@@ -21,7 +21,7 @@ index 31fb7bc..d65bcc1 100644
Socket.MessageQueueMessageSize, config_parse_long, 0, offsetof(Socket, mq_msgsize)
Socket.Service, config_parse_socket_service, 0, 0
diff --git a/src/core/socket.c b/src/core/socket.c
-index d368f7e..e673f38 100644
+index d368f7ee94..e673f3884c 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -770,7 +770,7 @@ static void socket_apply_socket_options(Socket *s, int fd) {
diff --git a/0114-localed-match-converted-keymaps-before-legacy.patch b/0114-localed-match-converted-keymaps-before-legacy.patch
index dfe88b3..601158d 100644
--- a/0114-localed-match-converted-keymaps-before-legacy.patch
+++ b/0114-localed-match-converted-keymaps-before-legacy.patch
@@ -44,7 +44,7 @@ Conflicts:
3 files changed, 126 insertions(+), 84 deletions(-)
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
-index 8259c0a..d3c6152 100644
+index 8259c0af5f..d3c6152ca2 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -38,6 +38,7 @@
@@ -75,7 +75,7 @@ index 8259c0a..d3c6152 100644
l = set_get_strv(keymaps);
if (!l) {
diff --git a/src/locale/localed.c b/src/locale/localed.c
-index e160c04..b9b98f4 100644
+index e160c046a4..b9b98f46e7 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -792,105 +792,135 @@ static int convert_vconsole_to_x11(DBusConnection *connection) {
@@ -302,7 +302,7 @@ index e160c04..b9b98f4 100644
r = write_data_vconsole();
if (r < 0)
diff --git a/src/shared/def.h b/src/shared/def.h
-index e4ef735..58c834c 100644
+index e4ef73555d..58c834c0c4 100644
--- a/src/shared/def.h
+++ b/src/shared/def.h
@@ -41,3 +41,16 @@
diff --git a/0115-keymap-Add-Toshiba-Satellite-U940.patch b/0115-keymap-Add-Toshiba-Satellite-U940.patch
index 88900dd..b676f60 100644
--- a/0115-keymap-Add-Toshiba-Satellite-U940.patch
+++ b/0115-keymap-Add-Toshiba-Satellite-U940.patch
@@ -9,7 +9,7 @@ Signed-off-by: Martin Pitt
1 file changed, 7 insertions(+)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index b497f92..d4d948d 100644
+index b497f924a8..d4d948d4a7 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -1031,6 +1031,13 @@ keyboard:dmi:bvn*:bvr*:bd*:svnTOSHIBA*:pnSatellite*P75-A:pvr*
diff --git a/0116-calendar-support-yearly-and-annually-names-the-same-.patch b/0116-calendar-support-yearly-and-annually-names-the-same-.patch
index 79d69a4..ceab09a 100644
--- a/0116-calendar-support-yearly-and-annually-names-the-same-.patch
+++ b/0116-calendar-support-yearly-and-annually-names-the-same-.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] calendar: support 'yearly' and 'annually' names the same way
1 file changed, 17 insertions(+)
diff --git a/src/shared/calendarspec.c b/src/shared/calendarspec.c
-index 7979e23..7075159 100644
+index 7979e2384f..7075159183 100644
--- a/src/shared/calendarspec.c
+++ b/src/shared/calendarspec.c
@@ -686,6 +686,23 @@ int calendar_spec_from_string(const char *p, CalendarSpec **spec) {
diff --git a/0117-hashmap-be-a-bit-more-conservative-with-pre-allocati.patch b/0117-hashmap-be-a-bit-more-conservative-with-pre-allocati.patch
index e4ad917..8ac6bce 100644
--- a/0117-hashmap-be-a-bit-more-conservative-with-pre-allocati.patch
+++ b/0117-hashmap-be-a-bit-more-conservative-with-pre-allocati.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] hashmap: be a bit more conservative with pre-allocating hash
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/shared/hashmap.c b/src/shared/hashmap.c
-index f06fce6..8f5957b 100644
+index f06fce6ef3..8f5957b4ac 100644
--- a/src/shared/hashmap.c
+++ b/src/shared/hashmap.c
@@ -66,13 +66,14 @@ static void *first_hashmap_tile = NULL;
diff --git a/0118-manager-don-t-do-plymouth-in-a-container.patch b/0118-manager-don-t-do-plymouth-in-a-container.patch
index 7a4611c..fa8d246 100644
--- a/0118-manager-don-t-do-plymouth-in-a-container.patch
+++ b/0118-manager-don-t-do-plymouth-in-a-container.patch
@@ -11,7 +11,7 @@ we might actually end up send plymouth data to the host.
1 file changed, 3 insertions(+)
diff --git a/src/core/manager.c b/src/core/manager.c
-index ce32baf..944c196 100644
+index ce32baf6ab..944c196f3e 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1966,6 +1966,9 @@ void manager_send_unit_plymouth(Manager *m, Unit *u) {
diff --git a/0119-nspawn-add-new-drop-capability-switch.patch b/0119-nspawn-add-new-drop-capability-switch.patch
index e884673..cf19f4d 100644
--- a/0119-nspawn-add-new-drop-capability-switch.patch
+++ b/0119-nspawn-add-new-drop-capability-switch.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] nspawn: add new --drop-capability= switch
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
-index ba9e516..c1a5cad 100644
+index ba9e51686a..c1a5cad714 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -304,6 +304,16 @@
@@ -30,7 +30,7 @@ index ba9e516..c1a5cad 100644
Control whether the
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 85bbadf..7346253 100644
+index 85bbadf811..734625321f 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -130,6 +130,7 @@ static int help(void) {
diff --git a/0120-valgrind-make-running-PID-1-in-valgrind-useful.patch b/0120-valgrind-make-running-PID-1-in-valgrind-useful.patch
index 75b24d3..53583ef 100644
--- a/0120-valgrind-make-running-PID-1-in-valgrind-useful.patch
+++ b/0120-valgrind-make-running-PID-1-in-valgrind-useful.patch
@@ -14,7 +14,7 @@ Conflicts:
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 9904e25..6232cf8 100644
+index 9904e25e99..6232cf8469 100644
--- a/configure.ac
+++ b/configure.ac
@@ -814,7 +814,7 @@ AC_DEFINE_UNQUOTED(TELINIT, ["$TELINIT"], [Path to telinit])
@@ -27,7 +27,7 @@ index 9904e25..6232cf8 100644
# ------------------------------------------------------------------------------
have_myhostname=no
diff --git a/src/core/main.c b/src/core/main.c
-index 00fd394..58c3a9e 100644
+index 00fd39486b..58c3a9e6ac 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -34,6 +34,10 @@
diff --git a/0121-efi-boot-generator-don-t-mount-boot-eagerly.patch b/0121-efi-boot-generator-don-t-mount-boot-eagerly.patch
index ccd1501..aff33b4 100644
--- a/0121-efi-boot-generator-don-t-mount-boot-eagerly.patch
+++ b/0121-efi-boot-generator-don-t-mount-boot-eagerly.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] efi-boot-generator: don't mount /boot eagerly
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/efi-boot-generator/efi-boot-generator.c b/src/efi-boot-generator/efi-boot-generator.c
-index 05b95ed..5e5c682 100644
+index 05b95ed455..5e5c6823a1 100644
--- a/src/efi-boot-generator/efi-boot-generator.c
+++ b/src/efi-boot-generator/efi-boot-generator.c
@@ -82,7 +82,7 @@ int main(int argc, char *argv[]) {
diff --git a/0122-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0122-hwdb-Update-database-of-Bluetooth-company-identifier.patch
index d798c10..ad01f4f 100644
--- a/0122-hwdb-Update-database-of-Bluetooth-company-identifier.patch
+++ b/0122-hwdb-Update-database-of-Bluetooth-company-identifier.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
1 file changed, 193 insertions(+), 16 deletions(-)
diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb/20-bluetooth-vendor-product.hwdb
-index c8cb322..faecf42 100644
+index c8cb322d14..faecf42ef0 100644
--- a/hwdb/20-bluetooth-vendor-product.hwdb
+++ b/hwdb/20-bluetooth-vendor-product.hwdb
@@ -46,7 +46,7 @@ bluetooth:v000D*
diff --git a/0123-journal-when-appending-to-journal-file-allocate-larg.patch b/0123-journal-when-appending-to-journal-file-allocate-larg.patch
index 9ee4b70..de5a884 100644
--- a/0123-journal-when-appending-to-journal-file-allocate-larg.patch
+++ b/0123-journal-when-appending-to-journal-file-allocate-larg.patch
@@ -13,7 +13,7 @@ Conflicts:
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 425e38a..d1b8433 100644
+index 425e38a990..d1b84339d0 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -68,6 +68,9 @@
diff --git a/0124-journal-make-table-const.patch b/0124-journal-make-table-const.patch
index 7f2cc19..14cc229 100644
--- a/0124-journal-make-table-const.patch
+++ b/0124-journal-make-table-const.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] journal: make table const
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index d1b8433..d3bdaea 100644
+index d1b84339d0..d3bdaea0e3 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -401,7 +401,7 @@ static int journal_file_move_to(JournalFile *f, int context, bool keep_always, u
@@ -23,7 +23,7 @@ index d1b8433..d3bdaea 100644
[OBJECT_FIELD] = sizeof(FieldObject),
[OBJECT_ENTRY] = sizeof(EntryObject),
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
-index 5cc2c2d..50bdb67 100644
+index 5cc2c2d28d..50bdb67b4c 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -54,11 +54,11 @@ typedef struct JournalFile {
diff --git a/0125-journald-keep-statistics-on-how-of-we-hit-miss-the-m.patch b/0125-journald-keep-statistics-on-how-of-we-hit-miss-the-m.patch
index 579071d..f535558 100644
--- a/0125-journald-keep-statistics-on-how-of-we-hit-miss-the-m.patch
+++ b/0125-journald-keep-statistics-on-how-of-we-hit-miss-the-m.patch
@@ -12,7 +12,7 @@ Subject: [PATCH] journald: keep statistics on how of we hit/miss the mmap
3 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c
-index 03b57be..42a8a7d 100644
+index 03b57beb04..42a8a7df6f 100644
--- a/src/journal/mmap-cache.c
+++ b/src/journal/mmap-cache.c
@@ -72,6 +72,9 @@ struct MMapCache {
@@ -64,7 +64,7 @@ index 03b57be..42a8a7d 100644
+ return m->n_missed;
+}
diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h
-index 0c42fb8..912336d 100644
+index 0c42fb88e6..912336d7c2 100644
--- a/src/journal/mmap-cache.h
+++ b/src/journal/mmap-cache.h
@@ -34,3 +34,6 @@ MMapCache* mmap_cache_unref(MMapCache *m);
@@ -75,7 +75,7 @@ index 0c42fb8..912336d 100644
+unsigned mmap_cache_get_hit(MMapCache *m);
+unsigned mmap_cache_get_missed(MMapCache *m);
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index 9676f0f..52abbe9 100644
+index 9676f0f041..52abbe9670 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1831,8 +1831,10 @@ _public_ void sd_journal_close(sd_journal *j) {
diff --git a/0126-journal-optimize-bisection-logic-a-bit-by-caching-th.patch b/0126-journal-optimize-bisection-logic-a-bit-by-caching-th.patch
index 4b775f7..c416265 100644
--- a/0126-journal-optimize-bisection-logic-a-bit-by-caching-th.patch
+++ b/0126-journal-optimize-bisection-logic-a-bit-by-caching-th.patch
@@ -13,7 +13,7 @@ jump around during the bisection process.
1 file changed, 99 insertions(+), 35 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index d3bdaea..02f7554 100644
+index d3bdaea0e3..02f75548b7 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1366,6 +1366,7 @@ typedef struct ChainCacheItem {
diff --git a/0127-journal-fix-iteration-when-we-go-backwards-from-the-.patch b/0127-journal-fix-iteration-when-we-go-backwards-from-the-.patch
index 07c7b38..3ad5c59 100644
--- a/0127-journal-fix-iteration-when-we-go-backwards-from-the-.patch
+++ b/0127-journal-fix-iteration-when-we-go-backwards-from-the-.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] journal: fix iteration when we go backwards from the
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 02f7554..4e22e08 100644
+index 02f75548b7..4e22e08017 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1687,7 +1687,7 @@ found:
diff --git a/0128-journal-allow-journal_file_copy_entry-to-work-on-non.patch b/0128-journal-allow-journal_file_copy_entry-to-work-on-non.patch
index aea6020..2932186 100644
--- a/0128-journal-allow-journal_file_copy_entry-to-work-on-non.patch
+++ b/0128-journal-allow-journal_file_copy_entry-to-work-on-non.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] journal: allow journal_file_copy_entry() to work on non-local
1 file changed, 4 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 4e22e08..e0abddf 100644
+index 4e22e08017..e0abddfb9e 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2739,10 +2739,6 @@ int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint6
diff --git a/0129-journal-simplify-pre-allocation-logic.patch b/0129-journal-simplify-pre-allocation-logic.patch
index 362513b..22864b2 100644
--- a/0129-journal-simplify-pre-allocation-logic.patch
+++ b/0129-journal-simplify-pre-allocation-logic.patch
@@ -15,7 +15,7 @@ benefits.
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index e0abddf..090cf97 100644
+index e0abddfb9e..090cf9771e 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -315,7 +315,7 @@ static int journal_file_verify_header(JournalFile *f) {
diff --git a/0130-journald-mention-how-long-we-needed-to-flush-to-var-.patch b/0130-journald-mention-how-long-we-needed-to-flush-to-var-.patch
index 221d996..2ade111 100644
--- a/0130-journald-mention-how-long-we-needed-to-flush-to-var-.patch
+++ b/0130-journald-mention-how-long-we-needed-to-flush-to-var-.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] journald: mention how long we needed to flush to /var in the
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index e03e413..a0a8e9c 100644
+index e03e413aef..a0a8e9c468 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -968,9 +968,12 @@ static int system_journal_open(Server *s) {
diff --git a/0131-automount-log-info-about-triggering-process.patch b/0131-automount-log-info-about-triggering-process.patch
index 3c23dc9..a3d0f9d 100644
--- a/0131-automount-log-info-about-triggering-process.patch
+++ b/0131-automount-log-info-about-triggering-process.patch
@@ -10,7 +10,7 @@ Conflicts:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/automount.c b/src/core/automount.c
-index d1379e0..203104e 100644
+index d1379e0913..203104ed94 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -776,8 +776,8 @@ static void automount_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
diff --git a/0132-virt-split-detect_vm-into-separate-functions.patch b/0132-virt-split-detect_vm-into-separate-functions.patch
index 4178f50..91b55ce 100644
--- a/0132-virt-split-detect_vm-into-separate-functions.patch
+++ b/0132-virt-split-detect_vm-into-separate-functions.patch
@@ -11,7 +11,7 @@ things easier when arm virtualization support is added.
1 file changed, 81 insertions(+), 59 deletions(-)
diff --git a/src/shared/virt.c b/src/shared/virt.c
-index 537ccda..4e18638 100644
+index 537ccda654..4e18638bc9 100644
--- a/src/shared/virt.c
+++ b/src/shared/virt.c
@@ -27,30 +27,10 @@
diff --git a/0133-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0133-hwdb-Update-database-of-Bluetooth-company-identifier.patch
index d6a8725..fb8bb7d 100644
--- a/0133-hwdb-Update-database-of-Bluetooth-company-identifier.patch
+++ b/0133-hwdb-Update-database-of-Bluetooth-company-identifier.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
1 file changed, 107 insertions(+), 2 deletions(-)
diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb/20-bluetooth-vendor-product.hwdb
-index faecf42..dcc25bb 100644
+index faecf42ef0..dcc25bb472 100644
--- a/hwdb/20-bluetooth-vendor-product.hwdb
+++ b/hwdb/20-bluetooth-vendor-product.hwdb
@@ -366,6 +366,9 @@ bluetooth:v0077*
diff --git a/0134-sysfs-show.c-return-negative-error.patch b/0134-sysfs-show.c-return-negative-error.patch
index 650accd..cda9538 100644
--- a/0134-sysfs-show.c-return-negative-error.patch
+++ b/0134-sysfs-show.c-return-negative-error.patch
@@ -9,7 +9,7 @@ introduced in 1ca208fb4f93e5869704af1812cbff7130a2fc03
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c
-index 7c1adfa..f7d11dd 100644
+index 7c1adfaaca..f7d11ddc4c 100644
--- a/src/login/sysfs-show.c
+++ b/src/login/sysfs-show.c
@@ -164,7 +164,7 @@ int show_sysfs(const char *seat, const char *prefix, unsigned n_columns) {
diff --git a/0135-util.c-check-if-return-value-from-ttyname_r-is-0-ins.patch b/0135-util.c-check-if-return-value-from-ttyname_r-is-0-ins.patch
index 0c2eea9..97d7b2d 100644
--- a/0135-util.c-check-if-return-value-from-ttyname_r-is-0-ins.patch
+++ b/0135-util.c-check-if-return-value-from-ttyname_r-is-0-ins.patch
@@ -14,7 +14,7 @@ be safe to change.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 3fc080a..1510c5e 100644
+index 3fc080ad7f..1510c5e552 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -2561,7 +2561,7 @@ int getttyname_malloc(int fd, char **r) {
diff --git a/0136-docs-remove-unneeded-the-s-in-gudev-docs.patch b/0136-docs-remove-unneeded-the-s-in-gudev-docs.patch
index a024dc2..a875b9d 100644
--- a/0136-docs-remove-unneeded-the-s-in-gudev-docs.patch
+++ b/0136-docs-remove-unneeded-the-s-in-gudev-docs.patch
@@ -9,7 +9,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=72164
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
-index a644904..161181a 100644
+index a644904757..161181a592 100644
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -980,9 +980,8 @@ static struct udev_device *device_new_from_parent(struct udev_device *udev_devic
diff --git a/0137-man-explicitly-say-when-multiple-units-can-be-specif.patch b/0137-man-explicitly-say-when-multiple-units-can-be-specif.patch
index 4ee3efd..03d0af5 100644
--- a/0137-man-explicitly-say-when-multiple-units-can-be-specif.patch
+++ b/0137-man-explicitly-say-when-multiple-units-can-be-specif.patch
@@ -11,7 +11,7 @@ itistoday> do you use a comma, or use multiple After= statements?
1 file changed, 70 insertions(+), 58 deletions(-)
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
-index 5c8b8e8..029392c 100644
+index 5c8b8e8868..029392cd5c 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -410,10 +410,12 @@
diff --git a/0138-systemd-treat-reload-failure-as-failure.patch b/0138-systemd-treat-reload-failure-as-failure.patch
index afc6196..391cffc 100644
--- a/0138-systemd-treat-reload-failure-as-failure.patch
+++ b/0138-systemd-treat-reload-failure-as-failure.patch
@@ -14,7 +14,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1036845
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/core/job.c b/src/core/job.c
-index dc3bc12..7d2b994 100644
+index dc3bc1220e..7d2b994026 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -528,7 +528,7 @@ int job_run_and_invalidate(Job *j) {
@@ -58,7 +58,7 @@ index dc3bc12..7d2b994 100644
DEFINE_STRING_TABLE_LOOKUP(job_result, JobResult);
diff --git a/src/core/job.h b/src/core/job.h
-index d90bc96..4237529 100644
+index d90bc96b76..4237529b09 100644
--- a/src/core/job.h
+++ b/src/core/job.h
@@ -97,7 +97,8 @@ enum JobResult {
@@ -72,7 +72,7 @@ index d90bc96..4237529 100644
_JOB_RESULT_INVALID = -1
};
diff --git a/src/core/unit.c b/src/core/unit.c
-index b65e798..6c2c4a0 100644
+index b65e798621..6c2c4a0ef0 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1239,8 +1239,11 @@ int unit_reload(Unit *u) {
diff --git a/0139-journal-fail-silently-in-sd_j_sendv-if-journal-is-un.patch b/0139-journal-fail-silently-in-sd_j_sendv-if-journal-is-un.patch
index 03e12ab..c84ada2 100644
--- a/0139-journal-fail-silently-in-sd_j_sendv-if-journal-is-un.patch
+++ b/0139-journal-fail-silently-in-sd_j_sendv-if-journal-is-un.patch
@@ -18,7 +18,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1023041
1 file changed, 4 insertions(+)
diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
-index d00e26f..d99ff0c 100644
+index d00e26f1eb..d99ff0c9cc 100644
--- a/src/journal/journal-send.c
+++ b/src/journal/journal-send.c
@@ -305,6 +305,10 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) {
diff --git a/0140-systemd-add-a-start-job-for-all-units-specified-with.patch b/0140-systemd-add-a-start-job-for-all-units-specified-with.patch
index 9237b02..0648908 100644
--- a/0140-systemd-add-a-start-job-for-all-units-specified-with.patch
+++ b/0140-systemd-add-a-start-job-for-all-units-specified-with.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] systemd: add a start job for all units specified with
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/core/device.c b/src/core/device.c
-index 5397bd6..610fe88 100644
+index 5397bd6354..610fe88e16 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -281,7 +281,8 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
diff --git a/0141-core-device-ignore-SYSTEMD_WANTS-in-user-mode.patch b/0141-core-device-ignore-SYSTEMD_WANTS-in-user-mode.patch
index ec54a21..fb867ab 100644
--- a/0141-core-device-ignore-SYSTEMD_WANTS-in-user-mode.patch
+++ b/0141-core-device-ignore-SYSTEMD_WANTS-in-user-mode.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] core/device: ignore SYSTEMD_WANTS= in user mode
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/core/device.c b/src/core/device.c
-index 610fe88..e02c207 100644
+index 610fe88e16..e02c207cde 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -275,8 +275,9 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
diff --git a/0142-Fix-memory-leak-in-stdout-journal-streams.patch b/0142-Fix-memory-leak-in-stdout-journal-streams.patch
index d4097e0..e0a9e3f 100644
--- a/0142-Fix-memory-leak-in-stdout-journal-streams.patch
+++ b/0142-Fix-memory-leak-in-stdout-journal-streams.patch
@@ -12,7 +12,7 @@ unit_id.
1 file changed, 1 insertion(+)
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
-index 9c4efec..4080622 100644
+index 9c4efec9bc..4080622c48 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -339,6 +339,7 @@ void stdout_stream_free(StdoutStream *s) {
diff --git a/0143-man-document-is-enabled-output.patch b/0143-man-document-is-enabled-output.patch
index 521d500..d0996e8 100644
--- a/0143-man-document-is-enabled-output.patch
+++ b/0143-man-document-is-enabled-output.patch
@@ -10,7 +10,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=953077
1 file changed, 59 insertions(+), 5 deletions(-)
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index 166282c..b4bc15d 100644
+index 166282cecc..b4bc15daa4 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -437,7 +437,7 @@ systemctl start foo
diff --git a/0144-hostnamed-avoid-using-NULL-in-error-path.patch b/0144-hostnamed-avoid-using-NULL-in-error-path.patch
index 23be9dd..b8ef926 100644
--- a/0144-hostnamed-avoid-using-NULL-in-error-path.patch
+++ b/0144-hostnamed-avoid-using-NULL-in-error-path.patch
@@ -9,7 +9,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1047335
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
-index 6a43aeb..0c24b65 100644
+index 6a43aeb840..0c24b65141 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -637,7 +637,7 @@ static int connect_bus(DBusConnection **_bus) {
diff --git a/0145-logind-use-correct-who-enum-values-with-KillUnit.patch b/0145-logind-use-correct-who-enum-values-with-KillUnit.patch
index 80b36b7..e50ec9d 100644
--- a/0145-logind-use-correct-who-enum-values-with-KillUnit.patch
+++ b/0145-logind-use-correct-who-enum-values-with-KillUnit.patch
@@ -9,7 +9,7 @@ NB This is already fixed differently in systemd 209 with the port to kdbus
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
-index bb85c7d..583d62e 100644
+index bb85c7d4af..583d62e15d 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2799,7 +2799,7 @@ int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo
diff --git a/0146-Revert-systemd-add-a-start-job-for-all-units-specifi.patch b/0146-Revert-systemd-add-a-start-job-for-all-units-specifi.patch
index 53d62fb..718d464 100644
--- a/0146-Revert-systemd-add-a-start-job-for-all-units-specifi.patch
+++ b/0146-Revert-systemd-add-a-start-job-for-all-units-specifi.patch
@@ -12,7 +12,7 @@ This was a mistake, and was reverted upstream.
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/core/device.c b/src/core/device.c
-index e02c207..f79c206 100644
+index e02c207cde..f79c206df1 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -282,8 +282,7 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
diff --git a/0147-core-do-not-segfault-if-swap-activity-happens-when-p.patch b/0147-core-do-not-segfault-if-swap-activity-happens-when-p.patch
index 086fad6..5184dcb 100644
--- a/0147-core-do-not-segfault-if-swap-activity-happens-when-p.patch
+++ b/0147-core-do-not-segfault-if-swap-activity-happens-when-p.patch
@@ -15,7 +15,7 @@ to recover.
1 file changed, 29 insertions(+), 16 deletions(-)
diff --git a/src/core/swap.c b/src/core/swap.c
-index 147f710..f295b65 100644
+index 147f710b66..f295b6543b 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -1068,14 +1068,40 @@ static int swap_load_proc_swaps(Manager *m, bool set_flags) {
diff --git a/0148-kernel-install-add-h-help.patch b/0148-kernel-install-add-h-help.patch
index f7fbcdb..a7b6ac6 100644
--- a/0148-kernel-install-add-h-help.patch
+++ b/0148-kernel-install-add-h-help.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] kernel-install: add -h/--help
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install
-index 9d3e75d..f5ff362 100644
+index 9d3e75db08..f5ff3622a4 100644
--- a/src/kernel-install/kernel-install
+++ b/src/kernel-install/kernel-install
@@ -21,9 +21,9 @@
diff --git a/0149-kernel-install-fix-help-output.patch b/0149-kernel-install-fix-help-output.patch
index 77b270f..fbe3dd1 100644
--- a/0149-kernel-install-fix-help-output.patch
+++ b/0149-kernel-install-fix-help-output.patch
@@ -13,7 +13,7 @@ This is correctly documented in the man page.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install
-index f5ff362..3ae1d77 100644
+index f5ff3622a4..3ae1d77e33 100644
--- a/src/kernel-install/kernel-install
+++ b/src/kernel-install/kernel-install
@@ -23,7 +23,7 @@ usage()
diff --git a/0150-man-improve-wording-and-comma-usage-in-systemd.journ.patch b/0150-man-improve-wording-and-comma-usage-in-systemd.journ.patch
index b6ce33a..fda9124 100644
--- a/0150-man-improve-wording-and-comma-usage-in-systemd.journ.patch
+++ b/0150-man-improve-wording-and-comma-usage-in-systemd.journ.patch
@@ -12,7 +12,7 @@ Improve wording under "Description" and "_KERNEL_DEVICE="
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
-index 8a15598..bb89ed5 100644
+index 8a15598e63..bb89ed58d3 100644
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@@ -51,14 +51,14 @@
diff --git a/0151-drop-several-entries-from-kbd-model-map-whose-kbd-la.patch b/0151-drop-several-entries-from-kbd-model-map-whose-kbd-la.patch
index 94dcb16..d220b0f 100644
--- a/0151-drop-several-entries-from-kbd-model-map-whose-kbd-la.patch
+++ b/0151-drop-several-entries-from-kbd-model-map-whose-kbd-la.patch
@@ -21,7 +21,7 @@ where only one or the other exists in this context.
1 file changed, 12 deletions(-)
diff --git a/src/locale/kbd-model-map b/src/locale/kbd-model-map
-index 1fe9bca..78c7887 100644
+index 1fe9bca6ce..78c78874e6 100644
--- a/src/locale/kbd-model-map
+++ b/src/locale/kbd-model-map
@@ -4,22 +4,18 @@ sg ch pc105 de_nodeadkeys terminate:ctrl_alt_bksp
diff --git a/0152-correct-name-of-Tajik-kbd-layout-in-kbd-model-map.patch b/0152-correct-name-of-Tajik-kbd-layout-in-kbd-model-map.patch
index 592cc01..d23a83d 100644
--- a/0152-correct-name-of-Tajik-kbd-layout-in-kbd-model-map.patch
+++ b/0152-correct-name-of-Tajik-kbd-layout-in-kbd-model-map.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] correct name of Tajik kbd layout in kbd-model-map
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/locale/kbd-model-map b/src/locale/kbd-model-map
-index 78c7887..322c0a9 100644
+index 78c78874e6..322c0a9bc2 100644
--- a/src/locale/kbd-model-map
+++ b/src/locale/kbd-model-map
@@ -39,7 +39,7 @@ ro ro pc105 - terminate:ctrl_alt_bksp
diff --git a/0153-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0153-hwdb-Update-database-of-Bluetooth-company-identifier.patch
index 30ab69e..3c785e2 100644
--- a/0153-hwdb-Update-database-of-Bluetooth-company-identifier.patch
+++ b/0153-hwdb-Update-database-of-Bluetooth-company-identifier.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
1 file changed, 18 insertions(+)
diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb/20-bluetooth-vendor-product.hwdb
-index dcc25bb..6f8301f 100644
+index dcc25bb472..6f8301f257 100644
--- a/hwdb/20-bluetooth-vendor-product.hwdb
+++ b/hwdb/20-bluetooth-vendor-product.hwdb
@@ -821,3 +821,21 @@ bluetooth:v010F*
diff --git a/0154-Ensure-unit-is-journaled-for-short-lived-or-oneshot-.patch b/0154-Ensure-unit-is-journaled-for-short-lived-or-oneshot-.patch
index 2a956e0..b6dad14 100644
--- a/0154-Ensure-unit-is-journaled-for-short-lived-or-oneshot-.patch
+++ b/0154-Ensure-unit-is-journaled-for-short-lived-or-oneshot-.patch
@@ -20,7 +20,7 @@ process.
1 file changed, 3 insertions(+)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index a0a8e9c..1fcb3d5 100644
+index a0a8e9c468..1fcb3d5783 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -626,6 +626,9 @@ static void dispatch_message_real(
diff --git a/0155-libudev-hwdb-use-libudev-not-systemd-logging.patch b/0155-libudev-hwdb-use-libudev-not-systemd-logging.patch
index e5a608e..8529369 100644
--- a/0155-libudev-hwdb-use-libudev-not-systemd-logging.patch
+++ b/0155-libudev-hwdb-use-libudev-not-systemd-logging.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] libudev: hwdb - use libudev not systemd logging
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/libudev-hwdb.c
-index de1cb83..ba43b9f 100644
+index de1cb83188..ba43b9f0c0 100644
--- a/src/libudev/libudev-hwdb.c
+++ b/src/libudev/libudev-hwdb.c
@@ -277,38 +277,38 @@ _public_ struct udev_hwdb *udev_hwdb_new(struct udev *udev) {
diff --git a/0156-core-manager-remove-infinite-loop.patch b/0156-core-manager-remove-infinite-loop.patch
index a03084f..678fb1a 100644
--- a/0156-core-manager-remove-infinite-loop.patch
+++ b/0156-core-manager-remove-infinite-loop.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] core/manager: remove infinite loop
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 944c196..a34a3c6 100644
+index 944c196f3e..a34a3c6387 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -2285,10 +2285,8 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
diff --git a/0157-util-check-for-overflow-in-greedy_realloc.patch b/0157-util-check-for-overflow-in-greedy_realloc.patch
index 41168b3..0d1b862 100644
--- a/0157-util-check-for-overflow-in-greedy_realloc.patch
+++ b/0157-util-check-for-overflow-in-greedy_realloc.patch
@@ -12,7 +12,7 @@ Conflicts:
1 file changed, 8 insertions(+)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 1510c5e..02bae90 100644
+index 1510c5e552..02bae9043c 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -5832,10 +5832,18 @@ void* greedy_realloc(void **p, size_t *allocated, size_t need) {
diff --git a/0158-journald-use-a-bit-more-cleanup-magic.patch b/0158-journald-use-a-bit-more-cleanup-magic.patch
index 922f101..54df45a 100644
--- a/0158-journald-use-a-bit-more-cleanup-magic.patch
+++ b/0158-journald-use-a-bit-more-cleanup-magic.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] journald: use a bit more cleanup magic!
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
-index 4080622..771a2bd 100644
+index 4080622c48..771a2bd832 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -75,7 +75,7 @@ struct StdoutStream {
diff --git a/0159-journald-malloc-less-when-streaming-messages.patch b/0159-journald-malloc-less-when-streaming-messages.patch
index 6115d07..7913483 100644
--- a/0159-journald-malloc-less-when-streaming-messages.patch
+++ b/0159-journald-malloc-less-when-streaming-messages.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] journald: malloc less when streaming messages
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
-index 771a2bd..aae381b 100644
+index 771a2bd832..aae381b4ee 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -75,9 +75,11 @@ struct StdoutStream {
@@ -75,7 +75,7 @@ index 771a2bd..aae381b 100644
if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, s->stdout_fd, &ev) < 0) {
log_error("Failed to add stdout server fd to epoll object: %m");
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
-index c2770a5..5d9b665 100644
+index c2770a53d0..5d9b6651ef 100644
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -236,7 +236,7 @@ size_t syslog_parse_identifier(const char **buf, char **identifier, char **pid)
@@ -97,7 +97,7 @@ index c2770a5..5d9b665 100644
if (s->forward_to_syslog)
forward_syslog_raw(s, priority, orig, ucred, tv);
diff --git a/src/journal/journald-syslog.h b/src/journal/journald-syslog.h
-index 8ccdb77..057ea79 100644
+index 8ccdb77a09..057ea79def 100644
--- a/src/journal/journald-syslog.h
+++ b/src/journal/journald-syslog.h
@@ -25,7 +25,7 @@
diff --git a/0160-activate-clean-up-inherited-descriptors.patch b/0160-activate-clean-up-inherited-descriptors.patch
index 933e491..3fb4472 100644
--- a/0160-activate-clean-up-inherited-descriptors.patch
+++ b/0160-activate-clean-up-inherited-descriptors.patch
@@ -23,7 +23,7 @@ will be closed.
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/activate/activate.c b/src/activate/activate.c
-index a9461bc..6aa8b9f 100644
+index a9461bc56b..6aa8b9fb91 100644
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -137,6 +137,17 @@ static int open_sockets(int *epoll_fd, bool accept) {
diff --git a/0161-man-explain-in-more-detail-how-SYSTEMD_READY-influen.patch b/0161-man-explain-in-more-detail-how-SYSTEMD_READY-influen.patch
index eea182b..155210c 100644
--- a/0161-man-explain-in-more-detail-how-SYSTEMD_READY-influen.patch
+++ b/0161-man-explain-in-more-detail-how-SYSTEMD_READY-influen.patch
@@ -11,7 +11,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1026860
1 file changed, 31 insertions(+), 14 deletions(-)
diff --git a/man/systemd.device.xml b/man/systemd.device.xml
-index 96ebe89..002b647 100644
+index 96ebe89095..002b647ff9 100644
--- a/man/systemd.device.xml
+++ b/man/systemd.device.xml
@@ -70,12 +70,15 @@
diff --git a/0162-units-don-t-run-readahead-done-timers-in-containers.patch b/0162-units-don-t-run-readahead-done-timers-in-containers.patch
index bb6ae6d..05534c2 100644
--- a/0162-units-don-t-run-readahead-done-timers-in-containers.patch
+++ b/0162-units-don-t-run-readahead-done-timers-in-containers.patch
@@ -13,7 +13,7 @@ to stop it either.
2 files changed, 2 insertions(+)
diff --git a/units/systemd-readahead-done.service.in b/units/systemd-readahead-done.service.in
-index c3b2ac5..e0d9579 100644
+index c3b2ac506a..e0d9579449 100644
--- a/units/systemd-readahead-done.service.in
+++ b/units/systemd-readahead-done.service.in
@@ -12,6 +12,7 @@ DefaultDependencies=no
@@ -25,7 +25,7 @@ index c3b2ac5..e0d9579 100644
[Service]
Type=oneshot
diff --git a/units/systemd-readahead-done.timer b/units/systemd-readahead-done.timer
-index 41bfb2b..a9f6278 100644
+index 41bfb2bd32..a9f6278f27 100644
--- a/units/systemd-readahead-done.timer
+++ b/units/systemd-readahead-done.timer
@@ -12,6 +12,7 @@ DefaultDependencies=no
diff --git a/0163-test-fileio-replace-mktemp-with-mkstemp-to-avoid-war.patch b/0163-test-fileio-replace-mktemp-with-mkstemp-to-avoid-war.patch
index 6e9dcd8..f215926 100644
--- a/0163-test-fileio-replace-mktemp-with-mkstemp-to-avoid-war.patch
+++ b/0163-test-fileio-replace-mktemp-with-mkstemp-to-avoid-war.patch
@@ -12,7 +12,7 @@ and analyzers shut up about the use of mktemp.
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
-index 06f3e28..b005f3b 100644
+index 06f3e28288..b005f3b4e6 100644
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@@ -41,7 +41,9 @@ static void test_parse_env_file(void) {
diff --git a/0164-journal-pipe-journalctl-help-output-into-a-pager.patch b/0164-journal-pipe-journalctl-help-output-into-a-pager.patch
index 39485f8..c0a6a2a 100644
--- a/0164-journal-pipe-journalctl-help-output-into-a-pager.patch
+++ b/0164-journal-pipe-journalctl-help-output-into-a-pager.patch
@@ -12,7 +12,7 @@ as other systemd tools do and pipe it into a pager.
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index a5c4779..71e28b0 100644
+index a5c4779460..71e28b0a70 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -114,8 +114,18 @@ typedef struct boot_id_t {
diff --git a/0165-nspawn-complain-and-continue-if-machine-has-same-id.patch b/0165-nspawn-complain-and-continue-if-machine-has-same-id.patch
index a72438a..f4c2f27 100644
--- a/0165-nspawn-complain-and-continue-if-machine-has-same-id.patch
+++ b/0165-nspawn-complain-and-continue-if-machine-has-same-id.patch
@@ -18,7 +18,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=68369
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 7346253..618f9c3 100644
+index 734625321f..618f9c3dc7 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -811,14 +811,11 @@ static int setup_hostname(void) {
diff --git a/0166-man-beef-up-ExecStart-description.patch b/0166-man-beef-up-ExecStart-description.patch
index ba5d4b8..716bdf8 100644
--- a/0166-man-beef-up-ExecStart-description.patch
+++ b/0166-man-beef-up-ExecStart-description.patch
@@ -14,7 +14,7 @@ http://bugs.debian.org/732156
1 file changed, 80 insertions(+), 17 deletions(-)
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index 3f31c11..ca297ba 100644
+index 3f31c11506..ca297ba303 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -305,9 +305,10 @@
diff --git a/0167-man-remove-advice-to-avoid-setting-the-same-var-more.patch b/0167-man-remove-advice-to-avoid-setting-the-same-var-more.patch
index e83a9eb..c8e5065 100644
--- a/0167-man-remove-advice-to-avoid-setting-the-same-var-more.patch
+++ b/0167-man-remove-advice-to-avoid-setting-the-same-var-more.patch
@@ -15,7 +15,7 @@ files.
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index ca297ba..8f9137c 100644
+index ca297ba303..8f9137c6ac 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -321,11 +321,7 @@
@@ -32,7 +32,7 @@ index ca297ba..8f9137c 100644
\;. If the empty
string is assigned to this option, the
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
-index 029392c..77127ff 100644
+index 029392cd5c..77127ffa86 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -120,6 +120,17 @@
diff --git a/0168-systemctl-add-the-plain-option-to-the-help-message.patch b/0168-systemctl-add-the-plain-option-to-the-help-message.patch
index 9b5f88d..37d820a 100644
--- a/0168-systemctl-add-the-plain-option-to-the-help-message.patch
+++ b/0168-systemctl-add-the-plain-option-to-the-help-message.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] systemctl: add the --plain option to the help message
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index db584b2..bc9808a 100644
+index db584b2703..bc9808aacd 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4748,7 +4748,8 @@ static int systemctl_help(void) {
diff --git a/0169-Fix-a-few-resource-leaks-in-error-paths.patch b/0169-Fix-a-few-resource-leaks-in-error-paths.patch
index 6fcbb1a..ec9dd40 100644
--- a/0169-Fix-a-few-resource-leaks-in-error-paths.patch
+++ b/0169-Fix-a-few-resource-leaks-in-error-paths.patch
@@ -14,7 +14,7 @@ Conflicts:
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
-index a56ab89..f96987f 100644
+index a56ab89e54..f96987f4dc 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -57,15 +57,14 @@ static int write_mode(char **modes) {
diff --git a/0170-Fix-a-few-signed-unsigned-format-string-issues.patch b/0170-Fix-a-few-signed-unsigned-format-string-issues.patch
index f40717d..f689f64 100644
--- a/0170-Fix-a-few-signed-unsigned-format-string-issues.patch
+++ b/0170-Fix-a-few-signed-unsigned-format-string-issues.patch
@@ -13,7 +13,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1043304
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/src/shared/time-util.c b/src/shared/time-util.c
-index 81d4ede..d31401b 100644
+index 81d4ede1b8..d31401bb5c 100644
--- a/src/shared/time-util.c
+++ b/src/shared/time-util.c
@@ -382,7 +382,7 @@ void dual_timestamp_deserialize(const char *value, dual_timestamp *t) {
@@ -26,7 +26,7 @@ index 81d4ede..d31401b 100644
else {
t->realtime = a;
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index 9ae8f08..9bc1946 100644
+index 9ae8f08ccf..9bc1946ecd 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -166,23 +166,17 @@ out:
diff --git a/0171-util-try-harder-to-increase-the-send-recv-buffers-of.patch b/0171-util-try-harder-to-increase-the-send-recv-buffers-of.patch
index cb55752..678c32e 100644
--- a/0171-util-try-harder-to-increase-the-send-recv-buffers-of.patch
+++ b/0171-util-try-harder-to-increase-the-send-recv-buffers-of.patch
@@ -12,7 +12,7 @@ only fall back to SO_SNDBUF/SO_RCVBUF if that fails.
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 02bae90..8824b9b 100644
+index 02bae9043c..8824b9b9a2 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -4928,15 +4928,15 @@ int fd_inc_sndbuf(int fd, size_t n) {
diff --git a/0172-execute-also-set-SO_SNDBUF-when-spawning-a-service-w.patch b/0172-execute-also-set-SO_SNDBUF-when-spawning-a-service-w.patch
index 53c7d62..3cac175 100644
--- a/0172-execute-also-set-SO_SNDBUF-when-spawning-a-service-w.patch
+++ b/0172-execute-also-set-SO_SNDBUF-when-spawning-a-service-w.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] execute: also set SO_SNDBUF when spawning a service with
1 file changed, 4 insertions(+)
diff --git a/src/core/execute.c b/src/core/execute.c
-index 58be72a..9b85379 100644
+index 58be72a224..9b85379b83 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -75,6 +75,8 @@
diff --git a/0173-journal-file-protect-against-alloca-0.patch b/0173-journal-file-protect-against-alloca-0.patch
index df7aefe..dbd2acc 100644
--- a/0173-journal-file-protect-against-alloca-0.patch
+++ b/0173-journal-file-protect-against-alloca-0.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] journal-file: protect against alloca(0)
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 090cf97..8ea258b 100644
+index 090cf9771e..8ea258bdfb 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2737,7 +2737,8 @@ int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint6
diff --git a/0174-man-describe-journalctl-show-cursor.patch b/0174-man-describe-journalctl-show-cursor.patch
index 553be3d..e02d5b0 100644
--- a/0174-man-describe-journalctl-show-cursor.patch
+++ b/0174-man-describe-journalctl-show-cursor.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] man: describe journalctl --show-cursor
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/man/journalctl.xml b/man/journalctl.xml
-index c0cc96d..d936933 100644
+index c0cc96d800..d936933d69 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -576,11 +576,23 @@
diff --git a/0175-journal-fix-against-theoretical-undefined-behavior.patch b/0175-journal-fix-against-theoretical-undefined-behavior.patch
index 87a8e41..e3a7f9d 100644
--- a/0175-journal-fix-against-theoretical-undefined-behavior.patch
+++ b/0175-journal-fix-against-theoretical-undefined-behavior.patch
@@ -24,7 +24,7 @@ see http://llvm.org/bugs/show_bug.cgi?id=18247
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 8ea258b..71ef092 100644
+index 8ea258bdfb..71ef092ecd 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1010,7 +1010,10 @@ static int journal_file_append_data(
diff --git a/0176-journald-downgrade-warning-message-when-dev-kmsg-doe.patch b/0176-journald-downgrade-warning-message-when-dev-kmsg-doe.patch
index e08ce5b..d9a0f03 100644
--- a/0176-journald-downgrade-warning-message-when-dev-kmsg-doe.patch
+++ b/0176-journald-downgrade-warning-message-when-dev-kmsg-doe.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] journald: downgrade warning message when /dev/kmsg does not
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
-index 21649d0..9895808 100644
+index 21649d06ce..98958081d2 100644
--- a/src/journal/journald-kmsg.c
+++ b/src/journal/journald-kmsg.c
@@ -382,7 +382,8 @@ int server_open_dev_kmsg(Server *s) {
diff --git a/0177-journal-file.c-remove-redundant-assignment-of-variab.patch b/0177-journal-file.c-remove-redundant-assignment-of-variab.patch
index 226dec1..b4a23c1 100644
--- a/0177-journal-file.c-remove-redundant-assignment-of-variab.patch
+++ b/0177-journal-file.c-remove-redundant-assignment-of-variab.patch
@@ -12,7 +12,7 @@ loop so there is no reason to also do it here.
1 file changed, 2 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 71ef092..5ef6a2a 100644
+index 71ef092ecd..5ef6a2a735 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1628,8 +1628,6 @@ static int generic_array_bisect(
diff --git a/0178-login-Don-t-stop-a-running-user-manager-from-garbage.patch b/0178-login-Don-t-stop-a-running-user-manager-from-garbage.patch
index 56b082b..98581ce 100644
--- a/0178-login-Don-t-stop-a-running-user-manager-from-garbage.patch
+++ b/0178-login-Don-t-stop-a-running-user-manager-from-garbage.patch
@@ -17,7 +17,7 @@ Conflicts:
1 file changed, 6 deletions(-)
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
-index adbe638..e2fce5c 100644
+index adbe638d46..e2fce5c831 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -629,12 +629,6 @@ int user_check_gc(User *u, bool drop_not_started) {
diff --git a/0179-libudev-devices-received-from-udev-are-always-initia.patch b/0179-libudev-devices-received-from-udev-are-always-initia.patch
index 6f797a0..93111b6 100644
--- a/0179-libudev-devices-received-from-udev-are-always-initia.patch
+++ b/0179-libudev-devices-received-from-udev-are-always-initia.patch
@@ -13,7 +13,7 @@ Conflicts:
2 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
-index 161181a..b6c4e24 100644
+index 161181a592..b6c4e24156 100644
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -536,6 +536,8 @@ int udev_device_read_db(struct udev_device *udev_device, const char *dbfile)
@@ -26,7 +26,7 @@ index 161181a..b6c4e24 100644
while (fgets(line, sizeof(line), f)) {
diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
-index 0212792..ff89e14 100644
+index 0212792552..ff89e149dd 100644
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -324,9 +324,6 @@ _public_ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
diff --git a/0180-log-don-t-reopen-dev-console-each-time-we-call-log_o.patch b/0180-log-don-t-reopen-dev-console-each-time-we-call-log_o.patch
index 0bbf9dd..053668a 100644
--- a/0180-log-don-t-reopen-dev-console-each-time-we-call-log_o.patch
+++ b/0180-log-don-t-reopen-dev-console-each-time-we-call-log_o.patch
@@ -13,7 +13,7 @@ Instead, force reopen it only if we really really have to.
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/main.c b/src/core/main.c
-index 58c3a9e..935762f 100644
+index 58c3a9e6ac..935762f7a4 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1347,6 +1347,7 @@ int main(int argc, char *argv[]) {
@@ -25,7 +25,7 @@ index 58c3a9e..935762f 100644
/* For the later on, see above... */
diff --git a/src/core/shutdown.c b/src/core/shutdown.c
-index ea02b60..5e0f3ce 100644
+index ea02b60456..5e0f3ce9fd 100644
--- a/src/core/shutdown.c
+++ b/src/core/shutdown.c
@@ -155,6 +155,7 @@ int main(int argc, char *argv[]) {
@@ -37,7 +37,7 @@ index ea02b60..5e0f3ce 100644
umask(0022);
diff --git a/src/shared/log.c b/src/shared/log.c
-index 8f4995a..bd918fb 100644
+index 8f4995a0c8..bd918fb14c 100644
--- a/src/shared/log.c
+++ b/src/shared/log.c
@@ -272,8 +272,6 @@ int log_open(void) {
diff --git a/0181-log-when-we-log-to-dev-console-and-got-disconnected-.patch b/0181-log-when-we-log-to-dev-console-and-got-disconnected-.patch
index ae25ee0..0d474e4 100644
--- a/0181-log-when-we-log-to-dev-console-and-got-disconnected-.patch
+++ b/0181-log-when-we-log-to-dev-console-and-got-disconnected-.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] log: when we log to /dev/console and got disconnected (maybe
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/shared/log.c b/src/shared/log.c
-index bd918fb..de770ca 100644
+index bd918fb14c..de770caefa 100644
--- a/src/shared/log.c
+++ b/src/shared/log.c
@@ -335,8 +335,25 @@ static int write_to_console(
diff --git a/0182-loginctl-when-showing-device-tree-of-seats-with-no-d.patch b/0182-loginctl-when-showing-device-tree-of-seats-with-no-d.patch
index c9bc617..6b98acc 100644
--- a/0182-loginctl-when-showing-device-tree-of-seats-with-no-d.patch
+++ b/0182-loginctl-when-showing-device-tree-of-seats-with-no-d.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] loginctl: when showing device tree of seats with no devices
1 file changed, 2 insertions(+)
diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c
-index f7d11dd..cb12ebf 100644
+index f7d11ddc4c..cb12ebf4c7 100644
--- a/src/login/sysfs-show.c
+++ b/src/login/sysfs-show.c
@@ -181,6 +181,8 @@ int show_sysfs(const char *seat, const char *prefix, unsigned n_columns) {
diff --git a/0183-man-be-more-explicit-about-option-arguments-that-tak.patch b/0183-man-be-more-explicit-about-option-arguments-that-tak.patch
index c76fc38..d094d4d 100644
--- a/0183-man-be-more-explicit-about-option-arguments-that-tak.patch
+++ b/0183-man-be-more-explicit-about-option-arguments-that-tak.patch
@@ -13,7 +13,7 @@ example option argument "ID128" with "128-bit-ID".
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/man/journalctl.xml b/man/journalctl.xml
-index d936933..dced90f 100644
+index d936933d69..dced90fa22 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -725,7 +725,7 @@
diff --git a/0184-man-add-DOI-for-refereed-article-on-Forward-Secure-S.patch b/0184-man-add-DOI-for-refereed-article-on-Forward-Secure-S.patch
index 17d313a..370c197 100644
--- a/0184-man-add-DOI-for-refereed-article-on-Forward-Secure-S.patch
+++ b/0184-man-add-DOI-for-refereed-article-on-Forward-Secure-S.patch
@@ -14,7 +14,7 @@ journald.conf(5) and what information can be found there.
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/man/journalctl.xml b/man/journalctl.xml
-index dced90f..d75c758 100644
+index dced90fa22..d75c758db5 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -781,10 +781,14 @@
@@ -35,7 +35,7 @@ index dced90f..d75c758 100644
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
-index 7aa2e78..8e642a3 100644
+index 7aa2e78ed3..8e642a3f59 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -130,15 +130,15 @@
diff --git a/0185-journalctl-zsh-completion-fix-several-issues-in-help.patch b/0185-journalctl-zsh-completion-fix-several-issues-in-help.patch
index cb15b27..af12708 100644
--- a/0185-journalctl-zsh-completion-fix-several-issues-in-help.patch
+++ b/0185-journalctl-zsh-completion-fix-several-issues-in-help.patch
@@ -25,7 +25,7 @@ Conflicts:
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/shell-completion/zsh/_journalctl b/shell-completion/zsh/_journalctl
-index 29ff3e3..8c3dbb0 100644
+index 29ff3e34ee..8c3dbb0758 100644
--- a/shell-completion/zsh/_journalctl
+++ b/shell-completion/zsh/_journalctl
@@ -71,14 +71,14 @@ _arguments -s \
@@ -60,7 +60,7 @@ index 29ff3e3..8c3dbb0 100644
'--verify[Verify journal file consistency]' \
'--verify-key=[Specify FSS verification key]:FSS key' \
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 71e28b0..1d66792 100644
+index 71e28b0a70..1d66792708 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -130,30 +130,30 @@ static int help(void) {
diff --git a/0186-keymap-Refactor-Acer-tables.patch b/0186-keymap-Refactor-Acer-tables.patch
index e568db5..1f29f84 100644
--- a/0186-keymap-Refactor-Acer-tables.patch
+++ b/0186-keymap-Refactor-Acer-tables.patch
@@ -12,7 +12,7 @@ exceptions.
1 file changed, 36 insertions(+), 65 deletions(-)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index d4d948d..ab9e569 100644
+index d4d948d4a7..ab9e569d1d 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -46,52 +46,7 @@
diff --git a/0187-logging-reduce-send-timeout-to-something-more-sensib.patch b/0187-logging-reduce-send-timeout-to-something-more-sensib.patch
index 7b57b00..6d220c6 100644
--- a/0187-logging-reduce-send-timeout-to-something-more-sensib.patch
+++ b/0187-logging-reduce-send-timeout-to-something-more-sensib.patch
@@ -14,7 +14,7 @@ is significantly wrong. It's better to lose the message and continue.
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/shared/log.c b/src/shared/log.c
-index de770ca..2267764 100644
+index de770caefa..2267764859 100644
--- a/src/shared/log.c
+++ b/src/shared/log.c
@@ -126,7 +126,10 @@ static int create_log_socket(int type) {
@@ -30,7 +30,7 @@ index de770ca..2267764 100644
return fd;
diff --git a/src/shared/time-util.c b/src/shared/time-util.c
-index d31401b..505b280 100644
+index d31401bb5c..505b280259 100644
--- a/src/shared/time-util.c
+++ b/src/shared/time-util.c
@@ -141,12 +141,11 @@ struct timeval *timeval_store(struct timeval *tv, usec_t u) {
diff --git a/0188-DEFAULT_PATH_SPLIT_USR-macro.patch b/0188-DEFAULT_PATH_SPLIT_USR-macro.patch
index a154f1a..3832df0 100644
--- a/0188-DEFAULT_PATH_SPLIT_USR-macro.patch
+++ b/0188-DEFAULT_PATH_SPLIT_USR-macro.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] DEFAULT_PATH_SPLIT_USR macro
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 618f9c3..cafc306 100644
+index 618f9c3dc7..cafc306273 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1227,7 +1227,7 @@ int main(int argc, char *argv[]) {
@@ -23,7 +23,7 @@ index 618f9c3..cafc306 100644
NULL, /* TERM */
NULL, /* HOME */
diff --git a/src/shared/path-util.h b/src/shared/path-util.h
-index 0a42de7..1e58e1b 100644
+index 0a42de7e27..1e58e1b813 100644
--- a/src/shared/path-util.h
+++ b/src/shared/path-util.h
@@ -25,10 +25,13 @@
diff --git a/0189-fstab-generator-Do-not-try-to-fsck-non-devices.patch b/0189-fstab-generator-Do-not-try-to-fsck-non-devices.patch
index bd8e4e7..ae4acea 100644
--- a/0189-fstab-generator-Do-not-try-to-fsck-non-devices.patch
+++ b/0189-fstab-generator-Do-not-try-to-fsck-non-devices.patch
@@ -13,7 +13,7 @@ system like nfs, and the type is specified as "auto".
1 file changed, 5 insertions(+)
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
-index 4137796..8c4c61c 100644
+index 41377962fa..8c4c61c062 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -153,6 +153,11 @@ static int add_fsck(FILE *f, const char *what, const char *where, const char *ty
diff --git a/0190-logind-remove-dead-variable.patch b/0190-logind-remove-dead-variable.patch
index 2e53d8e..3a246e1 100644
--- a/0190-logind-remove-dead-variable.patch
+++ b/0190-logind-remove-dead-variable.patch
@@ -11,7 +11,7 @@ Noticed-by: Jan Alexander Steffens
2 files changed, 4 deletions(-)
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
-index e2fce5c..b87311c 100644
+index e2fce5c831..b87311c0d7 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -648,9 +648,6 @@ UserState user_get_state(User *u) {
@@ -25,7 +25,7 @@ index e2fce5c..b87311c 100644
return USER_OPENING;
diff --git a/src/login/logind-user.h b/src/login/logind-user.h
-index b9171d3..a36f456 100644
+index b9171d345d..a36f4565e8 100644
--- a/src/login/logind-user.h
+++ b/src/login/logind-user.h
@@ -61,7 +61,6 @@ struct User {
diff --git a/0191-hwdb-update.patch b/0191-hwdb-update.patch
index 35e2d22..16dcc60 100644
--- a/0191-hwdb-update.patch
+++ b/0191-hwdb-update.patch
@@ -14,7 +14,7 @@ Conflicts:
3 files changed, 1922 insertions(+), 53 deletions(-)
diff --git a/hwdb/20-OUI.hwdb b/hwdb/20-OUI.hwdb
-index 5067167..92b96ae 100644
+index 5067167cbb..92b96ae45a 100644
--- a/hwdb/20-OUI.hwdb
+++ b/hwdb/20-OUI.hwdb
@@ -13411,6 +13411,222 @@ OUI:40D855198*
@@ -3270,7 +3270,7 @@ index 5067167..92b96ae 100644
ID_OUI_FROM_DATABASE=Shanghai Baud Data Communication Co.,Ltd.
diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb/20-pci-vendor-model.hwdb
-index 289f81c..6142dc8 100644
+index 289f81c738..6142dc86ac 100644
--- a/hwdb/20-pci-vendor-model.hwdb
+++ b/hwdb/20-pci-vendor-model.hwdb
@@ -917,6 +917,9 @@ pci:v00001000d0000005Bsv00001028sd00001F37*
@@ -4631,7 +4631,7 @@ index 289f81c..6142dc8 100644
ID_VENDOR_FROM_DATABASE=Digital Devices GmbH
diff --git a/hwdb/20-usb-vendor-model.hwdb b/hwdb/20-usb-vendor-model.hwdb
-index da8385e..6663820 100644
+index da8385ef91..66638203ef 100644
--- a/hwdb/20-usb-vendor-model.hwdb
+++ b/hwdb/20-usb-vendor-model.hwdb
@@ -53,6 +53,12 @@ usb:v017C*
diff --git a/0192-delta-replace-readdir_r-with-readdir.patch b/0192-delta-replace-readdir_r-with-readdir.patch
index b0af48d..d02315c 100644
--- a/0192-delta-replace-readdir_r-with-readdir.patch
+++ b/0192-delta-replace-readdir_r-with-readdir.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] delta: replace readdir_r with readdir
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/delta/delta.c b/src/delta/delta.c
-index b3272d9..fd024fc 100644
+index b3272d916e..fd024fc26f 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -280,13 +280,13 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
diff --git a/0193-delta-fix-delta-for-drop-ins.patch b/0193-delta-fix-delta-for-drop-ins.patch
index 9ae8a28..0eb71ac 100644
--- a/0193-delta-fix-delta-for-drop-ins.patch
+++ b/0193-delta-fix-delta-for-drop-ins.patch
@@ -15,7 +15,7 @@ Conflicts:
1 file changed, 79 insertions(+), 95 deletions(-)
diff --git a/src/delta/delta.c b/src/delta/delta.c
-index fd024fc..e97f2e9 100644
+index fd024fc26f..e97f2e9203 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -33,6 +33,34 @@
diff --git a/0194-delta-if-prefix-is-specified-only-show-overrides-the.patch b/0194-delta-if-prefix-is-specified-only-show-overrides-the.patch
index cb09dfa..4b3783f 100644
--- a/0194-delta-if-prefix-is-specified-only-show-overrides-the.patch
+++ b/0194-delta-if-prefix-is-specified-only-show-overrides-the.patch
@@ -13,7 +13,7 @@ in /run, etc.
2 files changed, 109 insertions(+), 42 deletions(-)
diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
-index 413ebd8..4d3ab78 100644
+index 413ebd8de8..4d3ab78040 100644
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.xml
@@ -49,7 +49,9 @@
@@ -127,7 +127,7 @@ index 413ebd8..4d3ab78 100644
diff --git a/src/delta/delta.c b/src/delta/delta.c
-index e97f2e9..ae658f9 100644
+index e97f2e9203..ae658f9c01 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -4,6 +4,7 @@
diff --git a/0195-log-log_error-and-friends-add-a-newline-after-each-l.patch b/0195-log-log_error-and-friends-add-a-newline-after-each-l.patch
index 2e13ddb..31746e7 100644
--- a/0195-log-log_error-and-friends-add-a-newline-after-each-l.patch
+++ b/0195-log-log_error-and-friends-add-a-newline-after-each-l.patch
@@ -46,7 +46,7 @@ Conflicts:
23 files changed, 195 insertions(+), 195 deletions(-)
diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
-index 5a42b3d..7ed1ae7 100644
+index 5a42b3dbef..7ed1ae7bfc 100644
--- a/src/binfmt/binfmt.c
+++ b/src/binfmt/binfmt.c
@@ -94,7 +94,7 @@ static int apply_file(const char *path, bool ignore_enoent) {
@@ -59,7 +59,7 @@ index 5a42b3d..7ed1ae7 100644
char l[LINE_MAX], *p;
int k;
diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
-index 14ccd3e..9f99c1f 100644
+index 14ccd3efe5..9f99c1f6b1 100644
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -262,12 +262,12 @@ static void do_journal_append(char *file)
@@ -78,7 +78,7 @@ index 14ccd3e..9f99c1f 100644
return;
}
diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c
-index 75c96cc..560a91b 100644
+index 75c96cc081..560a91b620 100644
--- a/src/journal/coredumpctl.c
+++ b/src/journal/coredumpctl.c
@@ -417,7 +417,7 @@ static int dump_core(sd_journal* j) {
@@ -91,7 +91,7 @@ index 75c96cc..560a91b 100644
return 0;
}
diff --git a/src/journal/journal-authenticate.c b/src/journal/journal-authenticate.c
-index bd7100a..f416b79 100644
+index bd7100a8d5..f416b79a34 100644
--- a/src/journal/journal-authenticate.c
+++ b/src/journal/journal-authenticate.c
@@ -60,7 +60,7 @@ int journal_file_append_tag(JournalFile *f) {
@@ -104,7 +104,7 @@ index bd7100a..f416b79 100644
FSPRG_GetEpoch(f->fsprg_state));
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
-index 49ee420..9789398 100644
+index 49ee4203dd..9789398e4e 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -122,7 +122,7 @@ static int load_module(struct kmod_ctx *ctx, const char *m) {
@@ -126,7 +126,7 @@ index 49ee420..9789398 100644
char line[LINE_MAX], *l;
int k;
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index b5670db..8fb0eb6 100644
+index b5670dbb86..8fb0eb6570 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -132,7 +132,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
@@ -139,7 +139,7 @@ index b5670db..8fb0eb6 100644
char l[LINE_MAX], *p, *value, *new_value, *property, *existing;
void *v;
diff --git a/src/test/test-udev.c b/src/test/test-udev.c
-index 17825f1..676669b 100644
+index 17825f12b4..676669ba88 100644
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -101,20 +101,20 @@ int main(int argc, char *argv[])
@@ -176,7 +176,7 @@ index 17825f1..676669b 100644
}
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index e23847b..00f74c2 100644
+index e23847bbea..00f74c2535 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -359,7 +359,7 @@ static int dir_cleanup(
@@ -198,7 +198,7 @@ index e23847b..00f74c2 100644
if (unlinkat(dirfd(d), dent->d_name, 0) < 0) {
if (errno != ENOENT) {
diff --git a/src/udev/accelerometer/accelerometer.c b/src/udev/accelerometer/accelerometer.c
-index e611b48..9610d7c 100644
+index e611b48a42..9610d7c2b2 100644
--- a/src/udev/accelerometer/accelerometer.c
+++ b/src/udev/accelerometer/accelerometer.c
@@ -334,7 +334,7 @@ int main (int argc, char** argv)
@@ -211,7 +211,7 @@ index e611b48..9610d7c 100644
free(devnode);
log_close();
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
-index d375d43..5e55f8d 100644
+index d375d43491..5e55f8dc28 100644
--- a/src/udev/ata_id/ata_id.c
+++ b/src/udev/ata_id/ata_id.c
@@ -462,14 +462,14 @@ int main(int argc, char *argv[])
@@ -241,7 +241,7 @@ index d375d43..5e55f8d 100644
goto close;
}
diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c
-index 1ad0459..1fc0dfa 100644
+index 1ad0459236..1fc0dfa34f 100644
--- a/src/udev/cdrom_id/cdrom_id.c
+++ b/src/udev/cdrom_id/cdrom_id.c
@@ -137,10 +137,10 @@ static bool is_mounted(const char *device)
@@ -758,7 +758,7 @@ index 1ad0459..1fc0dfa 100644
}
diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c
-index b48dccc..c806bd6 100644
+index b48dccc2fb..c806bd6ad8 100644
--- a/src/udev/udev-builtin-blkid.c
+++ b/src/udev/udev-builtin-blkid.c
@@ -190,7 +190,7 @@ static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t
@@ -771,7 +771,7 @@ index b48dccc..c806bd6 100644
noraid ? "no" : "", (unsigned long long) offset);
diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c
-index b80940b..8cfeed6 100644
+index b80940b6ef..8cfeed663b 100644
--- a/src/udev/udev-builtin-firmware.c
+++ b/src/udev/udev-builtin-firmware.c
@@ -33,7 +33,7 @@ static bool set_loading(struct udev *udev, char *loadpath, const char *state)
@@ -820,7 +820,7 @@ index b80940b..8cfeed6 100644
rc = EXIT_FAILURE;
goto exit;
diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
-index 445b602..4691fc0 100644
+index 445b602f9c..4691fc073d 100644
--- a/src/udev/udev-builtin-input_id.c
+++ b/src/udev/udev-builtin-input_id.c
@@ -57,7 +57,7 @@ static void get_cap_mask(struct udev_device *dev,
@@ -882,7 +882,7 @@ index 445b602..4691fc0 100644
break;
}
diff --git a/src/udev/udev-builtin-kmod.c b/src/udev/udev-builtin-kmod.c
-index fc28121..097f881 100644
+index fc28121267..097f881133 100644
--- a/src/udev/udev-builtin-kmod.c
+++ b/src/udev/udev-builtin-kmod.c
@@ -44,18 +44,18 @@ static int load_module(struct udev *udev, const char *alias)
@@ -950,7 +950,7 @@ index fc28121..097f881 100644
return false;
return (kmod_validate_resources(ctx) != KMOD_RESOURCES_OK);
diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c
-index 3e2f43e..1b9f824 100644
+index 3e2f43e1a6..1b9f8246fb 100644
--- a/src/udev/udev-builtin-usb_id.c
+++ b/src/udev/udev-builtin-usb_id.c
@@ -275,7 +275,7 @@ static int builtin_usb_id(struct udev_device *dev, int argc, char *argv[], bool
@@ -1047,7 +1047,7 @@ index 3e2f43e..1b9f824 100644
}
udev_util_encode_string(usb_vendor, vendor_str_enc, sizeof(vendor_str_enc));
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
-index e60da90..1898685 100644
+index e60da906c5..189868589d 100644
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -84,7 +84,7 @@ struct udev_ctrl *udev_ctrl_new_from_fd(struct udev *udev, int fd)
@@ -1138,7 +1138,7 @@ index e60da90..1898685 100644
}
diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
-index 1148a15..ca3d781 100644
+index 1148a1529c..ca3d781ff2 100644
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -65,7 +65,7 @@ static int node_symlink(struct udev_device *dev, const char *node, const char *s
@@ -1272,7 +1272,7 @@ index 1148a15..ca3d781 100644
if (node_permissions_apply(dev, apply, mode, uid, gid) < 0)
diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c
-index 9b694c6..cbe0c37 100644
+index 9b694c6666..cbe0c37a4f 100644
--- a/src/udev/udev-watch.c
+++ b/src/udev/udev-watch.c
@@ -40,7 +40,7 @@ int udev_watch_init(struct udev *udev)
@@ -1316,7 +1316,7 @@ index 9b694c6..cbe0c37 100644
snprintf(filename, sizeof(filename), "/run/udev/watch/%d", wd);
diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
-index d9dc73b..fe56758 100644
+index d9dc73bfc1..fe56758e3a 100644
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -389,17 +389,17 @@ static int trie_store(struct trie *trie, const char *filename) {
@@ -1426,7 +1426,7 @@ index d9dc73b..fe56758 100644
if (asprintf(&hwdb_bin, "%s/etc/udev/hwdb.bin", root) < 0) {
diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
-index c4fc4ee..a131e3f 100644
+index c4fc4ee4e5..a131e3fba1 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -113,20 +113,20 @@ static int adm_settle(struct udev *udev, int argc, char *argv[])
@@ -1486,7 +1486,7 @@ index c4fc4ee..a131e3f 100644
udev_list_entry_foreach(list_entry, udev_queue_get_queued_list_entry(udev_queue))
printf(" %s (%s)\n",
diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c
-index df1409b..3aa3274 100644
+index df1409bff6..3aa3274bfc 100644
--- a/src/udev/udevadm-test.c
+++ b/src/udev/udevadm-test.c
@@ -52,7 +52,7 @@ static int adm_test(struct udev *udev, int argc, char *argv[])
@@ -1508,7 +1508,7 @@ index df1409b..3aa3274 100644
}
break;
diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c
-index e14b3ca..dbca369 100644
+index e14b3ca27c..dbca369011 100644
--- a/src/udev/udevadm.c
+++ b/src/udev/udevadm.c
@@ -79,7 +79,7 @@ static int run_command(struct udev *udev, const struct udevadm_cmd *cmd, int arg
diff --git a/0196-man-units-tmpfiles.d-5-cleanup.patch b/0196-man-units-tmpfiles.d-5-cleanup.patch
index 975307e..5869f96 100644
--- a/0196-man-units-tmpfiles.d-5-cleanup.patch
+++ b/0196-man-units-tmpfiles.d-5-cleanup.patch
@@ -21,7 +21,7 @@ Conflicts:
3 files changed, 134 insertions(+), 88 deletions(-)
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
-index ba727e1..91c0372 100644
+index ba727e1854..91c0372396 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -54,7 +54,9 @@
@@ -113,7 +113,7 @@ index ba727e1..91c0372 100644
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
-index e8b630d..a00637b 100644
+index e8b630da24..a00637beff 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -67,23 +67,32 @@
@@ -390,7 +390,7 @@ index e8b630d..a00637b 100644
diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in
-index 6f98063..3405e28 100644
+index 6f98063744..3405e2842c 100644
--- a/units/systemd-tmpfiles-setup.service.in
+++ b/units/systemd-tmpfiles-setup.service.in
@@ -14,6 +14,7 @@ Conflicts=shutdown.target
diff --git a/0197-tmpfiles-introduce-the-concept-of-unsafe-operations.patch b/0197-tmpfiles-introduce-the-concept-of-unsafe-operations.patch
index ed75d38..9d80d25 100644
--- a/0197-tmpfiles-introduce-the-concept-of-unsafe-operations.patch
+++ b/0197-tmpfiles-introduce-the-concept-of-unsafe-operations.patch
@@ -39,7 +39,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1045849
create mode 100644 tmpfiles.d/systemd-nologin.conf
diff --git a/Makefile.am b/Makefile.am
-index 16a5c3c..6233a7f 100644
+index 16a5c3cb3a..6233a7f7ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1599,6 +1599,7 @@ nodist_systemunit_DATA += \
@@ -51,7 +51,7 @@ index 16a5c3c..6233a7f 100644
tmpfiles.d/x11.conf
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
-index 91c0372..495247e 100644
+index 91c0372396..495247e198 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -133,6 +133,12 @@
@@ -68,7 +68,7 @@ index 91c0372..495247e 100644
Only apply rules that
apply to paths with the specified
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
-index a00637b..39aa68d 100644
+index a00637beff..39aa68d92a 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -113,6 +113,9 @@ L /tmp/foobar - - - - /dev/null
@@ -111,7 +111,7 @@ index a00637b..39aa68d 100644
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 00f74c2..30a8a55 100644
+index 00f74c2535..30a8a55d61 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -106,6 +106,7 @@ static Set *unix_sockets = NULL;
@@ -193,7 +193,7 @@ index 00f74c2..30a8a55 100644
if (strv_extend(&include_prefixes, optarg) < 0)
return log_oom();
diff --git a/tmpfiles.d/legacy.conf b/tmpfiles.d/legacy.conf
-index 3fff347..a165687 100644
+index 3fff347db4..a1656873da 100644
--- a/tmpfiles.d/legacy.conf
+++ b/tmpfiles.d/legacy.conf
@@ -29,6 +29,6 @@ d /run/lock/lockdev 0775 root lock -
@@ -208,7 +208,7 @@ index 3fff347..a165687 100644
+r! /forcequotacheck
diff --git a/tmpfiles.d/systemd-nologin.conf b/tmpfiles.d/systemd-nologin.conf
new file mode 100644
-index 0000000..d61232b
+index 0000000000..d61232b534
--- /dev/null
+++ b/tmpfiles.d/systemd-nologin.conf
@@ -0,0 +1,11 @@
@@ -224,7 +224,7 @@ index 0000000..d61232b
+
+F! /run/nologin 0644 - - - "System is booting up. See pam_nologin(8)"
diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
-index a05c657..7c6d6b9 100644
+index a05c6577d2..7c6d6b9099 100644
--- a/tmpfiles.d/systemd.conf
+++ b/tmpfiles.d/systemd.conf
@@ -8,7 +8,7 @@
@@ -246,7 +246,7 @@ index a05c657..7c6d6b9 100644
m /var/log/journal/%m 2755 root systemd-journal - -
m /run/log/journal 2755 root systemd-journal - -
diff --git a/tmpfiles.d/x11.conf b/tmpfiles.d/x11.conf
-index ece6a5c..4c96a54 100644
+index ece6a5ce98..4c96a54a13 100644
--- a/tmpfiles.d/x11.conf
+++ b/tmpfiles.d/x11.conf
@@ -15,4 +15,4 @@ d /tmp/.font-unix 1777 root root 10d
@@ -256,7 +256,7 @@ index ece6a5c..4c96a54 100644
-r /tmp/.X[0-9]*-lock
+r! /tmp/.X[0-9]*-lock
diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in
-index 3405e28..c2dcae0 100644
+index 3405e2842c..c2dcae0e13 100644
--- a/units/systemd-tmpfiles-setup.service.in
+++ b/units/systemd-tmpfiles-setup.service.in
@@ -6,7 +6,7 @@
diff --git a/0198-sleep-config-fix-useless-check-for-swapfile-type.patch b/0198-sleep-config-fix-useless-check-for-swapfile-type.patch
index 25f85aa..fc5a350 100644
--- a/0198-sleep-config-fix-useless-check-for-swapfile-type.patch
+++ b/0198-sleep-config-fix-useless-check-for-swapfile-type.patch
@@ -16,7 +16,7 @@ a warning to detect those cases.
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
-index 2bb0493..d76e3ad 100644
+index 2bb0493812..d76e3ad036 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -183,7 +183,7 @@ static int hibernation_partition_size(size_t *size, size_t *used) {
diff --git a/0199-journalctl-make-sure-b-foobar-cannot-be-misunderstoo.patch b/0199-journalctl-make-sure-b-foobar-cannot-be-misunderstoo.patch
index e6bb464..444168f 100644
--- a/0199-journalctl-make-sure-b-foobar-cannot-be-misunderstoo.patch
+++ b/0199-journalctl-make-sure-b-foobar-cannot-be-misunderstoo.patch
@@ -14,7 +14,7 @@ Conflicts:
1 file changed, 60 insertions(+), 51 deletions(-)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 1d66792..ccd96b2 100644
+index 1d66792708..ccd96b221a 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -72,7 +72,8 @@ static bool arg_no_tail = false;
diff --git a/0200-man-resolve-word-omissions.patch b/0200-man-resolve-word-omissions.patch
index 96e77ff..1dfb0fa 100644
--- a/0200-man-resolve-word-omissions.patch
+++ b/0200-man-resolve-word-omissions.patch
@@ -59,7 +59,7 @@ Conflicts:
42 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
-index 94f97e0..6f8668b 100644
+index 94f97e0ed4..6f8668b478 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -88,8 +88,8 @@
@@ -74,7 +74,7 @@ index 94f97e0..6f8668b 100644
the lexicographically latest name will be applied.
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
-index 8e642a3..b362c5d 100644
+index 8e642a3f59..b362c5de2c 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -155,7 +155,7 @@
@@ -87,7 +87,7 @@ index 8e642a3..b362c5d 100644
logged in user. If
none, journal files
diff --git a/man/loginctl.xml b/man/loginctl.xml
-index 1b54ff7..133d6cf 100644
+index 1b54ff7dc3..133d6cfe9d 100644
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -109,7 +109,7 @@
@@ -100,7 +100,7 @@ index 1b54ff7..133d6cf 100644
diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
-index 6e804e1..84c1afa 100644
+index 6e804e1a6c..84c1afa46a 100644
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.xml
@@ -144,7 +144,7 @@
@@ -113,7 +113,7 @@ index 6e804e1..84c1afa 100644
libsystemd-daemon pkg-config1
file. Alternatively, applications consuming these APIs
diff --git a/man/sd-journal.xml b/man/sd-journal.xml
-index 6d39611..832d584 100644
+index 6d39611447..832d584579 100644
--- a/man/sd-journal.xml
+++ b/man/sd-journal.xml
@@ -98,7 +98,7 @@
@@ -126,7 +126,7 @@ index 6d39611..832d584 100644
libsystemd-journal pkg-config1
file.
diff --git a/man/sd-login.xml b/man/sd-login.xml
-index 251b35b..1d47b29 100644
+index 251b35b06f..1d47b298dd 100644
--- a/man/sd-login.xml
+++ b/man/sd-login.xml
@@ -99,7 +99,7 @@
@@ -148,7 +148,7 @@ index 251b35b..1d47b29 100644
libsystemd-login pkg-config1
file.
diff --git a/man/sd_booted.xml b/man/sd_booted.xml
-index 64c0cd9..6f8cc95 100644
+index 64c0cd9d3d..6f8cc95ca7 100644
--- a/man/sd_booted.xml
+++ b/man/sd_booted.xml
@@ -100,7 +100,7 @@
@@ -161,7 +161,7 @@ index 64c0cd9..6f8cc95 100644
libsystemd-daemon pkg-config1
file. Alternatively, applications consuming these APIs
diff --git a/man/sd_get_seats.xml b/man/sd_get_seats.xml
-index 8254b7c..1e55af3 100644
+index 8254b7cae4..1e55af3bdf 100644
--- a/man/sd_get_seats.xml
+++ b/man/sd_get_seats.xml
@@ -90,13 +90,13 @@
@@ -191,7 +191,7 @@ index 8254b7c..1e55af3 100644
libsystemd-login pkg-config1
file.
diff --git a/man/sd_id128_get_machine.xml b/man/sd_id128_get_machine.xml
-index 6bee7ad..084fda2 100644
+index 6bee7ad9c1..084fda251a 100644
--- a/man/sd_id128_get_machine.xml
+++ b/man/sd_id128_get_machine.xml
@@ -116,7 +116,7 @@
@@ -204,7 +204,7 @@ index 6bee7ad..084fda2 100644
libsystemd-id128Â pkg-config1
file.
diff --git a/man/sd_id128_randomize.xml b/man/sd_id128_randomize.xml
-index 0b95803..100de16 100644
+index 0b9580308a..100de167b8 100644
--- a/man/sd_id128_randomize.xml
+++ b/man/sd_id128_randomize.xml
@@ -95,7 +95,7 @@
@@ -217,7 +217,7 @@ index 0b95803..100de16 100644
libsystemd-id128Â pkg-config1
file.
diff --git a/man/sd_id128_to_string.xml b/man/sd_id128_to_string.xml
-index 71cf82a..eae2915 100644
+index 71cf82a6cd..eae291578a 100644
--- a/man/sd_id128_to_string.xml
+++ b/man/sd_id128_to_string.xml
@@ -118,7 +118,7 @@
@@ -230,7 +230,7 @@ index 71cf82a..eae2915 100644
file.
diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
-index 4d9cd79..5e79453 100644
+index 4d9cd79600..5e79453cec 100644
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -208,7 +208,7 @@
@@ -243,7 +243,7 @@ index 4d9cd79..5e79453 100644
libsystemd-daemon pkg-config1
file. Alternatively, applications consuming these APIs
diff --git a/man/sd_journal_add_match.xml b/man/sd_journal_add_match.xml
-index b6c7b06..6568234 100644
+index b6c7b06f2e..6568234e07 100644
--- a/man/sd_journal_add_match.xml
+++ b/man/sd_journal_add_match.xml
@@ -174,7 +174,7 @@
@@ -256,7 +256,7 @@ index b6c7b06..6568234 100644
libsystemd-journal pkg-config1
file.
diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml
-index 4a7e0a1..ecd329f 100644
+index 4a7e0a1f8c..ecd329f013 100644
--- a/man/sd_journal_get_catalog.xml
+++ b/man/sd_journal_get_catalog.xml
@@ -118,7 +118,7 @@
@@ -269,7 +269,7 @@ index 4a7e0a1..ecd329f 100644
libsystemd-journal pkg-config1
file.
diff --git a/man/sd_journal_get_cursor.xml b/man/sd_journal_get_cursor.xml
-index 4cee7d5..046c154 100644
+index 4cee7d5b63..046c154097 100644
--- a/man/sd_journal_get_cursor.xml
+++ b/man/sd_journal_get_cursor.xml
@@ -130,7 +130,7 @@
@@ -282,7 +282,7 @@ index 4cee7d5..046c154 100644
libsystemd-journal pkg-config1
file.
diff --git a/man/sd_journal_get_cutoff_realtime_usec.xml b/man/sd_journal_get_cutoff_realtime_usec.xml
-index 9bf8220..287c1c5 100644
+index 9bf8220d11..287c1c5ba1 100644
--- a/man/sd_journal_get_cutoff_realtime_usec.xml
+++ b/man/sd_journal_get_cutoff_realtime_usec.xml
@@ -122,7 +122,7 @@
@@ -295,7 +295,7 @@ index 9bf8220..287c1c5 100644
libsystemd-journal pkg-config1
file.
diff --git a/man/sd_journal_get_data.xml b/man/sd_journal_get_data.xml
-index 0e1111e..6ed52b5 100644
+index 0e1111e05d..6ed52b569e 100644
--- a/man/sd_journal_get_data.xml
+++ b/man/sd_journal_get_data.xml
@@ -203,7 +203,7 @@
@@ -308,7 +308,7 @@ index 0e1111e..6ed52b5 100644
libsystemd-journal pkg-config1
file.
diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml
-index 764f716..4b36f97 100644
+index 764f716a17..4b36f97af8 100644
--- a/man/sd_journal_get_fd.xml
+++ b/man/sd_journal_get_fd.xml
@@ -253,7 +253,7 @@ else {
@@ -321,7 +321,7 @@ index 764f716..4b36f97 100644
libsystemd-journal pkg-config1
file.
diff --git a/man/sd_journal_get_realtime_usec.xml b/man/sd_journal_get_realtime_usec.xml
-index 8870c29..bf1aa50 100644
+index 8870c29e30..bf1aa50092 100644
--- a/man/sd_journal_get_realtime_usec.xml
+++ b/man/sd_journal_get_realtime_usec.xml
@@ -122,7 +122,7 @@
@@ -334,7 +334,7 @@ index 8870c29..bf1aa50 100644
libsystemd-journal pkg-config1
file.
diff --git a/man/sd_journal_get_usage.xml b/man/sd_journal_get_usage.xml
-index 180d8b2..08d8640 100644
+index 180d8b2ffd..08d86401cf 100644
--- a/man/sd_journal_get_usage.xml
+++ b/man/sd_journal_get_usage.xml
@@ -84,7 +84,7 @@
@@ -347,7 +347,7 @@ index 180d8b2..08d8640 100644
libsystemd-journal pkg-config1
file.
diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml
-index 6e437d1..1409b0d 100644
+index 6e437d1822..1409b0dba3 100644
--- a/man/sd_journal_next.xml
+++ b/man/sd_journal_next.xml
@@ -102,7 +102,7 @@
@@ -378,7 +378,7 @@ index 6e437d1..1409b0d 100644
libsystemd-journal pkg-config1
file.
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
-index e61a648..a716cc3 100644
+index e61a648703..a716cc35e6 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -227,7 +227,7 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid(
@@ -391,7 +391,7 @@ index e61a648..a716cc3 100644
libsystemd-journal pkg-config1
file.
diff --git a/man/sd_journal_query_unique.xml b/man/sd_journal_query_unique.xml
-index f5d9d2b..f0b9204 100644
+index f5d9d2bfb5..f0b92048af 100644
--- a/man/sd_journal_query_unique.xml
+++ b/man/sd_journal_query_unique.xml
@@ -156,7 +156,7 @@
@@ -404,7 +404,7 @@ index f5d9d2b..f0b9204 100644
libsystemd-journal pkg-config1
file.
diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml
-index 03de30a..939f0b1 100644
+index 03de30a383..939f0b1086 100644
--- a/man/sd_journal_seek_head.xml
+++ b/man/sd_journal_seek_head.xml
@@ -94,7 +94,7 @@
@@ -426,7 +426,7 @@ index 03de30a..939f0b1 100644
libsystemd-journal pkg-config1
file.
diff --git a/man/sd_journal_stream_fd.xml b/man/sd_journal_stream_fd.xml
-index 4bd0abc..a8dc8fd 100644
+index 4bd0abc3b4..a8dc8fd08a 100644
--- a/man/sd_journal_stream_fd.xml
+++ b/man/sd_journal_stream_fd.xml
@@ -112,7 +112,7 @@
@@ -439,7 +439,7 @@ index 4bd0abc..a8dc8fd 100644
libsystemd-journal pkg-config1
file.
diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml
-index 240300d..aaabdbf 100644
+index 240300dcb0..aaabdbf3e8 100644
--- a/man/sd_listen_fds.xml
+++ b/man/sd_listen_fds.xml
@@ -73,7 +73,7 @@
@@ -461,7 +461,7 @@ index 240300d..aaabdbf 100644
libsystemd-daemon pkg-config1
file. Alternatively, applications consuming these APIs
diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml
-index 909a3d9..f439d3e 100644
+index 909a3d9bfd..f439d3e7b5 100644
--- a/man/sd_login_monitor_new.xml
+++ b/man/sd_login_monitor_new.xml
@@ -224,7 +224,7 @@ else {
@@ -474,7 +474,7 @@ index 909a3d9..f439d3e 100644
libsystemd-login pkg-config1
file.
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
-index 55965ff..e078140 100644
+index 55965ffce4..e078140406 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -79,7 +79,7 @@
@@ -496,7 +496,7 @@ index 55965ff..e078140 100644
libsystemd-daemon pkg-config1
file. Alternatively, applications consuming these APIs
diff --git a/man/sd_pid_get_session.xml b/man/sd_pid_get_session.xml
-index e5c7709..ff5905b 100644
+index e5c77090dd..ff5905b7d2 100644
--- a/man/sd_pid_get_session.xml
+++ b/man/sd_pid_get_session.xml
@@ -186,7 +186,7 @@
@@ -509,7 +509,7 @@ index e5c7709..ff5905b 100644
libsystemd-login pkg-config1
file.
diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml
-index cd87696..23d582d 100644
+index cd8769698c..23d582da92 100644
--- a/man/sd_seat_get_active.xml
+++ b/man/sd_seat_get_active.xml
@@ -164,7 +164,7 @@
@@ -522,7 +522,7 @@ index cd87696..23d582d 100644
libsystemd-login pkg-config1
file.
diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml
-index 293ce71..06891f7 100644
+index 293ce71642..06891f767f 100644
--- a/man/sd_session_is_active.xml
+++ b/man/sd_session_is_active.xml
@@ -252,7 +252,7 @@
@@ -535,7 +535,7 @@ index 293ce71..06891f7 100644
libsystemd-login pkg-config1
file.
diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
-index d4d23f4..0faa765 100644
+index d4d23f4f1d..0faa7651e5 100644
--- a/man/sd_uid_get_state.xml
+++ b/man/sd_uid_get_state.xml
@@ -139,7 +139,7 @@
@@ -557,7 +557,7 @@ index d4d23f4..0faa765 100644
file.
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
-index 854864c..5544283 100644
+index 854864cffc..5544283d49 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -89,8 +89,8 @@
@@ -572,7 +572,7 @@ index 854864c..5544283 100644
lexicographically latest name will be applied. It is
recommended to prefix all filenames with a two-digit
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index b4bc15d..61deb19 100644
+index b4bc15daa4..61deb194f0 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -250,7 +250,7 @@ systemctl start foo
@@ -594,7 +594,7 @@ index b4bc15d..61deb19 100644
temporarily, so that they are lost on the next
reboot.
diff --git a/man/systemd-getty-generator.xml b/man/systemd-getty-generator.xml
-index da88e72..b1993ae 100644
+index da88e727c7..b1993aeccc 100644
--- a/man/systemd-getty-generator.xml
+++ b/man/systemd-getty-generator.xml
@@ -61,10 +61,10 @@
@@ -613,7 +613,7 @@ index da88e72..b1993ae 100644
argument such as console= to get
both kernel messages and a getty prompt on a serial
diff --git a/man/systemd-halt.service.xml b/man/systemd-halt.service.xml
-index 90b443f..99457aa 100644
+index 90b443ffa8..99457aa721 100644
--- a/man/systemd-halt.service.xml
+++ b/man/systemd-halt.service.xml
@@ -65,7 +65,7 @@
@@ -626,7 +626,7 @@ index 90b443f..99457aa 100644
pulled in by poweroff.target,
systemd-reboot.service by
diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
-index fef76bc..bc38d55 100644
+index fef76bcfc7..bc38d551ca 100644
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.xml
@@ -80,7 +80,7 @@
@@ -639,7 +639,7 @@ index fef76bc..bc38d55 100644
is used to initialize the machine ID. For details see
the documentation of the
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
-index 1c78562..ac3127d 100644
+index 1c78562e8a..ac3127d7d0 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -213,7 +213,7 @@
@@ -689,7 +689,7 @@ index 1c78562..ac3127d 100644
it is recommended to set the
FreeBind= option
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
-index 77127ff..b70c5e9 100644
+index 77127ffa86..b70c5e9da7 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -634,7 +634,7 @@
@@ -711,7 +711,7 @@ index 77127ff..b70c5e9 100644
may be used to check whether a
specific kernel command line option is
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
-index 39aa68d..ed88751 100644
+index 39aa68d92a..ed88751a52 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -88,8 +88,8 @@
diff --git a/0201-man-improvements-to-comma-placement.patch b/0201-man-improvements-to-comma-placement.patch
index 4d299bf..04d6f56 100644
--- a/0201-man-improvements-to-comma-placement.patch
+++ b/0201-man-improvements-to-comma-placement.patch
@@ -52,7 +52,7 @@ Conflicts:
33 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/man/halt.xml b/man/halt.xml
-index 2a13d3c..f54a864 100644
+index 2a13d3c635..f54a8648ad 100644
--- a/man/halt.xml
+++ b/man/halt.xml
@@ -148,7 +148,7 @@
@@ -65,7 +65,7 @@ index 2a13d3c..f54a864 100644
diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
-index b39fb55..a0776f5 100644
+index b39fb5502b..a0776f55bc 100644
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.xml
@@ -255,7 +255,7 @@
@@ -78,7 +78,7 @@ index b39fb55..a0776f5 100644
diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
-index 84c1afa..b48eac9 100644
+index 84c1afa46a..b48eac9f44 100644
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.xml
@@ -83,7 +83,7 @@
@@ -100,7 +100,7 @@ index 84c1afa..b48eac9 100644
sources:
diff --git a/man/sd-readahead.xml b/man/sd-readahead.xml
-index f8a0a0b..bcc46b2 100644
+index f8a0a0b559..bcc46b24d8 100644
--- a/man/sd-readahead.xml
+++ b/man/sd-readahead.xml
@@ -83,7 +83,7 @@
@@ -113,7 +113,7 @@ index f8a0a0b..bcc46b2 100644
sources:
diff --git a/man/sd_booted.xml b/man/sd_booted.xml
-index 6f8cc95..1e38d2a 100644
+index 6f8cc95ca7..1e38d2abd3 100644
--- a/man/sd_booted.xml
+++ b/man/sd_booted.xml
@@ -106,7 +106,7 @@
@@ -126,7 +126,7 @@ index 6f8cc95..1e38d2a 100644
If the reference implementation is used as
diff --git a/man/sd_get_seats.xml b/man/sd_get_seats.xml
-index 1e55af3..f0e7655 100644
+index 1e55af3bdf..f0e7655d4c 100644
--- a/man/sd_get_seats.xml
+++ b/man/sd_get_seats.xml
@@ -107,7 +107,7 @@
@@ -139,7 +139,7 @@ index 1e55af3..f0e7655 100644
sd_get_uids() and
sd_get_machine_names() return the
diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
-index 5e79453..4bb2236 100644
+index 5e79453cec..4bb2236fce 100644
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -214,7 +214,7 @@
@@ -152,7 +152,7 @@ index 5e79453..4bb2236 100644
These functions continue to work as described,
diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml
-index aaabdbf..6a9e082 100644
+index aaabdbf3e8..6a9e082180 100644
--- a/man/sd_listen_fds.xml
+++ b/man/sd_listen_fds.xml
@@ -155,7 +155,7 @@
@@ -165,7 +165,7 @@ index aaabdbf..6a9e082 100644
If the reference implementation is used as
diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml
-index f439d3e..14ff241 100644
+index f439d3e7b5..14ff241d82 100644
--- a/man/sd_login_monitor_new.xml
+++ b/man/sd_login_monitor_new.xml
@@ -198,13 +198,13 @@ else {
@@ -186,7 +186,7 @@ index f439d3e..14ff241 100644
returns a combination of POLLIN,
POLLOUT and suchlike. On failure,
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
-index e078140..aae27a8 100644
+index e078140406..aae27a838d 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -241,7 +241,7 @@
@@ -199,7 +199,7 @@ index e078140..aae27a8 100644
If the reference implementation is used as
diff --git a/man/sd_readahead.xml b/man/sd_readahead.xml
-index bb01bcf..9827299 100644
+index bb01bcfd89..98272997cb 100644
--- a/man/sd_readahead.xml
+++ b/man/sd_readahead.xml
@@ -139,7 +139,7 @@
@@ -212,7 +212,7 @@ index bb01bcf..9827299 100644
If -DDISABLE_SYSTEMD is set during compilation,
diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml
-index 23d582d..c64ba13 100644
+index 23d582da92..c64ba13c3a 100644
--- a/man/sd_seat_get_active.xml
+++ b/man/sd_seat_get_active.xml
@@ -143,9 +143,9 @@
@@ -228,7 +228,7 @@ index 23d582d..c64ba13 100644
the number of entries in the session identifier
array. If the test succeeds,
diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
-index 0faa765..30b254c 100644
+index 0faa7651e5..30b254c805 100644
--- a/man/sd_uid_get_state.xml
+++ b/man/sd_uid_get_state.xml
@@ -152,11 +152,11 @@
@@ -246,7 +246,7 @@ index 0faa765..30b254c 100644
sd_uid_get_seats() return the
number of entries in the returned arrays. On failure,
diff --git a/man/shutdown.xml b/man/shutdown.xml
-index 795fb66..27e7e87 100644
+index 795fb66328..27e7e87b6c 100644
--- a/man/shutdown.xml
+++ b/man/shutdown.xml
@@ -164,7 +164,7 @@
@@ -259,7 +259,7 @@ index 795fb66..27e7e87 100644
diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
-index aefbfc8..b7753f9 100644
+index aefbfc8af7..b7753f99d1 100644
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -270,7 +270,7 @@
@@ -272,7 +272,7 @@ index aefbfc8..b7753f9 100644
diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml
-index 8af328d..79902cb 100644
+index 8af328dcfa..79902cbd9a 100644
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.xml
@@ -167,7 +167,7 @@
@@ -285,7 +285,7 @@ index 8af328d..79902cb 100644
diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml
-index ffb1dfd..ba7a2cf 100644
+index ffb1dfd50b..ba7a2cf0c7 100644
--- a/man/systemd-cat.xml
+++ b/man/systemd-cat.xml
@@ -158,7 +158,7 @@
@@ -298,7 +298,7 @@ index ffb1dfd..ba7a2cf 100644
diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml
-index 432706b..152b883 100644
+index 432706bcbc..152b883533 100644
--- a/man/systemd-cgls.xml
+++ b/man/systemd-cgls.xml
@@ -145,7 +145,7 @@
@@ -311,7 +311,7 @@ index 432706b..152b883 100644
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
-index 7faedfb..0e1f7c5 100644
+index 7faedfbfdb..0e1f7c554a 100644
--- a/man/systemd-cgtop.xml
+++ b/man/systemd-cgtop.xml
@@ -264,7 +264,7 @@
@@ -324,7 +324,7 @@ index 7faedfb..0e1f7c5 100644
diff --git a/man/systemd-coredumpctl.xml b/man/systemd-coredumpctl.xml
-index 9ccb67d..67f75d1 100644
+index 9ccb67d12d..67f75d1c53 100644
--- a/man/systemd-coredumpctl.xml
+++ b/man/systemd-coredumpctl.xml
@@ -200,7 +200,7 @@
@@ -337,7 +337,7 @@ index 9ccb67d..67f75d1 100644
as failure.
diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
-index 4d3ab78..ebaa349 100644
+index 4d3ab78040..ebaa3492f4 100644
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.xml
@@ -223,7 +223,7 @@
@@ -350,7 +350,7 @@ index 4d3ab78..ebaa349 100644
diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
-index bc38d55..7b3aa7e 100644
+index bc38d551ca..7b3aa7e9a0 100644
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.xml
@@ -116,7 +116,7 @@
@@ -363,7 +363,7 @@ index bc38d55..7b3aa7e 100644
diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml
-index a769346..e14977d 100644
+index a76934649a..e14977d054 100644
--- a/man/systemd-notify.xml
+++ b/man/systemd-notify.xml
@@ -172,7 +172,7 @@
@@ -376,7 +376,7 @@ index a769346..e14977d 100644
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
-index 495247e..c678031 100644
+index 495247e198..c678031c4e 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -178,7 +178,7 @@
@@ -389,7 +389,7 @@ index 495247e..c678031 100644
diff --git a/man/systemd-tty-ask-password-agent.xml b/man/systemd-tty-ask-password-agent.xml
-index 31a18ba..cb5fb43 100644
+index 31a18ba4b0..cb5fb43d9c 100644
--- a/man/systemd-tty-ask-password-agent.xml
+++ b/man/systemd-tty-ask-password-agent.xml
@@ -148,7 +148,7 @@
@@ -402,7 +402,7 @@ index 31a18ba..cb5fb43 100644
diff --git a/man/systemd.device.xml b/man/systemd.device.xml
-index 002b647..586473c 100644
+index 002b647ff9..586473c61d 100644
--- a/man/systemd.device.xml
+++ b/man/systemd.device.xml
@@ -75,7 +75,7 @@
@@ -415,7 +415,7 @@ index 002b647..586473c 100644
udev7
for details.
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
-index df5a79e..6f9f70c 100644
+index df5a79e2b8..6f9f70c3eb 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -94,7 +94,7 @@
@@ -428,7 +428,7 @@ index df5a79e..6f9f70c 100644
Optionally, a mount unit may be accompanied by
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index 80a935d..e869f95 100644
+index 80a935d373..e869f95033 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -441,7 +441,7 @@
@@ -441,7 +441,7 @@ index 80a935d..e869f95 100644
be used.
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
-index 863a029..76bb5cd 100644
+index 863a029fe3..76bb5cdcf3 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -996,7 +996,7 @@
@@ -454,7 +454,7 @@ index 863a029..76bb5cd 100644
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
-index 13f6c84..5e8b25f 100644
+index 13f6c8441a..5e8b25fdd8 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -85,7 +85,7 @@
@@ -467,7 +467,7 @@ index 13f6c84..5e8b25f 100644
All swap units automatically get the appropriate
diff --git a/man/systemd.xml b/man/systemd.xml
-index 85c06d3..23a0c26 100644
+index 85c06d3866..23a0c265bb 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -494,7 +494,7 @@
@@ -480,7 +480,7 @@ index 85c06d3..23a0c26 100644
Design Document.
diff --git a/man/telinit.xml b/man/telinit.xml
-index bb80939..b20a60a 100644
+index bb8093914a..b20a60a4ca 100644
--- a/man/telinit.xml
+++ b/man/telinit.xml
@@ -171,7 +171,7 @@
@@ -493,7 +493,7 @@ index bb80939..b20a60a 100644
diff --git a/man/timedatectl.xml b/man/timedatectl.xml
-index be0ad3f..f4975ce 100644
+index be0ad3f012..f4975ce547 100644
--- a/man/timedatectl.xml
+++ b/man/timedatectl.xml
@@ -222,7 +222,7 @@
diff --git a/0202-man-grammar-and-wording-improvements.patch b/0202-man-grammar-and-wording-improvements.patch
index 59eae77..53f2052 100644
--- a/0202-man-grammar-and-wording-improvements.patch
+++ b/0202-man-grammar-and-wording-improvements.patch
@@ -26,7 +26,7 @@ Conflicts:
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/man/daemon.xml b/man/daemon.xml
-index 7790420..1fe4546 100644
+index 7790420c6e..1fe4546f00 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -408,7 +408,7 @@
@@ -39,7 +39,7 @@ index 7790420..1fe4546 100644
it is recommended to place a symlink to the
unit file in the .wants/
diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml
-index 4bb2236..58cd1c9 100644
+index 4bb2236fce..58cd1c91bb 100644
--- a/man/sd_is_fifo.xml
+++ b/man/sd_is_fifo.xml
@@ -165,7 +165,7 @@
@@ -52,7 +52,7 @@ index 4bb2236..58cd1c9 100644
name. Special files in this context are character
device nodes and files in /proc
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index e869f95..e3a370f 100644
+index e869f95033..e3a370f204 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -427,7 +427,7 @@
@@ -65,7 +65,7 @@ index e869f95..e3a370f 100644
systemd.exec5.
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
-index b70c5e9..f6b4b24 100644
+index b70c5e9da7..f6b4b24797 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -548,7 +548,7 @@
diff --git a/0203-man-document-fail-nofail-auto-noauto.patch b/0203-man-document-fail-nofail-auto-noauto.patch
index 55a445d..0eff085 100644
--- a/0203-man-document-fail-nofail-auto-noauto.patch
+++ b/0203-man-document-fail-nofail-auto-noauto.patch
@@ -19,7 +19,7 @@ Conflicts:
6 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml
-index e934352..c653dc5 100644
+index e934352f19..c653dc59d4 100644
--- a/man/systemd-fsck@.service.xml
+++ b/man/systemd-fsck@.service.xml
@@ -62,7 +62,10 @@
@@ -35,7 +35,7 @@ index e934352..c653dc5 100644
systemd-fsck will
forward file system checking progress to the
diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml
-index 9ca16c7..e3cf5d2 100644
+index 9ca16c7ea1..e3cf5d2bfb 100644
--- a/man/systemd-fstab-generator.xml
+++ b/man/systemd-fstab-generator.xml
@@ -61,6 +61,12 @@
@@ -52,7 +52,7 @@ index 9ca16c7..e3cf5d2 100644
systemd.mount5
and
diff --git a/man/systemd-halt.service.xml b/man/systemd-halt.service.xml
-index 99457aa..bec2e36 100644
+index 99457aa721..bec2e36a56 100644
--- a/man/systemd-halt.service.xml
+++ b/man/systemd-halt.service.xml
@@ -86,7 +86,7 @@
@@ -65,7 +65,7 @@ index 99457aa..bec2e36 100644
Immediately before executing the actual system
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
-index 6f9f70c..cadf950 100644
+index 6f9f70c3eb..cadf95008a 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -132,7 +132,10 @@
@@ -103,7 +103,7 @@ index 6f9f70c..cadf950 100644
/etc/fstab and a unit file that
is stored below /usr, the former
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
-index f6b4b24..4704352 100644
+index f6b4b24797..4704352e42 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -232,7 +232,7 @@
@@ -116,7 +116,7 @@ index f6b4b24..4704352 100644
unit template that shares the same name but with the
instance string (i.e. the part between the @ character
diff --git a/man/udevadm.xml b/man/udevadm.xml
-index a1ffe42..ca3713f 100644
+index a1ffe4219c..ca3713f29c 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -461,7 +461,7 @@
diff --git a/0204-man-fix-description-of-is-enabled-returned-value.patch b/0204-man-fix-description-of-is-enabled-returned-value.patch
index 313550d..f784a62 100644
--- a/0204-man-fix-description-of-is-enabled-returned-value.patch
+++ b/0204-man-fix-description-of-is-enabled-returned-value.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] man: fix description of is-enabled returned value
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index 61deb19..25b03d8 100644
+index 61deb194f0..25b03d838e 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -932,7 +932,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
diff --git a/0205-man-fix-Type-reference.patch b/0205-man-fix-Type-reference.patch
index 625beba..4f0fc35 100644
--- a/0205-man-fix-Type-reference.patch
+++ b/0205-man-fix-Type-reference.patch
@@ -9,7 +9,7 @@ Simple man page fix attached.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index e3a370f..898c19d 100644
+index e3a370f204..898c19d881 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -139,7 +139,7 @@
diff --git a/0206-man-fix-Type-reference-v2.patch b/0206-man-fix-Type-reference-v2.patch
index adc5bcc..1b8b75d 100644
--- a/0206-man-fix-Type-reference-v2.patch
+++ b/0206-man-fix-Type-reference-v2.patch
@@ -17,7 +17,7 @@ grawity:
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index 898c19d..71bcfb4 100644
+index 898c19d881..71bcfb401d 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -139,9 +139,11 @@
diff --git a/0207-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0207-hwdb-Update-database-of-Bluetooth-company-identifier.patch
index 8504019..298175c 100644
--- a/0207-hwdb-Update-database-of-Bluetooth-company-identifier.patch
+++ b/0207-hwdb-Update-database-of-Bluetooth-company-identifier.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb/20-bluetooth-vendor-product.hwdb
-index 6f8301f..192b715 100644
+index 6f8301f257..192b715073 100644
--- a/hwdb/20-bluetooth-vendor-product.hwdb
+++ b/hwdb/20-bluetooth-vendor-product.hwdb
@@ -427,7 +427,7 @@ bluetooth:v008B*
diff --git a/0208-man-add-a-note-about-propagating-signals.patch b/0208-man-add-a-note-about-propagating-signals.patch
index 498a739..0beb12b 100644
--- a/0208-man-add-a-note-about-propagating-signals.patch
+++ b/0208-man-add-a-note-about-propagating-signals.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] man: add a note about propagating signals
1 file changed, 25 insertions(+), 14 deletions(-)
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index 71bcfb4..af3e0f2 100644
+index 71bcfb401d..af3e0f2335 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -734,22 +734,33 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}
diff --git a/0209-man-include-autoconf-snippet-in-daemon-7.patch b/0209-man-include-autoconf-snippet-in-daemon-7.patch
index b93ceb4..3ac0c39 100644
--- a/0209-man-include-autoconf-snippet-in-daemon-7.patch
+++ b/0209-man-include-autoconf-snippet-in-daemon-7.patch
@@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=40446
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/man/daemon.xml b/man/daemon.xml
-index 1fe4546..105826a 100644
+index 1fe4546f00..105826ac6b 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -765,12 +765,20 @@
diff --git a/0210-systemd-python-fix-setting-of-exception-codes.patch b/0210-systemd-python-fix-setting-of-exception-codes.patch
index dfef194..4a6242e 100644
--- a/0210-systemd-python-fix-setting-of-exception-codes.patch
+++ b/0210-systemd-python-fix-setting-of-exception-codes.patch
@@ -15,7 +15,7 @@ everywhere.
2 files changed, 35 insertions(+), 42 deletions(-)
diff --git a/src/python-systemd/_daemon.c b/src/python-systemd/_daemon.c
-index f0ab16f..c6db69f 100644
+index f0ab16f659..c6db69fe26 100644
--- a/src/python-systemd/_daemon.c
+++ b/src/python-systemd/_daemon.c
@@ -88,7 +88,7 @@ static PyObject* notify(PyObject *self, PyObject *args, PyObject *keywds) {
@@ -82,7 +82,7 @@ index f0ab16f..c6db69f 100644
return PyBool_FromLong(r);
diff --git a/src/python-systemd/_reader.c b/src/python-systemd/_reader.c
-index bc5db19..0c88926 100644
+index bc5db19049..0c889263a4 100644
--- a/src/python-systemd/_reader.c
+++ b/src/python-systemd/_reader.c
@@ -206,8 +206,7 @@ PyDoc_STRVAR(Reader_reliable_fd__doc__,
diff --git a/0211-systemd-python-fix-listen_fds-under-Python-2.patch b/0211-systemd-python-fix-listen_fds-under-Python-2.patch
index dff4332..ce6aa0c 100644
--- a/0211-systemd-python-fix-listen_fds-under-Python-2.patch
+++ b/0211-systemd-python-fix-listen_fds-under-Python-2.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] systemd-python: fix listen_fds under Python 2
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/python-systemd/_daemon.c b/src/python-systemd/_daemon.c
-index c6db69f..3982e85 100644
+index c6db69fe26..3982e85426 100644
--- a/src/python-systemd/_daemon.c
+++ b/src/python-systemd/_daemon.c
@@ -114,7 +114,7 @@ static PyObject* listen_fds(PyObject *self, PyObject *args, PyObject *keywds) {
diff --git a/0212-man-expand-on-some-more-subtle-points-in-systemd.soc.patch b/0212-man-expand-on-some-more-subtle-points-in-systemd.soc.patch
index d6e9560..424cf12 100644
--- a/0212-man-expand-on-some-more-subtle-points-in-systemd.soc.patch
+++ b/0212-man-expand-on-some-more-subtle-points-in-systemd.soc.patch
@@ -10,7 +10,7 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=727708#1694
1 file changed, 49 insertions(+), 18 deletions(-)
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
-index ac3127d..570a6fb 100644
+index ac3127d7d0..570a6fb1ff 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -85,21 +85,26 @@
diff --git a/0213-tmpfiles-rename-unsafe-to-boot.patch b/0213-tmpfiles-rename-unsafe-to-boot.patch
index 93e5f3b..de7d7ab 100644
--- a/0213-tmpfiles-rename-unsafe-to-boot.patch
+++ b/0213-tmpfiles-rename-unsafe-to-boot.patch
@@ -15,7 +15,7 @@ not what might happen.
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
-index c678031..64f9cf9 100644
+index c678031c4e..64f9cf9b74 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -133,7 +133,7 @@
@@ -28,7 +28,7 @@ index c678031..64f9cf9 100644
with an exclamation mark.
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
-index ed88751..8267ffc 100644
+index ed88751a52..8267ffca4b 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -273,7 +273,7 @@ L /tmp/foobar - - - - /dev/null
@@ -50,7 +50,7 @@ index ed88751..8267ffc 100644
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 30a8a55..4dd1638 100644
+index 30a8a55d61..4dd1638e44 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -106,7 +106,7 @@ static Set *unix_sockets = NULL;
@@ -110,7 +110,7 @@ index 30a8a55..4dd1638 100644
case ARG_PREFIX:
diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in
-index c2dcae0..01043b7 100644
+index c2dcae0e13..01043b7a96 100644
--- a/units/systemd-tmpfiles-setup.service.in
+++ b/units/systemd-tmpfiles-setup.service.in
@@ -24,4 +24,4 @@ RefuseManualStop=yes
diff --git a/0214-sleep-config-Dereference-pointer-before-check-for-NU.patch b/0214-sleep-config-Dereference-pointer-before-check-for-NU.patch
index 06a18a1..846fbfc 100644
--- a/0214-sleep-config-Dereference-pointer-before-check-for-NU.patch
+++ b/0214-sleep-config-Dereference-pointer-before-check-for-NU.patch
@@ -35,7 +35,7 @@ for *modes and *states being both non null.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
-index d76e3ad..b2a0787 100644
+index d76e3ad036..b2a0787844 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -94,7 +94,7 @@ int parse_sleep_config(const char *verb, char ***modes, char ***states) {
diff --git a/0215-sleep-config-fix-double-free.patch b/0215-sleep-config-fix-double-free.patch
index ffcb744..fd44d75 100644
--- a/0215-sleep-config-fix-double-free.patch
+++ b/0215-sleep-config-fix-double-free.patch
@@ -16,7 +16,7 @@ strv_split_nulstr with strv_new, since we know the strings anyway.
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
-index b2a0787..70a0896 100644
+index b2a0787844..70a0896069 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -28,11 +28,14 @@
diff --git a/0216-rules-drivers-do-not-reset-RUN-list.patch b/0216-rules-drivers-do-not-reset-RUN-list.patch
index 785d0d4..82408f3 100644
--- a/0216-rules-drivers-do-not-reset-RUN-list.patch
+++ b/0216-rules-drivers-do-not-reset-RUN-list.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] rules: drivers - do not reset RUN list
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/rules/80-drivers.rules b/rules/80-drivers.rules
-index 0b22d73..8551f47 100644
+index 0b22d73ce5..8551f47a4b 100644
--- a/rules/80-drivers.rules
+++ b/rules/80-drivers.rules
@@ -2,12 +2,12 @@
diff --git a/0217-core-manager-print-info-about-interesting-signals.patch b/0217-core-manager-print-info-about-interesting-signals.patch
index 1cd116e..1059340 100644
--- a/0217-core-manager-print-info-about-interesting-signals.patch
+++ b/0217-core-manager-print-info-about-interesting-signals.patch
@@ -13,7 +13,7 @@ happening in the system.
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index a34a3c6..69ad4b5 100644
+index a34a3c6387..69ad4b5010 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1435,16 +1435,22 @@ static int manager_process_signal_fd(Manager *m) {
diff --git a/0218-core-service-check-if-mainpid-matches-only-if-it-is-.patch b/0218-core-service-check-if-mainpid-matches-only-if-it-is-.patch
index 6ccd76e..08aeebf 100644
--- a/0218-core-service-check-if-mainpid-matches-only-if-it-is-.patch
+++ b/0218-core-service-check-if-mainpid-matches-only-if-it-is-.patch
@@ -13,7 +13,7 @@ Conflicts:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/service.c b/src/core/service.c
-index 62ae8f0..f0acda1 100644
+index 62ae8f0119..f0acda102b 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -3400,7 +3400,7 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) {
diff --git a/0219-man-typo-fix.patch b/0219-man-typo-fix.patch
index dd45ce3..37d4236 100644
--- a/0219-man-typo-fix.patch
+++ b/0219-man-typo-fix.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] man: typo fix
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/systemd.time.xml b/man/systemd.time.xml
-index f438fa5..a837f23 100644
+index f438fa5bb9..a837f232c3 100644
--- a/man/systemd.time.xml
+++ b/man/systemd.time.xml
@@ -222,7 +222,7 @@
diff --git a/0220-swap-remove-if-else-with-the-same-data-path.patch b/0220-swap-remove-if-else-with-the-same-data-path.patch
index ac2d33c..0732fad 100644
--- a/0220-swap-remove-if-else-with-the-same-data-path.patch
+++ b/0220-swap-remove-if-else-with-the-same-data-path.patch
@@ -14,7 +14,7 @@ This just removes unneeded lines of code, no functional change.
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/core/swap.c b/src/core/swap.c
-index f295b65..727bb95 100644
+index f295b6543b..727bb95e7c 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -959,10 +959,7 @@ static void swap_sigchld_event(Unit *u, pid_t pid, int code, int status) {
diff --git a/0221-hwdb-update.patch b/0221-hwdb-update.patch
index 47390e9..9d40321 100644
--- a/0221-hwdb-update.patch
+++ b/0221-hwdb-update.patch
@@ -14,7 +14,7 @@ Conflicts:
3 files changed, 241 insertions(+), 16 deletions(-)
diff --git a/hwdb/20-OUI.hwdb b/hwdb/20-OUI.hwdb
-index 92b96ae..a51a00a 100644
+index 92b96ae45a..a51a00aa1e 100644
--- a/hwdb/20-OUI.hwdb
+++ b/hwdb/20-OUI.hwdb
@@ -13627,6 +13627,12 @@ OUI:40D8551E2*
@@ -339,7 +339,7 @@ index 92b96ae..a51a00a 100644
ID_OUI_FROM_DATABASE=Belkin International Inc.
diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb/20-pci-vendor-model.hwdb
-index 6142dc8..7f833e3 100644
+index 6142dc86ac..7f833e3345 100644
--- a/hwdb/20-pci-vendor-model.hwdb
+++ b/hwdb/20-pci-vendor-model.hwdb
@@ -4166,6 +4166,9 @@ pci:v00001002d00006600*
@@ -753,7 +753,7 @@ index 6142dc8..7f833e3 100644
ID_MODEL_FROM_DATABASE=B85 Express LPC Controller
diff --git a/hwdb/20-usb-vendor-model.hwdb b/hwdb/20-usb-vendor-model.hwdb
-index 6663820..60dbcd2 100644
+index 66638203ef..60dbcd24bf 100644
--- a/hwdb/20-usb-vendor-model.hwdb
+++ b/hwdb/20-usb-vendor-model.hwdb
@@ -46055,6 +46055,12 @@ usb:v1B5A*
diff --git a/0222-journal-Add-missing-byte-order-conversions.patch b/0222-journal-Add-missing-byte-order-conversions.patch
index 5d5c222..ce7f64e 100644
--- a/0222-journal-Add-missing-byte-order-conversions.patch
+++ b/0222-journal-Add-missing-byte-order-conversions.patch
@@ -16,7 +16,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=73194
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 5ef6a2a..ba65464 100644
+index 5ef6a2a735..ba654649b6 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1452,7 +1452,7 @@ static int generic_array_get(
@@ -38,7 +38,7 @@ index 5ef6a2a..ba65464 100644
if (subtract_one && i == 0)
p = last_p;
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
-index 3405811..82b0f0a 100644
+index 3405811534..82b0f0a98b 100644
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -249,12 +249,12 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o
diff --git a/0223-hwdb-change-key-mappings-for-Samsung-90X3A.patch b/0223-hwdb-change-key-mappings-for-Samsung-90X3A.patch
index 85943fa..785f559 100644
--- a/0223-hwdb-change-key-mappings-for-Samsung-90X3A.patch
+++ b/0223-hwdb-change-key-mappings-for-Samsung-90X3A.patch
@@ -13,7 +13,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=70296
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index ab9e569..644cb94 100644
+index ab9e569d1d..644cb94ed3 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -886,7 +886,6 @@ keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*940X3G*:pvr*
diff --git a/0224-hwdb-add-Samsung-700G.patch b/0224-hwdb-add-Samsung-700G.patch
index 90b115c..47d106f 100644
--- a/0224-hwdb-add-Samsung-700G.patch
+++ b/0224-hwdb-add-Samsung-700G.patch
@@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=72311
1 file changed, 1 insertion(+)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index 644cb94..ccfc734 100644
+index 644cb94ed3..ccfc734057 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -875,6 +875,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*550P*:pvr*
diff --git a/0225-hwdb-remove-duplicate-entry-for-Samsung-700Z.patch b/0225-hwdb-remove-duplicate-entry-for-Samsung-700Z.patch
index 9d4060e..5552aea 100644
--- a/0225-hwdb-remove-duplicate-entry-for-Samsung-700Z.patch
+++ b/0225-hwdb-remove-duplicate-entry-for-Samsung-700Z.patch
@@ -12,7 +12,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=72311
1 file changed, 5 deletions(-)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index ccfc734..cf3d1fb 100644
+index ccfc734057..cf3d1fbf55 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -918,11 +918,6 @@ keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*SX20S*:pvr*
diff --git a/0226-hwdb-fix-match-for-Thinkpad-X201-tablet.patch b/0226-hwdb-fix-match-for-Thinkpad-X201-tablet.patch
index 5cb5912..c114112 100644
--- a/0226-hwdb-fix-match-for-Thinkpad-X201-tablet.patch
+++ b/0226-hwdb-fix-match-for-Thinkpad-X201-tablet.patch
@@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=71929
1 file changed, 1 insertion(+)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index cf3d1fb..d253724 100644
+index cf3d1fbf55..d253724015 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -524,6 +524,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pnS10-*:pvr*
diff --git a/0227-keymap-Recognize-different-Toshiba-Satellite-capital.patch b/0227-keymap-Recognize-different-Toshiba-Satellite-capital.patch
index 44914b2..20e32aa 100644
--- a/0227-keymap-Recognize-different-Toshiba-Satellite-capital.patch
+++ b/0227-keymap-Recognize-different-Toshiba-Satellite-capital.patch
@@ -10,7 +10,7 @@ https://launchpad.net/bugs/665918
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index d253724..84a061f 100644
+index d253724015..84a061f561 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -1056,9 +1056,9 @@ keyboard:dmi:bvn*:bvr*:bd*:svnFOXCONN:pnQBOOK:*
diff --git a/0228-sleep.c-fix-typo.patch b/0228-sleep.c-fix-typo.patch
index 38ab255..7883b6d 100644
--- a/0228-sleep.c-fix-typo.patch
+++ b/0228-sleep.c-fix-typo.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] sleep.c: fix typo
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
-index f96987f..c228cb6 100644
+index f96987f4dc..c228cb660f 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -90,7 +90,7 @@ static int execute(char **modes, char **states) {
diff --git a/0229-delta-ensure-that-d_type-will-be-set-on-every-fs.patch b/0229-delta-ensure-that-d_type-will-be-set-on-every-fs.patch
index 49baf94..72189f4 100644
--- a/0229-delta-ensure-that-d_type-will-be-set-on-every-fs.patch
+++ b/0229-delta-ensure-that-d_type-will-be-set-on-every-fs.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] delta: ensure that d_type will be set on every fs
1 file changed, 2 insertions(+)
diff --git a/src/delta/delta.c b/src/delta/delta.c
-index ae658f9..a8dd57e 100644
+index ae658f9c01..a8dd57e4cb 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -316,6 +316,8 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
diff --git a/0230-tmpfiles-don-t-allow-label_fix-to-print-ENOENT-when-.patch b/0230-tmpfiles-don-t-allow-label_fix-to-print-ENOENT-when-.patch
index d4ba7a5..4b95ab5 100644
--- a/0230-tmpfiles-don-t-allow-label_fix-to-print-ENOENT-when-.patch
+++ b/0230-tmpfiles-don-t-allow-label_fix-to-print-ENOENT-when-.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] tmpfiles: don't allow label_fix to print ENOENT when we want
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 4dd1638..5e49cc8 100644
+index 4dd1638e44..5e49cc8ec4 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -435,8 +435,6 @@ finish:
diff --git a/0231-man-mention-which-variables-will-be-expanded-in-Exec.patch b/0231-man-mention-which-variables-will-be-expanded-in-Exec.patch
index 758f84e..74f5deb 100644
--- a/0231-man-mention-which-variables-will-be-expanded-in-Exec.patch
+++ b/0231-man-mention-which-variables-will-be-expanded-in-Exec.patch
@@ -13,7 +13,7 @@ Conflicts:
2 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index e213ec4..c8414d4 100644
+index e213ec4f3c..c8414d4287 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -295,9 +295,11 @@
@@ -31,7 +31,7 @@ index e213ec4..c8414d4 100644
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index af3e0f2..4fb21ba 100644
+index af3e0f2335..4fb21ba799 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -392,16 +392,32 @@
diff --git a/0232-hwdb-Add-support-for-Toshiba-Satellite-P75-A7200-key.patch b/0232-hwdb-Add-support-for-Toshiba-Satellite-P75-A7200-key.patch
index 040e828..8f11cf9 100644
--- a/0232-hwdb-Add-support-for-Toshiba-Satellite-P75-A7200-key.patch
+++ b/0232-hwdb-Add-support-for-Toshiba-Satellite-P75-A7200-key.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] hwdb: Add support for Toshiba Satellite P75-A7200 keyboard
1 file changed, 8 insertions(+)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index 84a061f..e3d1f02 100644
+index 84a061f561..e3d1f02c9d 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -1012,6 +1012,14 @@ keyboard:name:Toshiba*input*device:dmi:bvn*:bvr*:bd*:svnTOSHIBA*:pnSATELLITEU940
diff --git a/0233-journal-fix-access-to-munmapped-memory-in-sd_journal.patch b/0233-journal-fix-access-to-munmapped-memory-in-sd_journal.patch
index e38c106..e745c05 100644
--- a/0233-journal-fix-access-to-munmapped-memory-in-sd_journal.patch
+++ b/0233-journal-fix-access-to-munmapped-memory-in-sd_journal.patch
@@ -27,7 +27,7 @@ is increased in sd_j_e_u and later on released.
6 files changed, 103 insertions(+), 23 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index ba65464..4d9787a 100644
+index ba654649b6..4d9787a1e1 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -419,7 +419,6 @@ int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset, Objec
@@ -51,7 +51,7 @@ index ba65464..4d9787a 100644
return r;
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
-index 50bdb67..0bd23f7 100644
+index 50bdb67b4c..0bd23f7002 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -128,6 +128,10 @@ int journal_file_open_reliably(
@@ -90,7 +90,7 @@ index 50bdb67..0bd23f7 100644
+ offset, o->object.size);
+}
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
-index 82b0f0a..f2422ff 100644
+index 82b0f0a98b..f2422ff841 100644
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -34,10 +34,6 @@
@@ -105,7 +105,7 @@ index 82b0f0a..f2422ff 100644
uint64_t i;
diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c
-index 42a8a7d..24b2bb8 100644
+index 42a8a7df6f..24b2bb8f4c 100644
--- a/src/journal/mmap-cache.c
+++ b/src/journal/mmap-cache.c
@@ -38,7 +38,7 @@ typedef struct FileDescriptor FileDescriptor;
@@ -238,7 +238,7 @@ index 42a8a7d..24b2bb8 100644
FileDescriptor *f;
diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h
-index 912336d..647555a 100644
+index 912336d7c2..647555a73e 100644
--- a/src/journal/mmap-cache.h
+++ b/src/journal/mmap-cache.h
@@ -31,7 +31,23 @@ MMapCache* mmap_cache_new(void);
@@ -267,7 +267,7 @@ index 912336d..647555a 100644
void mmap_cache_close_context(MMapCache *m, unsigned context);
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index 52abbe9..46c3feb 100644
+index 52abbe9670..46c3feb45d 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -2508,9 +2508,7 @@ _public_ int sd_journal_query_unique(sd_journal *j, const char *field) {
diff --git a/0234-gpt-auto-generator-skip-nonexistent-devices.patch b/0234-gpt-auto-generator-skip-nonexistent-devices.patch
index 16c93e3..1035597 100644
--- a/0234-gpt-auto-generator-skip-nonexistent-devices.patch
+++ b/0234-gpt-auto-generator-skip-nonexistent-devices.patch
@@ -19,7 +19,7 @@ function return -ENODEV.
1 file changed, 3 insertions(+)
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
-index 25440e7..0e8e959 100644
+index 25440e771e..0e8e959f6f 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -298,6 +298,9 @@ static int enumerate_partitions(struct udev *udev, dev_t dev) {
diff --git a/0235-gpt-auto-generator-use-EBADSLT-code-when-unable-to-d.patch b/0235-gpt-auto-generator-use-EBADSLT-code-when-unable-to-d.patch
index 0f3eed6..3e13230 100644
--- a/0235-gpt-auto-generator-use-EBADSLT-code-when-unable-to-d.patch
+++ b/0235-gpt-auto-generator-use-EBADSLT-code-when-unable-to-d.patch
@@ -13,7 +13,7 @@ here.
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
-index 0e8e959..d7c09f0 100644
+index 0e8e959f6f..d7c09f01f5 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -74,10 +74,8 @@ static int verify_gpt_partition(const char *node, sd_id128_t *type, unsigned *nr
diff --git a/0236-journald-do-not-free-space-when-disk-space-runs-low.patch b/0236-journald-do-not-free-space-when-disk-space-runs-low.patch
index 80040c4..73d5e77 100644
--- a/0236-journald-do-not-free-space-when-disk-space-runs-low.patch
+++ b/0236-journald-do-not-free-space-when-disk-space-runs-low.patch
@@ -39,7 +39,7 @@ reasonable compromise between implementation complexity and robustness.
8 files changed, 58 insertions(+), 27 deletions(-)
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
-index b362c5d..e0796e1 100644
+index b362c5de2c..e0796e1cce 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -250,20 +250,35 @@
@@ -91,7 +91,7 @@ index b362c5d..e0796e1 100644
RuntimeMaxFileSize=
control how large individual journal
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
-index 0bd23f7..2e06b57 100644
+index 0bd23f7002..2e06b57dc7 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -37,6 +37,7 @@
@@ -103,7 +103,7 @@ index 0bd23f7..2e06b57 100644
uint64_t min_size;
uint64_t keep_free;
diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c
-index d4a1c6c..8b07f65 100644
+index d4a1c6c933..8b07f659da 100644
--- a/src/journal/journal-vacuum.c
+++ b/src/journal/journal-vacuum.c
@@ -150,7 +150,6 @@ static int journal_file_empty(int dir_fd, const char *name) {
@@ -134,7 +134,7 @@ index d4a1c6c..8b07f65 100644
if (unlinkat(dirfd(d), list[i].filename, 0) >= 0) {
diff --git a/src/journal/journal-vacuum.h b/src/journal/journal-vacuum.h
-index f5e3e52..bc30c3a 100644
+index f5e3e5291f..bc30c3a140 100644
--- a/src/journal/journal-vacuum.h
+++ b/src/journal/journal-vacuum.h
@@ -23,4 +23,4 @@
@@ -144,7 +144,7 @@ index f5e3e52..bc30c3a 100644
-int journal_directory_vacuum(const char *directory, uint64_t max_use, uint64_t min_free, usec_t max_retention_usec, usec_t *oldest_usec);
+int journal_directory_vacuum(const char *directory, uint64_t max_use, usec_t max_retention_usec, usec_t *oldest_usec);
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 1fcb3d5..cd2cfe9 100644
+index 1fcb3d5783..cd2cfe9bb4 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -158,9 +158,18 @@ static uint64_t available_space(Server *s, bool verbose) {
@@ -204,7 +204,7 @@ index 1fcb3d5..cd2cfe9 100644
log_error("Failed to vacuum %s: %s", p, strerror(-r));
}
diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c
-index 1a058ea..974fa3b 100644
+index 1a058eaedd..974fa3b21d 100644
--- a/src/journal/test-journal-interleaving.c
+++ b/src/journal/test-journal-interleaving.c
@@ -194,7 +194,7 @@ static void test_skip(void (*setup)(void))
@@ -226,7 +226,7 @@ index 1a058ea..974fa3b 100644
assert_se(rm_rf_dangerous(t, false, true, false) >= 0);
}
diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c
-index 190c426..3b8778d 100644
+index 190c426eba..3b8778d496 100644
--- a/src/journal/test-journal.c
+++ b/src/journal/test-journal.c
@@ -126,7 +126,7 @@ static void test_non_empty(void) {
@@ -248,7 +248,7 @@ index 190c426..3b8778d 100644
assert_se(rm_rf_dangerous(t, false, true, false) >= 0);
}
diff --git a/src/shared/macro.h b/src/shared/macro.h
-index d4f92b6..bc5b3c1 100644
+index d4f92b60ec..bc5b3c1de8 100644
--- a/src/shared/macro.h
+++ b/src/shared/macro.h
@@ -114,6 +114,13 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
diff --git a/0237-man-add-busctl-1.patch b/0237-man-add-busctl-1.patch
index 6781612..42f00f2 100644
--- a/0237-man-add-busctl-1.patch
+++ b/0237-man-add-busctl-1.patch
@@ -16,7 +16,7 @@ Conflicts:
create mode 100644 man/busctl.xml
diff --git a/Makefile-man.am b/Makefile-man.am
-index 3f626e8..9c3cb35 100644
+index 3f626e8b6d..9c3cb35d91 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -3,6 +3,7 @@
@@ -29,7 +29,7 @@ index 3f626e8..9c3cb35 100644
man/hostname.5 \
diff --git a/man/busctl.xml b/man/busctl.xml
new file mode 100644
-index 0000000..0c5f05a
+index 0000000000..0c5f05af87
--- /dev/null
+++ b/man/busctl.xml
@@ -0,0 +1,206 @@
diff --git a/0238-journalctl-flip-to-full-by-default.patch b/0238-journalctl-flip-to-full-by-default.patch
index 1bd8b4b..e61499c 100644
--- a/0238-journalctl-flip-to-full-by-default.patch
+++ b/0238-journalctl-flip-to-full-by-default.patch
@@ -21,7 +21,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=984758
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/man/journalctl.xml b/man/journalctl.xml
-index d75c758..d1e841a 100644
+index d75c758db5..d1e841a5a5 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -152,11 +152,20 @@
@@ -49,7 +49,7 @@ index d75c758..d1e841a 100644
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index ccd96b2..1b5bdd3 100644
+index ccd96b221a..1b5bdd3f43 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -64,7 +64,7 @@
diff --git a/0239-coredumpctl-in-case-of-error-free-pattern-after-prin.patch b/0239-coredumpctl-in-case-of-error-free-pattern-after-prin.patch
index 76af1ac..eb685bc 100644
--- a/0239-coredumpctl-in-case-of-error-free-pattern-after-prin.patch
+++ b/0239-coredumpctl-in-case-of-error-free-pattern-after-prin.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] coredumpctl: in case of error free pattern after print
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c
-index 560a91b..a5997e2 100644
+index 560a91b620..a5997e2359 100644
--- a/src/journal/coredumpctl.c
+++ b/src/journal/coredumpctl.c
@@ -126,10 +126,11 @@ static int add_match(Set *set, const char *match) {
diff --git a/0240-shell-completion-remove-load-from-systemctl.patch b/0240-shell-completion-remove-load-from-systemctl.patch
index e1eb456..2d02e9c 100644
--- a/0240-shell-completion-remove-load-from-systemctl.patch
+++ b/0240-shell-completion-remove-load-from-systemctl.patch
@@ -13,7 +13,7 @@ Conflicts:
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/shell-completion/bash/systemctl b/shell-completion/bash/systemctl
-index eea4b6d..84149e3 100644
+index eea4b6dbf9..84149e3958 100644
--- a/shell-completion/bash/systemctl
+++ b/shell-completion/bash/systemctl
@@ -141,7 +141,7 @@ _systemctl () {
@@ -26,7 +26,7 @@ index eea4b6d..84149e3 100644
[TARGETS]='set-default'
)
diff --git a/shell-completion/zsh/_systemctl b/shell-completion/zsh/_systemctl
-index 3959cd5..6d98cb6 100644
+index 3959cd551c..6d98cb68d8 100644
--- a/shell-completion/zsh/_systemctl
+++ b/shell-completion/zsh/_systemctl
@@ -24,7 +24,6 @@
diff --git a/0241-units-drop-Install-section-from-multi-user.target-an.patch b/0241-units-drop-Install-section-from-multi-user.target-an.patch
index 9d5a3eb..c034d90 100644
--- a/0241-units-drop-Install-section-from-multi-user.target-an.patch
+++ b/0241-units-drop-Install-section-from-multi-user.target-an.patch
@@ -17,7 +17,7 @@ it makes the units appear as "disabled"), let's drop the sections.
2 files changed, 6 deletions(-)
diff --git a/units/graphical.target b/units/graphical.target
-index 65f2521..a2c4532 100644
+index 65f2521d9e..a2c4532e4c 100644
--- a/units/graphical.target
+++ b/units/graphical.target
@@ -13,6 +13,3 @@ After=multi-user.target
@@ -28,7 +28,7 @@ index 65f2521..a2c4532 100644
-[Install]
-Alias=default.target
diff --git a/units/multi-user.target b/units/multi-user.target
-index 998e046..0f0e5e9 100644
+index 998e04603e..0f0e5e99a7 100644
--- a/units/multi-user.target
+++ b/units/multi-user.target
@@ -12,6 +12,3 @@ Requires=basic.target
diff --git a/0242-systemctl-skip-native-unit-file-handling-if-sysv-fil.patch b/0242-systemctl-skip-native-unit-file-handling-if-sysv-fil.patch
index bd9a42e..dffaf00 100644
--- a/0242-systemctl-skip-native-unit-file-handling-if-sysv-fil.patch
+++ b/0242-systemctl-skip-native-unit-file-handling-if-sysv-fil.patch
@@ -12,7 +12,7 @@ Issue pointed out by Colin Guthrie.
1 file changed, 5 insertions(+)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index bc9808a..da49da7 100644
+index bc9808aacd..da49da7c32 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4436,6 +4436,11 @@ static int enable_unit(DBusConnection *bus, char **args) {
diff --git a/0243-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0243-hwdb-Update-database-of-Bluetooth-company-identifier.patch
index 738e4c8..6ee55ae 100644
--- a/0243-hwdb-Update-database-of-Bluetooth-company-identifier.patch
+++ b/0243-hwdb-Update-database-of-Bluetooth-company-identifier.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
1 file changed, 18 insertions(+)
diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb/20-bluetooth-vendor-product.hwdb
-index 192b715..6a9dc50 100644
+index 192b715073..6a9dc50e39 100644
--- a/hwdb/20-bluetooth-vendor-product.hwdb
+++ b/hwdb/20-bluetooth-vendor-product.hwdb
@@ -851,3 +851,21 @@ bluetooth:v0119*
diff --git a/0244-udev-static_node-do-not-exit-rule-after-first-static.patch b/0244-udev-static_node-do-not-exit-rule-after-first-static.patch
index a7a4fe0..1acbcc3 100644
--- a/0244-udev-static_node-do-not-exit-rule-after-first-static.patch
+++ b/0244-udev-static_node-do-not-exit-rule-after-first-static.patch
@@ -13,7 +13,7 @@ skipping the entire rule.
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
-index 6f8b127..c981773 100644
+index 6f8b127872..c9817733d8 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -900,6 +900,7 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
diff --git a/0245-cryptsetup-Support-key-slot-option.patch b/0245-cryptsetup-Support-key-slot-option.patch
index b2c79cc..f3e820e 100644
--- a/0245-cryptsetup-Support-key-slot-option.patch
+++ b/0245-cryptsetup-Support-key-slot-option.patch
@@ -22,7 +22,7 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704470
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/man/crypttab.xml b/man/crypttab.xml
-index 90d8ce9..5f386e5 100644
+index 90d8ce95fe..5f386e55f8 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -164,6 +164,20 @@
@@ -47,7 +47,7 @@ index 90d8ce9..5f386e5 100644
Force LUKS mode. When this mode
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
-index 39f7db7..6a76d21 100644
+index 39f7db7e3f..6a76d21c2c 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -39,6 +39,7 @@
diff --git a/0246-pam_systemd-Ignore-vtnr-when-seat-seat0.patch b/0246-pam_systemd-Ignore-vtnr-when-seat-seat0.patch
index a18c71f..bc6a537 100644
--- a/0246-pam_systemd-Ignore-vtnr-when-seat-seat0.patch
+++ b/0246-pam_systemd-Ignore-vtnr-when-seat-seat0.patch
@@ -12,7 +12,7 @@ non-zero vtnr for CreateSession
1 file changed, 6 insertions(+)
diff --git a/src/login/pam-module.c b/src/login/pam-module.c
-index 973daf7..7ebb5d2 100644
+index 973daf703e..7ebb5d27a5 100644
--- a/src/login/pam-module.c
+++ b/src/login/pam-module.c
@@ -335,6 +335,12 @@ _public_ PAM_EXTERN int pam_sm_open_session(
diff --git a/0247-keymap-Add-HP-Chromebook-14-Falco.patch b/0247-keymap-Add-HP-Chromebook-14-Falco.patch
index d7d9cf0..1fd9928 100644
--- a/0247-keymap-Add-HP-Chromebook-14-Falco.patch
+++ b/0247-keymap-Add-HP-Chromebook-14-Falco.patch
@@ -11,7 +11,7 @@ Thanks to Stefan Nagy .
1 file changed, 16 insertions(+)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index e3d1f02..c027cbe 100644
+index e3d1f02c9d..c027cbe203 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -417,6 +417,22 @@ keyboard:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHDX9494NR:pvr*
diff --git a/0248-keymap-Add-release-quirk-for-Acer-AOA-switchvideomod.patch b/0248-keymap-Add-release-quirk-for-Acer-AOA-switchvideomod.patch
index e688d54..baab518 100644
--- a/0248-keymap-Add-release-quirk-for-Acer-AOA-switchvideomod.patch
+++ b/0248-keymap-Add-release-quirk-for-Acer-AOA-switchvideomod.patch
@@ -10,7 +10,7 @@ https://launchpad.net/bugs/1272658
1 file changed, 3 insertions(+)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index c027cbe..52d9a2a 100644
+index c027cbe203..52d9a2a04c 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -118,6 +118,9 @@ keyboard:dmi:bvn*:bvr*:bd*:svnAcer*:pnTravelMate*6593:*
diff --git a/0249-keymap-Add-Sony-Vaio-VGN-FW250.patch b/0249-keymap-Add-Sony-Vaio-VGN-FW250.patch
index 749efc8..935427f 100644
--- a/0249-keymap-Add-Sony-Vaio-VGN-FW250.patch
+++ b/0249-keymap-Add-Sony-Vaio-VGN-FW250.patch
@@ -10,7 +10,7 @@ https://launchpad.net/bugs/1271163
1 file changed, 3 insertions(+)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index 52d9a2a..ea206bb 100644
+index 52d9a2a04c..ea206bba2e 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -981,6 +981,9 @@ keyboard:name:Sony Vaio Keys:dmi:bvn*:bvr*:bd*:svnSony*:pnVGN-Z21*:pvr*
diff --git a/0250-keymap-Add-Toshiba-EQUIUM.patch b/0250-keymap-Add-Toshiba-EQUIUM.patch
index c04e5f7..8f9cd09 100644
--- a/0250-keymap-Add-Toshiba-EQUIUM.patch
+++ b/0250-keymap-Add-Toshiba-EQUIUM.patch
@@ -11,7 +11,7 @@ Thanks Aleksander Kowalski !
1 file changed, 1 insertion(+)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index ea206bb..f9084e4 100644
+index ea206bba2e..f9084e4aa9 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -1089,6 +1089,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnPEGATRON*CORP.:pnSpring*Peak:*
diff --git a/0251-tmpfiles-fix-memory-leak-of-exclude_prefixes.patch b/0251-tmpfiles-fix-memory-leak-of-exclude_prefixes.patch
index c0e47df..a2ee815 100644
--- a/0251-tmpfiles-fix-memory-leak-of-exclude_prefixes.patch
+++ b/0251-tmpfiles-fix-memory-leak-of-exclude_prefixes.patch
@@ -11,7 +11,7 @@ Missed in 5c795114.
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 5e49cc8..fb88acd 100644
+index 5e49cc8ec4..fb88acd7b9 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1332,12 +1332,12 @@ static int parse_argv(int argc, char *argv[]) {
diff --git a/0252-analyze-fix-plot-issues-when-using-gummiboot.patch b/0252-analyze-fix-plot-issues-when-using-gummiboot.patch
index 5f6b8d8..0cb29a6 100644
--- a/0252-analyze-fix-plot-issues-when-using-gummiboot.patch
+++ b/0252-analyze-fix-plot-issues-when-using-gummiboot.patch
@@ -11,7 +11,7 @@ It would crash and the legend in the bottom followed the time 0.0.
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/analyze/systemd-analyze.c b/src/analyze/systemd-analyze.c
-index f4c7f68..317baf9 100644
+index f4c7f68fcd..317baf9c05 100644
--- a/src/analyze/systemd-analyze.c
+++ b/src/analyze/systemd-analyze.c
@@ -540,7 +540,7 @@ static int analyze_plot(DBusConnection *bus) {
diff --git a/0253-udev-add-zram-to-the-list-of-devices-inappropriate-f.patch b/0253-udev-add-zram-to-the-list-of-devices-inappropriate-f.patch
index 2634606..c75e79d 100644
--- a/0253-udev-add-zram-to-the-list-of-devices-inappropriate-f.patch
+++ b/0253-udev-add-zram-to-the-list-of-devices-inappropriate-f.patch
@@ -14,7 +14,7 @@ on arm devices one out of every 7 times or something.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
-index a4d009a..154ffd9 100644
+index a4d009ae6e..154ffd92ce 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -14,7 +14,7 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_
diff --git a/0254-bash-completion-fix-completion-of-complete-verbs.patch b/0254-bash-completion-fix-completion-of-complete-verbs.patch
index 6fff04d..78e3ec8 100644
--- a/0254-bash-completion-fix-completion-of-complete-verbs.patch
+++ b/0254-bash-completion-fix-completion-of-complete-verbs.patch
@@ -25,7 +25,7 @@ Conflicts:
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/shell-completion/bash/hostnamectl b/shell-completion/bash/hostnamectl
-index 38ab134..9c75da9 100644
+index 38ab1344f3..9c75da9e7f 100644
--- a/shell-completion/bash/hostnamectl
+++ b/shell-completion/bash/hostnamectl
@@ -41,7 +41,7 @@ _hostnamectl() {
@@ -38,7 +38,7 @@ index 38ab134..9c75da9 100644
verb=${COMP_WORDS[i]}
break
diff --git a/shell-completion/bash/localectl b/shell-completion/bash/localectl
-index bec9e78..84e2a6b 100644
+index bec9e78c64..84e2a6b09e 100644
--- a/shell-completion/bash/localectl
+++ b/shell-completion/bash/localectl
@@ -52,7 +52,7 @@ _localectl() {
@@ -51,7 +51,7 @@ index bec9e78..84e2a6b 100644
verb=${COMP_WORDS[i]}
break
diff --git a/shell-completion/bash/loginctl b/shell-completion/bash/loginctl
-index 3104b30..26a8696 100644
+index 3104b305fa..26a86965a6 100644
--- a/shell-completion/bash/loginctl
+++ b/shell-completion/bash/loginctl
@@ -70,7 +70,7 @@ _loginctl () {
@@ -64,7 +64,7 @@ index 3104b30..26a8696 100644
! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
verb=${COMP_WORDS[i]}
diff --git a/shell-completion/bash/systemctl b/shell-completion/bash/systemctl
-index 84149e3..a5f10b4 100644
+index 84149e3958..a5f10b4f13 100644
--- a/shell-completion/bash/systemctl
+++ b/shell-completion/bash/systemctl
@@ -146,7 +146,7 @@ _systemctl () {
@@ -77,7 +77,7 @@ index 84149e3..a5f10b4 100644
! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
verb=${COMP_WORDS[i]}
diff --git a/shell-completion/bash/systemd-analyze b/shell-completion/bash/systemd-analyze
-index b65466b..6afcd96 100644
+index b65466ba47..6afcd963c3 100644
--- a/shell-completion/bash/systemd-analyze
+++ b/shell-completion/bash/systemd-analyze
@@ -39,7 +39,7 @@ _systemd_analyze() {
@@ -90,7 +90,7 @@ index b65466b..6afcd96 100644
! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then
verb=${COMP_WORDS[i]}
diff --git a/shell-completion/bash/timedatectl b/shell-completion/bash/timedatectl
-index c6a6545..1a0acc6 100644
+index c6a6545257..1a0acc6c7c 100644
--- a/shell-completion/bash/timedatectl
+++ b/shell-completion/bash/timedatectl
@@ -52,7 +52,7 @@ _timedatectl() {
@@ -103,7 +103,7 @@ index c6a6545..1a0acc6 100644
verb=${COMP_WORDS[i]}
break
diff --git a/shell-completion/bash/udevadm b/shell-completion/bash/udevadm
-index 8ad8550..7e89189 100644
+index 8ad855060c..7e89189dca 100644
--- a/shell-completion/bash/udevadm
+++ b/shell-completion/bash/udevadm
@@ -36,7 +36,7 @@ _udevadm() {
diff --git a/0255-shell-completion-fix-completion-of-localectl-set-loc.patch b/0255-shell-completion-fix-completion-of-localectl-set-loc.patch
index 339f5c9..6cbc307 100644
--- a/0255-shell-completion-fix-completion-of-localectl-set-loc.patch
+++ b/0255-shell-completion-fix-completion-of-localectl-set-loc.patch
@@ -11,7 +11,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=74157
2 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/shell-completion/bash/localectl b/shell-completion/bash/localectl
-index 84e2a6b..c9e22af 100644
+index 84e2a6b09e..c9e22af2aa 100644
--- a/shell-completion/bash/localectl
+++ b/shell-completion/bash/localectl
@@ -24,8 +24,14 @@ __contains_word () {
@@ -50,7 +50,7 @@ index 84e2a6b..c9e22af 100644
comps=$(command localectl list-keymaps)
elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[X11]}; then
diff --git a/shell-completion/zsh/_localectl b/shell-completion/zsh/_localectl
-index 3d76bb0..c04f4f3 100644
+index 3d76bb0c4d..c04f4f3109 100644
--- a/shell-completion/zsh/_localectl
+++ b/shell-completion/zsh/_localectl
@@ -1,17 +1,22 @@
diff --git a/0256-zsh-completions-kernel-install-only-show-existing-ke.patch b/0256-zsh-completions-kernel-install-only-show-existing-ke.patch
index c74715f..d328922 100644
--- a/0256-zsh-completions-kernel-install-only-show-existing-ke.patch
+++ b/0256-zsh-completions-kernel-install-only-show-existing-ke.patch
@@ -12,7 +12,7 @@ When we remove a kernel, we don't remove the modules, so don't look at the modul
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shell-completion/zsh/_kernel-install b/shell-completion/zsh/_kernel-install
-index 0655188..4fdd3a4 100644
+index 065518834c..4fdd3a4ae7 100644
--- a/shell-completion/zsh/_kernel-install
+++ b/shell-completion/zsh/_kernel-install
@@ -12,7 +12,7 @@ _kernels(){
diff --git a/0257-core-fix-crashes-if-locale.conf-contains-invalid-utf.patch b/0257-core-fix-crashes-if-locale.conf-contains-invalid-utf.patch
index 8226142..9ba1e14 100644
--- a/0257-core-fix-crashes-if-locale.conf-contains-invalid-utf.patch
+++ b/0257-core-fix-crashes-if-locale.conf-contains-invalid-utf.patch
@@ -29,7 +29,7 @@ parse_env_file()
1 file changed, 43 insertions(+), 34 deletions(-)
diff --git a/src/shared/fileio.c b/src/shared/fileio.c
-index 733b320..d28e38a 100644
+index 733b320388..d28e38a621 100644
--- a/src/shared/fileio.c
+++ b/src/shared/fileio.c
@@ -462,35 +462,39 @@ fail:
diff --git a/0258-core-do-not-print-invalid-utf-8-in-error-messages.patch b/0258-core-do-not-print-invalid-utf-8-in-error-messages.patch
index 53b863d..b2cbf7f 100644
--- a/0258-core-do-not-print-invalid-utf-8-in-error-messages.patch
+++ b/0258-core-do-not-print-invalid-utf-8-in-error-messages.patch
@@ -15,7 +15,7 @@ Conflicts:
4 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/src/shared/fileio.c b/src/shared/fileio.c
-index d28e38a..121cd57 100644
+index d28e38a621..121cd571aa 100644
--- a/src/shared/fileio.c
+++ b/src/shared/fileio.c
@@ -467,15 +467,18 @@ static int parse_env_file_push(const char *filename, unsigned line,
@@ -42,7 +42,7 @@ index d28e38a..121cd57 100644
}
diff --git a/src/shared/utf8.c b/src/shared/utf8.c
-index 31120af..2b70d45 100644
+index 31120af046..2b70d45e97 100644
--- a/src/shared/utf8.c
+++ b/src/shared/utf8.c
@@ -172,6 +172,32 @@ const char *utf8_is_valid(const char *str) {
@@ -79,7 +79,7 @@ index 31120af..2b70d45 100644
const char *p;
diff --git a/src/shared/utf8.h b/src/shared/utf8.h
-index 96a03ea..f93dfb8 100644
+index 96a03ea7cb..f93dfb8676 100644
--- a/src/shared/utf8.h
+++ b/src/shared/utf8.h
@@ -25,8 +25,11 @@
@@ -95,7 +95,7 @@ index 96a03ea..f93dfb8 100644
bool utf8_is_printable(const char* str, size_t length) _pure_;
diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
-index f0182ee..53c1d47 100644
+index f0182ee9af..53c1d475b7 100644
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -66,12 +66,29 @@ static void test_utf8_encoded_valid_unichar(void) {
diff --git a/0259-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch b/0259-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch
index 1f80018..5148b7b 100644
--- a/0259-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch
+++ b/0259-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch
@@ -12,7 +12,7 @@ on the device rather than requiring the user to do so.
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index e1798a3..00891f1 100644
+index e1798a3e82..00891f1323 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -131,11 +131,21 @@ static int create_disk(
diff --git a/0260-man-fix-reference-in-systemd-inhibit-1.patch b/0260-man-fix-reference-in-systemd-inhibit-1.patch
index 81a245e..66eec82 100644
--- a/0260-man-fix-reference-in-systemd-inhibit-1.patch
+++ b/0260-man-fix-reference-in-systemd-inhibit-1.patch
@@ -10,7 +10,7 @@ http://bugs.debian.org/738316
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
-index de2f264..cac0ef6 100644
+index de2f264147..cac0ef6890 100644
--- a/man/systemd-inhibit.xml
+++ b/man/systemd-inhibit.xml
@@ -198,7 +198,7 @@
diff --git a/0261-man-fix-another-reference-in-systemd-inhibit-1.patch b/0261-man-fix-another-reference-in-systemd-inhibit-1.patch
index 1d46e47..6424249 100644
--- a/0261-man-fix-another-reference-in-systemd-inhibit-1.patch
+++ b/0261-man-fix-another-reference-in-systemd-inhibit-1.patch
@@ -10,7 +10,7 @@ http://bugs.debian.org/738316
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
-index cac0ef6..f915fb8 100644
+index cac0ef6890..f915fb8cbd 100644
--- a/man/systemd-inhibit.xml
+++ b/man/systemd-inhibit.xml
@@ -158,7 +158,7 @@
diff --git a/0262-fstab-generator-Create-fsck-root-symlink-with-correc.patch b/0262-fstab-generator-Create-fsck-root-symlink-with-correc.patch
index 5a44c51..7c8dd59 100644
--- a/0262-fstab-generator-Create-fsck-root-symlink-with-correc.patch
+++ b/0262-fstab-generator-Create-fsck-root-symlink-with-correc.patch
@@ -13,7 +13,7 @@ creates a broken symlink pointing to itself in
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
-index 8c4c61c..0d954a2 100644
+index 8c4c61c062..0d954a254e 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -177,7 +177,7 @@ static int add_fsck(FILE *f, const char *what, const char *where, const char *ty
diff --git a/0263-efi-fix-Undefined-reference-efi_loader_get_boot_usec.patch b/0263-efi-fix-Undefined-reference-efi_loader_get_boot_usec.patch
index 66917f4..928c842 100644
--- a/0263-efi-fix-Undefined-reference-efi_loader_get_boot_usec.patch
+++ b/0263-efi-fix-Undefined-reference-efi_loader_get_boot_usec.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] efi: fix Undefined reference efi_loader_get_boot_usec when
1 file changed, 2 insertions(+)
diff --git a/src/shared/boot-timestamps.c b/src/shared/boot-timestamps.c
-index 9449965..d656685 100644
+index 944996582e..d656685774 100644
--- a/src/shared/boot-timestamps.c
+++ b/src/shared/boot-timestamps.c
@@ -40,8 +40,10 @@ int boot_timestamps(const dual_timestamp *n, dual_timestamp *firmware, dual_time
diff --git a/0264-core-make-StopWhenUnneeded-work-in-conjunction-with-.patch b/0264-core-make-StopWhenUnneeded-work-in-conjunction-with-.patch
index 003380a..4f5c704 100644
--- a/0264-core-make-StopWhenUnneeded-work-in-conjunction-with-.patch
+++ b/0264-core-make-StopWhenUnneeded-work-in-conjunction-with-.patch
@@ -11,7 +11,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=997031
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index 6c2c4a0..49833d1 100644
+index 6c2c4a0ef0..49833d1745 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1453,7 +1453,9 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
diff --git a/0265-man-always-place-programlisting-and-programlisting-i.patch b/0265-man-always-place-programlisting-and-programlisting-i.patch
index f194b87..1b15bc6 100644
--- a/0265-man-always-place-programlisting-and-programlisting-i.patch
+++ b/0265-man-always-place-programlisting-and-programlisting-i.patch
@@ -25,7 +25,7 @@ Conflicts:
12 files changed, 33 insertions(+), 71 deletions(-)
diff --git a/man/daemon.xml b/man/daemon.xml
-index 105826a..17d9dd6 100644
+index 105826ac6b..17d9dd6a22 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -777,8 +777,7 @@ AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitd
@@ -39,7 +39,7 @@ index 105826a..17d9dd6 100644
This snippet allows automatic
installation of the unit files on systemd
diff --git a/man/kernel-install.xml b/man/kernel-install.xml
-index 929ceef..3612b7d 100644
+index 929ceef4af..3612b7d934 100644
--- a/man/kernel-install.xml
+++ b/man/kernel-install.xml
@@ -90,9 +90,7 @@ along with systemd; If not, see .
@@ -65,7 +65,7 @@ index 929ceef..3612b7d 100644
kernel-install removes the entire directory
diff --git a/man/nss-myhostname.xml b/man/nss-myhostname.xml
-index efbadac..cca3a99 100644
+index efbadac33f..cca3a99aaa 100644
--- a/man/nss-myhostname.xml
+++ b/man/nss-myhostname.xml
@@ -86,8 +86,7 @@
@@ -103,7 +103,7 @@ index efbadac..cca3a99 100644
In this case the local hostname is omega.
diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml
-index 4b36f97..df7632f 100644
+index 4b36f97af8..df7632f9b2 100644
--- a/man/sd_journal_get_fd.xml
+++ b/man/sd_journal_get_fd.xml
@@ -330,8 +330,7 @@ int wait_for_changes(sd_journal *j) {
@@ -117,7 +117,7 @@ index 4b36f97..df7632f 100644
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index 25b03d8..cde1694 100644
+index 25b03d838e..cde1694173 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -544,8 +544,7 @@ LISTEN UNIT ACTIVATES
@@ -131,7 +131,7 @@ index 25b03d8..cde1694 100644
is not suitable for programmatic consumption.
diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
-index ebaa349..f802aa5 100644
+index ebaa3492f4..f802aa5eb9 100644
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.xml
@@ -204,20 +204,16 @@
@@ -160,7 +160,7 @@ index ebaa349..f802aa5 100644
diff --git a/man/systemd-journal-gatewayd.service.xml b/man/systemd-journal-gatewayd.service.xml
-index 0b6fd70..f639811 100644
+index 0b6fd706a6..f639811e3b 100644
--- a/man/systemd-journal-gatewayd.service.xml
+++ b/man/systemd-journal-gatewayd.service.xml
@@ -154,14 +154,12 @@ along with systemd; If not, see .
@@ -201,7 +201,7 @@ index 0b6fd70..f639811 100644
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
-index 48a0715..97ddf44 100644
+index 48a0715499..97ddf449b8 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -209,8 +209,7 @@ Sep 08 07:37:21 bupkis systemd[1]: Starting /usr/bin/env...
@@ -215,7 +215,7 @@ index 48a0715..97ddf44 100644
diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
-index dc4b0da..4622205 100644
+index dc4b0da68e..462220595f 100644
--- a/man/systemd-sleep.conf.xml
+++ b/man/systemd-sleep.conf.xml
@@ -160,10 +160,8 @@ along with systemd; If not, see .
@@ -232,7 +232,7 @@ index dc4b0da..4622205 100644
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index 4fb21ba..e8bb02c 100644
+index 4fb21ba799..e8bb02ca21 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -442,12 +442,9 @@
@@ -271,7 +271,7 @@ index 4fb21ba..e8bb02c 100644
/bin/echo with four
arguments: one,
diff --git a/man/timedatectl.xml b/man/timedatectl.xml
-index f4975ce..5f95486 100644
+index f4975ce547..5f95486f3a 100644
--- a/man/timedatectl.xml
+++ b/man/timedatectl.xml
@@ -245,8 +245,7 @@
@@ -318,7 +318,7 @@ index f4975ce..5f95486 100644
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
-index 8267ffc..9578c93 100644
+index 8267ffca4b..9578c93f52 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -109,7 +109,6 @@
diff --git a/0266-Temporary-work-around-for-slow-shutdown-due-to-unter.patch b/0266-Temporary-work-around-for-slow-shutdown-due-to-unter.patch
index bf87194..575cbf2 100644
--- a/0266-Temporary-work-around-for-slow-shutdown-due-to-unter.patch
+++ b/0266-Temporary-work-around-for-slow-shutdown-due-to-unter.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] Temporary work around for slow shutdown due to unterminated
1 file changed, 7 insertions(+)
diff --git a/units/user@.service.in b/units/user@.service.in
-index 3f8b59d..a7e0584 100644
+index 3f8b59d07f..a7e0584bf8 100644
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -14,5 +14,12 @@ User=%I
diff --git a/0267-pam-module-fix-warning-about-ignoring-vtnr.patch b/0267-pam-module-fix-warning-about-ignoring-vtnr.patch
index ec793dd..47591d3 100644
--- a/0267-pam-module-fix-warning-about-ignoring-vtnr.patch
+++ b/0267-pam-module-fix-warning-about-ignoring-vtnr.patch
@@ -10,7 +10,7 @@ Feb 19 22:15:01 server crond[26418]: pam_systemd(crond:session): Ignoring vtnr
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/login/pam-module.c b/src/login/pam-module.c
-index 7ebb5d2..aa09ec1 100644
+index 7ebb5d27a5..aa09ec1dbe 100644
--- a/src/login/pam-module.c
+++ b/src/login/pam-module.c
@@ -335,7 +335,7 @@ _public_ PAM_EXTERN int pam_sm_open_session(
diff --git a/0268-pam_systemd-do-not-set-XDG_RUNTIME_DIR-if-the-sessio.patch b/0268-pam_systemd-do-not-set-XDG_RUNTIME_DIR-if-the-sessio.patch
index 74a376c..b9b6bd9 100644
--- a/0268-pam_systemd-do-not-set-XDG_RUNTIME_DIR-if-the-sessio.patch
+++ b/0268-pam_systemd-do-not-set-XDG_RUNTIME_DIR-if-the-sessio.patch
@@ -27,7 +27,7 @@ Note: Backported by Dr. Werner Fink
3 files changed, 38 insertions(+), 31 deletions(-)
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
-index 583d62e..6f3e442 100644
+index 583d62e15d..6f3e442efb 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -523,6 +523,7 @@ static int bus_manager_create_session(Manager *m, DBusMessage *message) {
@@ -39,7 +39,7 @@ index 583d62e..6f3e442 100644
DBUS_TYPE_UINT32, &vtnr,
DBUS_TYPE_BOOLEAN, &exists,
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
-index be4e01c..86b0746 100644
+index be4e01c5e3..86b0746313 100644
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -755,6 +755,7 @@ int session_send_create_reply(Session *s, DBusError *error) {
@@ -51,7 +51,7 @@ index be4e01c..86b0746 100644
DBUS_TYPE_UINT32, &vtnr,
DBUS_TYPE_BOOLEAN, &exists,
diff --git a/src/login/pam-module.c b/src/login/pam-module.c
-index aa09ec1..4d6b052 100644
+index aa09ec1dbe..4d6b052497 100644
--- a/src/login/pam-module.c
+++ b/src/login/pam-module.c
@@ -86,31 +86,24 @@ static int get_user_data(
diff --git a/0269-core-do-not-segfault-if-proc-swaps-cannot-be-opened.patch b/0269-core-do-not-segfault-if-proc-swaps-cannot-be-opened.patch
index 9c25c58..26e2eef 100644
--- a/0269-core-do-not-segfault-if-proc-swaps-cannot-be-opened.patch
+++ b/0269-core-do-not-segfault-if-proc-swaps-cannot-be-opened.patch
@@ -18,7 +18,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1069393
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/core/swap.c b/src/core/swap.c
-index 727bb95..3c009da 100644
+index 727bb95e7c..3c009da703 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -1074,7 +1074,7 @@ static int open_proc_swaps(Manager *m) {
diff --git a/0270-Revert-login-Don-t-stop-a-running-user-manager-from-.patch b/0270-Revert-login-Don-t-stop-a-running-user-manager-from-.patch
index b1ecb28..df794a8 100644
--- a/0270-Revert-login-Don-t-stop-a-running-user-manager-from-.patch
+++ b/0270-Revert-login-Don-t-stop-a-running-user-manager-from-.patch
@@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1053315
1 file changed, 6 insertions(+)
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
-index b87311c..ddf19eb 100644
+index b87311c0d7..ddf19eb0b6 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -629,6 +629,12 @@ int user_check_gc(User *u, bool drop_not_started) {
diff --git a/0271-Revert-journalctl-flip-to-full-by-default.patch b/0271-Revert-journalctl-flip-to-full-by-default.patch
index e940519..e4dd031 100644
--- a/0271-Revert-journalctl-flip-to-full-by-default.patch
+++ b/0271-Revert-journalctl-flip-to-full-by-default.patch
@@ -12,7 +12,7 @@ This is a user visible change and doesn't belong in stable series.
2 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/man/journalctl.xml b/man/journalctl.xml
-index d1e841a..d75c758 100644
+index d1e841a5a5..d75c758db5 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -152,20 +152,11 @@
@@ -40,7 +40,7 @@ index d1e841a..d75c758 100644
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 1b5bdd3..ccd96b2 100644
+index 1b5bdd3f43..ccd96b221a 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -64,7 +64,7 @@
diff --git a/0272-util-fix-handling-of-trailing-whitespace-in-split_qu.patch b/0272-util-fix-handling-of-trailing-whitespace-in-split_qu.patch
index 072282a..fefb678 100644
--- a/0272-util-fix-handling-of-trailing-whitespace-in-split_qu.patch
+++ b/0272-util-fix-handling-of-trailing-whitespace-in-split_qu.patch
@@ -15,7 +15,7 @@ Conflicts:
2 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 8824b9b..52451f9 100644
+index 8824b9b9a2..52451f938d 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -370,17 +370,21 @@ char *split(const char *c, size_t *l, const char *separator, char **state) {
@@ -79,7 +79,7 @@ index 8824b9b..52451f9 100644
int get_parent_of_pid(pid_t pid, pid_t *_ppid) {
diff --git a/src/test/test-strv.c b/src/test/test-strv.c
-index c3d536d..6de1455 100644
+index c3d536d057..6de1455575 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -143,6 +143,7 @@ static void test_strv_quote_unquote(const char* const *split, const char *quoted
diff --git a/0273-udev-net_id-Introduce-predictable-network-names-for-.patch b/0273-udev-net_id-Introduce-predictable-network-names-for-.patch
index 4064828..9966f85 100644
--- a/0273-udev-net_id-Introduce-predictable-network-names-for-.patch
+++ b/0273-udev-net_id-Introduce-predictable-network-names-for-.patch
@@ -28,7 +28,7 @@ Conflicts:
1 file changed, 62 insertions(+), 2 deletions(-)
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index 9bc1946..b3cb04b 100644
+index 9bc1946ecd..b3cb04b801 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -28,6 +28,7 @@
diff --git a/0274-utils-silence-the-compiler-warning.patch b/0274-utils-silence-the-compiler-warning.patch
index ad1745a..3a49f38 100644
--- a/0274-utils-silence-the-compiler-warning.patch
+++ b/0274-utils-silence-the-compiler-warning.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] utils: silence the compiler warning
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 52451f9..7500779 100644
+index 52451f938d..75007792cc 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -427,7 +427,7 @@ char *split_quoted(const char *c, size_t *l, char **state) {
diff --git a/0275-fix-SELinux-check-for-transient-units.patch b/0275-fix-SELinux-check-for-transient-units.patch
index 1a63bc5..0995ef8 100644
--- a/0275-fix-SELinux-check-for-transient-units.patch
+++ b/0275-fix-SELinux-check-for-transient-units.patch
@@ -16,7 +16,7 @@ This patch is only for systemd-208
3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
-index 536f2ea..6d16c2a 100644
+index 536f2ea4db..6d16c2a503 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -1104,7 +1104,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
@@ -47,7 +47,7 @@ index 536f2ea..6d16c2a 100644
if (u->load_state != UNIT_NOT_FOUND || set_size(u->dependencies[UNIT_REFERENCED_BY]) > 0) {
dbus_set_error(&error, BUS_ERROR_UNIT_EXISTS, "Unit %s already exists.", name);
diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
-index 0a3ee18..5d85b26 100644
+index 0a3ee18bb9..5d85b268ad 100644
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -374,8 +374,9 @@ int selinux_access_check(
@@ -75,7 +75,7 @@ index 0a3ee18..5d85b26 100644
if (r < 0) {
dbus_set_error(error, DBUS_ERROR_ACCESS_DENIED, "Failed to get current context.");
diff --git a/src/core/selinux-access.h b/src/core/selinux-access.h
-index 2d7ac64..92acd69 100644
+index 2d7ac64c8f..92acd69eb9 100644
--- a/src/core/selinux-access.h
+++ b/src/core/selinux-access.h
@@ -36,6 +36,18 @@ int selinux_access_check(DBusConnection *connection, DBusMessage *message, const
diff --git a/0276-s390-getty-generator-initialize-essential-system-ter.patch b/0276-s390-getty-generator-initialize-essential-system-ter.patch
index 632dca9..913d25c 100644
--- a/0276-s390-getty-generator-initialize-essential-system-ter.patch
+++ b/0276-s390-getty-generator-initialize-essential-system-ter.patch
@@ -31,7 +31,7 @@ of Linux on System z instances in LPAR mode.
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
-index a00ffed..1eaf0c1 100644
+index a00ffed4c0..1eaf0c115c 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -7,7 +7,7 @@
@@ -44,7 +44,7 @@ index a00ffed..1eaf0c1 100644
KERNEL=="vport*", TAG+="systemd"
diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c
-index 6c93806..40374b5 100644
+index 6c938062de..40374b525b 100644
--- a/src/getty-generator/getty-generator.c
+++ b/src/getty-generator/getty-generator.c
@@ -91,7 +91,9 @@ int main(int argc, char *argv[]) {
diff --git a/0277-pam-use-correct-log-level.patch b/0277-pam-use-correct-log-level.patch
index 57f7462..b14c180 100644
--- a/0277-pam-use-correct-log-level.patch
+++ b/0277-pam-use-correct-log-level.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] pam: use correct log level
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/login/pam-module.c b/src/login/pam-module.c
-index 4d6b052..5baf1b7 100644
+index 4d6b052497..5baf1b73c0 100644
--- a/src/login/pam-module.c
+++ b/src/login/pam-module.c
@@ -204,7 +204,7 @@ _public_ PAM_EXTERN int pam_sm_open_session(
diff --git a/0278-nspawn-if-we-don-t-find-bash-try-sh.patch b/0278-nspawn-if-we-don-t-find-bash-try-sh.patch
index 5766bbe..f111009 100644
--- a/0278-nspawn-if-we-don-t-find-bash-try-sh.patch
+++ b/0278-nspawn-if-we-don-t-find-bash-try-sh.patch
@@ -12,7 +12,7 @@ Conflicts:
1 file changed, 1 insertion(+)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index cafc306..410b879 100644
+index cafc306273..410b8794dc 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1499,6 +1499,7 @@ int main(int argc, char *argv[]) {
diff --git a/0279-units-systemd-logind-fails-hard-without-dbus.patch b/0279-units-systemd-logind-fails-hard-without-dbus.patch
index 8dbd224..c136971 100644
--- a/0279-units-systemd-logind-fails-hard-without-dbus.patch
+++ b/0279-units-systemd-logind-fails-hard-without-dbus.patch
@@ -15,7 +15,7 @@ the socket will be started, which is not imporant, but not the service.
1 file changed, 5 insertions(+)
diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in
-index 31b5cd0..e0b1b59 100644
+index 31b5cd011f..e0b1b59df2 100644
--- a/units/systemd-logind.service.in
+++ b/units/systemd-logind.service.in
@@ -13,6 +13,11 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/multiseat
diff --git a/0280-man-fix-grammatical-errors-and-other-formatting-issu.patch b/0280-man-fix-grammatical-errors-and-other-formatting-issu.patch
index b72bba5..8888427 100644
--- a/0280-man-fix-grammatical-errors-and-other-formatting-issu.patch
+++ b/0280-man-fix-grammatical-errors-and-other-formatting-issu.patch
@@ -24,7 +24,7 @@ Conflicts:
6 files changed, 181 insertions(+), 156 deletions(-)
diff --git a/man/systemd-coredumpctl.xml b/man/systemd-coredumpctl.xml
-index 67f75d1..c096f6d 100644
+index 67f75d1c53..c096f6d7b1 100644
--- a/man/systemd-coredumpctl.xml
+++ b/man/systemd-coredumpctl.xml
@@ -135,7 +135,7 @@
@@ -48,7 +48,7 @@ index 67f75d1..c096f6d 100644
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
-index 7fce300..50a1076 100644
+index 7fce3000f5..50a10764bf 100644
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -70,7 +70,7 @@
@@ -78,7 +78,7 @@ index 7fce300..50a1076 100644
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index c8414d4..5ba1aac 100644
+index c8414d4287..5ba1aac0a1 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -491,8 +491,8 @@
@@ -93,7 +93,7 @@ index c8414d4..5ba1aac 100644
/dev/console.
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index e8bb02c..d23904e 100644
+index e8bb02ca21..d23904ee77 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -103,7 +103,7 @@
@@ -611,7 +611,7 @@ index e8bb02c..d23904e 100644
diff --git a/man/udev.xml b/man/udev.xml
-index f107482..82e7478 100644
+index f107482329..82e747879b 100644
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -255,9 +255,9 @@
@@ -864,7 +864,7 @@ index f107482..82e7478 100644
diff --git a/man/udevadm.xml b/man/udevadm.xml
-index ca3713f..32bf480 100644
+index ca3713f29c..32bf480674 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -72,7 +72,7 @@
diff --git a/0281-man-replace-STDOUT-with-standard-output-etc.patch b/0281-man-replace-STDOUT-with-standard-output-etc.patch
index 68dd559..4f06ba4 100644
--- a/0281-man-replace-STDOUT-with-standard-output-etc.patch
+++ b/0281-man-replace-STDOUT-with-standard-output-etc.patch
@@ -33,7 +33,7 @@ Conflicts:
14 files changed, 63 insertions(+), 58 deletions(-)
diff --git a/man/daemon.xml b/man/daemon.xml
-index 17d9dd6..26ba600 100644
+index 17d9dd6a22..26ba600521 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -74,8 +74,8 @@
@@ -90,7 +90,7 @@ index 17d9dd6..26ba600 100644
syslog by the init system. If log
priorities are necessary, these can be
diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
-index b48eac9..555d1ac 100644
+index b48eac9f44..555d1ac289 100644
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.xml
@@ -96,7 +96,7 @@
@@ -103,7 +103,7 @@ index b48eac9..555d1ac 100644
configured with StandardError=syslog
or StandardError=kmsg, these
diff --git a/man/sd_journal_stream_fd.xml b/man/sd_journal_stream_fd.xml
-index a8dc8fd..646fe15 100644
+index a8dc8fd08a..646fe1580b 100644
--- a/man/sd_journal_stream_fd.xml
+++ b/man/sd_journal_stream_fd.xml
@@ -69,8 +69,8 @@
@@ -118,7 +118,7 @@ index a8dc8fd..646fe15 100644
sd_journal_stream_fd()
takes a short program identifier string as first
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index cde1694..d4048a8 100644
+index cde1694173..d4048a8801 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -666,21 +666,23 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
@@ -169,7 +169,7 @@ index cde1694..d4048a8 100644
A snapshot refers to a saved state of the systemd
manager. It is implemented itself as a unit that is
diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml
-index 79902cb..db5cb20 100644
+index 79902cbd9a..db5cb20db5 100644
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.xml
@@ -60,7 +60,7 @@
@@ -182,7 +182,7 @@ index 79902cb..db5cb20 100644
query the password system-wide and allow active users
to respond via several agents. The latter is
diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml
-index ba7a2cf..16a8eb4 100644
+index ba7a2cf0c7..16a8eb456c 100644
--- a/man/systemd-cat.xml
+++ b/man/systemd-cat.xml
@@ -60,18 +60,18 @@
@@ -229,7 +229,7 @@ index ba7a2cf..16a8eb4 100644
diff --git a/man/systemd-coredumpctl.xml b/man/systemd-coredumpctl.xml
-index c096f6d..286ff14 100644
+index c096f6d7b1..286ff14639 100644
--- a/man/systemd-coredumpctl.xml
+++ b/man/systemd-coredumpctl.xml
@@ -135,8 +135,8 @@
@@ -244,7 +244,7 @@ index c096f6d..286ff14 100644
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
-index 2f877f5..0a20e21 100644
+index 2f877f565c..0a20e21159 100644
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -59,15 +59,15 @@
@@ -272,7 +272,7 @@ index 2f877f5..0a20e21 100644
for more information about the collected meta data.
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
-index 50a1076..b3bca2f 100644
+index 50a10764bf..b3bca2fec2 100644
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -70,7 +70,7 @@
@@ -301,7 +301,7 @@ index 50a1076..b3bca2f 100644
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index 5ba1aac..ae134f2 100644
+index 5ba1aac0a1..ae134f2d89 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -472,9 +472,9 @@
@@ -329,7 +329,7 @@ index 5ba1aac..ae134f2 100644
/dev/console.
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index d23904e..c116a9b 100644
+index d23904ee77..c116a9b60f 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -858,7 +858,7 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}
@@ -342,7 +342,7 @@ index d23904e..c116a9b 100644
set and hence are in
non-blocking mode. This option is only
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
-index 570a6fb..da0f2aa 100644
+index 570a6fb1ff..da0f2aaf7d 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -144,8 +144,8 @@
@@ -357,7 +357,7 @@ index 570a6fb..da0f2aa 100644
diff --git a/man/udev.xml b/man/udev.xml
-index 82e7478..25a3ea9 100644
+index 82e747879b..25a3ea99af 100644
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -255,7 +255,7 @@
@@ -370,7 +370,7 @@ index 82e7478..25a3ea9 100644
This can only be used for very short-running foreground tasks. For details,
see RUN.
diff --git a/man/udevadm.xml b/man/udevadm.xml
-index 32bf480..b172266 100644
+index 32bf480674..b172266ade 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -72,7 +72,7 @@
diff --git a/0282-man-use-spaces-instead-of-tabs.patch b/0282-man-use-spaces-instead-of-tabs.patch
index 761c3b4..3138371 100644
--- a/0282-man-use-spaces-instead-of-tabs.patch
+++ b/0282-man-use-spaces-instead-of-tabs.patch
@@ -19,7 +19,7 @@ Conflicts:
3 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
-index f802aa5..23fb8d1 100644
+index f802aa5eb9..23fb8d1df2 100644
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.xml
@@ -50,8 +50,8 @@
@@ -116,7 +116,7 @@ index f802aa5..23fb8d1 100644
Exit status
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index c116a9b..0f4be71 100644
+index c116a9b60f..0f4be71960 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -769,8 +769,8 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}
@@ -131,7 +131,7 @@ index c116a9b..0f4be71 100644
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
-index da0f2aa..39fba51 100644
+index da0f2aaf7d..39fba510b7 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -121,16 +121,16 @@
diff --git a/0283-macro-add-a-macro-to-test-whether-a-value-is-in-a-sp.patch b/0283-macro-add-a-macro-to-test-whether-a-value-is-in-a-sp.patch
index 6c986c7..c03bb61 100644
--- a/0283-macro-add-a-macro-to-test-whether-a-value-is-in-a-sp.patch
+++ b/0283-macro-add-a-macro-to-test-whether-a-value-is-in-a-sp.patch
@@ -24,7 +24,7 @@ This is particularly useful for state machine enums.
2 files changed, 24 insertions(+)
diff --git a/src/shared/macro.h b/src/shared/macro.h
-index bc5b3c1..5f3e522 100644
+index bc5b3c1de8..5f3e52294b 100644
--- a/src/shared/macro.h
+++ b/src/shared/macro.h
@@ -294,4 +294,17 @@ do { \
@@ -46,7 +46,7 @@ index bc5b3c1..5f3e522 100644
+
#include "log.h"
diff --git a/src/test/test-util.c b/src/test/test-util.c
-index c5762ed..7566adc 100644
+index c5762ede4b..7566adcc2f 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -591,6 +591,16 @@ static void test_get_files_in_directory(void) {
diff --git a/0284-core-fix-property-changes-in-transient-units.patch b/0284-core-fix-property-changes-in-transient-units.patch
index 6e2128d..4cf29e9 100644
--- a/0284-core-fix-property-changes-in-transient-units.patch
+++ b/0284-core-fix-property-changes-in-transient-units.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] core: fix property changes in transient units
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
-index 2ea59b2..a185f5c 100644
+index 2ea59b2913..a185f5c0e1 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -962,9 +962,6 @@ int bus_unit_set_properties(
@@ -24,7 +24,7 @@ index 2ea59b2..a185f5c 100644
* if all passed data is valid, second run actually applies
* it. This is to implement transaction-like behaviour without
diff --git a/src/core/unit.c b/src/core/unit.c
-index 49833d1..8e2a7c4 100644
+index 49833d1745..8e2a7c478c 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2785,7 +2785,6 @@ static int drop_in_file(Unit *u, UnitSetPropertiesMode mode, const char *name, c
diff --git a/0285-core-more-exact-test-on-the-procfs-special-string-de.patch b/0285-core-more-exact-test-on-the-procfs-special-string-de.patch
index 049fa1b..ed4d587 100644
--- a/0285-core-more-exact-test-on-the-procfs-special-string-de.patch
+++ b/0285-core-more-exact-test-on-the-procfs-special-string-de.patch
@@ -13,7 +13,7 @@ but in one instance, it did not (yet). Make it do the same.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/umount.c b/src/core/umount.c
-index 99dbe27..fbd7e1c 100644
+index 99dbe27c8f..fbd7e1c101 100644
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -170,7 +170,7 @@ static int swap_list_get(MountPoint **head) {
diff --git a/0286-doc-update-punctuation.patch b/0286-doc-update-punctuation.patch
index 70eb9da..6d120cd 100644
--- a/0286-doc-update-punctuation.patch
+++ b/0286-doc-update-punctuation.patch
@@ -38,7 +38,7 @@ Conflicts:
12 files changed, 39 insertions(+), 38 deletions(-)
diff --git a/man/journalctl.xml b/man/journalctl.xml
-index d75c758..b695b3d 100644
+index d75c758db5..b695b3d6a9 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -509,6 +509,7 @@
@@ -50,7 +50,7 @@ index d75c758..b695b3d 100644
diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml
-index 16a8eb4..e61a6ac 100644
+index 16a8eb456c..e61a6ac8f9 100644
--- a/man/systemd-cat.xml
+++ b/man/systemd-cat.xml
@@ -189,7 +189,7 @@
@@ -63,7 +63,7 @@ index 16a8eb4..e61a6ac 100644
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
-index b3bca2f..0e49fa0 100644
+index b3bca2fec2..0e49fa07f6 100644
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -93,10 +93,10 @@
@@ -81,7 +81,7 @@ index b3bca2f..0e49fa0 100644
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index 0f4be71..4d672f0 100644
+index 0f4be71960..4d672f0f96 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -748,27 +748,27 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}
@@ -134,7 +134,7 @@ index 0f4be71..4d672f0 100644
effect.
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
-index 39fba51..3e1dd88 100644
+index 39fba510b7..3e1dd8859b 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -84,7 +84,7 @@
@@ -165,7 +165,7 @@ index 39fba51..3e1dd88 100644
option.
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
-index 76bb5cd..8ccccc2 100644
+index 76bb5cdcf3..8ccccc2798 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -820,7 +820,7 @@
@@ -178,7 +178,7 @@ index 76bb5cd..8ccccc2 100644
consumer of a service, but by the provider of the
service. This means: a consuming service should order
diff --git a/man/systemd.xml b/man/systemd.xml
-index 23a0c26..76d977d 100644
+index 23a0c265bb..76d977d461 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -407,7 +407,7 @@
@@ -191,7 +191,7 @@ index 23a0c26..76d977d 100644
this.
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
-index 154ffd9..4f7163d 100644
+index 154ffd92ce..4f7163da02 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -33,7 +33,7 @@ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", ATTRS{type}==
@@ -204,7 +204,7 @@ index 154ffd9..4f7163d 100644
# scsi devices
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index ccd96b2..5b0be27 100644
+index ccd96b221a..5b0be27156 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -715,7 +715,7 @@ static int add_matches(sd_journal *j, char **args) {
@@ -217,7 +217,7 @@ index ccd96b2..5b0be27 100644
!S_ISLNK(st.st_mode)) {
t2 = strappend("_EXE=", interpreter);
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index 46c3feb..f4af1f6 100644
+index 46c3feb45d..f4af1f6683 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -472,7 +472,7 @@ static int compare_entry_order(JournalFile *af, Object *_ao,
@@ -239,7 +239,7 @@ index 46c3feb..f4af1f6 100644
b = le64toh(bo->entry.realtime);
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
-index 8a4edda..3c64e62 100644
+index 8a4eddab7a..3c64e62870 100644
--- a/src/shared/cgroup-util.c
+++ b/src/shared/cgroup-util.c
@@ -1115,7 +1115,7 @@ int cg_mangle_path(const char *path, char **result) {
@@ -261,7 +261,7 @@ index 8a4edda..3c64e62 100644
if (r < 0)
return r;
diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c
-index 1b9f824..883e11e 100644
+index 1b9f8246fb..883e11eb07 100644
--- a/src/udev/udev-builtin-usb_id.c
+++ b/src/udev/udev-builtin-usb_id.c
@@ -219,9 +219,9 @@ static int dev_if_packed_info(struct udev_device *dev, char *ifs_str, size_t len
diff --git a/0287-doc-resolve-missing-extraneous-words-or-inappropriat.patch b/0287-doc-resolve-missing-extraneous-words-or-inappropriat.patch
index 22d3619..519940a 100644
--- a/0287-doc-resolve-missing-extraneous-words-or-inappropriat.patch
+++ b/0287-doc-resolve-missing-extraneous-words-or-inappropriat.patch
@@ -37,7 +37,7 @@ Conflicts:
12 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/man/busctl.xml b/man/busctl.xml
-index 0c5f05a..854eb38 100644
+index 0c5f05af87..854eb38b53 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -151,7 +151,7 @@ along with systemd; If not, see .
@@ -50,7 +50,7 @@ index 0c5f05a..854eb38 100644
diff --git a/man/journalctl.xml b/man/journalctl.xml
-index b695b3d..623d966 100644
+index b695b3d6a9..623d96695d 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -370,7 +370,7 @@
@@ -63,7 +63,7 @@ index b695b3d..623d966 100644
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
-index e0796e1..27c326e 100644
+index e0796e1cce..27c326e909 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -269,12 +269,12 @@
@@ -83,7 +83,7 @@ index e0796e1..27c326e 100644
either.
diff --git a/man/machine-info.xml b/man/machine-info.xml
-index ddf8f8b..7448e68 100644
+index ddf8f8b3d0..7448e68fd4 100644
--- a/man/machine-info.xml
+++ b/man/machine-info.xml
@@ -55,7 +55,7 @@
@@ -114,7 +114,7 @@ index ddf8f8b..7448e68 100644
/etc/machine-info:
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
-index a716cc3..871baff 100644
+index a716cc35e6..871baff8a5 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -203,7 +203,7 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid(
@@ -127,7 +127,7 @@ index a716cc3..871baff 100644
log entries that are generated via
sd_journal_send(). Using
diff --git a/man/systemd-coredumpctl.xml b/man/systemd-coredumpctl.xml
-index 286ff14..4318a2f 100644
+index 286ff14639..4318a2fd44 100644
--- a/man/systemd-coredumpctl.xml
+++ b/man/systemd-coredumpctl.xml
@@ -135,7 +135,7 @@
@@ -140,7 +140,7 @@ index 286ff14..4318a2f 100644
.
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
-index 0a20e21..4d2cb40 100644
+index 0a20e21159..4d2cb40805 100644
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -66,10 +66,10 @@
@@ -157,7 +157,7 @@ index 0a20e21..4d2cb40 100644
Log data collected by the journal is primarily
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
-index 9a1a99f..6f36930 100644
+index 9a1a99fecf..6f36930a06 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -135,7 +135,7 @@
@@ -170,7 +170,7 @@ index 9a1a99f..6f36930 100644
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
-index 0e49fa0..bb04694 100644
+index 0e49fa07f6..bb04694342 100644
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -83,7 +83,7 @@
@@ -192,7 +192,7 @@ index 0e49fa0..bb04694 100644
debugging system crashes during coldplug caused by loading
non-working kernel modules.
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index ae134f2..630a28c 100644
+index ae134f2d89..630a28cb54 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -248,7 +248,7 @@
@@ -205,7 +205,7 @@ index ae134f2..630a28c 100644
case the specificed CPU affinity masks
are merged. If the empty string is
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
-index bb89ed5..b492aae 100644
+index bb89ed58d3..b492aae0ae 100644
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@@ -529,7 +529,7 @@
@@ -218,7 +218,7 @@ index bb89ed5..b492aae 100644
log entries via calls such as
sd_journal_send3. They
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
-index 3e1dd88..67267b2 100644
+index 3e1dd8859b..67267b2744 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -90,9 +90,9 @@
diff --git a/0288-doc-choose-different-words-to-improve-clarity.patch b/0288-doc-choose-different-words-to-improve-clarity.patch
index 0aea4a1..f72e3b3 100644
--- a/0288-doc-choose-different-words-to-improve-clarity.patch
+++ b/0288-doc-choose-different-words-to-improve-clarity.patch
@@ -19,7 +19,7 @@ Conflicts:
create mode 100644 src/journal/systemd-journal-feeder.py
diff --git a/man/crypttab.xml b/man/crypttab.xml
-index 5f386e5..4b6d12e 100644
+index 5f386e55f8..4b6d12ef4f 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -171,7 +171,7 @@
@@ -42,7 +42,7 @@ index 5f386e5..4b6d12e 100644
inside of the volume provided in the second
diff --git a/src/journal/systemd-journal-feeder.py b/src/journal/systemd-journal-feeder.py
new file mode 100644
-index 0000000..5cfab82
+index 0000000000..5cfab82ea0
--- /dev/null
+++ b/src/journal/systemd-journal-feeder.py
@@ -0,0 +1,83 @@
diff --git a/0289-doc-properly-use-XML-entities.patch b/0289-doc-properly-use-XML-entities.patch
index a65ea62..4ea5a43 100644
--- a/0289-doc-properly-use-XML-entities.patch
+++ b/0289-doc-properly-use-XML-entities.patch
@@ -12,7 +12,7 @@ Conflicts:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/localtime.xml b/man/localtime.xml
-index b7fd1ba..dbf2379 100644
+index b7fd1ba15d..dbf2379e7d 100644
--- a/man/localtime.xml
+++ b/man/localtime.xml
@@ -55,7 +55,7 @@
diff --git a/0290-man-machinectl-there-is-no-command-kill-machine.patch b/0290-man-machinectl-there-is-no-command-kill-machine.patch
index 6df269a..5dac69b 100644
--- a/0290-man-machinectl-there-is-no-command-kill-machine.patch
+++ b/0290-man-machinectl-there-is-no-command-kill-machine.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] man: machinectl: there is no command 'kill-machine'
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/man/machinectl.xml b/man/machinectl.xml
-index 2ed9f2e..bb88395 100644
+index 2ed9f2e8a1..bb88395880 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -141,7 +141,7 @@
diff --git a/0291-load-modules-properly-return-a-failing-error-code-if.patch b/0291-load-modules-properly-return-a-failing-error-code-if.patch
index 56741cc..61f2ec4 100644
--- a/0291-load-modules-properly-return-a-failing-error-code-if.patch
+++ b/0291-load-modules-properly-return-a-failing-error-code-if.patch
@@ -12,7 +12,7 @@ This is the missing part of b857193b1def5172e3641ca1d5bc9e08ae81aac4.
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
-index 9789398..ba7d417 100644
+index 9789398e4e..ba7d417b53 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -306,9 +306,11 @@ int main(int argc, char *argv[]) {
diff --git a/0292-machinectl-add-bash-completion.patch b/0292-machinectl-add-bash-completion.patch
index 07d3544..045c8ea 100644
--- a/0292-machinectl-add-bash-completion.patch
+++ b/0292-machinectl-add-bash-completion.patch
@@ -19,7 +19,7 @@ Conflicts:
create mode 100644 shell-completion/bash/machinectl
diff --git a/Makefile.am b/Makefile.am
-index 6233a7f..033bbfa 100644
+index 6233a7f7ff..033bbfa7cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3726,6 +3726,9 @@ machinectl_LDADD = \
@@ -33,7 +33,7 @@ index 6233a7f..033bbfa 100644
src/machine/test-machine-tables.c
diff --git a/man/machinectl.xml b/man/machinectl.xml
-index bb88395..f00d212 100644
+index bb88395880..f00d2121eb 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -130,6 +130,14 @@
@@ -53,7 +53,7 @@ index bb88395..f00d212 100644
Do not query the user
diff --git a/shell-completion/bash/machinectl b/shell-completion/bash/machinectl
new file mode 100644
-index 0000000..3789492
+index 0000000000..3789492d72
--- /dev/null
+++ b/shell-completion/bash/machinectl
@@ -0,0 +1,97 @@
@@ -155,7 +155,7 @@ index 0000000..3789492
+
+complete -F _machinectl machinectl
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
-index 97c2193..88cf8d5 100644
+index 97c2193551..88cf8d5e01 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -43,6 +43,7 @@ static char **arg_property = NULL;
diff --git a/0293-delta-add-bash-completion.patch b/0293-delta-add-bash-completion.patch
index 3c3e19c..e8b9498 100644
--- a/0293-delta-add-bash-completion.patch
+++ b/0293-delta-add-bash-completion.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] delta: add bash completion
create mode 100644 shell-completion/bash/systemd-delta
diff --git a/Makefile.am b/Makefile.am
-index 033bbfa..9049fed 100644
+index 033bbfa7cd..9049fedd16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -342,6 +342,7 @@ dist_bashcompletion_DATA = \
@@ -24,7 +24,7 @@ index 033bbfa..9049fed 100644
shell-completion/bash/kernel-install
diff --git a/shell-completion/bash/systemd-delta b/shell-completion/bash/systemd-delta
new file mode 100644
-index 0000000..cb17328
+index 0000000000..cb1732895f
--- /dev/null
+++ b/shell-completion/bash/systemd-delta
@@ -0,0 +1,61 @@
diff --git a/0294-man-document-MAINPID.patch b/0294-man-document-MAINPID.patch
index 0521873..70ffc92 100644
--- a/0294-man-document-MAINPID.patch
+++ b/0294-man-document-MAINPID.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] man: document $MAINPID
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index 630a28c..d8dab36 100644
+index 630a28cb54..d8dab36f3a 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -472,7 +472,7 @@
diff --git a/0295-man-busctl-typo-fix.patch b/0295-man-busctl-typo-fix.patch
index 7f4fe48..e68fad7 100644
--- a/0295-man-busctl-typo-fix.patch
+++ b/0295-man-busctl-typo-fix.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] man: busctl typo fix
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/busctl.xml b/man/busctl.xml
-index 854eb38..6200643 100644
+index 854eb38b53..6200643b29 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -184,7 +184,7 @@ along with systemd; If not, see .
diff --git a/0296-journal-don-t-clobber-return-parameters-of-sd_journa.patch b/0296-journal-don-t-clobber-return-parameters-of-sd_journa.patch
index c221d89..527c266 100644
--- a/0296-journal-don-t-clobber-return-parameters-of-sd_journa.patch
+++ b/0296-journal-don-t-clobber-return-parameters-of-sd_journa.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] journal: don't clobber return parameters of
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index f4af1f6..b1bd61f 100644
+index f4af1f6683..b1bd61fcdb 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -2359,6 +2359,7 @@ _public_ int sd_journal_get_cutoff_realtime_usec(sd_journal *j, uint64_t *from,
diff --git a/0297-udev-make-sure-we-always-return-a-valid-error-code-i.patch b/0297-udev-make-sure-we-always-return-a-valid-error-code-i.patch
index 9c358d7..ec5f5dc 100644
--- a/0297-udev-make-sure-we-always-return-a-valid-error-code-i.patch
+++ b/0297-udev-make-sure-we-always-return-a-valid-error-code-i.patch
@@ -13,7 +13,7 @@ Conflicts:
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
-index fe56758..141db57 100644
+index fe56758e3a..141db57284 100644
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -341,7 +341,7 @@ static int trie_store(struct trie *trie, const char *filename) {
diff --git a/0298-bootctl-add-bash-completion.patch b/0298-bootctl-add-bash-completion.patch
index d346630..cdb98a6 100644
--- a/0298-bootctl-add-bash-completion.patch
+++ b/0298-bootctl-add-bash-completion.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] bootctl: add bash completion
create mode 100644 shell-completion/bash/bootctl
diff --git a/Makefile.am b/Makefile.am
-index 9049fed..703925a 100644
+index 9049fedd16..703925a4c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1748,6 +1748,9 @@ bootctl_LDADD = \
@@ -26,7 +26,7 @@ index 9049fed..703925a 100644
diff --git a/shell-completion/bash/bootctl b/shell-completion/bash/bootctl
new file mode 100644
-index 0000000..c86ec7e
+index 0000000000..c86ec7edc9
--- /dev/null
+++ b/shell-completion/bash/bootctl
@@ -0,0 +1,60 @@
diff --git a/0299-selinux-Don-t-attempt-to-load-policy-in-initramfs-if.patch b/0299-selinux-Don-t-attempt-to-load-policy-in-initramfs-if.patch
index 02ece81..79f48ae 100644
--- a/0299-selinux-Don-t-attempt-to-load-policy-in-initramfs-if.patch
+++ b/0299-selinux-Don-t-attempt-to-load-policy-in-initramfs-if.patch
@@ -23,7 +23,7 @@ load policy.
1 file changed, 7 insertions(+)
diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c
-index 7a32ed5..9a5d6b2 100644
+index 7a32ed59a0..9a5d6b2a9d 100644
--- a/src/core/selinux-setup.c
+++ b/src/core/selinux-setup.c
@@ -58,6 +58,13 @@ int selinux_setup(bool *loaded_policy) {
diff --git a/0300-man-there-is-no-ExecStopPre-for-service-units.patch b/0300-man-there-is-no-ExecStopPre-for-service-units.patch
index b4ba21c..d80b76c 100644
--- a/0300-man-there-is-no-ExecStopPre-for-service-units.patch
+++ b/0300-man-there-is-no-ExecStopPre-for-service-units.patch
@@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=73177
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index 4d672f0..50b19a8 100644
+index 4d672f0f96..50b19a8d5f 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -674,7 +674,7 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}
diff --git a/0301-man-document-that-per-interface-sysctl-variables-are.patch b/0301-man-document-that-per-interface-sysctl-variables-are.patch
index f84723e..7621df0 100644
--- a/0301-man-document-that-per-interface-sysctl-variables-are.patch
+++ b/0301-man-document-that-per-interface-sysctl-variables-are.patch
@@ -11,7 +11,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1062955
1 file changed, 10 insertions(+)
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
-index 5544283..00a857b 100644
+index 5544283d49..00a857b11a 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -103,6 +103,16 @@
diff --git a/0302-journal-downgrade-vaccuum-message-to-debug-level.patch b/0302-journal-downgrade-vaccuum-message-to-debug-level.patch
index 1822911..d0aa758 100644
--- a/0302-journal-downgrade-vaccuum-message-to-debug-level.patch
+++ b/0302-journal-downgrade-vaccuum-message-to-debug-level.patch
@@ -10,7 +10,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1047148
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c
-index 8b07f65..695e518 100644
+index 8b07f659da..695e518130 100644
--- a/src/journal/journal-vacuum.c
+++ b/src/journal/journal-vacuum.c
@@ -334,7 +334,7 @@ finish:
diff --git a/0303-core-gc-half-created-stub-units.patch b/0303-core-gc-half-created-stub-units.patch
index e572019..ae73ac3 100644
--- a/0303-core-gc-half-created-stub-units.patch
+++ b/0303-core-gc-half-created-stub-units.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] core: gc half-created stub units
1 file changed, 3 deletions(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index 8e2a7c4..de34ddc 100644
+index 8e2a7c478c..de34ddc843 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -249,9 +249,6 @@ int unit_set_description(Unit *u, const char *description) {
diff --git a/0304-getty-generator-verify-ttys-before-we-make-use-of-th.patch b/0304-getty-generator-verify-ttys-before-we-make-use-of-th.patch
index 631520d..ad6aa50 100644
--- a/0304-getty-generator-verify-ttys-before-we-make-use-of-th.patch
+++ b/0304-getty-generator-verify-ttys-before-we-make-use-of-th.patch
@@ -23,7 +23,7 @@ This should make Eric Paris happy!
1 file changed, 28 insertions(+)
diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c
-index 40374b5..625a87e 100644
+index 40374b525b..625a87e1e8 100644
--- a/src/getty-generator/getty-generator.c
+++ b/src/getty-generator/getty-generator.c
@@ -22,6 +22,7 @@
diff --git a/0305-units-serial-getty-.service-add-Install-section.patch b/0305-units-serial-getty-.service-add-Install-section.patch
index 2a46d0a..b58c4f2 100644
--- a/0305-units-serial-getty-.service-add-Install-section.patch
+++ b/0305-units-serial-getty-.service-add-Install-section.patch
@@ -13,7 +13,7 @@ http://lists.freedesktop.org/archives/systemd-devel/2014-February/017329.html
1 file changed, 3 insertions(+)
diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
-index e32c6b7..aea078f 100644
+index e32c6b7aff..aea078f48f 100644
--- a/units/serial-getty@.service.m4
+++ b/units/serial-getty@.service.m4
@@ -33,3 +33,6 @@ TTYVHangup=yes
diff --git a/0306-README-document-that-var-run-must-be-a-symlink-run.patch b/0306-README-document-that-var-run-must-be-a-symlink-run.patch
index 8152222..d049cff 100644
--- a/0306-README-document-that-var-run-must-be-a-symlink-run.patch
+++ b/0306-README-document-that-var-run-must-be-a-symlink-run.patch
@@ -14,7 +14,7 @@ Content-Transfer-Encoding: 8bit
1 file changed, 3 insertions(+)
diff --git a/README b/README
-index cf0a18d..fa433be 100644
+index cf0a18de2e..fa433be458 100644
--- a/README
+++ b/README
@@ -189,6 +189,9 @@ WARNINGS:
diff --git a/0307-Use-var-run-dbus-system_bus_socket-for-the-D-Bus-soc.patch b/0307-Use-var-run-dbus-system_bus_socket-for-the-D-Bus-soc.patch
index 3bd5ff1..b0ff1ab 100644
--- a/0307-Use-var-run-dbus-system_bus_socket-for-the-D-Bus-soc.patch
+++ b/0307-Use-var-run-dbus-system_bus_socket-for-the-D-Bus-soc.patch
@@ -17,7 +17,7 @@ Conflicts:
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c
-index db0880f..8dc3f6e 100644
+index db0880f21c..8dc3f6e345 100644
--- a/src/libsystemd-bus/sd-bus.c
+++ b/src/libsystemd-bus/sd-bus.c
@@ -972,8 +972,8 @@ int sd_bus_open_system(sd_bus **ret) {
@@ -32,7 +32,7 @@ index db0880f..8dc3f6e 100644
b->bus_client = true;
diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c
-index ab1a43a..f2a26c0 100644
+index ab1a43ab1a..f2a26c019d 100644
--- a/src/stdio-bridge/stdio-bridge.c
+++ b/src/stdio-bridge/stdio-bridge.c
@@ -62,7 +62,7 @@ int main(int argc, char *argv[]) {
diff --git a/0308-mount-don-t-send-out-PropertiesChanged-message-if-ac.patch b/0308-mount-don-t-send-out-PropertiesChanged-message-if-ac.patch
index 02225b6..cf322db 100644
--- a/0308-mount-don-t-send-out-PropertiesChanged-message-if-ac.patch
+++ b/0308-mount-don-t-send-out-PropertiesChanged-message-if-ac.patch
@@ -13,7 +13,7 @@ Conflicts:
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/core/mount.c b/src/core/mount.c
-index c0445a6..0a0ef82 100644
+index c0445a6113..0a0ef82f17 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1412,9 +1412,10 @@ static int mount_add_one(
diff --git a/0309-mount-don-t-fire-PropertiesChanged-signals-for-mount.patch b/0309-mount-don-t-fire-PropertiesChanged-signals-for-mount.patch
index 5b5c3d4..2c1517f 100644
--- a/0309-mount-don-t-fire-PropertiesChanged-signals-for-mount.patch
+++ b/0309-mount-don-t-fire-PropertiesChanged-signals-for-mount.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] mount: don't fire PropertiesChanged signals for mounts that
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/core/mount.c b/src/core/mount.c
-index 0a0ef82..65ea3f9 100644
+index 0a0ef82f17..65ea3f90fa 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1691,20 +1691,20 @@ void mount_fd_event(Manager *m, int events) {
diff --git a/0310-logs-show-fix-corrupt-output-with-empty-messages.patch b/0310-logs-show-fix-corrupt-output-with-empty-messages.patch
index 4c182d1..5aa7ac4 100644
--- a/0310-logs-show-fix-corrupt-output-with-empty-messages.patch
+++ b/0310-logs-show-fix-corrupt-output-with-empty-messages.patch
@@ -23,7 +23,7 @@ Feb 09 21:16:17 glyph NetworkManager[788]: (enp4s2): DHCPv4 state changed
1 file changed, 5 insertions(+)
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
-index 7bb19b4..91eefb3 100644
+index 7bb19b4006..91eefb32bd 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -121,6 +121,11 @@ static bool print_multiline(FILE *f, unsigned prefix, unsigned n_columns, Output
diff --git a/0311-journalctl-refuse-extra-arguments-with-verify-and-si.patch b/0311-journalctl-refuse-extra-arguments-with-verify-and-si.patch
index bd005db..cbefa54 100644
--- a/0311-journalctl-refuse-extra-arguments-with-verify-and-si.patch
+++ b/0311-journalctl-refuse-extra-arguments-with-verify-and-si.patch
@@ -12,7 +12,7 @@ For other actions, complain instead of ignoring them silently.
1 file changed, 5 insertions(+)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 5b0be27..6f52467 100644
+index 5b0be27156..6f52467042 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -646,6 +646,11 @@ static int parse_argv(int argc, char *argv[]) {
diff --git a/0312-cdrom_id-use-the-old-MMC-fallback.patch b/0312-cdrom_id-use-the-old-MMC-fallback.patch
index 1aa5073..521da6b 100644
--- a/0312-cdrom_id-use-the-old-MMC-fallback.patch
+++ b/0312-cdrom_id-use-the-old-MMC-fallback.patch
@@ -38,7 +38,7 @@ Suggested-by:Luca Miccini
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c
-index 1fc0dfa..dac35a6 100644
+index 1fc0dfa34f..dac35a6455 100644
--- a/src/udev/cdrom_id/cdrom_id.c
+++ b/src/udev/cdrom_id/cdrom_id.c
@@ -555,7 +555,7 @@ static int cd_profiles(struct udev *udev, int fd)
diff --git a/0313-udev-rules-setup-tty-permissions-and-group-for-sclp_.patch b/0313-udev-rules-setup-tty-permissions-and-group-for-sclp_.patch
index 715470d..3f452e5 100644
--- a/0313-udev-rules-setup-tty-permissions-and-group-for-sclp_.patch
+++ b/0313-udev-rules-setup-tty-permissions-and-group-for-sclp_.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] udev/rules: setup tty permissions and group for sclp_line,
1 file changed, 3 insertions(+)
diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules
-index 679dfdf..0bccf67 100644
+index 679dfdfcf4..0bccf67b7b 100644
--- a/rules/50-udev-default.rules
+++ b/rules/50-udev-default.rules
@@ -15,6 +15,9 @@ ACTION!="add", GOTO="default_permissions_end"
diff --git a/0314-bash-add-completion-for-systemd-nspawn.patch b/0314-bash-add-completion-for-systemd-nspawn.patch
index da239f2..9b29b05 100644
--- a/0314-bash-add-completion-for-systemd-nspawn.patch
+++ b/0314-bash-add-completion-for-systemd-nspawn.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] bash: add completion for systemd-nspawn
create mode 100644 shell-completion/bash/systemd-nspawn
diff --git a/Makefile.am b/Makefile.am
-index 703925a..03a1f91 100644
+index 703925a4c0..03a1f91bc0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -343,6 +343,7 @@ dist_bashcompletion_DATA = \
@@ -24,7 +24,7 @@ index 703925a..03a1f91 100644
shell-completion/bash/kernel-install
diff --git a/shell-completion/bash/systemd-nspawn b/shell-completion/bash/systemd-nspawn
new file mode 100644
-index 0000000..0e8a30c
+index 0000000000..0e8a30cb26
--- /dev/null
+++ b/shell-completion/bash/systemd-nspawn
@@ -0,0 +1,90 @@
diff --git a/0315-add-bash-completion-for-systemd-cgls.patch b/0315-add-bash-completion-for-systemd-cgls.patch
index 5c1e44c..e15d129 100644
--- a/0315-add-bash-completion-for-systemd-cgls.patch
+++ b/0315-add-bash-completion-for-systemd-cgls.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] add bash completion for systemd-cgls
create mode 100644 shell-completion/bash/systemd-cgls
diff --git a/Makefile.am b/Makefile.am
-index 03a1f91..d4a65e7 100644
+index 03a1f91bc0..d4a65e7f6b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -342,6 +342,7 @@ dist_bashcompletion_DATA = \
@@ -24,7 +24,7 @@ index 03a1f91..d4a65e7 100644
shell-completion/bash/systemd-run \
diff --git a/shell-completion/bash/systemd-cgls b/shell-completion/bash/systemd-cgls
new file mode 100644
-index 0000000..0570438
+index 0000000000..0570438660
--- /dev/null
+++ b/shell-completion/bash/systemd-cgls
@@ -0,0 +1,56 @@
diff --git a/0316-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0316-hwdb-Update-database-of-Bluetooth-company-identifier.patch
index b8c6a93..9b68bfe 100644
--- a/0316-hwdb-Update-database-of-Bluetooth-company-identifier.patch
+++ b/0316-hwdb-Update-database-of-Bluetooth-company-identifier.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
1 file changed, 33 insertions(+)
diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb/20-bluetooth-vendor-product.hwdb
-index 6a9dc50..db3bc24 100644
+index 6a9dc50e39..db3bc24240 100644
--- a/hwdb/20-bluetooth-vendor-product.hwdb
+++ b/hwdb/20-bluetooth-vendor-product.hwdb
@@ -630,6 +630,9 @@ bluetooth:v00CE*
diff --git a/0317-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0317-hwdb-Update-database-of-Bluetooth-company-identifier.patch
index 0df6fb1..dcb7d24 100644
--- a/0317-hwdb-Update-database-of-Bluetooth-company-identifier.patch
+++ b/0317-hwdb-Update-database-of-Bluetooth-company-identifier.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
1 file changed, 9 insertions(+)
diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb/20-bluetooth-vendor-product.hwdb
-index db3bc24..0335a71 100644
+index db3bc24240..0335a71899 100644
--- a/hwdb/20-bluetooth-vendor-product.hwdb
+++ b/hwdb/20-bluetooth-vendor-product.hwdb
@@ -902,3 +902,12 @@ bluetooth:v0129*
diff --git a/0318-Allow-fractional-parts-in-disk-sizes.patch b/0318-Allow-fractional-parts-in-disk-sizes.patch
index bea605b..1b23b04 100644
--- a/0318-Allow-fractional-parts-in-disk-sizes.patch
+++ b/0318-Allow-fractional-parts-in-disk-sizes.patch
@@ -15,7 +15,7 @@ Conflicts:
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 7500779..e754747 100644
+index 75007792cc..e75474781b 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -2285,6 +2285,8 @@ int parse_bytes(const char *t, off_t *bytes) {
diff --git a/0319-add-bash-completion-for-systemd-cgtop.patch b/0319-add-bash-completion-for-systemd-cgtop.patch
index 9f1dcd8..ee32cec 100644
--- a/0319-add-bash-completion-for-systemd-cgtop.patch
+++ b/0319-add-bash-completion-for-systemd-cgtop.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] add bash completion for systemd-cgtop
create mode 100644 shell-completion/bash/systemd-cgtop
diff --git a/Makefile.am b/Makefile.am
-index d4a65e7..64d44ce 100644
+index d4a65e7f6b..64d44ce5e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -343,6 +343,7 @@ dist_bashcompletion_DATA = \
@@ -24,7 +24,7 @@ index d4a65e7..64d44ce 100644
shell-completion/bash/systemd-run \
diff --git a/shell-completion/bash/systemd-cgtop b/shell-completion/bash/systemd-cgtop
new file mode 100644
-index 0000000..d7ea42d
+index 0000000000..d7ea42d910
--- /dev/null
+++ b/shell-completion/bash/systemd-cgtop
@@ -0,0 +1,40 @@
diff --git a/0320-execute-free-directory-path-if-we-fail-to-remove-it-.patch b/0320-execute-free-directory-path-if-we-fail-to-remove-it-.patch
index b220c4d..636c3fd 100644
--- a/0320-execute-free-directory-path-if-we-fail-to-remove-it-.patch
+++ b/0320-execute-free-directory-path-if-we-fail-to-remove-it-.patch
@@ -10,7 +10,7 @@ Based on 98b47d54ce946ad3524f84eb38d2413498a333dc.
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/core/execute.c b/src/core/execute.c
-index 9b85379..ee445d7 100644
+index 9b85379b83..ee445d7cda 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1611,10 +1611,16 @@ void exec_context_tmp_dirs_done(ExecContext *c) {
diff --git a/0321-add-bash-completion-for-systemd-detect-virt.patch b/0321-add-bash-completion-for-systemd-detect-virt.patch
index c5cc392..07fb14d 100644
--- a/0321-add-bash-completion-for-systemd-detect-virt.patch
+++ b/0321-add-bash-completion-for-systemd-detect-virt.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] add bash completion for systemd-detect-virt
create mode 100644 shell-completion/bash/systemd-detect-virt
diff --git a/Makefile.am b/Makefile.am
-index 64d44ce..dafc428 100644
+index 64d44ce5e6..dafc428b86 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -345,6 +345,7 @@ dist_bashcompletion_DATA = \
@@ -24,7 +24,7 @@ index 64d44ce..dafc428 100644
shell-completion/bash/udevadm \
diff --git a/shell-completion/bash/systemd-detect-virt b/shell-completion/bash/systemd-detect-virt
new file mode 100644
-index 0000000..df06c29
+index 0000000000..df06c29841
--- /dev/null
+++ b/shell-completion/bash/systemd-detect-virt
@@ -0,0 +1,40 @@
diff --git a/0322-Do-not-print-invalid-UTF-8-in-error-messages.patch b/0322-Do-not-print-invalid-UTF-8-in-error-messages.patch
index 901c8e1..8366f12 100644
--- a/0322-Do-not-print-invalid-UTF-8-in-error-messages.patch
+++ b/0322-Do-not-print-invalid-UTF-8-in-error-messages.patch
@@ -19,7 +19,7 @@ Conflicts:
4 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index f01843d..d6ac4f6 100644
+index f01843d65e..d6ac4f6478 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -515,9 +515,7 @@ int config_parse_exec(const char *unit,
@@ -55,7 +55,7 @@ index f01843d..d6ac4f6 100644
}
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
-index 6085d33..4ac71ed 100644
+index 6085d33391..4ac71ed3f2 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -607,8 +607,7 @@ int config_parse_path(const char *unit,
@@ -79,7 +79,7 @@ index 6085d33..4ac71ed 100644
}
diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
-index 08428a5..247e562 100644
+index 08428a514a..247e562ef6 100644
--- a/src/shared/conf-parser.h
+++ b/src/shared/conf-parser.h
@@ -122,6 +122,12 @@ int log_syntax_internal(const char *unit, int level,
@@ -96,7 +96,7 @@ index 08428a5..247e562 100644
int function(const char *unit, \
const char *filename, \
diff --git a/src/shared/fileio.c b/src/shared/fileio.c
-index 121cd57..0586e33 100644
+index 121cd571aa..0586e330ea 100644
--- a/src/shared/fileio.c
+++ b/src/shared/fileio.c
@@ -526,15 +526,18 @@ static int load_env_file_push(const char *filename, unsigned line,
diff --git a/0323-add-bash-completion-for-systemd-cat.patch b/0323-add-bash-completion-for-systemd-cat.patch
index d526611..d51156b 100644
--- a/0323-add-bash-completion-for-systemd-cat.patch
+++ b/0323-add-bash-completion-for-systemd-cat.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] add bash completion for systemd-cat
create mode 100644 shell-completion/bash/systemd-cat
diff --git a/Makefile.am b/Makefile.am
-index dafc428..df476ce 100644
+index dafc428b86..df476ce60e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -342,6 +342,7 @@ dist_bashcompletion_DATA = \
@@ -24,7 +24,7 @@ index dafc428..df476ce 100644
shell-completion/bash/systemd-delta \
diff --git a/shell-completion/bash/systemd-cat b/shell-completion/bash/systemd-cat
new file mode 100644
-index 0000000..8d84042
+index 0000000000..8d84042af1
--- /dev/null
+++ b/shell-completion/bash/systemd-cat
@@ -0,0 +1,57 @@
diff --git a/0324-journal-assume-that-next-entry-is-after-previous-ent.patch b/0324-journal-assume-that-next-entry-is-after-previous-ent.patch
index 7febcfc..a6762e9 100644
--- a/0324-journal-assume-that-next-entry-is-after-previous-ent.patch
+++ b/0324-journal-assume-that-next-entry-is-after-previous-ent.patch
@@ -16,7 +16,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1047039
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 4d9787a..57ded0a 100644
+index 4d9787a1e1..57ded0abb1 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1359,7 +1359,7 @@ int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const st
diff --git a/0325-journal-forget-file-after-encountering-an-error.patch b/0325-journal-forget-file-after-encountering-an-error.patch
index de00c2b..881c49b 100644
--- a/0325-journal-forget-file-after-encountering-an-error.patch
+++ b/0325-journal-forget-file-after-encountering-an-error.patch
@@ -14,7 +14,7 @@ or sd_journal_previous that happens afterwards.
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index b1bd61f..661257b 100644
+index b1bd61fcdb..661257b243 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -50,6 +50,8 @@
diff --git a/0326-logind-ignore-failing-close-on-session-devices.patch b/0326-logind-ignore-failing-close-on-session-devices.patch
index 87f057f..808e1f7 100644
--- a/0326-logind-ignore-failing-close-on-session-devices.patch
+++ b/0326-logind-ignore-failing-close-on-session-devices.patch
@@ -25,7 +25,7 @@ Fixes:
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
-index 6605935..fd02b43 100644
+index 6605935f3c..fd02b437d6 100644
--- a/src/login/logind-session-device.c
+++ b/src/login/logind-session-device.c
@@ -162,7 +162,7 @@ static int session_device_open(SessionDevice *sd, bool active) {
diff --git a/0327-core-introduce-new-stop-protocol-for-unit-scopes.patch b/0327-core-introduce-new-stop-protocol-for-unit-scopes.patch
index d3b2514..9f83c6c 100644
--- a/0327-core-introduce-new-stop-protocol-for-unit-scopes.patch
+++ b/0327-core-introduce-new-stop-protocol-for-unit-scopes.patch
@@ -22,7 +22,7 @@ Based-on: 2d4a39e759c4ab846ad8a546abeddd40bc8d736e
7 files changed, 128 insertions(+), 3 deletions(-)
diff --git a/src/core/dbus-scope.c b/src/core/dbus-scope.c
-index 783a969..b576f76 100644
+index 783a969fb3..b576f760ef 100644
--- a/src/core/dbus-scope.c
+++ b/src/core/dbus-scope.c
@@ -31,10 +31,12 @@
@@ -110,7 +110,7 @@ index 783a969..b576f76 100644
+ return dbus_connection_send(UNIT(s)->manager->api_bus, m, NULL);
+}
diff --git a/src/core/dbus-scope.h b/src/core/dbus-scope.h
-index e6836f1..34720f2 100644
+index e6836f13f0..34720f2b75 100644
--- a/src/core/dbus-scope.h
+++ b/src/core/dbus-scope.h
@@ -30,4 +30,6 @@ DBusHandlerResult bus_scope_message_handler(Unit *u, DBusConnection *c, DBusMess
@@ -121,7 +121,7 @@ index e6836f1..34720f2 100644
+
extern const char bus_scope_interface[];
diff --git a/src/core/scope.c b/src/core/scope.c
-index 41da3b9..e75fc2b 100644
+index 41da3b9378..e75fc2b58b 100644
--- a/src/core/scope.c
+++ b/src/core/scope.c
@@ -64,6 +64,9 @@ static void scope_done(Unit *u) {
@@ -170,7 +170,7 @@ index 41da3b9..e75fc2b 100644
if (r > 0) {
if (s->timeout_stop_usec > 0) {
diff --git a/src/core/scope.h b/src/core/scope.h
-index 2a3dcb7..b4bafa7 100644
+index 2a3dcb73d7..b4bafa75bf 100644
--- a/src/core/scope.h
+++ b/src/core/scope.h
@@ -55,6 +55,8 @@ struct Scope {
@@ -183,7 +183,7 @@ index 2a3dcb7..b4bafa7 100644
Watch timer_watch;
diff --git a/src/run/run.c b/src/run/run.c
-index a6abead..93e3f88 100644
+index a6abead8ba..93e3f88e6f 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -315,6 +315,14 @@ static int start_transient_scope(
@@ -202,7 +202,7 @@ index a6abead..93e3f88 100644
if (r < 0)
return r;
diff --git a/src/shared/dbus-common.c b/src/shared/dbus-common.c
-index 3ba2d87..8a68708 100644
+index 3ba2d87c4d..8a6870868f 100644
--- a/src/shared/dbus-common.c
+++ b/src/shared/dbus-common.c
@@ -1428,3 +1428,45 @@ const char *bus_message_get_sender_with_fallback(DBusMessage *m) {
@@ -252,7 +252,7 @@ index 3ba2d87..8a68708 100644
+ return true;
+}
diff --git a/src/shared/dbus-common.h b/src/shared/dbus-common.h
-index 9752f08..8d01d14 100644
+index 9752f08c05..8d01d14045 100644
--- a/src/shared/dbus-common.h
+++ b/src/shared/dbus-common.h
@@ -242,5 +242,7 @@ const char *bus_message_get_sender_with_fallback(DBusMessage *m);
diff --git a/0328-core-watch-SIGCHLD-more-closely-to-track-processes-o.patch b/0328-core-watch-SIGCHLD-more-closely-to-track-processes-o.patch
index 4214b10..9a965ff 100644
--- a/0328-core-watch-SIGCHLD-more-closely-to-track-processes-o.patch
+++ b/0328-core-watch-SIGCHLD-more-closely-to-track-processes-o.patch
@@ -31,7 +31,7 @@ Based-on: a911bb9ab27ac0eb3bbf4e8b4109e5da9b88eee3
7 files changed, 298 insertions(+), 93 deletions(-)
diff --git a/src/core/dbus-scope.c b/src/core/dbus-scope.c
-index b576f76..58dd9ff 100644
+index b576f760ef..58dd9ff702 100644
--- a/src/core/dbus-scope.c
+++ b/src/core/dbus-scope.c
@@ -30,6 +30,7 @@
@@ -108,7 +108,7 @@ index b576f76..58dd9ff 100644
return r;
}
diff --git a/src/core/manager.c b/src/core/manager.c
-index 69ad4b5..e7b5234 100644
+index 69ad4b5010..e7b5234bb4 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1389,7 +1389,7 @@ static int manager_dispatch_sigchld(Manager *m) {
@@ -121,7 +121,7 @@ index 69ad4b5..e7b5234 100644
}
diff --git a/src/core/scope.c b/src/core/scope.c
-index e75fc2b..22bdfb2 100644
+index e75fc2b58b..22bdfb25d0 100644
--- a/src/core/scope.c
+++ b/src/core/scope.c
@@ -35,6 +35,7 @@
@@ -316,7 +316,7 @@ index e75fc2b..22bdfb2 100644
.reset_failed = scope_reset_failed,
diff --git a/src/core/scope.h b/src/core/scope.h
-index b4bafa7..1e9f201 100644
+index b4bafa75bf..1e9f201c82 100644
--- a/src/core/scope.h
+++ b/src/core/scope.h
@@ -29,6 +29,7 @@ typedef struct Scope Scope;
@@ -344,7 +344,7 @@ index b4bafa7..1e9f201 100644
ScopeState scope_state_from_string(const char *s) _pure_;
diff --git a/src/core/service.c b/src/core/service.c
-index f0acda1..41e5cb5 100644
+index f0acda102b..41e5cb55f6 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1546,6 +1546,11 @@ static void service_set_state(Service *s, ServiceState state) {
@@ -545,7 +545,7 @@ index f0acda1..41e5cb5 100644
Service *s = SERVICE(u);
const char *e;
diff --git a/src/core/unit.c b/src/core/unit.c
-index de34ddc..57a406d 100644
+index de34ddc843..57a406d1dd 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -469,6 +469,8 @@ void unit_free(Unit *u) {
@@ -688,7 +688,7 @@ index de34ddc..57a406d 100644
int unit_watch_timer(Unit *u, clockid_t clock_id, bool relative, usec_t usec, Watch *w) {
diff --git a/src/core/unit.h b/src/core/unit.h
-index 6dd750f..6dff25e 100644
+index 6dd750f8c2..6dff25e9bc 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -198,6 +198,11 @@ struct Unit {
diff --git a/0329-logind-rework-session-shutdown-logic.patch b/0329-logind-rework-session-shutdown-logic.patch
index 7e102b8..cfc4d07 100644
--- a/0329-logind-rework-session-shutdown-logic.patch
+++ b/0329-logind-rework-session-shutdown-logic.patch
@@ -38,7 +38,7 @@ Based-on: 5f41d1f10fd97e93517b6a762b1bec247f4d1171
8 files changed, 182 insertions(+), 65 deletions(-)
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
-index 6f3e442..63f0d3c 100644
+index 6f3e442efb..63f0d3c7a3 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1746,13 +1746,7 @@ static DBusHandlerResult manager_message_handler(
@@ -121,7 +121,7 @@ index 6f3e442..63f0d3c 100644
_cleanup_dbus_message_unref_ DBusMessage *reply = NULL;
const char *w;
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index 27aa335..78e6d74 100644
+index 27aa335142..78e6d74cda 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -24,6 +24,7 @@
@@ -378,7 +378,7 @@ index 27aa335..78e6d74 100644
return SESSION_ACTIVE;
diff --git a/src/login/logind-session.h b/src/login/logind-session.h
-index f175a89..9b76582 100644
+index f175a8995e..9b76582c21 100644
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -98,11 +98,14 @@ struct Session {
@@ -405,7 +405,7 @@ index f175a89..9b76582 100644
int session_load(Session *s);
int session_kill(Session *s, KillWho who, int signo);
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
-index ddf19eb..3aeac13 100644
+index ddf19eb0b6..3aeac136e8 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -529,6 +529,8 @@ int user_stop(User *u) {
@@ -454,7 +454,7 @@ index ddf19eb..3aeac13 100644
if (user_check_linger_file(u) > 0)
return USER_LINGERING;
diff --git a/src/login/logind-user.h b/src/login/logind-user.h
-index a36f456..a12532e 100644
+index a36f4565e8..a12532e229 100644
--- a/src/login/logind-user.h
+++ b/src/login/logind-user.h
@@ -61,6 +61,7 @@ struct User {
@@ -466,7 +466,7 @@ index a36f456..a12532e 100644
LIST_HEAD(Session, sessions);
LIST_FIELDS(User, gc_queue);
diff --git a/src/login/logind.c b/src/login/logind.c
-index 0628032..5180be7 100644
+index 0628032ae5..5180be7426 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -80,10 +80,11 @@ Manager *manager_new(void) {
@@ -540,7 +540,7 @@ index 0628032..5180be7 100644
int r;
Seat *seat;
diff --git a/src/login/logind.h b/src/login/logind.h
-index 9e6296c..0d2248f 100644
+index 9e6296cb7e..0d2248fa53 100644
--- a/src/login/logind.h
+++ b/src/login/logind.h
@@ -88,6 +88,7 @@ struct Manager {
@@ -564,7 +564,7 @@ index 9e6296c..0d2248f 100644
int manager_unit_is_active(Manager *manager, const char *unit);
diff --git a/src/login/pam-module.c b/src/login/pam-module.c
-index 5baf1b7..6259450 100644
+index 5baf1b73c0..6259450025 100644
--- a/src/login/pam-module.c
+++ b/src/login/pam-module.c
@@ -489,7 +489,7 @@ _public_ PAM_EXTERN int pam_sm_close_session(
diff --git a/0330-logind-order-all-scopes-after-both-systemd-logind.se.patch b/0330-logind-order-all-scopes-after-both-systemd-logind.se.patch
index eff810e..780de53 100644
--- a/0330-logind-order-all-scopes-after-both-systemd-logind.se.patch
+++ b/0330-logind-order-all-scopes-after-both-systemd-logind.se.patch
@@ -15,7 +15,7 @@ Based-on: ba4c5d93b73ef7bba0ae0c6bf2b36a42360f7a34
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
-index 63f0d3c..c1c3d7f 100644
+index 63f0d3c7a3..c1c3d7fd40 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2544,10 +2544,11 @@ int manager_start_scope(
@@ -60,7 +60,7 @@ index 63f0d3c..c1c3d7f 100644
* currently. To make this less problematic, let's shorten the
* stop timeout for sessions, so that we don't wait
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index 78e6d74..2bac0a2 100644
+index 78e6d74cda..2bac0a2392 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -518,7 +518,7 @@ static int session_start_scope(Session *s) {
@@ -73,7 +73,7 @@ index 78e6d74..2bac0a2 100644
log_error("Failed to start session scope %s: %s %s",
scope, bus_error(&error, r), error.name);
diff --git a/src/login/logind.h b/src/login/logind.h
-index 0d2248f..540572f 100644
+index 0d2248fa53..540572f164 100644
--- a/src/login/logind.h
+++ b/src/login/logind.h
@@ -184,7 +184,7 @@ int manager_send_changed(Manager *manager, const char *properties);
diff --git a/0331-logind-given-that-we-can-now-relatively-safely-shutd.patch b/0331-logind-given-that-we-can-now-relatively-safely-shutd.patch
index 3c8931e..a7e8898 100644
--- a/0331-logind-given-that-we-can-now-relatively-safely-shutd.patch
+++ b/0331-logind-given-that-we-can-now-relatively-safely-shutd.patch
@@ -11,7 +11,7 @@ Based-on: a50df72b37ce2a7caf7775c70d18c3f9504b9e80
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
-index c1c3d7f..e1f0c9a 100644
+index c1c3d7fd40..e1f0c9a0d7 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2548,10 +2548,9 @@ int manager_start_scope(
diff --git a/0332-logind-fix-reference-to-systemd-user-sessions.servic.patch b/0332-logind-fix-reference-to-systemd-user-sessions.servic.patch
index ef47801..602ddd0 100644
--- a/0332-logind-fix-reference-to-systemd-user-sessions.servic.patch
+++ b/0332-logind-fix-reference-to-systemd-user-sessions.servic.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] logind: fix reference to systemd-user-sessions.service
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index 2bac0a2..f31961a 100644
+index 2bac0a2392..f31961a9da 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -518,7 +518,7 @@ static int session_start_scope(Session *s) {
diff --git a/0333-logind-add-forgotten-call-to-user_send_changed.patch b/0333-logind-add-forgotten-call-to-user_send_changed.patch
index 4901db7..6305571 100644
--- a/0333-logind-add-forgotten-call-to-user_send_changed.patch
+++ b/0333-logind-add-forgotten-call-to-user_send_changed.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] logind: add forgotten call to user_send_changed()
1 file changed, 1 insertion(+)
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index f31961a..e519d35 100644
+index f31961a9da..e519d358c4 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -587,6 +587,7 @@ int session_start(Session *s) {
diff --git a/0334-logind-save-session-after-setting-the-stopping-flag.patch b/0334-logind-save-session-after-setting-the-stopping-flag.patch
index 902ddfa..a893b09 100644
--- a/0334-logind-save-session-after-setting-the-stopping-flag.patch
+++ b/0334-logind-save-session-after-setting-the-stopping-flag.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] logind: save session after setting the stopping flag
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index e519d35..3ab41e6 100644
+index e519d358c4..3ab41e6339 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -682,10 +682,9 @@ int session_stop(Session *s) {
diff --git a/0335-logind-save-user-state-after-stopping-the-session.patch b/0335-logind-save-user-state-after-stopping-the-session.patch
index 2cea353..fd08654 100644
--- a/0335-logind-save-user-state-after-stopping-the-session.patch
+++ b/0335-logind-save-user-state-after-stopping-the-session.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] logind: save user state after stopping the session
1 file changed, 2 insertions(+)
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index 3ab41e6..2a2a670 100644
+index 3ab41e6339..2a2a6704dd 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -685,6 +685,8 @@ int session_stop(Session *s) {
diff --git a/0336-logind-initialize-timer_fd.patch b/0336-logind-initialize-timer_fd.patch
index 70b769f..a04a9b8 100644
--- a/0336-logind-initialize-timer_fd.patch
+++ b/0336-logind-initialize-timer_fd.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] logind: initialize timer_fd
1 file changed, 1 insertion(+)
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index 2a2a670..d7c3187 100644
+index 2a2a6704dd..d7c318780c 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -89,6 +89,7 @@ Session* session_new(Manager *m, const char *id) {
diff --git a/0337-logind-pass-pointer-to-User-object-to-user_save.patch b/0337-logind-pass-pointer-to-User-object-to-user_save.patch
index b674c51..5d6e262 100644
--- a/0337-logind-pass-pointer-to-User-object-to-user_save.patch
+++ b/0337-logind-pass-pointer-to-User-object-to-user_save.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] logind: pass pointer to User object to user_save()
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index d7c3187..b0e4bf6 100644
+index d7c318780c..b0e4bf6da2 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -686,7 +686,7 @@ int session_stop(Session *s) {
diff --git a/0338-core-allow-PIDs-to-be-watched-by-two-units-at-the-sa.patch b/0338-core-allow-PIDs-to-be-watched-by-two-units-at-the-sa.patch
index af32f16..3de01d2 100644
--- a/0338-core-allow-PIDs-to-be-watched-by-two-units-at-the-sa.patch
+++ b/0338-core-allow-PIDs-to-be-watched-by-two-units-at-the-sa.patch
@@ -19,7 +19,7 @@ Conflicts:
3 files changed, 142 insertions(+), 96 deletions(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index e7b5234..58c17ab 100644
+index e7b5234bb4..58c17ab325 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -525,7 +525,10 @@ int manager_new(SystemdRunningAs running_as, bool reexecuting, Manager **_m) {
@@ -280,7 +280,7 @@ index e7b5234..58c17ab 100644
static int manager_start_target(Manager *m, const char *name, JobMode mode) {
diff --git a/src/core/manager.h b/src/core/manager.h
-index ee42c5e..0133ea5 100644
+index ee42c5e00a..0133ea5d91 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -125,7 +125,14 @@ struct Manager {
@@ -300,7 +300,7 @@ index ee42c5e..0133ea5 100644
char *notify_socket;
diff --git a/src/core/unit.c b/src/core/unit.c
-index 57a406d..dc88862 100644
+index 57a406d1dd..dc88862343 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1663,16 +1663,27 @@ int unit_watch_pid(Unit *u, pid_t pid) {
diff --git a/0339-core-correctly-unregister-PIDs-from-PID-hashtables.patch b/0339-core-correctly-unregister-PIDs-from-PID-hashtables.patch
index a40492b..e8dfd29 100644
--- a/0339-core-correctly-unregister-PIDs-from-PID-hashtables.patch
+++ b/0339-core-correctly-unregister-PIDs-from-PID-hashtables.patch
@@ -10,7 +10,7 @@ Conflicts:
1 file changed, 18 insertions(+), 23 deletions(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index dc88862..9a7720d 100644
+index dc88862343..9a7720da7b 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1666,11 +1666,11 @@ int unit_watch_pid(Unit *u, pid_t pid) {
diff --git a/0340-logind-uninitialized-timer_fd-is-set-to-1.patch b/0340-logind-uninitialized-timer_fd-is-set-to-1.patch
index 03b3f0c..2bdf47f 100644
--- a/0340-logind-uninitialized-timer_fd-is-set-to-1.patch
+++ b/0340-logind-uninitialized-timer_fd-is-set-to-1.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] logind: uninitialized timer_fd is set to -1
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index b0e4bf6..730f11d 100644
+index b0e4bf6da2..730f11de7b 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -657,7 +657,7 @@ static int session_unlink_x11_socket(Session *s) {
diff --git a/0341-logind-add-forgotten-return-statement.patch b/0341-logind-add-forgotten-return-statement.patch
index d5dc51e..399639e 100644
--- a/0341-logind-add-forgotten-return-statement.patch
+++ b/0341-logind-add-forgotten-return-statement.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] logind: add forgotten return statement
1 file changed, 2 insertions(+)
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index 730f11d..ece222a 100644
+index 730f11de7b..ece222af3e 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -782,6 +782,8 @@ void session_release(Session *s) {
diff --git a/0342-core-fix-detection-of-dead-processes.patch b/0342-core-fix-detection-of-dead-processes.patch
index fb2bd76..ac06ed4 100644
--- a/0342-core-fix-detection-of-dead-processes.patch
+++ b/0342-core-fix-detection-of-dead-processes.patch
@@ -19,7 +19,7 @@ This fixes timeouts like:
3 files changed, 34 insertions(+)
diff --git a/src/core/service.c b/src/core/service.c
-index 41e5cb5..d9bc021 100644
+index 41e5cb55f6..d9bc021812 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1429,6 +1429,14 @@ static int service_load_pid_file(Service *s, bool may_warn) {
@@ -38,7 +38,7 @@ index 41e5cb5..d9bc021 100644
if (pid == s->main_pid)
return 0;
diff --git a/src/shared/util.c b/src/shared/util.c
-index e754747..1329854 100644
+index e75474781b..132985452f 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -558,6 +558,31 @@ char *truncate_nl(char *s) {
@@ -74,7 +74,7 @@ index e754747..1329854 100644
const char *p;
diff --git a/src/shared/util.h b/src/shared/util.h
-index bdbdca3..ca38336 100644
+index bdbdca3b57..ca38336521 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -216,6 +216,7 @@ char *file_in_same_dir(const char *path, const char *filename);
diff --git a/0343-Fix-prototype-of-get_process_state.patch b/0343-Fix-prototype-of-get_process_state.patch
index b19c70c..d7af39f 100644
--- a/0343-Fix-prototype-of-get_process_state.patch
+++ b/0343-Fix-prototype-of-get_process_state.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Fix prototype of get_process_state
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/util.h b/src/shared/util.h
-index ca38336..02621a7 100644
+index ca38336521..02621a7e19 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -216,7 +216,7 @@ char *file_in_same_dir(const char *path, const char *filename);
diff --git a/0344-core-check-for-return-value-from-get_process_state.patch b/0344-core-check-for-return-value-from-get_process_state.patch
index c7ed60a..bc845fb 100644
--- a/0344-core-check-for-return-value-from-get_process_state.patch
+++ b/0344-core-check-for-return-value-from-get_process_state.patch
@@ -9,7 +9,7 @@ Fix for commit e10c9985bb.
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/core/service.c b/src/core/service.c
-index d9bc021..c8dbbef 100644
+index d9bc021812..c8dbbeff1b 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1429,11 +1429,17 @@ static int service_load_pid_file(Service *s, bool may_warn) {
diff --git a/0345-man-update-link-to-LSB.patch b/0345-man-update-link-to-LSB.patch
index 91996c8..8ad328b 100644
--- a/0345-man-update-link-to-LSB.patch
+++ b/0345-man-update-link-to-LSB.patch
@@ -11,7 +11,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1073402
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/man/daemon.xml b/man/daemon.xml
-index 26ba600..932de3b 100644
+index 26ba600521..932de3b478 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -252,7 +252,7 @@
diff --git a/0346-man-systemd-bootchart-fix-spacing-in-command.patch b/0346-man-systemd-bootchart-fix-spacing-in-command.patch
index 8adac11..fe5dc3c 100644
--- a/0346-man-systemd-bootchart-fix-spacing-in-command.patch
+++ b/0346-man-systemd-bootchart-fix-spacing-in-command.patch
@@ -12,7 +12,7 @@ Use the same formatting as the systemd-analyze man page, so that man shows a spa
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/man/systemd-bootchart.xml b/man/systemd-bootchart.xml
-index ae432b5..818afa1 100644
+index ae432b563f..818afa1a29 100644
--- a/man/systemd-bootchart.xml
+++ b/man/systemd-bootchart.xml
@@ -76,8 +76,8 @@
diff --git a/0347-man-add-missing-comma.patch b/0347-man-add-missing-comma.patch
index 705e498..2382b22 100644
--- a/0347-man-add-missing-comma.patch
+++ b/0347-man-add-missing-comma.patch
@@ -12,7 +12,7 @@ marcosf0> missing comma in udevadm "see also" section
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/udevadm.xml b/man/udevadm.xml
-index b172266..112652c 100644
+index b172266ade..112652c8d1 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -514,7 +514,7 @@
diff --git a/0348-build-sys-Don-t-distribute-generated-udev-rule.patch b/0348-build-sys-Don-t-distribute-generated-udev-rule.patch
index 51ae06a..153ab1d 100644
--- a/0348-build-sys-Don-t-distribute-generated-udev-rule.patch
+++ b/0348-build-sys-Don-t-distribute-generated-udev-rule.patch
@@ -16,7 +16,7 @@ as such it will complain at runtime if rootprefix != prefix
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
-index df476ce..5cf03c0 100644
+index df476ce60e..5cf03c0aed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2224,7 +2224,6 @@ INSTALL_DIRS += \
diff --git a/0349-units-Do-not-unescape-instance-name-in-systemd-backl.patch b/0349-units-Do-not-unescape-instance-name-in-systemd-backl.patch
index 3bd1c5b..4eab0e6 100644
--- a/0349-units-Do-not-unescape-instance-name-in-systemd-backl.patch
+++ b/0349-units-Do-not-unescape-instance-name-in-systemd-backl.patch
@@ -16,7 +16,7 @@ This results in the following error message on Asus boards:
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/units/systemd-backlight@.service.in b/units/systemd-backlight@.service.in
-index 5caa5d5..e945d87 100644
+index 5caa5d531f..e945d8733f 100644
--- a/units/systemd-backlight@.service.in
+++ b/units/systemd-backlight@.service.in
@@ -6,7 +6,7 @@
diff --git a/0350-util-add-timeout-to-generator-execution.patch b/0350-util-add-timeout-to-generator-execution.patch
index 9375ae0..2fd18a0 100644
--- a/0350-util-add-timeout-to-generator-execution.patch
+++ b/0350-util-add-timeout-to-generator-execution.patch
@@ -19,7 +19,7 @@ Conflicts:
6 files changed, 108 insertions(+), 85 deletions(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 58c17ab..3a38fab 100644
+index 58c17ab325..3a38fab6d5 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -2661,9 +2661,8 @@ void manager_run_generators(Manager *m) {
@@ -35,7 +35,7 @@ index 58c17ab..3a38fab 100644
trim_generator_dir(m, &m->generator_unit_path);
trim_generator_dir(m, &m->generator_unit_path_early);
diff --git a/src/core/shutdown.c b/src/core/shutdown.c
-index 5e0f3ce..68960b1 100644
+index 5e0f3ce9fd..68960b1abe 100644
--- a/src/core/shutdown.c
+++ b/src/core/shutdown.c
@@ -294,7 +294,7 @@ int main(int argc, char *argv[]) {
@@ -48,7 +48,7 @@ index 5e0f3ce..68960b1 100644
if (!in_container && !in_initrd() &&
access("/run/initramfs/shutdown", X_OK) == 0) {
diff --git a/src/shared/hashmap.h b/src/shared/hashmap.h
-index 3d4f672..b912af8 100644
+index 3d4f6721bc..b912af8d8f 100644
--- a/src/shared/hashmap.h
+++ b/src/shared/hashmap.h
@@ -24,6 +24,7 @@
@@ -71,7 +71,7 @@ index 3d4f672..b912af8 100644
+#define _cleanup_hashmap_free_free_ _cleanup_(hashmap_free_freep)
+#define _cleanup_hashmap_free_free_free_ _cleanup_(hashmap_free_free_freep)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 1329854..bec339b 100644
+index 132985452f..bec339b80a 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -3740,111 +3740,123 @@ bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) {
@@ -274,7 +274,7 @@ index 1329854..bec339b 100644
int kill_and_sigcont(pid_t pid, int sig) {
diff --git a/src/shared/util.h b/src/shared/util.h
-index 02621a7..47a3dc9 100644
+index 02621a7e19..47a3dc9114 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -432,7 +432,7 @@ bool tty_is_console(const char *tty) _pure_;
@@ -287,7 +287,7 @@ index 02621a7..47a3dc9 100644
int kill_and_sigcont(pid_t pid, int sig);
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
-index c228cb6..8e847db 100644
+index c228cb660f..8e847db61a 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -25,14 +25,15 @@
diff --git a/0351-input_id-Recognize-buttonless-joystick-types.patch b/0351-input_id-Recognize-buttonless-joystick-types.patch
index 392b03f..aef2ddd 100644
--- a/0351-input_id-Recognize-buttonless-joystick-types.patch
+++ b/0351-input_id-Recognize-buttonless-joystick-types.patch
@@ -17,7 +17,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=70734
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
-index 4691fc0..33c8075 100644
+index 4691fc073d..33c8075a89 100644
--- a/src/udev/udev-builtin-input_id.c
+++ b/src/udev/udev-builtin-input_id.c
@@ -116,16 +116,27 @@ static void test_pointers (struct udev_device *dev,
diff --git a/0352-logind-fix-policykit-checks.patch b/0352-logind-fix-policykit-checks.patch
index bd34592..3fef9b0 100644
--- a/0352-logind-fix-policykit-checks.patch
+++ b/0352-logind-fix-policykit-checks.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] logind: fix policykit checks
1 file changed, 6 insertions(+)
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
-index e1f0c9a..a5ab19c 100644
+index e1f0c9a0d7..a5ab19cd9e 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1302,18 +1302,24 @@ static int bus_manager_do_shutdown_or_sleep(
diff --git a/0353-nspawn-don-t-try-mknod-of-dev-console-with-the-corre.patch b/0353-nspawn-don-t-try-mknod-of-dev-console-with-the-corre.patch
index 912422c..a2aaec9 100644
--- a/0353-nspawn-don-t-try-mknod-of-dev-console-with-the-corre.patch
+++ b/0353-nspawn-don-t-try-mknod-of-dev-console-with-the-corre.patch
@@ -21,7 +21,7 @@ would fail, since creating /dev/console is not allowed by it. Creating
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 410b879..8718e94 100644
+index 410b8794dc..8718e94d14 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -679,23 +679,19 @@ static int setup_ptmx(const char *dest) {
diff --git a/0354-build-sys-Find-the-tools-for-users-with-no-sbin-usr-.patch b/0354-build-sys-Find-the-tools-for-users-with-no-sbin-usr-.patch
index 54d042d..1231029 100644
--- a/0354-build-sys-Find-the-tools-for-users-with-no-sbin-usr-.patch
+++ b/0354-build-sys-Find-the-tools-for-users-with-no-sbin-usr-.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] build-sys: Find the tools for users with no /sbin:/usr/sbin
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 6232cf8..9af56ab 100644
+index 6232cf8469..9af56ab1f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,16 +67,16 @@ AC_PROG_GCC_TRADITIONAL
diff --git a/0355-rules-mark-loop-device-as-SYSTEMD_READY-0-if-no-file.patch b/0355-rules-mark-loop-device-as-SYSTEMD_READY-0-if-no-file.patch
index 7aa438b..c17b187 100644
--- a/0355-rules-mark-loop-device-as-SYSTEMD_READY-0-if-no-file.patch
+++ b/0355-rules-mark-loop-device-as-SYSTEMD_READY-0-if-no-file.patch
@@ -15,7 +15,7 @@ ready for use yet (there's no file attached).
1 file changed, 3 insertions(+)
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
-index 1eaf0c1..79a03cd 100644
+index 1eaf0c115c..79a03cd227 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -22,6 +22,9 @@ SUBSYSTEM=="block", KERNEL!="ram*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_T
diff --git a/0356-man-multiple-sleep-modes-are-to-be-separated-by-whit.patch b/0356-man-multiple-sleep-modes-are-to-be-separated-by-whit.patch
index ed10e7e..f4e31c6 100644
--- a/0356-man-multiple-sleep-modes-are-to-be-separated-by-whit.patch
+++ b/0356-man-multiple-sleep-modes-are-to-be-separated-by-whit.patch
@@ -16,7 +16,7 @@ Conflicts:
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
-index 4622205..04f3b06 100644
+index 462220595f..04f3b06bbe 100644
--- a/man/systemd-sleep.conf.xml
+++ b/man/systemd-sleep.conf.xml
@@ -127,8 +127,8 @@ along with systemd; If not, see .
diff --git a/0357-man-fix-description-of-systemctl-after-before.patch b/0357-man-fix-description-of-systemctl-after-before.patch
index 35caaa2..0bf26b6 100644
--- a/0357-man-fix-description-of-systemctl-after-before.patch
+++ b/0357-man-fix-description-of-systemctl-after-before.patch
@@ -13,7 +13,7 @@ come *before* unit given as argument. Same for --before.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index d4048a8..03f2bc5 100644
+index d4048a8801..03f2bc5e51 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -176,8 +176,8 @@ systemctl start foo
diff --git a/0358-udev-properly-detect-reference-to-unexisting-part-of.patch b/0358-udev-properly-detect-reference-to-unexisting-part-of.patch
index 1062549..2f5f36c 100644
--- a/0358-udev-properly-detect-reference-to-unexisting-part-of.patch
+++ b/0358-udev-properly-detect-reference-to-unexisting-part-of.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] udev: properly detect reference to unexisting part of
1 file changed, 2 insertions(+)
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
-index 3db2cb7..37b545b 100644
+index 3db2cb7165..37b545b10c 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -254,6 +254,8 @@ subst:
diff --git a/0359-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0359-hwdb-Update-database-of-Bluetooth-company-identifier.patch
index 7e57634..ff4b771 100644
--- a/0359-hwdb-Update-database-of-Bluetooth-company-identifier.patch
+++ b/0359-hwdb-Update-database-of-Bluetooth-company-identifier.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
1 file changed, 12 insertions(+)
diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb/20-bluetooth-vendor-product.hwdb
-index 0335a71..7d86f10 100644
+index 0335a71899..7d86f10244 100644
--- a/hwdb/20-bluetooth-vendor-product.hwdb
+++ b/hwdb/20-bluetooth-vendor-product.hwdb
@@ -911,3 +911,15 @@ bluetooth:v012C*
diff --git a/0360-gpt-auto-generator-don-t-return-OOM-on-parentless-de.patch b/0360-gpt-auto-generator-don-t-return-OOM-on-parentless-de.patch
index a9151f7..0b79c6d 100644
--- a/0360-gpt-auto-generator-don-t-return-OOM-on-parentless-de.patch
+++ b/0360-gpt-auto-generator-don-t-return-OOM-on-parentless-de.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] gpt-auto-generator: don't return OOM on parentless devices
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
-index d7c09f0..d97374c 100644
+index d7c09f01f5..d97374cb8d 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -255,7 +255,7 @@ static int enumerate_partitions(struct udev *udev, dev_t dev) {
diff --git a/0361-man-improve-wording-of-systemctl-s-after-before.patch b/0361-man-improve-wording-of-systemctl-s-after-before.patch
index 09ce1ea..015d47a 100644
--- a/0361-man-improve-wording-of-systemctl-s-after-before.patch
+++ b/0361-man-improve-wording-of-systemctl-s-after-before.patch
@@ -19,7 +19,7 @@ Reported-by: Lennart Poettering
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index 03f2bc5..171a9bf 100644
+index 03f2bc5e51..171a9bfae5 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -173,12 +173,27 @@ systemctl start foo
diff --git a/0362-cgroup-it-s-not-OK-to-invoke-alloca-in-loops.patch b/0362-cgroup-it-s-not-OK-to-invoke-alloca-in-loops.patch
index cbde087..f246763 100644
--- a/0362-cgroup-it-s-not-OK-to-invoke-alloca-in-loops.patch
+++ b/0362-cgroup-it-s-not-OK-to-invoke-alloca-in-loops.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] cgroup: it's not OK to invoke alloca() in loops
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
-index 4359f59..679f289 100644
+index 4359f59908..679f28979a 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -210,10 +210,10 @@ int mount_setup_early(void) {
diff --git a/0363-hwdb-update.patch b/0363-hwdb-update.patch
index 23fc284..8489e57 100644
--- a/0363-hwdb-update.patch
+++ b/0363-hwdb-update.patch
@@ -12,7 +12,7 @@ Subject: [PATCH] hwdb: update
3 files changed, 2330 insertions(+), 239 deletions(-)
diff --git a/hwdb/20-OUI.hwdb b/hwdb/20-OUI.hwdb
-index a51a00a..209b89e 100644
+index a51a00aa1e..209b89ed2b 100644
--- a/hwdb/20-OUI.hwdb
+++ b/hwdb/20-OUI.hwdb
@@ -13558,6 +13558,9 @@ OUI:40D8551CA*
@@ -2599,7 +2599,7 @@ index a51a00a..209b89e 100644
ID_OUI_FROM_DATABASE=Intel Corporate
diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb/20-pci-vendor-model.hwdb
-index 7f833e3..371a685 100644
+index 7f833e3345..371a6858ef 100644
--- a/hwdb/20-pci-vendor-model.hwdb
+++ b/hwdb/20-pci-vendor-model.hwdb
@@ -890,6 +890,9 @@ pci:v00001000d0000005Bsv00001000sd00009295*
@@ -6260,7 +6260,7 @@ index 7f833e3..371a685 100644
ID_VENDOR_FROM_DATABASE=Essence Technology, Inc.
diff --git a/hwdb/20-usb-vendor-model.hwdb b/hwdb/20-usb-vendor-model.hwdb
-index 60dbcd2..014c628 100644
+index 60dbcd24bf..014c628ebb 100644
--- a/hwdb/20-usb-vendor-model.hwdb
+++ b/hwdb/20-usb-vendor-model.hwdb
@@ -20,6 +20,12 @@ usb:v0003*
diff --git a/0364-core-don-t-try-to-relabel-mounts-before-we-loaded-th.patch b/0364-core-don-t-try-to-relabel-mounts-before-we-loaded-th.patch
index bee861a..a57822f 100644
--- a/0364-core-don-t-try-to-relabel-mounts-before-we-loaded-th.patch
+++ b/0364-core-don-t-try-to-relabel-mounts-before-we-loaded-th.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] core: don't try to relabel mounts before we loaded the policy
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
-index 679f289..cff83d3 100644
+index 679f28979a..cff83d39e4 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -166,7 +166,10 @@ static int mount_one(const MountPoint *p, bool relabel) {
diff --git a/0365-man-explain-that-the-journal-field-SYSLOG_IDENTIFIER.patch b/0365-man-explain-that-the-journal-field-SYSLOG_IDENTIFIER.patch
index bacc426..fbd54b9 100644
--- a/0365-man-explain-that-the-journal-field-SYSLOG_IDENTIFIER.patch
+++ b/0365-man-explain-that-the-journal-field-SYSLOG_IDENTIFIER.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] man: explain that the journal field SYSLOG_IDENTIFIER is
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
-index b492aae..42d209b 100644
+index b492aae0ae..42d209bf9e 100644
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@@ -156,7 +156,10 @@
diff --git a/0366-man-be-more-specific-when-EnvironmentFile-is-read.patch b/0366-man-be-more-specific-when-EnvironmentFile-is-read.patch
index 20ceb6e..4d85b64 100644
--- a/0366-man-be-more-specific-when-EnvironmentFile-is-read.patch
+++ b/0366-man-be-more-specific-when-EnvironmentFile-is-read.patch
@@ -11,7 +11,7 @@ http://lists.freedesktop.org/archives/systemd-devel/2014-March/018004.html
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index d8dab36..37b9c4d 100644
+index d8dab36f3a..37b9c4d1d7 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -340,9 +340,14 @@
diff --git a/0367-systemctl-kill-mode-is-long-long-gone-don-t-mention-.patch b/0367-systemctl-kill-mode-is-long-long-gone-don-t-mention-.patch
index bc77cc3..e794f52 100644
--- a/0367-systemctl-kill-mode-is-long-long-gone-don-t-mention-.patch
+++ b/0367-systemctl-kill-mode-is-long-long-gone-don-t-mention-.patch
@@ -12,7 +12,7 @@ Subject: [PATCH] systemctl: --kill-mode is long long gone, don't mention it in
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index 171a9bf..816586c 100644
+index 171a9bfae5..816586c39e 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -671,9 +671,8 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
@@ -28,7 +28,7 @@ index 171a9bf..816586c 100644
diff --git a/shell-completion/bash/systemctl b/shell-completion/bash/systemctl
-index a5f10b4..857552d 100644
+index a5f10b4f13..857552d570 100644
--- a/shell-completion/bash/systemctl
+++ b/shell-completion/bash/systemctl
@@ -74,7 +74,7 @@ _systemctl () {
diff --git a/0368-systemctl-add-more-verbose-explanation-of-kill-who-a.patch b/0368-systemctl-add-more-verbose-explanation-of-kill-who-a.patch
index 3cb2841..e2f9abd 100644
--- a/0368-systemctl-add-more-verbose-explanation-of-kill-who-a.patch
+++ b/0368-systemctl-add-more-verbose-explanation-of-kill-who-a.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] systemctl: add more verbose explanation of --kill-who and
1 file changed, 30 insertions(+), 5 deletions(-)
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index 816586c..6492b0e 100644
+index 816586c39e..6492b0ef96 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -389,11 +389,36 @@ systemctl start foo
diff --git a/0369-ask-password-when-the-user-types-a-overly-long-passw.patch b/0369-ask-password-when-the-user-types-a-overly-long-passw.patch
index 12d4536..a8d0975 100644
--- a/0369-ask-password-when-the-user-types-a-overly-long-passw.patch
+++ b/0369-ask-password-when-the-user-types-a-overly-long-passw.patch
@@ -16,7 +16,7 @@ Based on a similar patch from David Härdeman.
1 file changed, 5 insertions(+)
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
-index 4557155..25367d0 100644
+index 4557155d45..25367d0972 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -207,6 +207,11 @@ int ask_password_tty(
diff --git a/0370-util-consider-both-fuse.glusterfs-and-glusterfs-netw.patch b/0370-util-consider-both-fuse.glusterfs-and-glusterfs-netw.patch
index 8a52525..b25e59d 100644
--- a/0370-util-consider-both-fuse.glusterfs-and-glusterfs-netw.patch
+++ b/0370-util-consider-both-fuse.glusterfs-and-glusterfs-netw.patch
@@ -16,7 +16,7 @@ Based on a similar patch by Lukáš Nykrýn.
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index bec339b..617c3ac 100644
+index bec339b80a..617c3ac288 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1625,7 +1625,14 @@ bool fstype_is_network(const char *fstype) {
diff --git a/0371-core-do-not-read-system-boot-timestamps-in-systemd-u.patch b/0371-core-do-not-read-system-boot-timestamps-in-systemd-u.patch
index b5392a2..057c102 100644
--- a/0371-core-do-not-read-system-boot-timestamps-in-systemd-u.patch
+++ b/0371-core-do-not-read-system-boot-timestamps-in-systemd-u.patch
@@ -19,7 +19,7 @@ After:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 3a38fab..28f4d72 100644
+index 3a38fab6d5..28f4d72e26 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -495,7 +495,7 @@ int manager_new(SystemdRunningAs running_as, bool reexecuting, Manager **_m) {
diff --git a/0372-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0372-hwdb-Update-database-of-Bluetooth-company-identifier.patch
index c57b6ed..4c2fcf5 100644
--- a/0372-hwdb-Update-database-of-Bluetooth-company-identifier.patch
+++ b/0372-hwdb-Update-database-of-Bluetooth-company-identifier.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
1 file changed, 18 insertions(+)
diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb/20-bluetooth-vendor-product.hwdb
-index 7d86f10..b928f5a 100644
+index 7d86f10244..b928f5a716 100644
--- a/hwdb/20-bluetooth-vendor-product.hwdb
+++ b/hwdb/20-bluetooth-vendor-product.hwdb
@@ -923,3 +923,21 @@ bluetooth:v0130*
diff --git a/0373-Add-hwdb-entry-for-Samsung-Series-7-Ultra.patch b/0373-Add-hwdb-entry-for-Samsung-Series-7-Ultra.patch
index a7730a2..ab88e0f 100644
--- a/0373-Add-hwdb-entry-for-Samsung-Series-7-Ultra.patch
+++ b/0373-Add-hwdb-entry-for-Samsung-Series-7-Ultra.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] Add hwdb entry for Samsung Series 7 Ultra
1 file changed, 8 insertions(+)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index f9084e4..fdab827 100644
+index f9084e4aa9..fdab8273d9 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -921,6 +921,14 @@ keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*90X3A*:pvr*
diff --git a/0374-udev-do-not-export-static-node-tags-for-non-existing.patch b/0374-udev-do-not-export-static-node-tags-for-non-existing.patch
index 8aecd97..27ca202 100644
--- a/0374-udev-do-not-export-static-node-tags-for-non-existing.patch
+++ b/0374-udev-do-not-export-static-node-tags-for-non-existing.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] udev: do not export "static node" tags for non-existing
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
-index c981773..392ae86 100644
+index c9817733d8..392ae86fb5 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -2572,10 +2572,15 @@ int udev_rules_apply_static_dev_perms(struct udev_rules *rules)
diff --git a/0375-journalctl-free-arg_file-on-exit.patch b/0375-journalctl-free-arg_file-on-exit.patch
index c44b086..2da3520 100644
--- a/0375-journalctl-free-arg_file-on-exit.patch
+++ b/0375-journalctl-free-arg_file-on-exit.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] journalctl: free arg_file on exit
1 file changed, 2 insertions(+)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 6f52467..b991ae3 100644
+index 6f52467042..b991ae304d 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1781,5 +1781,7 @@ int main(int argc, char *argv[]) {
diff --git a/0376-journal-fix-export-of-messages-containing-newlines.patch b/0376-journal-fix-export-of-messages-containing-newlines.patch
index 10ec3f7..004e5cd 100644
--- a/0376-journal-fix-export-of-messages-containing-newlines.patch
+++ b/0376-journal-fix-export-of-messages-containing-newlines.patch
@@ -15,7 +15,7 @@ newlines must be exported as "binary".
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
-index 91eefb3..00e6d11 100644
+index 91eefb32bd..00e6d11bd3 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -544,7 +544,9 @@ static int output_export(
@@ -40,7 +40,7 @@ index 91eefb3..00e6d11 100644
fputc('\n', f);
}
diff --git a/src/shared/utf8.c b/src/shared/utf8.c
-index 2b70d45..15605e6 100644
+index 2b70d45e97..15605e6002 100644
--- a/src/shared/utf8.c
+++ b/src/shared/utf8.c
@@ -136,7 +136,7 @@ static int utf8_encoded_to_unichar(const char *str) {
@@ -63,7 +63,7 @@ index 2b70d45..15605e6 100644
length -= encoded_len;
diff --git a/src/shared/utf8.h b/src/shared/utf8.h
-index f93dfb8..b14709a 100644
+index f93dfb8676..b14709aedc 100644
--- a/src/shared/utf8.h
+++ b/src/shared/utf8.h
@@ -31,7 +31,10 @@ const char *utf8_is_valid(const char *s) _pure_;
diff --git a/0377-tty-ask-password-agent-return-negative-errno.patch b/0377-tty-ask-password-agent-return-negative-errno.patch
index d79d90b..3ede049 100644
--- a/0377-tty-ask-password-agent-return-negative-errno.patch
+++ b/0377-tty-ask-password-agent-return-negative-errno.patch
@@ -14,7 +14,7 @@ Reported-by: Simon
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
-index f463662..256c21d 100644
+index f463662d6b..256c21d877 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -438,7 +438,7 @@ static int wall_tty_block(void) {
diff --git a/0378-systemd-python-use-.hex-instead-of-.get_hex.patch b/0378-systemd-python-use-.hex-instead-of-.get_hex.patch
index fed44a7..54b590a 100644
--- a/0378-systemd-python-use-.hex-instead-of-.get_hex.patch
+++ b/0378-systemd-python-use-.hex-instead-of-.get_hex.patch
@@ -13,7 +13,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=77086
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/python-systemd/journal.py b/src/python-systemd/journal.py
-index 9c7e004..dd1f229 100644
+index 9c7e0045e5..dd1f229973 100644
--- a/src/python-systemd/journal.py
+++ b/src/python-systemd/journal.py
@@ -293,7 +293,7 @@ class Reader(_Reader):
diff --git a/0379-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch b/0379-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch
index 8d9ace4..e13535d 100644
--- a/0379-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch
+++ b/0379-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch
@@ -18,7 +18,7 @@ Conflicts:
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/core/main.c b/src/core/main.c
-index 935762f..1ac1ba7 100644
+index 935762f7a4..1ac1ba7a31 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -411,12 +411,9 @@ static int parse_proc_cmdline_word(const char *word) {
diff --git a/0380-journal-cleanup-up-error-handling-in-update_catalog.patch b/0380-journal-cleanup-up-error-handling-in-update_catalog.patch
index 020afd4..899b238 100644
--- a/0380-journal-cleanup-up-error-handling-in-update_catalog.patch
+++ b/0380-journal-cleanup-up-error-handling-in-update_catalog.patch
@@ -15,7 +15,7 @@ Subject: [PATCH] journal: cleanup up error handling in update_catalog()
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/journal/catalog.c b/src/journal/catalog.c
-index 90ca008..e5342be 100644
+index 90ca008064..e5342bee51 100644
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -109,7 +109,7 @@ static int finish_item(
@@ -89,7 +89,7 @@ index 90ca008..e5342be 100644
strbuf_cleanup(sb);
diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c
-index 5db5bed..f021dbf 100644
+index 5db5bed8de..f021dbfd54 100644
--- a/src/journal/test-catalog.c
+++ b/src/journal/test-catalog.c
@@ -126,7 +126,8 @@ int main(int argc, char *argv[]) {
diff --git a/0381-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0381-hwdb-Update-database-of-Bluetooth-company-identifier.patch
index 304e246..c925f99 100644
--- a/0381-hwdb-Update-database-of-Bluetooth-company-identifier.patch
+++ b/0381-hwdb-Update-database-of-Bluetooth-company-identifier.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb/20-bluetooth-vendor-product.hwdb
-index b928f5a..28aa2a7 100644
+index b928f5a716..28aa2a7150 100644
--- a/hwdb/20-bluetooth-vendor-product.hwdb
+++ b/hwdb/20-bluetooth-vendor-product.hwdb
@@ -733,7 +733,7 @@ bluetooth:v00F1*
diff --git a/0382-bash-completion-fix-__get_startable_units.patch b/0382-bash-completion-fix-__get_startable_units.patch
index 1f7282d..4214624 100644
--- a/0382-bash-completion-fix-__get_startable_units.patch
+++ b/0382-bash-completion-fix-__get_startable_units.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] bash completion: fix __get_startable_units
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shell-completion/bash/systemctl b/shell-completion/bash/systemctl
-index 857552d..1e4d07a 100644
+index 857552d570..1e4d07ac42 100644
--- a/shell-completion/bash/systemctl
+++ b/shell-completion/bash/systemctl
@@ -56,7 +56,7 @@ __get_all_units () { __systemctl $1 list-units --all \
diff --git a/0383-hwdb-update.patch b/0383-hwdb-update.patch
index b09cbf2..ebc7ba6 100644
--- a/0383-hwdb-update.patch
+++ b/0383-hwdb-update.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] hwdb: update
2 files changed, 751 insertions(+), 46 deletions(-)
diff --git a/hwdb/20-OUI.hwdb b/hwdb/20-OUI.hwdb
-index 209b89e..17794ed 100644
+index 209b89ed2b..17794ed58a 100644
--- a/hwdb/20-OUI.hwdb
+++ b/hwdb/20-OUI.hwdb
@@ -6929,7 +6929,7 @@ OUI:0050C2912*
@@ -941,7 +941,7 @@ index 209b89e..17794ed 100644
OUI:FC4499*
ID_OUI_FROM_DATABASE=Swarco LEA d.o.o.
diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb/20-pci-vendor-model.hwdb
-index 371a685..d54cb2a 100644
+index 371a6858ef..d54cb2a039 100644
--- a/hwdb/20-pci-vendor-model.hwdb
+++ b/hwdb/20-pci-vendor-model.hwdb
@@ -497,6 +497,9 @@ pci:v00000E11d0000F130*
diff --git a/0384-hwdb-PCI-include-primary-model-string-in-subsystem-m.patch b/0384-hwdb-PCI-include-primary-model-string-in-subsystem-m.patch
index 183c7fb..2e5f76d 100644
--- a/0384-hwdb-PCI-include-primary-model-string-in-subsystem-m.patch
+++ b/0384-hwdb-PCI-include-primary-model-string-in-subsystem-m.patch
@@ -20,7 +20,7 @@ strings to describe the hardware.
2 files changed, 10685 insertions(+), 10682 deletions(-)
diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb/20-pci-vendor-model.hwdb
-index d54cb2a..14637d3 100644
+index d54cb2a039..14637d3087 100644
--- a/hwdb/20-pci-vendor-model.hwdb
+++ b/hwdb/20-pci-vendor-model.hwdb
@@ -15,10 +15,10 @@ pci:v0000001Cd00000001*
@@ -51583,7 +51583,7 @@ index d54cb2a..14637d3 100644
pci:v0000E159d00000002*
ID_MODEL_FROM_DATABASE=Tiger100APC ISDN chipset
diff --git a/hwdb/ids-update.pl b/hwdb/ids-update.pl
-index 37d3556..8cfbeaa 100755
+index 37d3556382..8cfbeaa009 100755
--- a/hwdb/ids-update.pl
+++ b/hwdb/ids-update.pl
@@ -107,6 +107,7 @@ sub usb_classes {
diff --git a/0385-sysctl-replaces-some-slashes-with-dots.patch b/0385-sysctl-replaces-some-slashes-with-dots.patch
index 25ba5b3..df9c793 100644
--- a/0385-sysctl-replaces-some-slashes-with-dots.patch
+++ b/0385-sysctl-replaces-some-slashes-with-dots.patch
@@ -15,7 +15,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=77466
2 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
-index 00a857b..db53b49 100644
+index 00a857b11a..db53b49599 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -68,13 +68,26 @@
@@ -62,7 +62,7 @@ index 00a857b..db53b49 100644
net.ipv6.conf.*,
net.ipv4.neigh.* and net.ipv6.neigh.*)
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index 8fb0eb6..70c4d89 100644
+index 8fb0eb6570..70c4d89f9e 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -48,12 +48,26 @@ static const char conf_file_dirs[] =
diff --git a/0386-man-document-relationship-between-RequiresMountsFor-.patch b/0386-man-document-relationship-between-RequiresMountsFor-.patch
index 06d0567..34ff99e 100644
--- a/0386-man-document-relationship-between-RequiresMountsFor-.patch
+++ b/0386-man-document-relationship-between-RequiresMountsFor-.patch
@@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1088057
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
-index 4704352..eb8b13d 100644
+index 4704352e42..eb8b13deee 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -675,13 +675,26 @@
diff --git a/0387-install-create_symlink-check-unlink-return-value.patch b/0387-install-create_symlink-check-unlink-return-value.patch
index 15611fa..fea4be0 100644
--- a/0387-install-create_symlink-check-unlink-return-value.patch
+++ b/0387-install-create_symlink-check-unlink-return-value.patch
@@ -30,7 +30,7 @@ Failed to set default target: Permission denied
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index b9c85b7..e6a61fa 100644
+index b9c85b729c..e6a61fa4f9 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1172,7 +1172,9 @@ static int create_symlink(
diff --git a/0388-delta-do-not-use-unicode-chars-in-C-locale.patch b/0388-delta-do-not-use-unicode-chars-in-C-locale.patch
index ada61d2..06aa749 100644
--- a/0388-delta-do-not-use-unicode-chars-in-C-locale.patch
+++ b/0388-delta-do-not-use-unicode-chars-in-C-locale.patch
@@ -11,7 +11,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1088418
1 file changed, 25 insertions(+), 15 deletions(-)
diff --git a/src/delta/delta.c b/src/delta/delta.c
-index a8dd57e..f1aea80 100644
+index a8dd57e4cb..f1aea8044a 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -85,6 +85,10 @@ static void pager_open_if_enabled(void) {
diff --git a/0389-core-print-debug-instead-of-error-message.patch b/0389-core-print-debug-instead-of-error-message.patch
index dc88d0c..b155628 100644
--- a/0389-core-print-debug-instead-of-error-message.patch
+++ b/0389-core-print-debug-instead-of-error-message.patch
@@ -14,7 +14,7 @@ SCOPE_STOP_SIGTERM or SCOPE_STOP_SIGKILL.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/dbus-scope.c b/src/core/dbus-scope.c
-index 58dd9ff..71d6921 100644
+index 58dd9ff702..71d6921879 100644
--- a/src/core/dbus-scope.c
+++ b/src/core/dbus-scope.c
@@ -76,7 +76,7 @@ DBusHandlerResult bus_scope_message_handler(Unit *u, DBusConnection *c, DBusMess
diff --git a/0390-tmpfiles-fix-permissions-on-new-journal-files.patch b/0390-tmpfiles-fix-permissions-on-new-journal-files.patch
index 2773bf8..e2e49e3 100644
--- a/0390-tmpfiles-fix-permissions-on-new-journal-files.patch
+++ b/0390-tmpfiles-fix-permissions-on-new-journal-files.patch
@@ -13,7 +13,7 @@ the system.journal files, not only on the journal directory.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
-index 7c6d6b9..c470045 100644
+index 7c6d6b9099..c470045321 100644
--- a/tmpfiles.d/systemd.conf
+++ b/tmpfiles.d/systemd.conf
@@ -23,6 +23,6 @@ d /run/systemd/machines 0755 root root -
diff --git a/0391-implement-a-union-to-pad-out-file_handle.patch b/0391-implement-a-union-to-pad-out-file_handle.patch
index fb4ff27..e22fdd1 100644
--- a/0391-implement-a-union-to-pad-out-file_handle.patch
+++ b/0391-implement-a-union-to-pad-out-file_handle.patch
@@ -28,7 +28,7 @@ Conflicts:
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/readahead/readahead-common.c b/src/readahead/readahead-common.c
-index aea1fbe..1edf9cc 100644
+index aea1fbeea4..1edf9cc33c 100644
--- a/src/readahead/readahead-common.c
+++ b/src/readahead/readahead-common.c
@@ -75,7 +75,7 @@ int fs_on_ssd(const char *p) {
@@ -52,7 +52,7 @@ index aea1fbe..1edf9cc 100644
return false;
diff --git a/src/shared/util.h b/src/shared/util.h
-index 47a3dc9..a173885 100644
+index 47a3dc9114..a1738856bc 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -22,6 +22,7 @@
@@ -73,7 +73,7 @@ index 47a3dc9..a173885 100644
+ char padding[sizeof(struct file_handle) + MAX_HANDLE_SZ];
+};
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index fb88acd..98d01a1 100644
+index fb88acd7b9..98d01a1384 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -215,19 +215,16 @@ static bool unix_socket_alive(const char *fn) {
diff --git a/0392-analyze-fix-plot-with-bad-y-size.patch b/0392-analyze-fix-plot-with-bad-y-size.patch
index 5719db0..1885c46 100644
--- a/0392-analyze-fix-plot-with-bad-y-size.patch
+++ b/0392-analyze-fix-plot-with-bad-y-size.patch
@@ -16,7 +16,7 @@ https://github.com/archlinuxarm/PKGBUILDs/issues/815
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/analyze/systemd-analyze.c b/src/analyze/systemd-analyze.c
-index 317baf9..25f8ad6 100644
+index 317baf9c05..25f8ad61e2 100644
--- a/src/analyze/systemd-analyze.c
+++ b/src/analyze/systemd-analyze.c
@@ -41,7 +41,7 @@
diff --git a/0393-util-make-sure-all-our-name_to_handle_at-code-makes-.patch b/0393-util-make-sure-all-our-name_to_handle_at-code-makes-.patch
index 0cf8c23..d39e18d 100644
--- a/0393-util-make-sure-all-our-name_to_handle_at-code-makes-.patch
+++ b/0393-util-make-sure-all-our-name_to_handle_at-code-makes-.patch
@@ -14,7 +14,7 @@ Conflicts:
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
-index 45099ee..d8c14e8 100644
+index 45099eeda8..d8c14e8b30 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -327,11 +327,15 @@ bool path_equal(const char *a, const char *b) {
diff --git a/0394-Fix-keysize-handling-in-cryptsetup-bits-vs.-bytes.patch b/0394-Fix-keysize-handling-in-cryptsetup-bits-vs.-bytes.patch
index 97884d2..221ece9 100644
--- a/0394-Fix-keysize-handling-in-cryptsetup-bits-vs.-bytes.patch
+++ b/0394-Fix-keysize-handling-in-cryptsetup-bits-vs.-bytes.patch
@@ -21,7 +21,7 @@ Conflicts:
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
-index 6a76d21..1211433 100644
+index 6a76d21c2c..1211433771 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -88,6 +88,13 @@ static int parse_one_option(const char *option) {
diff --git a/0395-udev-increase-the-size-of-RESULT-buffer.patch b/0395-udev-increase-the-size-of-RESULT-buffer.patch
index 73e3bdd..411103c 100644
--- a/0395-udev-increase-the-size-of-RESULT-buffer.patch
+++ b/0395-udev-increase-the-size-of-RESULT-buffer.patch
@@ -14,7 +14,7 @@ command/app is bigger then 1024 bytes.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
-index 392ae86..366d870 100644
+index 392ae86fb5..366d8709bf 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -2058,7 +2058,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
diff --git a/0396-job-add-waiting-jobs-to-run-queue-in-unit_coldplug.patch b/0396-job-add-waiting-jobs-to-run-queue-in-unit_coldplug.patch
index 4e4679c..d6b3c52 100644
--- a/0396-job-add-waiting-jobs-to-run-queue-in-unit_coldplug.patch
+++ b/0396-job-add-waiting-jobs-to-run-queue-in-unit_coldplug.patch
@@ -29,7 +29,7 @@ This includes the fixup in ae6feb2a01f6954af682bc3580c95d99721dcf46.
1 file changed, 3 insertions(+)
diff --git a/src/core/job.c b/src/core/job.c
-index 7d2b994..c6bf08f 100644
+index 7d2b994026..c6bf08fc06 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -1070,6 +1070,9 @@ int job_coldplug(Job *j) {
diff --git a/0397-machine-id-only-look-into-KVM-uuid-when-we-are-not-r.patch b/0397-machine-id-only-look-into-KVM-uuid-when-we-are-not-r.patch
index 22677b8..8a4f038 100644
--- a/0397-machine-id-only-look-into-KVM-uuid-when-we-are-not-r.patch
+++ b/0397-machine-id-only-look-into-KVM-uuid-when-we-are-not-r.patch
@@ -15,7 +15,7 @@ Conflicts:
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c
-index 18e015f..dcd1630 100644
+index 18e015fe7f..dcd16308db 100644
--- a/src/core/machine-id-setup.c
+++ b/src/core/machine-id-setup.c
@@ -88,29 +88,6 @@ static int generate(char id[34]) {
diff --git a/0398-hwdb-update.patch b/0398-hwdb-update.patch
index 4bec12f..ebc2f11 100644
--- a/0398-hwdb-update.patch
+++ b/0398-hwdb-update.patch
@@ -12,7 +12,7 @@ Subject: [PATCH] hwdb: update
3 files changed, 1368 insertions(+), 93 deletions(-)
diff --git a/hwdb/20-OUI.hwdb b/hwdb/20-OUI.hwdb
-index 17794ed..afc0d90 100644
+index 17794ed58a..afc0d90350 100644
--- a/hwdb/20-OUI.hwdb
+++ b/hwdb/20-OUI.hwdb
@@ -13940,7 +13940,7 @@ OUI:000063*
@@ -1002,7 +1002,7 @@ index 17794ed..afc0d90 100644
ID_OUI_FROM_DATABASE=QTS NETWORKS
diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb/20-pci-vendor-model.hwdb
-index 14637d3..2957774 100644
+index 14637d3087..2957774ef1 100644
--- a/hwdb/20-pci-vendor-model.hwdb
+++ b/hwdb/20-pci-vendor-model.hwdb
@@ -1673,6 +1673,9 @@ pci:v00001002d00001306*
@@ -1418,7 +1418,7 @@ index 14637d3..2957774 100644
pci:v00008086d00001584*
ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40GbE QSFP+
diff --git a/hwdb/20-usb-vendor-model.hwdb b/hwdb/20-usb-vendor-model.hwdb
-index 014c628..52586bc 100644
+index 014c628ebb..52586bc973 100644
--- a/hwdb/20-usb-vendor-model.hwdb
+++ b/hwdb/20-usb-vendor-model.hwdb
@@ -21,7 +21,7 @@ usb:v0004*
diff --git a/0399-core-check-the-right-variable-for-failed-open.patch b/0399-core-check-the-right-variable-for-failed-open.patch
index a78f27f..5ebee43 100644
--- a/0399-core-check-the-right-variable-for-failed-open.patch
+++ b/0399-core-check-the-right-variable-for-failed-open.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] core: check the right variable for failed open()
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
-index 32e2599..c215a86 100644
+index 32e2599a2c..c215a86aad 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -661,7 +661,7 @@ int manager_setup_cgroup(Manager *m) {
diff --git a/0400-man-sd_journal_send-does-nothing-when-journald-is-no.patch b/0400-man-sd_journal_send-does-nothing-when-journald-is-no.patch
index 28a6490..4a01cb0 100644
--- a/0400-man-sd_journal_send-does-nothing-when-journald-is-no.patch
+++ b/0400-man-sd_journal_send-does-nothing-when-journald-is-no.patch
@@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1096067
1 file changed, 5 insertions(+)
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
-index 871baff..5ae10bf 100644
+index 871baff8a5..5ae10bf5b5 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -218,6 +218,11 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid(
diff --git a/0401-core-sysvcompat-network-should-be-equivalent-to-netw.patch b/0401-core-sysvcompat-network-should-be-equivalent-to-netw.patch
index eb35df3..1566a18 100644
--- a/0401-core-sysvcompat-network-should-be-equivalent-to-netw.patch
+++ b/0401-core-sysvcompat-network-should-be-equivalent-to-netw.patch
@@ -27,7 +27,7 @@ Cc: Michal Sekletar
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/core/service.c b/src/core/service.c
-index c8dbbef..3bda9a3 100644
+index c8dbbeff1b..3bda9a37d6 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -359,7 +359,7 @@ static int sysv_translate_facility(const char *name, const char *filename, char
diff --git a/0402-udev-do-not-skip-the-execution-of-RUN-when-renaming-.patch b/0402-udev-do-not-skip-the-execution-of-RUN-when-renaming-.patch
index d257b7a..e3cf800 100644
--- a/0402-udev-do-not-skip-the-execution-of-RUN-when-renaming-.patch
+++ b/0402-udev-do-not-skip-the-execution-of-RUN-when-renaming-.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] udev: do not skip the execution of RUN when renaming a
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/test/test-udev.c b/src/test/test-udev.c
-index 676669b..c59aab1 100644
+index 676669ba88..c59aab11a6 100644
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -157,8 +157,7 @@ int main(int argc, char *argv[])
@@ -27,7 +27,7 @@ index 676669b..c59aab1 100644
if (event != NULL && event->fd_signal >= 0)
close(event->fd_signal);
diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c
-index 3aa3274..4610823 100644
+index 3aa3274bfc..461082357f 100644
--- a/src/udev/udevadm-test.c
+++ b/src/udev/udevadm-test.c
@@ -42,7 +42,6 @@ static int adm_test(struct udev *udev, int argc, char *argv[])
@@ -63,7 +63,7 @@ index 3aa3274..4610823 100644
out:
if (event != NULL && event->fd_signal >= 0)
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 7c6c5d6..5235cbd 100644
+index 7c6c5d6a87..5235cbd2ca 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -288,13 +288,12 @@ static void worker_new(struct event *event)
diff --git a/0403-udev-avoid-use-of-uninitialized-err.patch b/0403-udev-avoid-use-of-uninitialized-err.patch
index 7d846ad..44670b5 100644
--- a/0403-udev-avoid-use-of-uninitialized-err.patch
+++ b/0403-udev-avoid-use-of-uninitialized-err.patch
@@ -18,7 +18,7 @@ Conflicts:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 5235cbd..bbca5d5 100644
+index 5235cbd2ca..bbca5d5bb4 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -272,7 +272,7 @@ static void worker_new(struct event *event)
diff --git a/0404-shared-install-do-not-prefix-created-symlink-with-ro.patch b/0404-shared-install-do-not-prefix-created-symlink-with-ro.patch
index 42eb5aa..7482632 100644
--- a/0404-shared-install-do-not-prefix-created-symlink-with-ro.patch
+++ b/0404-shared-install-do-not-prefix-created-symlink-with-ro.patch
@@ -12,7 +12,7 @@ After: /var/tmp/inst1/etc/systemd/system/default.target -> /usr/lib/systemd/syst
1 file changed, 43 insertions(+), 46 deletions(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index e6a61fa..9f34ac5 100644
+index e6a61fa4f9..9f34ac5ad5 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1039,67 +1039,64 @@ static int unit_file_search(
diff --git a/0405-shared-include-root-when-canonicalizing-conf-paths.patch b/0405-shared-include-root-when-canonicalizing-conf-paths.patch
index 52c59b2..2dc9f78 100644
--- a/0405-shared-include-root-when-canonicalizing-conf-paths.patch
+++ b/0405-shared-include-root-when-canonicalizing-conf-paths.patch
@@ -26,7 +26,7 @@ path_strv_canonicalize with a list of absolute paths.
6 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c
-index ed4070c..3d5b1df 100644
+index ed4070c662..3d5b1dfb39 100644
--- a/src/shared/conf-files.c
+++ b/src/shared/conf-files.c
@@ -37,12 +37,8 @@
@@ -62,7 +62,7 @@ index ed4070c..3d5b1df 100644
hashmap_free_free(fh);
return r;
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
-index 1a47ea9..03c1380 100644
+index 1a47ea9ce7..03c1380076 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -316,7 +316,7 @@ int lookup_paths_init(
@@ -88,7 +88,7 @@ index 1a47ea9..03c1380 100644
strv_uniq(p->sysvinit_path);
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
-index d8c14e8..36542cd 100644
+index d8c14e8b30..36542cdb8b 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -165,7 +165,7 @@ char **path_strv_make_absolute_cwd(char **l) {
@@ -153,7 +153,7 @@ index d8c14e8..36542cd 100644
return strv_uniq(l);
diff --git a/src/shared/path-util.h b/src/shared/path-util.h
-index 1e58e1b..f867ab6 100644
+index 1e58e1b813..f867ab6d2a 100644
--- a/src/shared/path-util.h
+++ b/src/shared/path-util.h
@@ -46,8 +46,8 @@ char* path_startswith(const char *path, const char *prefix) _pure_;
@@ -168,7 +168,7 @@ index 1e58e1b..f867ab6 100644
int path_is_mount_point(const char *path, bool allow_symlink);
int path_is_read_only_fs(const char *path);
diff --git a/src/shared/util.c b/src/shared/util.c
-index 617c3ac..533db92 100644
+index 617c3ac288..533db92918 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -5704,7 +5704,7 @@ static int search_and_fopen_internal(const char *path, const char *mode, char **
@@ -181,7 +181,7 @@ index 617c3ac..533db92 100644
STRV_FOREACH(i, search) {
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
-index 366d870..7e6db81 100644
+index 366d8709bf..7e6db812c9 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1628,7 +1628,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
diff --git a/0406-Make-systemctl-root-look-for-files-in-the-proper-pla.patch b/0406-Make-systemctl-root-look-for-files-in-the-proper-pla.patch
index f5f7d10..6a07752 100644
--- a/0406-Make-systemctl-root-look-for-files-in-the-proper-pla.patch
+++ b/0406-Make-systemctl-root-look-for-files-in-the-proper-pla.patch
@@ -40,7 +40,7 @@ Conflicts:
6 files changed, 75 insertions(+), 32 deletions(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 28f4d72..1baa863 100644
+index 28f4d72e26..1baa8631a1 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -890,6 +890,7 @@ int manager_startup(Manager *m, FILE *serialization, FDSet *fds) {
@@ -60,7 +60,7 @@ index 28f4d72..1baa863 100644
m->generator_unit_path_early,
m->generator_unit_path_late);
diff --git a/src/shared/install.c b/src/shared/install.c
-index 9f34ac5..cb07947 100644
+index 9f34ac5ad5..cb07947527 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -47,7 +47,9 @@ typedef struct {
@@ -190,7 +190,7 @@ index 9f34ac5..cb07947 100644
return r;
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
-index 03c1380..b62f302 100644
+index 03c1380076..b62f302489 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -239,6 +239,7 @@ int lookup_paths_init(
@@ -233,7 +233,7 @@ index 03c1380..b62f302 100644
_cleanup_free_ char *t = strv_join(p->sysvinit_path, "\n\t");
if (!t)
diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h
-index 9dee85f..0db9bfb 100644
+index 9dee85f967..0db9bfb249 100644
--- a/src/shared/path-lookup.h
+++ b/src/shared/path-lookup.h
@@ -41,5 +41,11 @@ SystemdRunningAs systemd_running_as_from_string(const char *s) _pure_;
@@ -250,7 +250,7 @@ index 9dee85f..0db9bfb 100644
+ const char *generator_late);
void lookup_paths_free(LookupPaths *p);
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
-index 36542cd..5c0bf93 100644
+index 36542cdb8b..5c0bf93181 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -179,36 +179,63 @@ char **path_strv_canonicalize_absolute(char **l, const char *prefix) {
@@ -329,7 +329,7 @@ index 36542cd..5c0bf93 100644
free(t);
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index da49da7..517257b 100644
+index da49da7c32..517257b77f 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4239,7 +4239,7 @@ static int enable_sysv_units(const char *verb, char **args) {
diff --git a/0407-util-replace-close_nointr_nofail-by-a-more-useful-sa.patch b/0407-util-replace-close_nointr_nofail-by-a-more-useful-sa.patch
index 3832353..77e562e 100644
--- a/0407-util-replace-close_nointr_nofail-by-a-more-useful-sa.patch
+++ b/0407-util-replace-close_nointr_nofail-by-a-more-useful-sa.patch
@@ -133,7 +133,7 @@ Conflicts:
76 files changed, 297 insertions(+), 483 deletions(-)
diff --git a/src/core/audit-fd.c b/src/core/audit-fd.c
-index 5955bd8..4326d17 100644
+index 5955bd846e..4326d17360 100644
--- a/src/core/audit-fd.c
+++ b/src/core/audit-fd.c
@@ -55,7 +55,7 @@ int get_audit_fd(void) {
@@ -146,7 +146,7 @@ index 5955bd8..4326d17 100644
initialized = true;
audit_fd = -ECONNRESET;
diff --git a/src/core/automount.c b/src/core/automount.c
-index 203104e..4c753de 100644
+index 203104ed94..4c753de136 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -92,8 +92,7 @@ static void unmount_autofs(Automount *a) {
@@ -268,7 +268,7 @@ index 203104e..4c753de 100644
static void automount_reset_failed(Unit *u) {
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
-index c215a86..9e46304 100644
+index c215a86aad..9e463043b3 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -657,8 +657,7 @@ int manager_setup_cgroup(Manager *m) {
@@ -294,7 +294,7 @@ index c215a86..9e46304 100644
free(m->cgroup_root);
m->cgroup_root = NULL;
diff --git a/src/core/dbus.c b/src/core/dbus.c
-index aa3d93b..b616a24 100644
+index aa3d93bf06..b616a24a3f 100644
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -147,7 +147,7 @@ static dbus_bool_t bus_add_watch(DBusWatch *bus_watch, void *data) {
@@ -336,7 +336,7 @@ index aa3d93b..b616a24 100644
}
diff --git a/src/core/execute.c b/src/core/execute.c
-index ee445d7..add66ce 100644
+index ee445d7cda..add66ceceb 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -103,7 +103,7 @@ static int shift_fds(int fds[], unsigned n_fds) {
@@ -486,7 +486,7 @@ index ee445d7..add66ce 100644
int exec_spawn(ExecCommand *command,
diff --git a/src/core/ima-setup.c b/src/core/ima-setup.c
-index 7f8ec23..ed65096 100644
+index 7f8ec23d58..ed65096f04 100644
--- a/src/core/ima-setup.c
+++ b/src/core/ima-setup.c
@@ -47,7 +47,7 @@ int ima_setup(void) {
@@ -510,7 +510,7 @@ index 7f8ec23..ed65096 100644
return result;
#endif /* HAVE_IMA */
diff --git a/src/core/job.c b/src/core/job.c
-index c6bf08f..916e191 100644
+index c6bf08fc06..916e191075 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -110,7 +110,7 @@ void job_free(Job *j) {
@@ -542,7 +542,7 @@ index c6bf08f..916e191 100644
j->timer_watch.type = WATCH_JOB_TIMER;
j->timer_watch.fd = fdset_remove(fds, fd);
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
-index d6ac4f6..45b36b9 100644
+index d6ac4f6478..45b36b97c4 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -2373,7 +2373,7 @@ static int open_follow(char **filename, FILE **_f, Set *names, char **_final) {
@@ -555,7 +555,7 @@ index d6ac4f6..45b36b9 100644
}
diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c
-index dcd1630..86fa0b4 100644
+index dcd16308db..86fa0b4c99 100644
--- a/src/core/machine-id-setup.c
+++ b/src/core/machine-id-setup.c
@@ -73,7 +73,7 @@ static int generate(char id[34]) {
@@ -587,7 +587,7 @@ index dcd1630..86fa0b4 100644
/* Hmm, we couldn't write it? So let's write it to
* /run/machine-id as a replacement */
diff --git a/src/core/main.c b/src/core/main.c
-index 1ac1ba7..2a294c6 100644
+index 1ac1ba7a31..2a294c67fb 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -235,7 +235,7 @@ static int console_setup(bool do_reset) {
@@ -600,7 +600,7 @@ index 1ac1ba7..2a294c6 100644
}
diff --git a/src/core/manager.c b/src/core/manager.c
-index 1baa863..1e7dc38 100644
+index 1baa8631a1..1e7dc3835c 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -192,8 +192,7 @@ static int manager_watch_jobs_in_progress(Manager *m) {
@@ -692,7 +692,7 @@ index 1baa863..1e7dc38 100644
free(message);
}
diff --git a/src/core/path.c b/src/core/path.c
-index 99e2fed..5e4f6d5 100644
+index 99e2fedf29..5e4f6d5b69 100644
--- a/src/core/path.c
+++ b/src/core/path.c
@@ -150,9 +150,7 @@ void path_spec_unwatch(PathSpec *s, Unit *u) {
@@ -707,7 +707,7 @@ index 99e2fed..5e4f6d5 100644
int path_spec_fd_event(PathSpec *s, uint32_t events) {
diff --git a/src/core/service.c b/src/core/service.c
-index 3bda9a3..f0df5fe 100644
+index 3bda9a37d6..f0df5fead8 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -222,8 +222,7 @@ static void service_close_socket_fd(Service *s) {
@@ -731,7 +731,7 @@ index 3bda9a3..f0df5fe 100644
}
} else if (streq(key, "main-exec-status-pid")) {
diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
-index 1434dea..8838d31 100644
+index 1434dea7c1..8838d31a88 100644
--- a/src/core/smack-setup.c
+++ b/src/core/smack-setup.c
@@ -86,7 +86,7 @@ static int write_rules(const char* dstpath, const char* srcdir) {
@@ -744,7 +744,7 @@ index 1434dea..8838d31 100644
continue;
}
diff --git a/src/core/socket.c b/src/core/socket.c
-index e673f38..842850f 100644
+index e673f3884c..842850f9d2 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -113,7 +113,7 @@ void socket_free_ports(Socket *s) {
@@ -894,7 +894,7 @@ index e673f38..842850f 100644
}
}
diff --git a/src/core/switch-root.c b/src/core/switch-root.c
-index ce0e41d..518ec1f 100644
+index ce0e41d510..518ec1f0a7 100644
--- a/src/core/switch-root.c
+++ b/src/core/switch-root.c
@@ -41,11 +41,10 @@ int switch_root(const char *new_root) {
@@ -987,7 +987,7 @@ index ce0e41d..518ec1f 100644
+ return 0;
}
diff --git a/src/core/umount.c b/src/core/umount.c
-index fbd7e1c..57a97e1 100644
+index fbd7e1c101..57a97e1dc7 100644
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -315,14 +315,14 @@ static int dm_list_get(MountPoint **head) {
@@ -1010,7 +1010,7 @@ index fbd7e1c..57a97e1 100644
return 1;
diff --git a/src/core/unit.c b/src/core/unit.c
-index 9a7720d..c05926a 100644
+index 9a7720da7b..c05926ad3b 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1851,7 +1851,7 @@ int unit_watch_timer(Unit *u, clockid_t clock_id, bool relative, usec_t usec, Wa
@@ -1032,7 +1032,7 @@ index 9a7720d..c05926a 100644
w->fd = -1;
w->type = WATCH_INVALID;
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
-index 1189fe7..1ae104a 100644
+index 1189fe76bf..1ae104a1a4 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -183,7 +183,7 @@ static int process_progress(int fd) {
@@ -1063,7 +1063,7 @@ index 1189fe7..1ae104a 100644
if (progress_pipe[0] >= 0) {
process_progress(progress_pipe[0]);
diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
-index ec33040..03a379a 100644
+index ec33040509..03a379a954 100644
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -258,7 +258,7 @@ static void fifo_free(Fifo *f) {
@@ -1086,7 +1086,7 @@ index ec33040..03a379a 100644
if (s->bus) {
dbus_connection_flush(s->bus);
diff --git a/src/journal/cat.c b/src/journal/cat.c
-index ea61578..b4b1332 100644
+index ea61578353..b4b13323c2 100644
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -151,7 +151,7 @@ int main(int argc, char *argv[]) {
@@ -1113,7 +1113,7 @@ index ea61578..b4b1332 100644
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
diff --git a/src/journal/catalog.c b/src/journal/catalog.c
-index e5342be..7f748b3 100644
+index e5342bee51..7f748b3ae1 100644
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -435,18 +435,18 @@ static int open_mmap(const char *database, int *_fd, struct stat *_st, void **_p
@@ -1148,7 +1148,7 @@ index e5342be..7f748b3 100644
return -EBADMSG;
}
diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c
-index a5997e2..f384286 100644
+index a5997e2359..f3842864c4 100644
--- a/src/journal/coredumpctl.c
+++ b/src/journal/coredumpctl.c
@@ -491,8 +491,7 @@ static int run_gdb(sd_journal *j) {
@@ -1162,7 +1162,7 @@ index a5997e2..f384286 100644
pid = fork();
if (pid < 0) {
diff --git a/src/journal/journal-authenticate.c b/src/journal/journal-authenticate.c
-index f416b79..5ab1982 100644
+index f416b79a34..5ab1982bf0 100644
--- a/src/journal/journal-authenticate.c
+++ b/src/journal/journal-authenticate.c
@@ -418,10 +418,9 @@ finish:
@@ -1179,7 +1179,7 @@ index f416b79..5ab1982 100644
}
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 57ded0a..2d2d289 100644
+index 57ded0abb1..2d2d289260 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -133,9 +133,7 @@ void journal_file_close(JournalFile *f) {
@@ -1194,7 +1194,7 @@ index 57ded0a..2d2d289 100644
if (f->mmap)
diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
-index d99ff0c..d40eaba 100644
+index d99ff0c9cc..d40eababa6 100644
--- a/src/journal/journal-send.c
+++ b/src/journal/journal-send.c
@@ -66,7 +66,7 @@ retry:
@@ -1262,7 +1262,7 @@ index d99ff0c..d40eaba 100644
}
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
-index f2422ff..55ec6fd 100644
+index f2422ff841..55ec6fd7e6 100644
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -1228,9 +1228,9 @@ int journal_file_verify(
@@ -1300,7 +1300,7 @@ index f2422ff..55ec6fd 100644
return r;
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index b991ae3..9886a2f 100644
+index b991ae304d..9886a2fe4a 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1141,7 +1141,7 @@ static int setup_keys(void) {
@@ -1323,7 +1323,7 @@ index b991ae3..9886a2f 100644
if (k) {
unlink(k);
diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c
-index 1ee3afe..7a566ae 100644
+index 1ee3afeacc..7a566ae9e4 100644
--- a/src/journal/journald-console.c
+++ b/src/journal/journald-console.c
@@ -107,7 +107,7 @@ void server_forward_console(
@@ -1336,7 +1336,7 @@ index 1ee3afe..7a566ae 100644
finish:
free(ident_buf);
diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
-index 9895808..4c2f6e7 100644
+index 98958081d2..4c2f6e7767 100644
--- a/src/journal/journald-kmsg.c
+++ b/src/journal/journald-kmsg.c
@@ -407,7 +407,7 @@ int server_open_dev_kmsg(Server *s) {
@@ -1368,7 +1368,7 @@ index 9895808..4c2f6e7 100644
return 0;
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index cd2cfe9..0b31d10 100644
+index cd2cfe9bb4..0b31d1015c 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1638,26 +1638,13 @@ void server_done(Server *s) {
@@ -1406,7 +1406,7 @@ index cd2cfe9..0b31d10 100644
if (s->rate_limit)
journal_rate_limit_free(s->rate_limit);
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
-index aae381b..816e351 100644
+index aae381b4ee..816e351e0a 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -327,7 +327,7 @@ void stdout_stream_free(StdoutStream *s) {
@@ -1435,7 +1435,7 @@ index aae381b..816e351 100644
}
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index 661257b..3840ee4 100644
+index 661257b243..3840ee486f 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1836,8 +1836,7 @@ _public_ void sd_journal_close(sd_journal *j) {
@@ -1449,7 +1449,7 @@ index 661257b..3840ee4 100644
if (j->mmap) {
log_debug("mmap cache statistics: %u hit, %u miss", mmap_cache_get_hit(j->mmap), mmap_cache_get_missed(j->mmap));
diff --git a/src/journal/test-journal-verify.c b/src/journal/test-journal-verify.c
-index 0540074..3b181c6 100644
+index 0540074207..3b181c6794 100644
--- a/src/journal/test-journal-verify.c
+++ b/src/journal/test-journal-verify.c
@@ -48,7 +48,7 @@ static void bit_toggle(const char *fn, uint64_t p) {
@@ -1462,7 +1462,7 @@ index 0540074..3b181c6 100644
static int raw_verify(const char *fn, const char *verification_key) {
diff --git a/src/journal/test-mmap-cache.c b/src/journal/test-mmap-cache.c
-index e2ffaf4..868ba00 100644
+index e2ffaf4723..868ba007b6 100644
--- a/src/journal/test-mmap-cache.c
+++ b/src/journal/test-mmap-cache.c
@@ -71,9 +71,9 @@ int main(int argc, char *argv[]) {
@@ -1479,7 +1479,7 @@ index e2ffaf4..868ba00 100644
return 0;
}
diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c
-index bf8de04..4efc65f 100644
+index bf8de04ab6..4efc65fea4 100644
--- a/src/libsystemd-bus/bus-kernel.c
+++ b/src/libsystemd-bus/bus-kernel.c
@@ -414,7 +414,7 @@ static void close_kdbus_msg(sd_bus *bus, struct kdbus_msg *k) {
@@ -1510,7 +1510,7 @@ index bf8de04..4efc65f 100644
void bus_kernel_push_memfd(sd_bus *bus, int fd, void *address, size_t size) {
diff --git a/src/libsystemd-bus/bus-message.c b/src/libsystemd-bus/bus-message.c
-index 760a148..7284d27 100644
+index 760a148fad..7284d27879 100644
--- a/src/libsystemd-bus/bus-message.c
+++ b/src/libsystemd-bus/bus-message.c
@@ -68,7 +68,7 @@ static void message_free_part(sd_bus_message *m, struct bus_body_part *part) {
@@ -1533,7 +1533,7 @@ index 760a148..7284d27 100644
return r;
}
diff --git a/src/libsystemd-bus/bus-socket.c b/src/libsystemd-bus/bus-socket.c
-index b60facb..32b9207 100644
+index b60facb20f..32b92079d6 100644
--- a/src/libsystemd-bus/bus-socket.c
+++ b/src/libsystemd-bus/bus-socket.c
@@ -745,7 +745,7 @@ int bus_socket_exec(sd_bus *b) {
@@ -1555,7 +1555,7 @@ index b60facb..32b9207 100644
return bus_socket_start_auth(b);
diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c
-index 8dc3f6e..6f08a00 100644
+index 8dc3f6e345..6f08a00a02 100644
--- a/src/libsystemd-bus/sd-bus.c
+++ b/src/libsystemd-bus/sd-bus.c
@@ -49,10 +49,10 @@ static void bus_close_fds(sd_bus *b) {
@@ -1572,7 +1572,7 @@ index 8dc3f6e..6f08a00 100644
b->input_fd = b->output_fd = -1;
}
diff --git a/src/libsystemd-bus/sd-memfd.c b/src/libsystemd-bus/sd-memfd.c
-index bd14da3..4ecfe61 100644
+index bd14da3a70..4ecfe61ab3 100644
--- a/src/libsystemd-bus/sd-memfd.c
+++ b/src/libsystemd-bus/sd-memfd.c
@@ -88,7 +88,7 @@ void sd_memfd_free(sd_memfd *m) {
@@ -1585,7 +1585,7 @@ index bd14da3..4ecfe61 100644
free(m);
}
diff --git a/src/libsystemd-bus/test-bus-chat.c b/src/libsystemd-bus/test-bus-chat.c
-index f308edd..b2c2636 100644
+index f308eddbb0..b2c263628a 100644
--- a/src/libsystemd-bus/test-bus-chat.c
+++ b/src/libsystemd-bus/test-bus-chat.c
@@ -229,7 +229,7 @@ static int server(sd_bus *bus) {
@@ -1598,7 +1598,7 @@ index f308edd..b2c2636 100644
}
diff --git a/src/libsystemd-bus/test-bus-kernel-benchmark.c b/src/libsystemd-bus/test-bus-kernel-benchmark.c
-index 2e84cd9..7ee9fbb 100644
+index 2e84cd9244..7ee9fbb160 100644
--- a/src/libsystemd-bus/test-bus-kernel-benchmark.c
+++ b/src/libsystemd-bus/test-bus-kernel-benchmark.c
@@ -269,7 +269,7 @@ int main(int argc, char *argv[]) {
@@ -1611,7 +1611,7 @@ index 2e84cd9..7ee9fbb 100644
switch (mode) {
diff --git a/src/libsystemd-bus/test-bus-kernel.c b/src/libsystemd-bus/test-bus-kernel.c
-index 680dcde..2d08bc8 100644
+index 680dcde5b4..2d08bc82ac 100644
--- a/src/libsystemd-bus/test-bus-kernel.c
+++ b/src/libsystemd-bus/test-bus-kernel.c
@@ -122,14 +122,12 @@ int main(int argc, char *argv[]) {
@@ -1632,7 +1632,7 @@ index 680dcde..2d08bc8 100644
r = sd_bus_send(b, m, NULL);
assert_se(r >= 0);
diff --git a/src/login/inhibit.c b/src/login/inhibit.c
-index 29e50c1..37edc5e 100644
+index 29e50c1447..37edc5edb5 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -285,7 +285,7 @@ int main(int argc, char *argv[]) {
@@ -1645,7 +1645,7 @@ index 29e50c1..37edc5e 100644
execvp(argv[optind], argv + optind);
diff --git a/src/login/logind-button.c b/src/login/logind-button.c
-index 4f456d2..1705a29 100644
+index 4f456d21af..1705a294c1 100644
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -74,7 +74,7 @@ void button_free(Button *b) {
@@ -1658,7 +1658,7 @@ index 4f456d2..1705a29 100644
}
diff --git a/src/login/logind-core.c b/src/login/logind-core.c
-index 36999ac..ce14a99 100644
+index 36999ace40..ce14a992a1 100644
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -460,7 +460,7 @@ static int vt_is_busy(int vtnr) {
@@ -1671,7 +1671,7 @@ index 36999ac..ce14a99 100644
return r;
}
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
-index a5ab19c..24f6622 100644
+index a5ab19cd9e..24f6622330 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -795,7 +795,7 @@ static int bus_manager_inhibit(
@@ -1694,7 +1694,7 @@ index a5ab19c..24f6622 100644
return r;
}
diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
-index e770883..38a6841 100644
+index e77088364a..38a684189a 100644
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -258,8 +258,7 @@ int inhibitor_load(Inhibitor *i) {
@@ -1718,7 +1718,7 @@ index e770883..38a6841 100644
if (i->fifo_path) {
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
-index feebcf4..b581925 100644
+index feebcf4558..b581925091 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -183,8 +183,7 @@ static int vt_allocate(int vtnr) {
@@ -1732,7 +1732,7 @@ index feebcf4..b581925 100644
return r;
}
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index ece222a..13de549 100644
+index ece222af3e..13de549ddf 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -375,8 +375,7 @@ int session_load(Session *s) {
@@ -1756,7 +1756,7 @@ index ece222a..13de549 100644
session_save(s);
user_save(s->user);
diff --git a/src/login/logind.c b/src/login/logind.c
-index 5180be7..f147910 100644
+index 5180be7426..f14791058e 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -152,8 +152,7 @@ void manager_free(Manager *m) {
@@ -1804,7 +1804,7 @@ index 5180be7..f147910 100644
return r;
}
diff --git a/src/login/pam-module.c b/src/login/pam-module.c
-index 6259450..fe3ddd4 100644
+index 6259450025..fe3ddd40ed 100644
--- a/src/login/pam-module.c
+++ b/src/login/pam-module.c
@@ -478,8 +478,7 @@ finish:
@@ -1818,7 +1818,7 @@ index 6259450..fe3ddd4 100644
return r;
}
diff --git a/src/login/sd-login.c b/src/login/sd-login.c
-index 7e25041..2e7768e 100644
+index 7e25041f6d..2e7768e6c8 100644
--- a/src/login/sd-login.c
+++ b/src/login/sd-login.c
@@ -646,7 +646,7 @@ _public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) {
@@ -1858,7 +1858,7 @@ index 7e25041..2e7768e 100644
}
diff --git a/src/login/test-inhibit.c b/src/login/test-inhibit.c
-index 7b6deff..68d91da 100644
+index 7b6deffc3e..68d91daf47 100644
--- a/src/login/test-inhibit.c
+++ b/src/login/test-inhibit.c
@@ -127,11 +127,11 @@ int main(int argc, char*argv[]) {
@@ -1876,7 +1876,7 @@ index 7b6deff..68d91da 100644
print_inhibitors(bus);
diff --git a/src/machine/machined.c b/src/machine/machined.c
-index ad804a1..f427383 100644
+index ad804a1e14..f4273838ec 100644
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -73,11 +73,8 @@ void manager_free(Manager *m) {
@@ -1894,7 +1894,7 @@ index ad804a1..f427383 100644
free(m);
}
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 8718e94..adc682d 100644
+index 8718e94d14..adc682d6a9 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -785,7 +785,7 @@ static int setup_kmsg(const char *dest, int kmsg_socket) {
@@ -1979,7 +1979,7 @@ index 8718e94..adc682d 100644
fdset_free(fds);
fds = NULL;
diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c
-index 6b74866..112f59c 100644
+index 6b748664c3..112f59cfd4 100644
--- a/src/readahead/readahead-collect.c
+++ b/src/readahead/readahead-collect.c
@@ -177,8 +177,7 @@ finish:
@@ -2030,7 +2030,7 @@ index 6b74866..112f59c 100644
if (pack) {
fclose(pack);
diff --git a/src/readahead/readahead-common.c b/src/readahead/readahead-common.c
-index 1edf9cc..49679fc 100644
+index 1edf9cc33c..49679fc834 100644
--- a/src/readahead/readahead-common.c
+++ b/src/readahead/readahead-common.c
@@ -218,7 +218,7 @@ int open_inotify(void) {
@@ -2043,7 +2043,7 @@ index 1edf9cc..49679fc 100644
}
diff --git a/src/readahead/readahead-replay.c b/src/readahead/readahead-replay.c
-index cb04e5f..8dc1942 100644
+index cb04e5f9cd..8dc194257f 100644
--- a/src/readahead/readahead-replay.c
+++ b/src/readahead/readahead-replay.c
@@ -67,10 +67,8 @@ static int unpack_file(FILE *pack) {
@@ -2093,7 +2093,7 @@ index cb04e5f..8dc1942 100644
free(pack_fn);
diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c
-index 2f16898..c730216 100644
+index 2f168985b4..c730216b73 100644
--- a/src/reply-password/reply-password.c
+++ b/src/reply-password/reply-password.c
@@ -91,7 +91,8 @@ int main(int argc, char *argv[]) {
@@ -2117,7 +2117,7 @@ index 2f16898..c730216 100644
return r;
}
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
-index 25367d0..200876d 100644
+index 25367d0972..200876de83 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -231,8 +231,7 @@ int ask_password_tty(
@@ -2172,7 +2172,7 @@ index 25367d0..200876d 100644
if (f)
fclose(f);
diff --git a/src/shared/dbus-loop.c b/src/shared/dbus-loop.c
-index c533242..aadb641 100644
+index c533242220..aadb641811 100644
--- a/src/shared/dbus-loop.c
+++ b/src/shared/dbus-loop.c
@@ -75,7 +75,7 @@ static dbus_bool_t add_watch(DBusWatch *watch, void *data) {
@@ -2223,7 +2223,7 @@ index c533242..aadb641 100644
}
diff --git a/src/shared/fdset.c b/src/shared/fdset.c
-index fd27398..a2c861d 100644
+index fd27398ebb..a2c861de3f 100644
--- a/src/shared/fdset.c
+++ b/src/shared/fdset.c
@@ -82,7 +82,7 @@ int fdset_put_dup(FDSet *s, int fd) {
@@ -2236,7 +2236,7 @@ index fd27398..a2c861d 100644
}
diff --git a/src/shared/hwclock.c b/src/shared/hwclock.c
-index 17f12de..10c6537 100644
+index 17f12de51f..10c6537a87 100644
--- a/src/shared/hwclock.c
+++ b/src/shared/hwclock.c
@@ -62,7 +62,7 @@ int hwclock_get_time(struct tm *tm) {
@@ -2258,7 +2258,7 @@ index 17f12de..10c6537 100644
return err;
}
diff --git a/src/shared/install.c b/src/shared/install.c
-index cb07947..241e000 100644
+index cb07947527..241e000820 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -207,7 +207,7 @@ static int remove_marked_symlinks_fd(
@@ -2316,7 +2316,7 @@ index cb07947..241e000 100644
}
diff --git a/src/shared/log.c b/src/shared/log.c
-index 2267764..039cbbe 100644
+index 2267764859..039cbbebca 100644
--- a/src/shared/log.c
+++ b/src/shared/log.c
@@ -62,7 +62,7 @@ void log_close_console(void) {
@@ -2380,7 +2380,7 @@ index 2267764..039cbbe 100644
static int log_open_journal(void) {
diff --git a/src/shared/socket-label.c b/src/shared/socket-label.c
-index ff212de..e4382d5 100644
+index ff212de825..e4382d531c 100644
--- a/src/shared/socket-label.c
+++ b/src/shared/socket-label.c
@@ -138,6 +138,6 @@ int socket_address_listen(
@@ -2392,7 +2392,7 @@ index ff212de..e4382d5 100644
return r;
}
diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c
-index f9e52cd..fccf1e9 100644
+index f9e52cdcbd..fccf1e9173 100644
--- a/src/shared/spawn-polkit-agent.c
+++ b/src/shared/spawn-polkit-agent.c
@@ -61,7 +61,7 @@ int polkit_agent_open(void) {
@@ -2414,7 +2414,7 @@ index f9e52cd..fccf1e9 100644
return r;
}
diff --git a/src/shared/util.c b/src/shared/util.c
-index 533db92..aa6242d 100644
+index 533db92918..aa6242d40c 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -173,13 +173,22 @@ int close_nointr(int fd) {
@@ -2686,7 +2686,7 @@ index 533db92..aa6242d 100644
if (fd < 0) {
if (errno == ENOENT)
diff --git a/src/shared/util.h b/src/shared/util.h
-index a173885..e83d2ab 100644
+index a1738856bc..e83d2abf27 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -125,7 +125,8 @@ char *endswith(const char *s, const char *postfix) _pure_;
@@ -2710,7 +2710,7 @@ index a173885..e83d2ab 100644
static inline void umaskp(mode_t *u) {
diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c
-index ddbe7af..ba9ad9b 100644
+index ddbe7afd3c..ba9ad9be97 100644
--- a/src/shared/watchdog.c
+++ b/src/shared/watchdog.c
@@ -164,6 +164,5 @@ void watchdog_close(bool disarm) {
@@ -2722,7 +2722,7 @@ index ddbe7af..ba9ad9b 100644
+ watchdog_fd = safe_close(watchdog_fd);
}
diff --git a/src/shutdownd/shutdownd.c b/src/shutdownd/shutdownd.c
-index 461a726..886380d 100644
+index 461a7261f4..886380d36c 100644
--- a/src/shutdownd/shutdownd.c
+++ b/src/shutdownd/shutdownd.c
@@ -438,8 +438,7 @@ int main(int argc, char *argv[]) {
@@ -2736,7 +2736,7 @@ index 461a726..886380d 100644
if (unlink_nologin)
unlink("/run/nologin");
diff --git a/src/test/test-util.c b/src/test/test-util.c
-index 7566adc..34b7db8 100644
+index 7566adcc2f..34b7db81cb 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -64,7 +64,7 @@ static void test_close_many(void) {
@@ -2749,7 +2749,7 @@ index 7566adc..34b7db8 100644
unlink(name0);
unlink(name1);
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 98d01a1..4244656 100644
+index 98d01a1384..4244656a15 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -489,7 +489,7 @@ static int write_one_file(Item *i, const char *path) {
@@ -2777,7 +2777,7 @@ index 98d01a1..4244656 100644
if (stat(path, &st) < 0) {
log_error("stat(%s) failed: %m", path);
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
-index 256c21d..cb74c72 100644
+index 256c21d877..cb74c72a98 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -234,11 +234,8 @@ static int ask_password_plymouth(
@@ -2841,7 +2841,7 @@ index 256c21d..cb74c72 100644
return r;
}
diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
-index 1bbf737..0f2b706 100644
+index 1bbf737c36..0f2b7066e2 100644
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -301,8 +301,7 @@ finish:
diff --git a/0408-async-add-asynchronous-close-call.patch b/0408-async-add-asynchronous-close-call.patch
index 775a864..9ff13dd 100644
--- a/0408-async-add-asynchronous-close-call.patch
+++ b/0408-async-add-asynchronous-close-call.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] async: add asynchronous close() call
2 files changed, 24 insertions(+)
diff --git a/src/core/async.c b/src/core/async.c
-index af527be..3876ded 100644
+index af527bea4e..3876deda70 100644
--- a/src/core/async.c
+++ b/src/core/async.c
@@ -24,6 +24,7 @@
@@ -48,7 +48,7 @@ index af527be..3876ded 100644
+ return -1;
+}
diff --git a/src/core/async.h b/src/core/async.h
-index 6601b4d..7f1ef79 100644
+index 6601b4dc4b..7f1ef79532 100644
--- a/src/core/async.h
+++ b/src/core/async.h
@@ -22,4 +22,6 @@
diff --git a/0409-core-close-socket-fds-asynchronously.patch b/0409-core-close-socket-fds-asynchronously.patch
index 0b48b5e..5a19196 100644
--- a/0409-core-close-socket-fds-asynchronously.patch
+++ b/0409-core-close-socket-fds-asynchronously.patch
@@ -11,7 +11,7 @@ http://lists.freedesktop.org/archives/systemd-devel/2014-April/018928.html
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/core/service.c b/src/core/service.c
-index f0df5fe..9fd58fa 100644
+index f0df5fead8..9fd58fab09 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -25,6 +25,7 @@
diff --git a/0410-logind-bring-polkit-policy-for-hibernate-in-line-wit.patch b/0410-logind-bring-polkit-policy-for-hibernate-in-line-wit.patch
index 0f80d2f..c45960e 100644
--- a/0410-logind-bring-polkit-policy-for-hibernate-in-line-wit.patch
+++ b/0410-logind-bring-polkit-policy-for-hibernate-in-line-wit.patch
@@ -14,7 +14,7 @@ suspendor poweroff, so sync the policies.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/login/org.freedesktop.login1.policy.in b/src/login/org.freedesktop.login1.policy.in
-index b96d32d..b8e90f1 100644
+index b96d32d526..b8e90f1938 100644
--- a/src/login/org.freedesktop.login1.policy.in
+++ b/src/login/org.freedesktop.login1.policy.in
@@ -254,7 +254,7 @@
diff --git a/0411-unit.c-Move-code-around-to-easy-cherrypicking.patch b/0411-unit.c-Move-code-around-to-easy-cherrypicking.patch
index 508d855..7abb758 100644
--- a/0411-unit.c-Move-code-around-to-easy-cherrypicking.patch
+++ b/0411-unit.c-Move-code-around-to-easy-cherrypicking.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] unit.c: Move code around to easy cherrypicking
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index c05926a..29782aa 100644
+index c05926ad3b..29782aa684 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2300,19 +2300,6 @@ int unit_serialize(Unit *u, FILE *f, FDSet *fds, bool serialize_jobs) {
diff --git a/0412-core-make-sure-to-serialize-jobs-for-all-units.patch b/0412-core-make-sure-to-serialize-jobs-for-all-units.patch
index be96727..9c4f3a1 100644
--- a/0412-core-make-sure-to-serialize-jobs-for-all-units.patch
+++ b/0412-core-make-sure-to-serialize-jobs-for-all-units.patch
@@ -18,7 +18,7 @@ Conflicts:
2 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 1e7dc38..e75550b 100644
+index 1e7dc3835c..e75550bb4e 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -2166,9 +2166,6 @@ int manager_serialize(Manager *m, FILE *f, FDSet *fds, bool switching_root) {
@@ -32,7 +32,7 @@ index 1e7dc38..e75550b 100644
fputs(u->id, f);
fputc('\n', f);
diff --git a/src/core/unit.c b/src/core/unit.c
-index 29782aa..5226963 100644
+index 29782aa684..5226963522 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2293,12 +2293,11 @@ int unit_serialize(Unit *u, FILE *f, FDSet *fds, bool serialize_jobs) {
diff --git a/0413-man-clarify-that-the-ExecReload-command-should-be-sy.patch b/0413-man-clarify-that-the-ExecReload-command-should-be-sy.patch
index 9d73520..f1f68d7 100644
--- a/0413-man-clarify-that-the-ExecReload-command-should-be-sy.patch
+++ b/0413-man-clarify-that-the-ExecReload-command-should-be-sy.patch
@@ -12,7 +12,7 @@ http://lists.freedesktop.org/archives/systemd-devel/2014-May/019054.html
1 file changed, 14 insertions(+)
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index 50b19a8..f549e89 100644
+index 50b19a8d5f..f549e89ee0 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -519,6 +519,20 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}
diff --git a/0414-man-readahead-fix-cmdline-switch-inconsistency-betwe.patch b/0414-man-readahead-fix-cmdline-switch-inconsistency-betwe.patch
index 712b32e..8730661 100644
--- a/0414-man-readahead-fix-cmdline-switch-inconsistency-betwe.patch
+++ b/0414-man-readahead-fix-cmdline-switch-inconsistency-betwe.patch
@@ -18,7 +18,7 @@ Conflicts:
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/man/systemd-readahead-replay.service.xml b/man/systemd-readahead-replay.service.xml
-index 806d460..8a1f47a 100644
+index 806d46093b..8a1f47a947 100644
--- a/man/systemd-readahead-replay.service.xml
+++ b/man/systemd-readahead-replay.service.xml
@@ -124,7 +124,7 @@
@@ -31,7 +31,7 @@ index 806d460..8a1f47a 100644
Maximum number of
files to read ahead. Only valid
diff --git a/src/readahead/readahead.c b/src/readahead/readahead.c
-index 29255c9..78bf837 100644
+index 29255c9f07..78bf837851 100644
--- a/src/readahead/readahead.c
+++ b/src/readahead/readahead.c
@@ -40,7 +40,7 @@ static int help(void) {
diff --git a/0415-build-sys-at-configure-check-for-verifying-that-ln-s.patch b/0415-build-sys-at-configure-check-for-verifying-that-ln-s.patch
index 2cf8f83..b9cc3cf 100644
--- a/0415-build-sys-at-configure-check-for-verifying-that-ln-s.patch
+++ b/0415-build-sys-at-configure-check-for-verifying-that-ln-s.patch
@@ -14,7 +14,7 @@ Conflicts:
1 file changed, 2 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 9af56ab..9605b38 100644
+index 9af56ab1f4..9605b3860e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,6 +78,8 @@ AC_PATH_PROG([KMOD], [kmod], [/usr/bin/kmod], [$PATH:/usr/sbin:/sbin])
diff --git a/0416-man-update-journald-rate-limit-defaults.patch b/0416-man-update-journald-rate-limit-defaults.patch
index 5b4026d..740a4bd 100644
--- a/0416-man-update-journald-rate-limit-defaults.patch
+++ b/0416-man-update-journald-rate-limit-defaults.patch
@@ -12,7 +12,7 @@ This brings the man page back into sync with the actual code.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
-index 27c326e..77ecd5d 100644
+index 27c326e909..77ecd5d3b9 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -190,8 +190,8 @@
diff --git a/0417-nspawn-properly-format-container_uuid-in-UUID-format.patch b/0417-nspawn-properly-format-container_uuid-in-UUID-format.patch
index 03ebde1..bca8115 100644
--- a/0417-nspawn-properly-format-container_uuid-in-UUID-format.patch
+++ b/0417-nspawn-properly-format-container_uuid-in-UUID-format.patch
@@ -11,7 +11,7 @@ http://lists.freedesktop.org/archives/systemd-devel/2014-April/018971.html
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index adc682d..028dbe3 100644
+index adc682d6a9..028dbe33e7 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -561,6 +561,15 @@ static int setup_resolv_conf(const char *dest) {
diff --git a/0418-core-reindent-selinux-ima-smack-setup.c.patch b/0418-core-reindent-selinux-ima-smack-setup.c.patch
index eaf29d7..5e46eb1 100644
--- a/0418-core-reindent-selinux-ima-smack-setup.c.patch
+++ b/0418-core-reindent-selinux-ima-smack-setup.c.patch
@@ -19,7 +19,7 @@ Conflicts:
1 file changed, 76 insertions(+), 76 deletions(-)
diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c
-index 9a5d6b2..6d8bc89 100644
+index 9a5d6b2a9d..6d8bc89965 100644
--- a/src/core/selinux-setup.c
+++ b/src/core/selinux-setup.c
@@ -46,82 +46,82 @@ static int null_log(int type, const char *fmt, ...) {
diff --git a/0419-core-let-selinux_setup-load-policy-more-than-once.patch b/0419-core-let-selinux_setup-load-policy-more-than-once.patch
index 01fe4f8..e3e7fb4 100644
--- a/0419-core-let-selinux_setup-load-policy-more-than-once.patch
+++ b/0419-core-let-selinux_setup-load-policy-more-than-once.patch
@@ -40,7 +40,7 @@ enforce=1.
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c
-index 6d8bc89..b419a27 100644
+index 6d8bc89965..b419a2710a 100644
--- a/src/core/selinux-setup.c
+++ b/src/core/selinux-setup.c
@@ -51,6 +51,7 @@ int selinux_setup(bool *loaded_policy) {
diff --git a/0420-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0420-hwdb-Update-database-of-Bluetooth-company-identifier.patch
index 87d3d11..9f54a6c 100644
--- a/0420-hwdb-Update-database-of-Bluetooth-company-identifier.patch
+++ b/0420-hwdb-Update-database-of-Bluetooth-company-identifier.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
1 file changed, 52 insertions(+), 1 deletion(-)
diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb/20-bluetooth-vendor-product.hwdb
-index 28aa2a7..a65c7db 100644
+index 28aa2a7150..a65c7db38f 100644
--- a/hwdb/20-bluetooth-vendor-product.hwdb
+++ b/hwdb/20-bluetooth-vendor-product.hwdb
@@ -961,4 +961,55 @@ bluetooth:v013D*
diff --git a/0421-hwdb-update.patch b/0421-hwdb-update.patch
index f9af792..2dabfe5 100644
--- a/0421-hwdb-update.patch
+++ b/0421-hwdb-update.patch
@@ -12,7 +12,7 @@ Subject: [PATCH] hwdb: update
3 files changed, 572 insertions(+), 26 deletions(-)
diff --git a/hwdb/20-OUI.hwdb b/hwdb/20-OUI.hwdb
-index afc0d90..6188bfc 100644
+index afc0d90350..6188bfcff6 100644
--- a/hwdb/20-OUI.hwdb
+++ b/hwdb/20-OUI.hwdb
@@ -52915,6 +52915,9 @@ OUI:0CA42A*
@@ -531,7 +531,7 @@ index afc0d90..6188bfc 100644
+OUI:FCFFAA*
+ ID_OUI_FROM_DATABASE=IEEE REGISTRATION AUTHORITY - Please see MAL public listing for more information.
diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb/20-pci-vendor-model.hwdb
-index 2957774..62941b9 100644
+index 2957774ef1..62941b9a45 100644
--- a/hwdb/20-pci-vendor-model.hwdb
+++ b/hwdb/20-pci-vendor-model.hwdb
@@ -4205,6 +4205,9 @@ pci:v00001002d00005F57*
@@ -886,7 +886,7 @@ index 2957774..62941b9 100644
ID_MODEL_FROM_DATABASE=Z77 Express Chipset LPC Controller (Motherboard)
diff --git a/hwdb/20-usb-vendor-model.hwdb b/hwdb/20-usb-vendor-model.hwdb
-index 52586bc..05f267d 100644
+index 52586bc973..05f267d3a5 100644
--- a/hwdb/20-usb-vendor-model.hwdb
+++ b/hwdb/20-usb-vendor-model.hwdb
@@ -41163,7 +41163,7 @@ usb:v1234pED02*
diff --git a/0422-nspawn-allow-to-bind-mount-journal-on-top-of-a-non-e.patch b/0422-nspawn-allow-to-bind-mount-journal-on-top-of-a-non-e.patch
index a530ce4..4f7366b 100644
--- a/0422-nspawn-allow-to-bind-mount-journal-on-top-of-a-non-e.patch
+++ b/0422-nspawn-allow-to-bind-mount-journal-on-top-of-a-non-e.patch
@@ -27,7 +27,7 @@ Reported-by: Tobias Hunger
1 file changed, 5 deletions(-)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 028dbe3..d645001 100644
+index 028dbe33e7..d645001038 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -939,11 +939,6 @@ static int setup_journal(const char *directory) {
diff --git a/0423-nspawn-restore-journal-directory-is-empty-check.patch b/0423-nspawn-restore-journal-directory-is-empty-check.patch
index f9e83b1..9af5889 100644
--- a/0423-nspawn-restore-journal-directory-is-empty-check.patch
+++ b/0423-nspawn-restore-journal-directory-is-empty-check.patch
@@ -15,7 +15,7 @@ directories, simply downgrade the message to a warning and proceed.
1 file changed, 3 insertions(+)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index d645001..28e50fb 100644
+index d645001038..28e50fba20 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -939,6 +939,9 @@ static int setup_journal(const char *directory) {
diff --git a/0424-machine-escape-fields-we-store-in-run-so-that-they-c.patch b/0424-machine-escape-fields-we-store-in-run-so-that-they-c.patch
index ea693c0..42075c5 100644
--- a/0424-machine-escape-fields-we-store-in-run-so-that-they-c.patch
+++ b/0424-machine-escape-fields-we-store-in-run-so-that-they-c.patch
@@ -14,7 +14,7 @@ Conflicts:
1 file changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/machine/machine.c b/src/machine/machine.c
-index 602aa18..3df9c45 100644
+index 602aa18be6..3df9c4508f 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -120,17 +120,42 @@ int machine_save(Machine *m) {
diff --git a/0425-logind-also-escape-external-data-when-saving-to-run.patch b/0425-logind-also-escape-external-data-when-saving-to-run.patch
index 88256c3..7295e32 100644
--- a/0425-logind-also-escape-external-data-when-saving-to-run.patch
+++ b/0425-logind-also-escape-external-data-when-saving-to-run.patch
@@ -15,7 +15,7 @@ Conflicts:
1 file changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index 13de549..9c87e43 100644
+index 13de549ddf..9c87e4326f 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -202,7 +202,6 @@ int session_save(Session *s) {
diff --git a/0426-man-drop-reference-to-file-locking-for-PID-file-crea.patch b/0426-man-drop-reference-to-file-locking-for-PID-file-crea.patch
index 6440ce9..4b5e47d 100644
--- a/0426-man-drop-reference-to-file-locking-for-PID-file-crea.patch
+++ b/0426-man-drop-reference-to-file-locking-for-PID-file-crea.patch
@@ -13,7 +13,7 @@ File locking is usually a bad idea, don't suggest using it.
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/man/daemon.xml b/man/daemon.xml
-index 932de3b..170949e 100644
+index 932de3b478..170949e712 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -158,9 +158,7 @@
diff --git a/0427-man-update-URL-refernce-in-daemon-7.patch b/0427-man-update-URL-refernce-in-daemon-7.patch
index 232641f..66c10b4 100644
--- a/0427-man-update-URL-refernce-in-daemon-7.patch
+++ b/0427-man-update-URL-refernce-in-daemon-7.patch
@@ -11,7 +11,7 @@ http://lists.freedesktop.org/archives/systemd-devel/2014-May/019410.html
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/daemon.xml b/man/daemon.xml
-index 170949e..543468e 100644
+index 170949e712..543468eff8 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -352,7 +352,7 @@
diff --git a/0428-conf-parser-never-consider-it-an-error-if-we-cannot-.patch b/0428-conf-parser-never-consider-it-an-error-if-we-cannot-.patch
index ec08c7c..f5aafa8 100644
--- a/0428-conf-parser-never-consider-it-an-error-if-we-cannot-.patch
+++ b/0428-conf-parser-never-consider-it-an-error-if-we-cannot-.patch
@@ -13,7 +13,7 @@ After all, we want to be able to boot with /etc empty one day...
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
-index 4ac71ed..e206b5b 100644
+index 4ac71ed3f2..e206b5b523 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -320,8 +320,8 @@ int config_parse(const char *unit,
diff --git a/0429-socket-properly-handle-if-our-service-vanished-durin.patch b/0429-socket-properly-handle-if-our-service-vanished-durin.patch
index 3bf996c..a54335d 100644
--- a/0429-socket-properly-handle-if-our-service-vanished-durin.patch
+++ b/0429-socket-properly-handle-if-our-service-vanished-durin.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] socket: properly handle if our service vanished during
1 file changed, 6 insertions(+)
diff --git a/src/core/socket.c b/src/core/socket.c
-index 842850f..b811a61 100644
+index 842850f9d2..b811a61df5 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -1462,6 +1462,12 @@ static void socket_enter_running(Socket *s, int cfd) {
diff --git a/0430-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch b/0430-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch
index 2a80f78..a1a5e77 100644
--- a/0430-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch
+++ b/0430-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch
@@ -14,7 +14,7 @@ Conflicts:
1 file changed, 11 insertions(+)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index fdab827..c320c21 100644
+index fdab8273d9..c320c218ce 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -576,6 +576,17 @@ keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*IdeaPad*U300s*:pvr*
diff --git a/0431-keymap-Asus-EeePC-touchpad-toggle-key.patch b/0431-keymap-Asus-EeePC-touchpad-toggle-key.patch
index c3622c1..20d8ad6 100644
--- a/0431-keymap-Asus-EeePC-touchpad-toggle-key.patch
+++ b/0431-keymap-Asus-EeePC-touchpad-toggle-key.patch
@@ -17,7 +17,7 @@ Conflicts:
1 file changed, 3 insertions(+)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index c320c21..b407949 100644
+index c320c218ce..b4079491de 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -140,6 +140,9 @@ keyboard:dmi:bvn*:bvr*:bd*:svnASUS:pn*
diff --git a/0432-udev-keyboard-also-hook-into-change-events.patch b/0432-udev-keyboard-also-hook-into-change-events.patch
index a5bf46c..9437c29 100644
--- a/0432-udev-keyboard-also-hook-into-change-events.patch
+++ b/0432-udev-keyboard-also-hook-into-change-events.patch
@@ -14,7 +14,7 @@ instead of applying the new config.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/60-keyboard.rules b/rules/60-keyboard.rules
-index 4e0f366..22f71e7 100644
+index 4e0f3663f6..22f71e7792 100644
--- a/rules/60-keyboard.rules
+++ b/rules/60-keyboard.rules
@@ -1,6 +1,6 @@
diff --git a/0433-Do-not-unescape-unit-names-in-Install-section.patch b/0433-Do-not-unescape-unit-names-in-Install-section.patch
index 91024da..4501f49 100644
--- a/0433-Do-not-unescape-unit-names-in-Install-section.patch
+++ b/0433-Do-not-unescape-unit-names-in-Install-section.patch
@@ -11,7 +11,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=49316
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
-index e206b5b..348a540 100644
+index e206b5b523..348a5407f4 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -669,7 +669,7 @@ int config_parse_strv(const char *unit,
diff --git a/0434-util-ignore_file-should-not-allow-files-ending-with.patch b/0434-util-ignore_file-should-not-allow-files-ending-with.patch
index 5725aea..fbb3101 100644
--- a/0434-util-ignore_file-should-not-allow-files-ending-with.patch
+++ b/0434-util-ignore_file-should-not-allow-files-ending-with.patch
@@ -14,7 +14,7 @@ a228a22fda4faa9ecb7c5a5e499980c8ae5d2a08
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index aa6242d..6e97a6d 100644
+index aa6242d40c..6e97a6d6fd 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1499,7 +1499,7 @@ bool ignore_file(const char *filename) {
diff --git a/0435-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch b/0435-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch
index 2f4b817..2fb9d63 100644
--- a/0435-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch
+++ b/0435-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch
@@ -20,7 +20,7 @@ Conflicts:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
-index 8f457ab..6357931 100644
+index 8f457ab4a2..6357931f49 100644
--- a/src/udev/udev-builtin-keyboard.c
+++ b/src/udev/udev-builtin-keyboard.c
@@ -143,7 +143,7 @@ static int builtin_keyboard(struct udev_device *dev, int argc, char *argv[], boo
diff --git a/0436-tty-ask-password-agent-Do-tell-what-directory-we-fai.patch b/0436-tty-ask-password-agent-Do-tell-what-directory-we-fai.patch
index f762311..dffa32e 100644
--- a/0436-tty-ask-password-agent-Do-tell-what-directory-we-fai.patch
+++ b/0436-tty-ask-password-agent-Do-tell-what-directory-we-fai.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] tty-ask-password-agent: Do tell what directory we failed to
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
-index cb74c72..1e9ad9e 100644
+index cb74c72a98..1e9ad9ecd2 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -503,7 +503,7 @@ static int show_passwords(void) {
diff --git a/0437-keyboard-add-Plantronics-.Audio-mute-button.patch b/0437-keyboard-add-Plantronics-.Audio-mute-button.patch
index 33e1948..1bb8d1c 100644
--- a/0437-keyboard-add-Plantronics-.Audio-mute-button.patch
+++ b/0437-keyboard-add-Plantronics-.Audio-mute-button.patch
@@ -11,7 +11,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=79495
1 file changed, 8 insertions(+)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index b407949..17f06e8 100644
+index b4079491de..17f06e823b 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -864,6 +864,14 @@ keyboard:dmi:bvn*:bvr*:bd*:svnOQO*Inc.*:pnOQO*Model*2*:pvr*
diff --git a/0438-hwdb-fix-case-sensitive-match.patch b/0438-hwdb-fix-case-sensitive-match.patch
index fdbe425..8307f6f 100644
--- a/0438-hwdb-fix-case-sensitive-match.patch
+++ b/0438-hwdb-fix-case-sensitive-match.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] hwdb: fix case-sensitive match
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index 17f06e8..3071c61 100644
+index 17f06e823b..3071c61987 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -868,7 +868,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnOQO*Inc.*:pnOQO*Model*2*:pvr*
diff --git a/0439-man-fix-references-to-sd_journal_cutoff_realtime_use.patch b/0439-man-fix-references-to-sd_journal_cutoff_realtime_use.patch
index 71edc9d..d4d1eab 100644
--- a/0439-man-fix-references-to-sd_journal_cutoff_realtime_use.patch
+++ b/0439-man-fix-references-to-sd_journal_cutoff_realtime_use.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] man: fix references to sd_journal_cutoff_realtime_usec
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/man/sd-journal.xml b/man/sd-journal.xml
-index 832d584..83ee8f4 100644
+index 832d584579..83ee8f4c20 100644
--- a/man/sd-journal.xml
+++ b/man/sd-journal.xml
@@ -78,7 +78,8 @@
diff --git a/0440-man-Searching-for-an-explanation-of-what-a-slice-uni.patch b/0440-man-Searching-for-an-explanation-of-what-a-slice-uni.patch
index acb864a..9ed5cf1 100644
--- a/0440-man-Searching-for-an-explanation-of-what-a-slice-uni.patch
+++ b/0440-man-Searching-for-an-explanation-of-what-a-slice-uni.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] man: Searching for an explanation of what a "slice unit" was,
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml
-index 4d27ddf..f82e6c3 100644
+index 4d27ddf890..f82e6c3ba0 100644
--- a/man/systemd.slice.xml
+++ b/man/systemd.slice.xml
@@ -56,13 +56,13 @@ along with systemd; If not, see .
diff --git a/0441-systemd-detect-virt-only-discover-Xen-domU.patch b/0441-systemd-detect-virt-only-discover-Xen-domU.patch
index 6b40f0b..e3a5e30 100644
--- a/0441-systemd-detect-virt-only-discover-Xen-domU.patch
+++ b/0441-systemd-detect-virt-only-discover-Xen-domU.patch
@@ -23,7 +23,7 @@ Conflicts:
1 file changed, 27 insertions(+), 7 deletions(-)
diff --git a/src/shared/virt.c b/src/shared/virt.c
-index 4e18638..e59f2b1 100644
+index 4e18638bc9..e59f2b1f3e 100644
--- a/src/shared/virt.c
+++ b/src/shared/virt.c
@@ -149,7 +149,7 @@ static int detect_vm_dmi(const char **_id) {
diff --git a/0442-man-updates-to-the-passive-target-section.patch b/0442-man-updates-to-the-passive-target-section.patch
index 1e5ac32..5443a9c 100644
--- a/0442-man-updates-to-the-passive-target-section.patch
+++ b/0442-man-updates-to-the-passive-target-section.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] man: updates to the passive target section
1 file changed, 43 insertions(+), 15 deletions(-)
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
-index 8ccccc2..38b94a7 100644
+index 8ccccc2798..38b94a7657 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -866,7 +866,13 @@
diff --git a/0443-label-when-clearing-selinux-context-don-t-mangle-err.patch b/0443-label-when-clearing-selinux-context-don-t-mangle-err.patch
index 2f2931d..2e8aca0 100644
--- a/0443-label-when-clearing-selinux-context-don-t-mangle-err.patch
+++ b/0443-label-when-clearing-selinux-context-don-t-mangle-err.patch
@@ -14,7 +14,7 @@ Conflicts:
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/shared/label.c b/src/shared/label.c
-index fde39f2..3a18e31 100644
+index fde39f2259..3a18e31c97 100644
--- a/src/shared/label.c
+++ b/src/shared/label.c
@@ -230,6 +230,8 @@ int label_socket_set(const char *label) {
@@ -36,7 +36,7 @@ index fde39f2..3a18e31 100644
return;
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 4244656..be2115c 100644
+index 4244656a15..be2115c609 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -460,18 +460,19 @@ static int item_set_perms(Item *i, const char *path) {
diff --git a/0444-units-order-network-online.target-after-network.targ.patch b/0444-units-order-network-online.target-after-network.targ.patch
index 95c4dcb..cb953b4 100644
--- a/0444-units-order-network-online.target-after-network.targ.patch
+++ b/0444-units-order-network-online.target-after-network.targ.patch
@@ -19,7 +19,7 @@ Conflicts:
1 file changed, 1 insertion(+)
diff --git a/units/network-online.target b/units/network-online.target
-index a40c44c..67bc4fa 100644
+index a40c44c9be..67bc4fa471 100644
--- a/units/network-online.target
+++ b/units/network-online.target
@@ -9,3 +9,4 @@
diff --git a/0445-core-fix-invalid-free-in-killall.patch b/0445-core-fix-invalid-free-in-killall.patch
index 2f47f7a..161f0f3 100644
--- a/0445-core-fix-invalid-free-in-killall.patch
+++ b/0445-core-fix-invalid-free-in-killall.patch
@@ -18,7 +18,7 @@ the scope it is in finishes.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/killall.c b/src/core/killall.c
-index e395050..967dac0 100644
+index e395050107..967dac0f91 100644
--- a/src/core/killall.c
+++ b/src/core/killall.c
@@ -167,7 +167,7 @@ static int killall(int sig, Set *pids) {
diff --git a/0446-install-fix-invalid-free-in-unit_file_mask.patch b/0446-install-fix-invalid-free-in-unit_file_mask.patch
index 3d03566..428e8bf 100644
--- a/0446-install-fix-invalid-free-in-unit_file_mask.patch
+++ b/0446-install-fix-invalid-free-in-unit_file_mask.patch
@@ -16,7 +16,7 @@ get_config_path(...)).
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index 241e000..c9c785a 100644
+index 241e000820..c9c785a443 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -567,7 +567,7 @@ int unit_file_mask(
diff --git a/0447-rpm-don-t-hardcode-the-binary-paths-in-the-macros-re.patch b/0447-rpm-don-t-hardcode-the-binary-paths-in-the-macros-re.patch
index 3ef7277..6534537 100644
--- a/0447-rpm-don-t-hardcode-the-binary-paths-in-the-macros-re.patch
+++ b/0447-rpm-don-t-hardcode-the-binary-paths-in-the-macros-re.patch
@@ -15,7 +15,7 @@ new systemds.
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in
-index 89b4825..167016a 100644
+index 89b48259ad..167016a85a 100644
--- a/src/core/macros.systemd.in
+++ b/src/core/macros.systemd.in
@@ -37,42 +37,42 @@ Requires(postun): systemd \
diff --git a/0448-tmpfiles-set-up-selinux-label-proeprly-when-creating.patch b/0448-tmpfiles-set-up-selinux-label-proeprly-when-creating.patch
index d99ac24..0a44bae 100644
--- a/0448-tmpfiles-set-up-selinux-label-proeprly-when-creating.patch
+++ b/0448-tmpfiles-set-up-selinux-label-proeprly-when-creating.patch
@@ -14,7 +14,7 @@ Conflicts:
1 file changed, 2 insertions(+)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index be2115c..6b0dfaf 100644
+index be2115c609..6b0dfaf4db 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -699,9 +699,11 @@ static int create_item(Item *i) {
diff --git a/0449-util-add-files_same-helper-function.patch b/0449-util-add-files_same-helper-function.patch
index 0ce8c53..2e77c6a 100644
--- a/0449-util-add-files_same-helper-function.patch
+++ b/0449-util-add-files_same-helper-function.patch
@@ -16,7 +16,7 @@ files_same() returns
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 6e97a6d..1f83eb7 100644
+index 6e97a6d6fd..1f83eb7518 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -3333,19 +3333,27 @@ bool on_tty(void) {
@@ -56,7 +56,7 @@ index 6e97a6d..1f83eb7 100644
char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigned percent) {
diff --git a/src/shared/util.h b/src/shared/util.h
-index e83d2ab..20d81e5 100644
+index e83d2abf27..20d81e5c80 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -405,6 +405,8 @@ static inline const char *ansi_highlight_off(void) {
diff --git a/0450-Add-strappenda3.patch b/0450-Add-strappenda3.patch
index 9364a8f..1e130ce 100644
--- a/0450-Add-strappenda3.patch
+++ b/0450-Add-strappenda3.patch
@@ -16,7 +16,7 @@ Conflicts:
1 file changed, 13 insertions(+)
diff --git a/src/shared/util.h b/src/shared/util.h
-index 20d81e5..3f97663 100644
+index 20d81e5c80..3f9766339d 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -728,6 +728,19 @@ int unlink_noerrno(const char *path);
diff --git a/0451-unit-name-fix-detection-of-unit-templates-instances.patch b/0451-unit-name-fix-detection-of-unit-templates-instances.patch
index 4095f1c..aaf5bae 100644
--- a/0451-unit-name-fix-detection-of-unit-templates-instances.patch
+++ b/0451-unit-name-fix-detection-of-unit-templates-instances.patch
@@ -13,7 +13,7 @@ the suffix. Correct that.
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c
-index bc8094d..577f7e7 100644
+index bc8094d112..577f7e7731 100644
--- a/src/shared/unit-name.c
+++ b/src/shared/unit-name.c
@@ -334,7 +334,7 @@ char *unit_name_path_unescape(const char *f) {
diff --git a/0452-conf-files-fix-when-for-root-logic.patch b/0452-conf-files-fix-when-for-root-logic.patch
index d6eda4b..fb50188 100644
--- a/0452-conf-files-fix-when-for-root-logic.patch
+++ b/0452-conf-files-fix-when-for-root-logic.patch
@@ -13,7 +13,7 @@ Lukas Nykrin, but simply uses strappenda3().
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c
-index 3d5b1df..4ec8bed 100644
+index 3d5b1dfb39..4ec8bede71 100644
--- a/src/shared/conf-files.c
+++ b/src/shared/conf-files.c
@@ -37,10 +37,20 @@
diff --git a/0453-bootchart-set-white-background.patch b/0453-bootchart-set-white-background.patch
index cabe199..34ac91b 100644
--- a/0453-bootchart-set-white-background.patch
+++ b/0453-bootchart-set-white-background.patch
@@ -15,7 +15,7 @@ Similar fix from the one done in systemd-analyze (418e3750)
1 file changed, 2 insertions(+)
diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c
-index 5eee2d1..fe8b1b8 100644
+index 5eee2d1987..fe8b1b8a8f 100644
--- a/src/bootchart/svg.c
+++ b/src/bootchart/svg.c
@@ -123,6 +123,7 @@ static void svg_header(void) {
diff --git a/0454-backlight-always-prefer-firmware-platform-backlights.patch b/0454-backlight-always-prefer-firmware-platform-backlights.patch
index dd0648f..d4f25e4 100644
--- a/0454-backlight-always-prefer-firmware-platform-backlights.patch
+++ b/0454-backlight-always-prefer-firmware-platform-backlights.patch
@@ -16,7 +16,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1108019
2 files changed, 212 insertions(+), 16 deletions(-)
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
-index 79a03cd..ff0e771 100644
+index 79a03cd227..ff0e771132 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -54,10 +54,10 @@ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:
@@ -34,7 +34,7 @@ index 79a03cd..ff0e771 100644
# Asynchronously mount file systems implemented by these modules as
diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
-index c45b2d0..51a67a0 100644
+index c45b2d0b6b..51a67a042a 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -25,10 +25,178 @@
diff --git a/0455-install-various-modernizations.patch b/0455-install-various-modernizations.patch
index 407686b..55f5939 100644
--- a/0455-install-various-modernizations.patch
+++ b/0455-install-various-modernizations.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] install: various modernizations
1 file changed, 14 insertions(+), 29 deletions(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index c9c785a..1f3ea5b 100644
+index c9c785a443..1f3ea5b1c6 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -320,7 +320,8 @@ static int remove_marked_symlinks(
diff --git a/0456-install-simplify-and-clarify-disabling-logic-for-ins.patch b/0456-install-simplify-and-clarify-disabling-logic-for-ins.patch
index dc817b5..401860d 100644
--- a/0456-install-simplify-and-clarify-disabling-logic-for-ins.patch
+++ b/0456-install-simplify-and-clarify-disabling-logic-for-ins.patch
@@ -13,7 +13,7 @@ Conflicts:
1 file changed, 28 insertions(+), 22 deletions(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index 1f3ea5b..ff0a2a4 100644
+index 1f3ea5b1c6..ff0a2a4d03 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -194,10 +194,10 @@ static int remove_marked_symlinks_fd(
diff --git a/0457-install-when-looking-for-a-unit-file-for-enabling-se.patch b/0457-install-when-looking-for-a-unit-file-for-enabling-se.patch
index bf7adc4..800840d 100644
--- a/0457-install-when-looking-for-a-unit-file-for-enabling-se.patch
+++ b/0457-install-when-looking-for-a-unit-file-for-enabling-se.patch
@@ -14,7 +14,7 @@ unit names first, before looking for templates for them.
1 file changed, 38 insertions(+), 36 deletions(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index ff0a2a4..00a6a77 100644
+index ff0a2a4d03..00a6a77ec6 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1048,67 +1048,69 @@ static int unit_file_search(
diff --git a/0458-install-make-sure-systemctl-disable-foobar-.service-.patch b/0458-install-make-sure-systemctl-disable-foobar-.service-.patch
index d5af10d..708734b 100644
--- a/0458-install-make-sure-systemctl-disable-foobar-.service-.patch
+++ b/0458-install-make-sure-systemctl-disable-foobar-.service-.patch
@@ -15,7 +15,7 @@ Conflicts:
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index 00a6a77..e772c45 100644
+index 00a6a77ec6..e772c4500a 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -267,8 +267,21 @@ static int remove_marked_symlinks_fd(
diff --git a/0459-install-make-sure-that-root-mode-doesn-t-make-us-con.patch b/0459-install-make-sure-that-root-mode-doesn-t-make-us-con.patch
index 12b75f3..f6e6366 100644
--- a/0459-install-make-sure-that-root-mode-doesn-t-make-us-con.patch
+++ b/0459-install-make-sure-that-root-mode-doesn-t-make-us-con.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] install: make sure that --root= mode doesn't make us consider
3 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index e772c45..5d93a2e 100644
+index e772c4500a..5d93a2eaf3 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -47,6 +47,37 @@ typedef struct {
@@ -107,7 +107,7 @@ index e772c45..5d93a2e 100644
r = q;
}
diff --git a/src/shared/util.c b/src/shared/util.c
-index 1f83eb7..f034134 100644
+index 1f83eb7518..f034134949 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -4520,22 +4520,6 @@ int dirent_ensure_type(DIR *d, struct dirent *de) {
@@ -134,7 +134,7 @@ index 1f83eb7..f034134 100644
_cleanup_closedir_ DIR *d = NULL;
size_t bufsize = 0, n = 0;
diff --git a/src/shared/util.h b/src/shared/util.h
-index 3f97663..f358362 100644
+index 3f9766339d..f358362a0b 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -477,7 +477,6 @@ int glob_extend(char ***strv, const char *path);
diff --git a/0460-install-simplify-symlink-root-logic.patch b/0460-install-simplify-symlink-root-logic.patch
index a54cae7..cfd63d4 100644
--- a/0460-install-simplify-symlink-root-logic.patch
+++ b/0460-install-simplify-symlink-root-logic.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] install: simplify symlink --root= logic
1 file changed, 15 insertions(+), 44 deletions(-)
diff --git a/src/shared/install.c b/src/shared/install.c
-index 5d93a2e..86a05a4 100644
+index 5d93a2eaf3..86a05a47a6 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -47,9 +47,8 @@ typedef struct {
diff --git a/0461-backlight-include-ID_PATH-in-file-names-for-backligh.patch b/0461-backlight-include-ID_PATH-in-file-names-for-backligh.patch
index 26642da..7a3b063 100644
--- a/0461-backlight-include-ID_PATH-in-file-names-for-backligh.patch
+++ b/0461-backlight-include-ID_PATH-in-file-names-for-backligh.patch
@@ -19,7 +19,7 @@ Conflicts:
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
-index ff0e771..dd6e7f1 100644
+index ff0e771132..dd6e7f1518 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -57,8 +57,8 @@ ACTION=="add", SUBSYSTEM=="net", KERNEL!="lo", RUN+="@rootlibexecdir@/systemd-sy
@@ -34,7 +34,7 @@ index ff0e771..dd6e7f1 100644
# Asynchronously mount file systems implemented by these modules as
# soon as they are loaded.
diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
-index 51a67a0..e8cdad6 100644
+index 51a67a042a..e8cdad61ed 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -195,8 +195,8 @@ static bool validate_device(struct udev *udev, struct udev_device *device) {
diff --git a/0462-backlight-Fix-copy-paste-error-printing-an-unrelated.patch b/0462-backlight-Fix-copy-paste-error-printing-an-unrelated.patch
index 117b90f..f274868 100644
--- a/0462-backlight-Fix-copy-paste-error-printing-an-unrelated.patch
+++ b/0462-backlight-Fix-copy-paste-error-printing-an-unrelated.patch
@@ -15,7 +15,7 @@ an unrelated error code from a previous call.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
-index e8cdad6..4b04a3a 100644
+index e8cdad61ed..4b04a3a290 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -322,7 +322,7 @@ int main(int argc, char *argv[]) {
diff --git a/0463-backlight-Avoid-restoring-brightness-to-an-unreadabl.patch b/0463-backlight-Avoid-restoring-brightness-to-an-unreadabl.patch
index 6167b31..d03afd4 100644
--- a/0463-backlight-Avoid-restoring-brightness-to-an-unreadabl.patch
+++ b/0463-backlight-Avoid-restoring-brightness-to-an-unreadabl.patch
@@ -16,7 +16,7 @@ the user to disable state restoration.
1 file changed, 44 insertions(+)
diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
-index 4b04a3a..2740b80 100644
+index 4b04a3a290..2740b80da3 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -192,6 +192,48 @@ static bool validate_device(struct udev *udev, struct udev_device *device) {
diff --git a/0464-backlight-do-nothing-if-max_brightness-is-0.patch b/0464-backlight-do-nothing-if-max_brightness-is-0.patch
index 9d38e66..6e0be66 100644
--- a/0464-backlight-do-nothing-if-max_brightness-is-0.patch
+++ b/0464-backlight-do-nothing-if-max_brightness-is-0.patch
@@ -20,7 +20,7 @@ both the load and save actions.
1 file changed, 30 insertions(+), 14 deletions(-)
diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
-index 2740b80..84bf51d 100644
+index 2740b80da3..84bf51dc3a 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -192,30 +192,37 @@ static bool validate_device(struct udev *udev, struct udev_device *device) {
diff --git a/0465-backlight-unify-error-messages.patch b/0465-backlight-unify-error-messages.patch
index 95f7da7..14e33c7 100644
--- a/0465-backlight-unify-error-messages.patch
+++ b/0465-backlight-unify-error-messages.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] backlight: unify error messages
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
-index 84bf51d..34c01d9 100644
+index 84bf51dc3a..34c01d91df 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -24,6 +24,7 @@
diff --git a/0466-backlight-handle-saved-brightness-exceeding-max-brig.patch b/0466-backlight-handle-saved-brightness-exceeding-max-brig.patch
index 5596acb..93ed3d8 100644
--- a/0466-backlight-handle-saved-brightness-exceeding-max-brig.patch
+++ b/0466-backlight-handle-saved-brightness-exceeding-max-brig.patch
@@ -26,7 +26,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=78200
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
-index 34c01d9..77ae48c 100644
+index 34c01d91df..77ae48c26f 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -225,7 +225,7 @@ static unsigned get_max_brightness(struct udev_device *device) {
diff --git a/0467-backlight-Do-not-clamp-brightness-for-LEDs.patch b/0467-backlight-Do-not-clamp-brightness-for-LEDs.patch
index c68f5fa..9684fd5 100644
--- a/0467-backlight-Do-not-clamp-brightness-for-LEDs.patch
+++ b/0467-backlight-Do-not-clamp-brightness-for-LEDs.patch
@@ -25,7 +25,7 @@ see updated patch:
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
-index 77ae48c..e944f57 100644
+index 77ae48c26f..e944f574c4 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -221,11 +221,13 @@ static unsigned get_max_brightness(struct udev_device *device) {
diff --git a/0468-cryptsetup-introduce-new-cryptsetup-pre.traget-unit-.patch b/0468-cryptsetup-introduce-new-cryptsetup-pre.traget-unit-.patch
index 48cf6b0..8d44137 100644
--- a/0468-cryptsetup-introduce-new-cryptsetup-pre.traget-unit-.patch
+++ b/0468-cryptsetup-introduce-new-cryptsetup-pre.traget-unit-.patch
@@ -17,7 +17,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1097938
create mode 100644 units/cryptsetup-pre.target
diff --git a/Makefile.am b/Makefile.am
-index 5cf03c0..d57d890 100644
+index 5cf03c0aed..d57d890185 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3414,7 +3414,8 @@ systemgenerator_PROGRAMS += \
@@ -31,7 +31,7 @@ index 5cf03c0..d57d890 100644
systemd_cryptsetup_SOURCES = \
src/cryptsetup/cryptsetup.c
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
-index 38b94a7..4dd7d97 100644
+index 38b94a7657..4dd7d9701c 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -52,6 +52,7 @@
@@ -71,7 +71,7 @@ index 38b94a7..4dd7d97 100644
This target unit is
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index 00891f1..11e5268 100644
+index 00891f1323..11e5268185 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -119,7 +119,7 @@ static int create_disk(
@@ -85,7 +85,7 @@ index 00891f1..11e5268 100644
if (!nofail)
diff --git a/units/cryptsetup-pre.target b/units/cryptsetup-pre.target
new file mode 100644
-index 0000000..6535341
+index 0000000000..65353419fc
--- /dev/null
+++ b/units/cryptsetup-pre.target
@@ -0,0 +1,11 @@
diff --git a/0469-rules-add-loop-control-and-btrfs-control-to-disk-gro.patch b/0469-rules-add-loop-control-and-btrfs-control-to-disk-gro.patch
index 25fdd58..10ea1f3 100644
--- a/0469-rules-add-loop-control-and-btrfs-control-to-disk-gro.patch
+++ b/0469-rules-add-loop-control-and-btrfs-control-to-disk-gro.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] rules: add loop-control and btrfs-control to "disk" group
1 file changed, 2 insertions(+)
diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules
-index 0bccf67..23ca088 100644
+index 0bccf67b7b..23ca08859e 100644
--- a/rules/50-udev-default.rules
+++ b/rules/50-udev-default.rules
@@ -59,6 +59,8 @@ KERNEL=="pktcdvd", GROUP="cdrom"
diff --git a/0470-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0470-hwdb-Update-database-of-Bluetooth-company-identifier.patch
index bdeb44b..820f01b 100644
--- a/0470-hwdb-Update-database-of-Bluetooth-company-identifier.patch
+++ b/0470-hwdb-Update-database-of-Bluetooth-company-identifier.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
1 file changed, 39 insertions(+), 3 deletions(-)
diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb/20-bluetooth-vendor-product.hwdb
-index a65c7db..377748a 100644
+index a65c7db38f..377748a598 100644
--- a/hwdb/20-bluetooth-vendor-product.hwdb
+++ b/hwdb/20-bluetooth-vendor-product.hwdb
@@ -115,7 +115,7 @@ bluetooth:v0024*
diff --git a/0471-Fix-instance-argument-for-systemd-backlight-.service.patch b/0471-Fix-instance-argument-for-systemd-backlight-.service.patch
index 9930c30..faddced 100644
--- a/0471-Fix-instance-argument-for-systemd-backlight-.service.patch
+++ b/0471-Fix-instance-argument-for-systemd-backlight-.service.patch
@@ -9,7 +9,7 @@ When backporting patches, I lost "backlight:" in the udev rule.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
-index dd6e7f1..713e052 100644
+index dd6e7f1518..713e0528f7 100644
--- a/rules/99-systemd.rules.in
+++ b/rules/99-systemd.rules.in
@@ -57,8 +57,8 @@ ACTION=="add", SUBSYSTEM=="net", KERNEL!="lo", RUN+="@rootlibexecdir@/systemd-sy
diff --git a/0472-socket-check-return-from-exec_spawn.patch b/0472-socket-check-return-from-exec_spawn.patch
index fdf9597..06e2571 100644
--- a/0472-socket-check-return-from-exec_spawn.patch
+++ b/0472-socket-check-return-from-exec_spawn.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] socket: check return from exec_spawn
1 file changed, 2 insertions(+)
diff --git a/src/core/socket.c b/src/core/socket.c
-index b811a61..8e02c03 100644
+index b811a61df5..8e02c036b3 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -1208,6 +1208,8 @@ static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) {
diff --git a/0473-getty-generator-properly-escape-instance-names.patch b/0473-getty-generator-properly-escape-instance-names.patch
index a114fac..3095ac7 100644
--- a/0473-getty-generator-properly-escape-instance-names.patch
+++ b/0473-getty-generator-properly-escape-instance-names.patch
@@ -19,7 +19,7 @@ Conflicts:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c
-index 625a87e..2f790b8 100644
+index 625a87e1e8..2f790b8350 100644
--- a/src/getty-generator/getty-generator.c
+++ b/src/getty-generator/getty-generator.c
@@ -77,7 +77,7 @@ static int add_serial_getty(const char *tty) {
diff --git a/0474-conf-files-include-root-in-returned-file-paths.patch b/0474-conf-files-include-root-in-returned-file-paths.patch
index f5f9538..0d3ff49 100644
--- a/0474-conf-files-include-root-in-returned-file-paths.patch
+++ b/0474-conf-files-include-root-in-returned-file-paths.patch
@@ -23,7 +23,7 @@ Conflicts:
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c
-index 4ec8bed..fc5f1fe 100644
+index 4ec8bede71..fc5f1fe61e 100644
--- a/src/shared/conf-files.c
+++ b/src/shared/conf-files.c
@@ -37,20 +37,16 @@
@@ -62,7 +62,7 @@ index 4ec8bed..fc5f1fe 100644
hashmap_free_free(fh);
return r;
diff --git a/src/shared/install.c b/src/shared/install.c
-index 86a05a4..f40be79 100644
+index 86a05a47a6..f40be798f8 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1763,7 +1763,7 @@ UnitFileState unit_file_get_state(
diff --git a/0475-shared-add-root-argument-to-search_and_fopen.patch b/0475-shared-add-root-argument-to-search_and_fopen.patch
index f0123a2..55f0482 100644
--- a/0475-shared-add-root-argument-to-search_and_fopen.patch
+++ b/0475-shared-add-root-argument-to-search_and_fopen.patch
@@ -23,7 +23,7 @@ Conflicts:
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
-index 7ed1ae7..e3a3d4f 100644
+index 7ed1ae7bfc..e3a3d4f9c5 100644
--- a/src/binfmt/binfmt.c
+++ b/src/binfmt/binfmt.c
@@ -85,7 +85,7 @@ static int apply_file(const char *path, bool ignore_enoent) {
@@ -36,7 +36,7 @@ index 7ed1ae7..e3a3d4f 100644
if (ignore_enoent && r == -ENOENT)
return 0;
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
-index ba7d417..bfb6e7e 100644
+index ba7d417b53..bfb6e7e911 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -181,7 +181,7 @@ static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent
@@ -49,7 +49,7 @@ index ba7d417..bfb6e7e 100644
if (ignore_enoent && r == -ENOENT)
return 0;
diff --git a/src/shared/util.c b/src/shared/util.c
-index f034134..65a09d9 100644
+index f034134949..65a09d90da 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -5687,14 +5687,14 @@ int on_ac_power(void) {
@@ -101,7 +101,7 @@ index f034134..65a09d9 100644
int create_tmp_dir(char template[], char** dir_name) {
diff --git a/src/shared/util.h b/src/shared/util.h
-index f358362..b00395c 100644
+index f358362a0b..b00395ca7f 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -629,8 +629,8 @@ char *strip_tab_ansi(char **p, size_t *l);
@@ -116,7 +116,7 @@ index f358362..b00395c 100644
#define FOREACH_LINE(line, f, on_error) \
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index 70c4d89..1b7b482 100644
+index 70c4d89f9e..1b7b4824de 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -137,7 +137,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
@@ -129,7 +129,7 @@ index 70c4d89..1b7b482 100644
if (ignore_enoent && r == -ENOENT)
return 0;
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 6b0dfaf..ca99bb4 100644
+index 6b0dfaf4db..ca99bb4a38 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1364,7 +1364,7 @@ static int read_config_file(const char *fn, bool ignore_enoent) {
diff --git a/0476-shared-fix-search_and_fopen-with-alternate-roots.patch b/0476-shared-fix-search_and_fopen-with-alternate-roots.patch
index 4f5b964..843054f 100644
--- a/0476-shared-fix-search_and_fopen-with-alternate-roots.patch
+++ b/0476-shared-fix-search_and_fopen-with-alternate-roots.patch
@@ -13,7 +13,7 @@ paths relative to the given root, not the full absolute paths.
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 65a09d9..7aa3d02 100644
+index 65a09d90da..7aa3d0271c 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -5701,7 +5701,10 @@ static int search_and_fopen_internal(const char *path, const char *mode, const c
diff --git a/0477-Reset-signal-mask-on-re-exec-to-init.patch b/0477-Reset-signal-mask-on-re-exec-to-init.patch
index a88d728..5598a7b 100644
--- a/0477-Reset-signal-mask-on-re-exec-to-init.patch
+++ b/0477-Reset-signal-mask-on-re-exec-to-init.patch
@@ -17,7 +17,7 @@ kernel command line.
1 file changed, 8 insertions(+)
diff --git a/src/core/main.c b/src/core/main.c
-index 2a294c6..2f45485 100644
+index 2a294c67fb..2f4548502f 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1748,6 +1748,7 @@ finish:
diff --git a/0478-core-clean-up-signal-reset-logic-when-reexec.patch b/0478-core-clean-up-signal-reset-logic-when-reexec.patch
index c57d57d..703b228 100644
--- a/0478-core-clean-up-signal-reset-logic-when-reexec.patch
+++ b/0478-core-clean-up-signal-reset-logic-when-reexec.patch
@@ -14,7 +14,7 @@ leave SIG_IGN set for some of them across reexec.
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/core/main.c b/src/core/main.c
-index 2f45485..8c994a8 100644
+index 2f4548502f..8c994a88a8 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1748,7 +1748,7 @@ finish:
diff --git a/0479-util-treat-fuse.sshfs-as-a-network-filesystem.patch b/0479-util-treat-fuse.sshfs-as-a-network-filesystem.patch
index b14bf20..3212a91 100644
--- a/0479-util-treat-fuse.sshfs-as-a-network-filesystem.patch
+++ b/0479-util-treat-fuse.sshfs-as-a-network-filesystem.patch
@@ -11,7 +11,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=73727
1 file changed, 1 insertion(+)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 7aa3d02..e78e4e4 100644
+index 7aa3d0271c..e78e4e404c 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1629,6 +1629,7 @@ bool fstype_is_network(const char *fstype) {
diff --git a/0480-units-systemd-sysctl.service.in-run-after-load-modul.patch b/0480-units-systemd-sysctl.service.in-run-after-load-modul.patch
new file mode 100644
index 0000000..50d4c8e
--- /dev/null
+++ b/0480-units-systemd-sysctl.service.in-run-after-load-modul.patch
@@ -0,0 +1,30 @@
+From 78b929e277a801fe49e35a5adff4e3b6d2ecaa10 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?=
+Date: Sat, 23 Mar 2013 03:54:16 +0100
+Subject: [PATCH] units/systemd-sysctl.service.in: run after load-modules
+
+Modules might or will register new sysctl options.
+
+[zj: This mechanism of adding modules just to reliably set sysctl
+attributes is not ideal. Nevertheless, sysctl for dynamically created
+attributes is simply broken, and this is the easiest workaround.]
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1022977
+https://bugzilla.novell.com/show_bug.cgi?id=725412
+(cherry picked from commit 0b73eab7a2185ae0377650e3fdb8208347a8a575)
+---
+ units/systemd-sysctl.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in
+index 5baf22c183..b8e8175803 100644
+--- a/units/systemd-sysctl.service.in
++++ b/units/systemd-sysctl.service.in
+@@ -11,6 +11,7 @@ Documentation=man:systemd-sysctl.service(8) man:sysctl.d(5)
+ DefaultDependencies=no
+ Conflicts=shutdown.target
+ After=systemd-readahead-collect.service systemd-readahead-replay.service
++After=systemd-modules-load.service
+ Before=sysinit.target shutdown.target
+ ConditionPathIsReadWrite=/proc/sys/
+ ConditionDirectoryNotEmpty=|/lib/sysctl.d
diff --git a/0481-man-document-statically-loading-modules-for-sysctl-s.patch b/0481-man-document-statically-loading-modules-for-sysctl-s.patch
new file mode 100644
index 0000000..99142c2
--- /dev/null
+++ b/0481-man-document-statically-loading-modules-for-sysctl-s.patch
@@ -0,0 +1,128 @@
+From c3002f71361100f8ec868ccd2f2631198a88af32 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
+Date: Thu, 19 Jun 2014 20:43:56 -0400
+Subject: [PATCH] man: document statically loading modules for sysctl settings
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1022977
+https://bugzilla.novell.com/show_bug.cgi?id=725412
+(cherry picked from commit 7284335adbb8cb2bc9c11f9e102906da1bf71145)
+---
+ man/sysctl.d.xml | 79 +++++++++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 56 insertions(+), 23 deletions(-)
+
+diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
+index db53b49599..78c4e80b8c 100644
+--- a/man/sysctl.d.xml
++++ b/man/sysctl.d.xml
+@@ -71,24 +71,6 @@
+ is # or ; are
+ ignored.
+
+- Note that either / or
+- . may be used as separators within
+- sysctl variable names. If the first separator is a
+- slash, remaining slashes and dots are left intact. If
+- the first separator is a dot, dots and slashes are
+- interchanged. kernel.domainname=foo
+- and kernel/domainname=foo are
+- equivalent and will cause foo to
+- be written to
+- /proc/sys/kernel/domainname.
+- Either
+- net.ipv4.conf.enp3s0/200.forwarding
+- or
+- net/ipv4/conf/enp3s0.200/forwarding
+- may be used to refer to
+- /proc/sys/net/ipv4/conf/enp3s0.200/forwarding.
+-
+-
+ Each configuration file shall be named in the
+ style of program.conf.
+ Files in /etc/ override files
+@@ -110,6 +92,24 @@
+ number and a dash, to simplify the ordering of the
+ files.
+
++ Note that either / or
++ . may be used as separators within
++ sysctl variable names. If the first separator is a
++ slash, remaining slashes and dots are left intact. If
++ the first separator is a dot, dots and slashes are
++ interchanged. kernel.domainname=foo
++ and kernel/domainname=foo are
++ equivalent and will cause foo to
++ be written to
++ /proc/sys/kernel/domainname.
++ Either
++ net.ipv4.conf.enp3s0/200.forwarding
++ or
++ net/ipv4/conf/enp3s0.200/forwarding
++ may be used to refer to
++ /proc/sys/net/ipv4/conf/enp3s0.200/forwarding.
++
++
+ If the administrator wants to disable a
+ configuration file supplied by the vendor, the
+ recommended way is to place a symlink to
+@@ -125,16 +125,48 @@
+ specifically,
+ net.ipv4.conf.*,
+ net.ipv6.conf.*,
+- net.ipv4.neigh.* and net.ipv6.neigh.*)
++ net.ipv4.neigh.* and net.ipv6.neigh.*).
++
++ Many sysctl parameters only become available
++ when certain kernel modules are loaded. Modules are
++ usually loaded on demand, e.g. when certain hardware
++ is plugged in or network brought up. This means that
++ systemd-sysctl.service8 which runs
++ during early boot will not configure such parameters
++ if they become available after it has run. To
++ set such parameters, it is recommended to add
++ an udev7 rule to set those parameters when they become
++ available. Alternatively, a slightly simpler and
++ less efficient option is to add the module to
++ modules-load.d5, causing it to be loaded statically
++ before sysctl settings are applied (see
++ example below).
+
+
+
+- Example
++ Examples
++
++ Set kernel YP domain name
++ /etc/sysctl.d/domain-name.conf:
++
++
++ kernel.domainname=example.com
++
++
+
+- /etc/sysctl.d/domain-name.conf example:
++ Disable packet filter on the bridge
++ /etc/modules-load.d/bridge.conf:
++
++
++ bridge
++
++ /etc/sysctl.d/bridge.conf:
++
+
+- # Set kernel YP domain name
+-kernel.domainname=example.com
++ net.bridge.bridge-nf-call-ip6tables = 0
++net.bridge.bridge-nf-call-iptables = 0
++net.bridge.bridge-nf-call-arptables = 0
++
+
+
+
+@@ -146,6 +178,7 @@ kernel.domainname=example.com
+ systemd-delta1,
+ sysctl8,
+ sysctl.conf5
++ modprobe8
+
+
+
diff --git a/0482-man-also-describe-an-udev-rule-for-bridge-sysctl.patch b/0482-man-also-describe-an-udev-rule-for-bridge-sysctl.patch
new file mode 100644
index 0000000..6bb8e68
--- /dev/null
+++ b/0482-man-also-describe-an-udev-rule-for-bridge-sysctl.patch
@@ -0,0 +1,40 @@
+From 74cfaf67f132f7a6a738020750bd7bb0ebd30a3a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
+Date: Thu, 19 Jun 2014 21:13:56 -0400
+Subject: [PATCH] man: also describe an udev rule for bridge sysctl
+
+(cherry picked from commit 71418295125c542d3edd1e7251bb0701ef1af89b)
+---
+ man/sysctl.d.xml | 19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
+index 78c4e80b8c..ed9e997f8a 100644
+--- a/man/sysctl.d.xml
++++ b/man/sysctl.d.xml
+@@ -154,7 +154,24 @@
+
+
+
+- Disable packet filter on the bridge
++ Disable packet filter on the bridge (method one)
++ /etc/udev/rules.d/99-bridge.conf:
++
++
++ ACTION=="add", SUBSYSTEM=="module", KERNEL=="bridge", RUN+="/usr/lib/systemd/systemd-sysctl --prefix=/proc/sys/net/bridge"
++
++
++ /etc/sysctl.d/bridge.conf:
++
++
++ net.bridge.bridge-nf-call-ip6tables = 0
++net.bridge.bridge-nf-call-iptables = 0
++net.bridge.bridge-nf-call-arptables = 0
++
++
++
++
++ Disable packet filter on the bridge (method two)
+ /etc/modules-load.d/bridge.conf:
+
+
diff --git a/0483-util-do-not-strip-dev-prefix-twice.patch b/0483-util-do-not-strip-dev-prefix-twice.patch
new file mode 100644
index 0000000..024a5bd
--- /dev/null
+++ b/0483-util-do-not-strip-dev-prefix-twice.patch
@@ -0,0 +1,24 @@
+From b0a6e77ffcca3c18725b460e99269322bd4b85bd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
+Date: Fri, 20 Jun 2014 18:44:39 -0400
+Subject: [PATCH] util: do not strip /dev prefix twice
+
+(cherry picked from commit 0d460faf732ff3c9483dbfa5db6905d53c2e2522)
+---
+ src/shared/util.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/shared/util.c b/src/shared/util.c
+index e78e4e404c..6de527ed44 100644
+--- a/src/shared/util.c
++++ b/src/shared/util.c
+@@ -3630,9 +3630,6 @@ char *fstab_node_to_udev_node(const char *p) {
+ bool tty_is_vc(const char *tty) {
+ assert(tty);
+
+- if (startswith(tty, "/dev/"))
+- tty += 5;
+-
+ return vtnr_from_tty(tty) >= 0;
+ }
+
diff --git a/0484-core-transaction-avoid-misleading-error-message-when.patch b/0484-core-transaction-avoid-misleading-error-message-when.patch
new file mode 100644
index 0000000..59dd63d
--- /dev/null
+++ b/0484-core-transaction-avoid-misleading-error-message-when.patch
@@ -0,0 +1,48 @@
+From f8b3ac3455144d3a1c14aaafc52161928c4efb32 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
+Date: Sun, 22 Jun 2014 14:04:23 -0400
+Subject: [PATCH] core/transaction: avoid misleading error message when unit
+ not found
+
+There's no point in telling the user to look at the logs when
+an attempt to load the unit file failed with ENOENT.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=996133
+(cherry picked from commit 04ef5b03f64d3824a51a2a903548af029a006744)
+
+Conflicts:
+ TODO
+ src/core/transaction.c
+---
+ src/core/transaction.c | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/src/core/transaction.c b/src/core/transaction.c
+index 203070fa26..10d7602288 100644
+--- a/src/core/transaction.c
++++ b/src/core/transaction.c
+@@ -861,12 +861,18 @@ int transaction_add_job_and_dependencies(
+ }
+
+ if (type != JOB_STOP && unit->load_state == UNIT_ERROR) {
+- dbus_set_error(e, BUS_ERROR_LOAD_FAILED,
+- "Unit %s failed to load: %s. "
+- "See system logs and 'systemctl status %s' for details.",
+- unit->id,
+- strerror(-unit->load_error),
+- unit->id);
++ if (unit->load_error == -ENOENT)
++ dbus_set_error(e, BUS_ERROR_LOAD_FAILED,
++ "Unit %s failed to load: %s.",
++ unit->id,
++ strerror(-unit->load_error));
++ else
++ dbus_set_error(e, BUS_ERROR_LOAD_FAILED,
++ "Unit %s failed to load: %s. "
++ "See system logs and 'systemctl status %s' for details.",
++ unit->id,
++ strerror(-unit->load_error),
++ unit->id);
+ return -EINVAL;
+ }
+
diff --git a/0485-core-snapshot-log-info-when-snapshots-are-created-an.patch b/0485-core-snapshot-log-info-when-snapshots-are-created-an.patch
new file mode 100644
index 0000000..6052c36
--- /dev/null
+++ b/0485-core-snapshot-log-info-when-snapshots-are-created-an.patch
@@ -0,0 +1,82 @@
+From 550977c2beb8029db9f6236717e630af00d0906c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
+Date: Sun, 22 Jun 2014 14:20:08 -0400
+Subject: [PATCH] core/snapshot: log info when snapshots are created and
+ removed
+
+Snapshot mechanism is not used very much, but snapshot creation/destruction
+should be at least as verbose as normal unit starting/stopping.
+
+(cherry picked from commit 6f8bd5c94ebc19c9afdb17684945526dddc2ec23)
+
+Conflicts:
+ TODO
+---
+ src/core/snapshot.c | 19 ++++++++++++-------
+ 1 file changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/src/core/snapshot.c b/src/core/snapshot.c
+index d11239dff3..e1267a954d 100644
+--- a/src/core/snapshot.c
++++ b/src/core/snapshot.c
+@@ -51,10 +51,11 @@ static void snapshot_set_state(Snapshot *s, SnapshotState state) {
+ s->state = state;
+
+ if (state != old_state)
+- log_debug("%s changed %s -> %s",
+- UNIT(s)->id,
+- snapshot_state_to_string(old_state),
+- snapshot_state_to_string(state));
++ log_debug_unit(UNIT(s)->id,
++ "%s changed %s -> %s",
++ UNIT(s)->id,
++ snapshot_state_to_string(old_state),
++ snapshot_state_to_string(state));
+
+ unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], true);
+ }
+@@ -154,7 +155,7 @@ static int snapshot_deserialize_item(Unit *u, const char *key, const char *value
+
+ state = snapshot_state_from_string(value);
+ if (state < 0)
+- log_debug("Failed to parse state value %s", value);
++ log_debug_unit(u->id, "Failed to parse state value %s", value);
+ else
+ s->deserialized_state = state;
+
+@@ -162,7 +163,7 @@ static int snapshot_deserialize_item(Unit *u, const char *key, const char *value
+
+ r = parse_boolean(value);
+ if (r < 0)
+- log_debug("Failed to parse cleanup value %s", value);
++ log_debug_unit(u->id, "Failed to parse cleanup value %s", value);
+ else
+ s->cleanup = r;
+
+@@ -172,7 +173,7 @@ static int snapshot_deserialize_item(Unit *u, const char *key, const char *value
+ if (r < 0)
+ return r;
+ } else
+- log_debug("Unknown serialization key '%s'", key);
++ log_debug_unit(u->id, "Unknown serialization key '%s'", key);
+
+ return 0;
+ }
+@@ -263,6 +264,8 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, DBusError *e, Sn
+ SNAPSHOT(u)->cleanup = cleanup;
+ *_s = SNAPSHOT(u);
+
++ log_info_unit(u->id, "Created snapshot %s.", u->id);
++
+ return 0;
+
+ fail:
+@@ -275,6 +278,8 @@ fail:
+ void snapshot_remove(Snapshot *s) {
+ assert(s);
+
++ log_info_unit(UNIT(s)->id, "Removing snapshot %s.", UNIT(s)->id);
++
+ unit_add_to_cleanup_queue(UNIT(s));
+ }
+
diff --git a/0486-vconsole-also-copy-character-maps-not-just-fonts-fro.patch b/0486-vconsole-also-copy-character-maps-not-just-fonts-fro.patch
new file mode 100644
index 0000000..9d40b67
--- /dev/null
+++ b/0486-vconsole-also-copy-character-maps-not-just-fonts-fro.patch
@@ -0,0 +1,54 @@
+From ad1faa28c6b319ad5a1b8a9879fba2962ca4e755 Mon Sep 17 00:00:00 2001
+From: Carl Schaefer
+Date: Mon, 23 Jun 2014 18:23:48 +0200
+Subject: [PATCH] vconsole: also copy character maps (not just fonts) from vt1
+ to vt2, vt3, ...
+
+https://bugs.freedesktop.org/show_bug.cgi?id=78796
+(cherry picked from commit ff452e76e2c0f89a32542b7179bb2fd538335933)
+---
+ src/vconsole/vconsole-setup.c | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
+index 0f2b7066e2..e0c4050611 100644
+--- a/src/vconsole/vconsole-setup.c
++++ b/src/vconsole/vconsole-setup.c
+@@ -180,6 +180,10 @@ static int font_load(const char *vc, const char *font, const char *map, const ch
+ */
+ static void font_copy_to_all_vcs(int fd) {
+ struct vt_stat vcs = {};
++ unsigned char map8[E_TABSZ];
++ unsigned short map16[E_TABSZ];
++ struct unimapdesc unimapd;
++ struct unipair unipairs[USHRT_MAX];
+ int i, r;
+
+ /* get active, and 16 bit mask of used VT numbers */
+@@ -209,6 +213,26 @@ static void font_copy_to_all_vcs(int fd) {
+ cfo.op = KD_FONT_OP_COPY;
+ cfo.height = vcs.v_active-1; /* tty1 == index 0 */
+ ioctl(vcfd, KDFONTOP, &cfo);
++
++ /* copy map of 8bit chars */
++ if (ioctl(fd, GIO_SCRNMAP, map8) >= 0)
++ ioctl(vcfd, PIO_SCRNMAP, map8);
++
++ /* copy map of 8bit chars -> 16bit Unicode values */
++ if (ioctl(fd, GIO_UNISCRNMAP, map16) >= 0)
++ ioctl(vcfd, PIO_UNISCRNMAP, map16);
++
++ /* copy unicode translation table */
++ /* unimapd is a ushort count and a pointer to an
++ array of struct unipair { ushort, ushort } */
++ unimapd.entries = unipairs;
++ unimapd.entry_ct = USHRT_MAX;
++ if (ioctl(fd, GIO_UNIMAP, &unimapd) >= 0) {
++ struct unimapinit adv = { 0, 0, 0 };
++
++ ioctl(vcfd, PIO_UNIMAPCLR, &adv);
++ ioctl(vcfd, PIO_UNIMAP, &unimapd);
++ }
+ }
+ }
+
diff --git a/0487-core-You-can-not-put-the-cached-result-of-use_smack-.patch b/0487-core-You-can-not-put-the-cached-result-of-use_smack-.patch
new file mode 100644
index 0000000..c570ce7
--- /dev/null
+++ b/0487-core-You-can-not-put-the-cached-result-of-use_smack-.patch
@@ -0,0 +1,30 @@
+From 75547f3f23d4a38ae497b5ffe7d4d8c5038d1a45 Mon Sep 17 00:00:00 2001
+From: Ronan Le Martret
+Date: Tue, 22 Apr 2014 10:33:25 +0200
+Subject: [PATCH] core: You can not put the cached result of use_smack fct, as
+ we are not sure the "/sys" is mounted. So we should mount "sys" before
+ "/proc"
+
+https://bugs.freedesktop.org/show_bug.cgi?id=77646
+(cherry picked from commit d1d8e5d49f3149d03ceb94d1d2f6c14e7abccb6f)
+---
+ src/core/mount-setup.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
+index cff83d39e4..5c6edfd6f3 100644
+--- a/src/core/mount-setup.c
++++ b/src/core/mount-setup.c
+@@ -69,10 +69,10 @@ typedef struct MountPoint {
+ #define N_EARLY_MOUNT 5
+
+ static const MountPoint mount_table[] = {
+- { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,
+- NULL, MNT_FATAL|MNT_IN_CONTAINER },
+ { "sysfs", "/sys", "sysfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,
+ NULL, MNT_FATAL|MNT_IN_CONTAINER },
++ { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,
++ NULL, MNT_FATAL|MNT_IN_CONTAINER },
+ { "devtmpfs", "/dev", "devtmpfs", "mode=755", MS_NOSUID|MS_STRICTATIME,
+ NULL, MNT_FATAL|MNT_IN_CONTAINER },
+ { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV,
diff --git a/0488-cryptsetup-don-t-add-unit-dependency-on-dev-null-dev.patch b/0488-cryptsetup-don-t-add-unit-dependency-on-dev-null-dev.patch
new file mode 100644
index 0000000..0c8ec4c
--- /dev/null
+++ b/0488-cryptsetup-don-t-add-unit-dependency-on-dev-null-dev.patch
@@ -0,0 +1,57 @@
+From bb6caff37bdf0de68a5f9243fe282b2df1da6737 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering
+Date: Mon, 23 Jun 2014 19:18:44 +0200
+Subject: [PATCH] cryptsetup: don't add unit dependency on /dev/null devices
+ when it is listed as password file
+
+As special magic, don't create device dependencies for /dev/null. Of
+course, there might be similar devices we might want to include, but
+given that none of them really make sense to specify as password source
+there's really no point in checking for anything else here.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=75816
+(cherry picked from commit bde29068aa3815c88190a91e9867605a0aeaf9c4)
+
+Conflicts:
+ src/cryptsetup/cryptsetup-generator.c
+---
+ src/cryptsetup/cryptsetup-generator.c | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
+index 11e5268185..1b5f8bec30 100644
+--- a/src/cryptsetup/cryptsetup-generator.c
++++ b/src/cryptsetup/cryptsetup-generator.c
+@@ -30,6 +30,7 @@
+ #include "virt.h"
+ #include "strv.h"
+ #include "fileio.h"
++#include "path-util.h"
+
+ static const char *arg_dest = "/tmp";
+ static bool arg_enabled = true;
+@@ -137,14 +138,17 @@ static int create_disk(
+ if (uu == NULL)
+ return log_oom();
+
+- if (is_device_path(uu)) {
+- _cleanup_free_ char *dd = unit_name_from_path(uu, ".device");
+- if (dd == NULL)
+- return log_oom();
++ if (!path_equal(uu, "/dev/null")) {
++
++ if (is_device_path(uu)) {
++ _cleanup_free_ char *dd = unit_name_from_path(uu, ".device");
++ if (dd == NULL)
++ return log_oom();
+
+- fprintf(f, "After=%1$s\nRequires=%1$s\n", dd);
+- } else
+- fprintf(f, "RequiresMountsFor=%s\n", password);
++ fprintf(f, "After=%1$s\nRequires=%1$s\n", dd);
++ } else
++ fprintf(f, "RequiresMountsFor=%s\n", password);
++ }
+ }
+ }
+
diff --git a/0489-man-fix-path-in-crypttab-5.patch b/0489-man-fix-path-in-crypttab-5.patch
new file mode 100644
index 0000000..4cbe672
--- /dev/null
+++ b/0489-man-fix-path-in-crypttab-5.patch
@@ -0,0 +1,24 @@
+From 2b0f2489ce5df772c88c44773443349cb3e218e0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
+Date: Mon, 23 Jun 2014 23:07:53 -0400
+Subject: [PATCH] man: fix path in crypttab(5)
+
+https://bugs.freedesktop.org/show_bug.cgi?id=75816
+(cherry picked from commit 9fcdf32294e66f91d2a177f73a77049832768311)
+---
+ man/crypttab.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/crypttab.xml b/man/crypttab.xml
+index 4b6d12ef4f..af41ef481a 100644
+--- a/man/crypttab.xml
++++ b/man/crypttab.xml
+@@ -376,7 +376,7 @@
+ luks UUID=2505567a-9e27-4efe-a4d5-15ad146c258b
+ swap /dev/sda7 /dev/urandom swap
+ truecrypt /dev/sda2 /etc/container_password tcrypt
+-hidden /mnt/tc_hidden /null tcrypt-hidden,tcrypt-keyfile=/etc/keyfile
++hidden /mnt/tc_hidden /dev/null tcrypt-hidden,tcrypt-keyfile=/etc/keyfile
+
+
+
diff --git a/0490-core-transaction-fix-cycle-break-attempts-outside-tr.patch b/0490-core-transaction-fix-cycle-break-attempts-outside-tr.patch
new file mode 100644
index 0000000..280ed40
--- /dev/null
+++ b/0490-core-transaction-fix-cycle-break-attempts-outside-tr.patch
@@ -0,0 +1,40 @@
+From 20aff35923a0409d403afd891bc35324ab7d67f8 Mon Sep 17 00:00:00 2001
+From: Uoti Urpala
+Date: Mon, 23 Jun 2014 16:50:03 +0300
+Subject: [PATCH] core/transaction: fix cycle break attempts outside
+ transaction
+
+Patch fixes some incorrect-looking code in transaction.c.
+It could fix cases where Debian users with bad package configurations
+had systemd go into an infinite loop printing messages about breaking an
+ordering cycle, though I have not reproduced that problem myself.
+
+transaction_verify_order_one() considers jobs/units outside current
+transaction when checking whether ordering dependencies cause cycles.
+It would also incorrectly try to break cycles at these jobs; this
+cannot work, as the break action is to remove the job from the
+transaction, which is a no-op if the job isn't part of the transaction
+to begin with. The unit_matters_to_anchor() test also looks like it
+would not work correctly for non-transaction jobs. Add a check to
+verify that the unit is part of the transaction before considering a
+job a candidate for deletion.
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752259
+(cherry picked from commit 375ae4aa4d2f89ae8afdd27e9f2b8336fcc2a046)
+---
+ src/core/transaction.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/transaction.c b/src/core/transaction.c
+index 10d7602288..c8ab491a33 100644
+--- a/src/core/transaction.c
++++ b/src/core/transaction.c
+@@ -374,7 +374,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi
+ "Found dependency on %s/%s",
+ k->unit->id, job_type_to_string(k->type));
+
+- if (!delete &&
++ if (!delete && hashmap_get(tr->jobs, k->unit) &&
+ !unit_matters_to_anchor(k->unit, k)) {
+ /* Ok, we can drop this one, so let's
+ * do so. */
diff --git a/0491-journald-make-MaxFileSec-really-default-to-1month.patch b/0491-journald-make-MaxFileSec-really-default-to-1month.patch
new file mode 100644
index 0000000..8945291
--- /dev/null
+++ b/0491-journald-make-MaxFileSec-really-default-to-1month.patch
@@ -0,0 +1,34 @@
+From d3db9a9911637d06c8cd5a573b87acd5e8101270 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20Bartoszkiewicz?=
+Date: Thu, 26 Jun 2014 22:11:35 +0200
+Subject: [PATCH] journald: make MaxFileSec really default to 1month
+
+journald.conf(5) states that the default for MaxFileSec is one month,
+but the code didn't respect that.
+
+(cherry picked from commit e150e82097211f09b911c7784a89ef9efed713ca)
+---
+ src/journal/journald-server.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
+index 0b31d1015c..1e936704aa 100644
+--- a/src/journal/journald-server.c
++++ b/src/journal/journald-server.c
+@@ -67,6 +67,7 @@
+ #define DEFAULT_SYNC_INTERVAL_USEC (5*USEC_PER_MINUTE)
+ #define DEFAULT_RATE_LIMIT_INTERVAL (30*USEC_PER_SEC)
+ #define DEFAULT_RATE_LIMIT_BURST 1000
++#define DEFAULT_MAX_FILE_USEC USEC_PER_MONTH
+
+ #define RECHECK_AVAILABLE_SPACE_USEC (30*USEC_PER_SEC)
+
+@@ -1486,6 +1487,8 @@ int server_init(Server *s) {
+
+ s->forward_to_syslog = true;
+
++ s->max_file_usec = DEFAULT_MAX_FILE_USEC;
++
+ s->max_level_store = LOG_DEBUG;
+ s->max_level_syslog = LOG_DEBUG;
+ s->max_level_kmsg = LOG_NOTICE;
diff --git a/0492-rules-don-t-enable-usb-pm-for-Avocent-devices.patch b/0492-rules-don-t-enable-usb-pm-for-Avocent-devices.patch
new file mode 100644
index 0000000..b5ca372
--- /dev/null
+++ b/0492-rules-don-t-enable-usb-pm-for-Avocent-devices.patch
@@ -0,0 +1,28 @@
+From 44599e6162d6806a39a6691b1d4f9f69f8329646 Mon Sep 17 00:00:00 2001
+From: Tom Hirst
+Date: Wed, 25 Jun 2014 11:57:11 +0000
+Subject: [PATCH] rules: don't enable usb pm for Avocent devices
+
+The Avocent KVM over IP devices doesn't work correctly with USB power
+management enabled.
+
+(cherry picked from commit 52fb538361053f8c4abce0e40cd0bae3d28ceb16)
+---
+ rules/42-usb-hid-pm.rules | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/rules/42-usb-hid-pm.rules b/rules/42-usb-hid-pm.rules
+index 3fd6e8ab4c..483a7811f5 100644
+--- a/rules/42-usb-hid-pm.rules
++++ b/rules/42-usb-hid-pm.rules
+@@ -11,10 +11,6 @@ ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Mouse", ATTR{serial}==
+ ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Tablet", ATTR{serial}=="42", TEST=="power/control", ATTR{power/control}="auto"
+ ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Keyboard", ATTR{serial}=="42", TEST=="power/control", ATTR{power/control}="auto"
+
+-# Catch-all for Avocent HID devices. Keyed off interface in order to only
+-# trigger on HID class devices.
+-ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0624", ATTR{bInterfaceClass}=="03", TEST=="../power/control", ATTR{../power/control}="auto"
+-
+ # Dell DRAC 4
+ ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="413c", ATTR{idProduct}=="2500", TEST=="power/control", ATTR{power/control}="auto"
+
diff --git a/0493-units-remove-RefuseManualStart-from-units-which-are-.patch b/0493-units-remove-RefuseManualStart-from-units-which-are-.patch
new file mode 100644
index 0000000..338d13f
--- /dev/null
+++ b/0493-units-remove-RefuseManualStart-from-units-which-are-.patch
@@ -0,0 +1,60 @@
+From 368b458ef96c7c10054bd9b9c3a5d16745bc7983 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
+Date: Sat, 28 Jun 2014 00:06:30 -0400
+Subject: [PATCH] units: remove RefuseManualStart from units which are always
+ around
+
+In a normal running system, non-passive targets and units used during
+early bootup are always started. So refusing "manual start" for them
+doesn't make any difference, because a "start" command doesn't cause
+any action.
+
+In early boot however, the administrator might want to start on
+of those targets or services by hand. We shouldn't interfere with that.
+
+Note: in case of systemd-tmpfiles-setup.service, really running the
+unit after system is up would break the system. So e.g. restarting
+should not be allowed. The unit has "RefuseManualStop=yes", which
+prevents restart too.
+
+(cherry picked from commit 0fdeb6e011dfdb17636c81e2d7e0d632186359ce)
+
+Conflicts:
+ units/systemd-tmpfiles-setup.service.in
+ units/user/basic.target
+---
+ units/basic.target | 1 -
+ units/sysinit.target | 1 -
+ units/systemd-tmpfiles-setup.service.in | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/units/basic.target b/units/basic.target
+index d7c68f4e2c..b890d48bbc 100644
+--- a/units/basic.target
++++ b/units/basic.target
+@@ -11,4 +11,3 @@ Documentation=man:systemd.special(7)
+ Requires=sysinit.target
+ Wants=sockets.target timers.target paths.target slices.target
+ After=sysinit.target sockets.target timers.target paths.target slices.target
+-RefuseManualStart=yes
+diff --git a/units/sysinit.target b/units/sysinit.target
+index 8f4fb8f5c1..ec33503330 100644
+--- a/units/sysinit.target
++++ b/units/sysinit.target
+@@ -11,4 +11,3 @@ Documentation=man:systemd.special(7)
+ Conflicts=emergency.service emergency.target
+ Wants=local-fs.target swap.target
+ After=local-fs.target swap.target emergency.service emergency.target
+-RefuseManualStart=yes
+diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in
+index 01043b7a96..136520bf7d 100644
+--- a/units/systemd-tmpfiles-setup.service.in
++++ b/units/systemd-tmpfiles-setup.service.in
+@@ -18,7 +18,6 @@ ConditionDirectoryNotEmpty=|/lib/tmpfiles.d
+ ConditionDirectoryNotEmpty=|/usr/local/lib/tmpfiles.d
+ ConditionDirectoryNotEmpty=|/etc/tmpfiles.d
+ ConditionDirectoryNotEmpty=|/run/tmpfiles.d
+-RefuseManualStart=yes
+ RefuseManualStop=yes
+
+ [Service]
diff --git a/0494-units-skip-mounting-tmp-if-it-is-a-symlink.patch b/0494-units-skip-mounting-tmp-if-it-is-a-symlink.patch
new file mode 100644
index 0000000..ded197a
--- /dev/null
+++ b/0494-units-skip-mounting-tmp-if-it-is-a-symlink.patch
@@ -0,0 +1,25 @@
+From 8096b6516621a2f9aeae77fbb622c859e585564b Mon Sep 17 00:00:00 2001
+From: Lennart Poettering
+Date: Mon, 30 Jun 2014 21:44:05 +0200
+Subject: [PATCH] units: skip mounting /tmp if it is a symlink
+
+We shouldn't get confused if people have symlinked /tmp somewhere, so
+let's simply skip the mount then.
+
+(cherry picked from commit 8ebf02d6f382ce1ac7e0d44a713b8795a07b08cd)
+---
+ units/tmp.mount | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/units/tmp.mount b/units/tmp.mount
+index 99a3ba3f6c..00a0d28722 100644
+--- a/units/tmp.mount
++++ b/units/tmp.mount
+@@ -9,6 +9,7 @@
+ Description=Temporary Directory
+ Documentation=man:hier(7)
+ Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
++ConditionPathIsSymbolicLink=!/tmp
+ DefaultDependencies=no
+ Conflicts=umount.target
+ Before=local-fs.target umount.target
diff --git a/0495-man-sd_journal_next-fix-argument-in-example.patch b/0495-man-sd_journal_next-fix-argument-in-example.patch
new file mode 100644
index 0000000..dda588c
--- /dev/null
+++ b/0495-man-sd_journal_next-fix-argument-in-example.patch
@@ -0,0 +1,33 @@
+From dbf388481a82cbca60e185a8611b5f197ce4cb93 Mon Sep 17 00:00:00 2001
+From: Christian Hesse
+Date: Tue, 1 Jul 2014 10:22:50 +0200
+Subject: [PATCH] man/sd_journal_next: fix argument in example
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The example does not compile, it fails with:
+
+error: passing argument 3 of ‘sd_journal_get_data’ from incompatible
+pointer type
+
+Cast to (const void **) to avoid this.
+
+(cherry picked from commit 8959ae0d4cc7921293a21182693b7d953f6cce9b)
+---
+ man/sd_journal_next.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml
+index 1409b0dba3..750282cfb9 100644
+--- a/man/sd_journal_next.xml
++++ b/man/sd_journal_next.xml
+@@ -183,7 +183,7 @@ int main(int argc, char *argv[]) {
+ const char *d;
+ size_t l;
+
+- r = sd_journal_get_data(j, "MESSAGE", &d, &l);
++ r = sd_journal_get_data(j, "MESSAGE", (const void **)&d, &l);
+ if (r < 0) {
+ fprintf(stderr, "Failed to read message field: %s\n", strerror(-r));
+ continue;
diff --git a/0496-man-sd_journal_get_data-fix-variable-naming-in-examp.patch b/0496-man-sd_journal_get_data-fix-variable-naming-in-examp.patch
new file mode 100644
index 0000000..1d6b60c
--- /dev/null
+++ b/0496-man-sd_journal_get_data-fix-variable-naming-in-examp.patch
@@ -0,0 +1,23 @@
+From 68d9f2a3e92f2275d30d67580f64defc76499006 Mon Sep 17 00:00:00 2001
+From: Christian Hesse
+Date: Tue, 1 Jul 2014 10:22:51 +0200
+Subject: [PATCH] man/sd_journal_get_data: fix variable naming in example
+
+(cherry picked from commit 02ea24ca2a0aac854c4e9e7d712f6464c8b29e4a)
+---
+ man/sd_journal_get_data.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/man/sd_journal_get_data.xml b/man/sd_journal_get_data.xml
+index 6ed52b569e..7f90fc3600 100644
+--- a/man/sd_journal_get_data.xml
++++ b/man/sd_journal_get_data.xml
+@@ -225,7 +225,7 @@
+ ...
+ int print_fields(sd_journal *j) {
+ const void *data;
+- size_t l;
++ size_t length;
+ SD_JOURNAL_FOREACH_DATA(j, data, length)
+ printf("%.*s\n", (int) length, data);
+ }
diff --git a/0497-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0497-hwdb-Update-database-of-Bluetooth-company-identifier.patch
new file mode 100644
index 0000000..a1300e7
--- /dev/null
+++ b/0497-hwdb-Update-database-of-Bluetooth-company-identifier.patch
@@ -0,0 +1,47 @@
+From 406f410745533c3c584ad1cdf0b83c609012cd6d Mon Sep 17 00:00:00 2001
+From: Marcel Holtmann
+Date: Thu, 3 Jul 2014 16:13:48 +0200
+Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
+
+(cherry picked from commit 063e36db8aed7b54100b33089deb6d2e86d516b9)
+---
+ hwdb/20-bluetooth-vendor-product.hwdb | 26 +++++++++++++++++++++++++-
+ 1 file changed, 25 insertions(+), 1 deletion(-)
+
+diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb/20-bluetooth-vendor-product.hwdb
+index 377748a598..9f3136a6a7 100644
+--- a/hwdb/20-bluetooth-vendor-product.hwdb
++++ b/hwdb/20-bluetooth-vendor-product.hwdb
+@@ -1045,7 +1045,31 @@ bluetooth:v0159*
+ ID_VENDOR_FROM_DATABASE=ChefSteps, Inc.
+
+ bluetooth:v015A*
+- ID_VENDOR_FROM_DATABASE=micus AG
++ ID_VENDOR_FROM_DATABASE=micas AG
+
+ bluetooth:v015B*
+ ID_VENDOR_FROM_DATABASE=Biomedical Research Ltd.
++
++bluetooth:v015C*
++ ID_VENDOR_FROM_DATABASE=Pitius Tec S.L.
++
++bluetooth:v015D*
++ ID_VENDOR_FROM_DATABASE=Estimote, Inc.
++
++bluetooth:v015E*
++ ID_VENDOR_FROM_DATABASE=Unikey Technologies, Inc.
++
++bluetooth:v015F*
++ ID_VENDOR_FROM_DATABASE=Timer Cap Co.
++
++bluetooth:v0160*
++ ID_VENDOR_FROM_DATABASE=AwoX
++
++bluetooth:v0161*
++ ID_VENDOR_FROM_DATABASE=yikes
++
++bluetooth:v0162*
++ ID_VENDOR_FROM_DATABASE=MADSGlobal NZ Ltd.
++
++bluetooth:v0163*
++ ID_VENDOR_FROM_DATABASE=PCH International
diff --git a/0498-hwdb-update.patch b/0498-hwdb-update.patch
new file mode 100644
index 0000000..91f2324
--- /dev/null
+++ b/0498-hwdb-update.patch
@@ -0,0 +1,4390 @@
+From bf5aa798d912455d657fae6c52d725b8941aa9c5 Mon Sep 17 00:00:00 2001
+From: Kay Sievers
+Date: Thu, 3 Jul 2014 16:28:40 +0200
+Subject: [PATCH] hwdb: update
+
+(cherry picked from commit 98be1a746ac0d7a17e69ccb05936a4d6b3223e97)
+---
+ hwdb/20-OUI.hwdb | 543 +++++++++++++++++++--
+ hwdb/20-pci-classes.hwdb | 27 ++
+ hwdb/20-pci-vendor-model.hwdb | 1071 +++++++++++++++++++++++++++--------------
+ hwdb/20-usb-classes.hwdb | 3 +
+ hwdb/20-usb-vendor-model.hwdb | 102 +++-
+ 5 files changed, 1362 insertions(+), 384 deletions(-)
+
+diff --git a/hwdb/20-OUI.hwdb b/hwdb/20-OUI.hwdb
+index 6188bfcff6..97f1e6b2c0 100644
+--- a/hwdb/20-OUI.hwdb
++++ b/hwdb/20-OUI.hwdb
+@@ -6446,7 +6446,7 @@ OUI:0050C2871*
+ ID_OUI_FROM_DATABASE=R-S-I Elektrotechnik GmbH & Co. KG
+
+ OUI:0050C2872*
+- ID_OUI_FROM_DATABASE=Oliotalo - Objecthouse Oy
++ ID_OUI_FROM_DATABASE=Oliotalo Oy
+
+ OUI:0050C2873*
+ ID_OUI_FROM_DATABASE=XRONET Corporation
+@@ -37139,76 +37139,76 @@ OUI:001EC7*
+ ID_OUI_FROM_DATABASE=2Wire, Inc.
+
+ OUI:001EC8*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=Rapid Mobile (Pty) Ltd
+
+ OUI:001EC9*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=Dell Inc
+
+ OUI:001ECA*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=Nortel
+
+ OUI:001ECB*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE="RPC "Energoautomatika" Ltd
+
+ OUI:001ECC*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=CDVI
+
+ OUI:001ECD*
+ ID_OUI_FROM_DATABASE=KYLAND Technology Co. LTD
+
+ OUI:001ECE*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=BISA Technologies (Hong Kong) Limited
+
+ OUI:001ECF*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=PHILIPS ELECTRONICS UK LTD
+
+ OUI:001ED0*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=Ingespace
+
+ OUI:001ED1*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=Keyprocessor B.V.
+
+ OUI:001ED2*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=Ray Shine Video Technology Inc
+
+ OUI:001ED3*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=Dot Technology Int'l Co., Ltd.
+
+ OUI:001ED4*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=Doble Engineering
+
+ OUI:001ED5*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=Tekon-Automatics
+
+ OUI:001ED6*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=Alentec & Orion AB
+
+ OUI:001ED7*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=H-Stream Wireless, Inc.
+
+ OUI:001ED8*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=Digital United Inc.
+
+ OUI:001ED9*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=Mitsubishi Precision Co.,LTd.
+
+ OUI:001EDA*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=Wesemann Elektrotechniek B.V.
+
+ OUI:001EDB*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=Giken Trastem Co., Ltd.
+
+ OUI:001EDC*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=Sony Ericsson Mobile Communications AB
+
+ OUI:001EDD*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=WASKO S.A.
+
+ OUI:001EDE*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=BYD COMPANY LIMITED
+
+ OUI:001EDF*
+- ID_OUI_FROM_DATABASE=2Wire, Inc.
++ ID_OUI_FROM_DATABASE=Master Industrialization Center Kista
+
+ OUI:001EE0*
+ ID_OUI_FROM_DATABASE=Urmet Domus SpA
+@@ -45800,7 +45800,7 @@ OUI:0050F8*
+ ID_OUI_FROM_DATABASE=ENTREGA TECHNOLOGIES, INC.
+
+ OUI:0050F9*
+- ID_OUI_FROM_DATABASE=SENSORMATIC ACD
++ ID_OUI_FROM_DATABASE=Sensormatic Electronics LLC
+
+ OUI:0050FA*
+ ID_OUI_FROM_DATABASE=OXTEL, LTD.
+@@ -45829,6 +45829,9 @@ OUI:0054AF*
+ OUI:005907*
+ ID_OUI_FROM_DATABASE=LenovoEMC Products USA, LLC
+
++OUI:005A39*
++ ID_OUI_FROM_DATABASE=SHENZHEN FAST TECHNOLOGIES CO., LTD.
++
+ OUI:005CB1*
+ ID_OUI_FROM_DATABASE=Gospell DIGITAL TECHNOLOGY CO., LTD
+
+@@ -46603,6 +46606,9 @@ OUI:0060FE*
+ OUI:0060FF*
+ ID_OUI_FROM_DATABASE=QuVis, Inc.
+
++OUI:006171*
++ ID_OUI_FROM_DATABASE=Apple
++
+ OUI:006440*
+ ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC.
+
+@@ -48238,6 +48244,9 @@ OUI:009C02*
+ OUI:009D8E*
+ ID_OUI_FROM_DATABASE=CARDIAC RECORDERS, INC.
+
++OUI:009EC8*
++ ID_OUI_FROM_DATABASE=Beijing Xiaomi Electronic Products Co., Ltd.
++
+ OUI:00A000*
+ ID_OUI_FROM_DATABASE=CENTILLION NETWORKS, INC.
+
+@@ -50740,6 +50749,9 @@ OUI:00D38D*
+ OUI:00D632*
+ ID_OUI_FROM_DATABASE=GE Energy
+
++OUI:00D9D1*
++ ID_OUI_FROM_DATABASE=Sony Computer Entertainment Inc.
++
+ OUI:00DB1E*
+ ID_OUI_FROM_DATABASE=Albedo Telecom SL
+
+@@ -51778,6 +51790,9 @@ OUI:0462D7*
+ OUI:0463E0*
+ ID_OUI_FROM_DATABASE=Nome Oy
+
++OUI:046785*
++ ID_OUI_FROM_DATABASE=scemtec Hard- und Software fuer Mess- und Steuerungstechnik GmbH
++
+ OUI:046D42*
+ ID_OUI_FROM_DATABASE=Bryston Ltd.
+
+@@ -51901,6 +51916,9 @@ OUI:04DB8A*
+ OUI:04DD4C*
+ ID_OUI_FROM_DATABASE=Velocytech
+
++OUI:04DEDB*
++ ID_OUI_FROM_DATABASE=Rockport Networks Inc
++
+ OUI:04DF69*
+ ID_OUI_FROM_DATABASE=Car Connectivity Consortium
+
+@@ -52498,6 +52516,9 @@ OUI:083F76*
+ OUI:084027*
+ ID_OUI_FROM_DATABASE=Gridstore Inc.
+
++OUI:084656*
++ ID_OUI_FROM_DATABASE=VODALYS Ingénierie
++
+ OUI:08482C*
+ ID_OUI_FROM_DATABASE=Raycore Taiwan Co., LTD.
+
+@@ -52966,6 +52987,9 @@ OUI:0CCDD3*
+ OUI:0CCDFB*
+ ID_OUI_FROM_DATABASE=EDIC Systems Inc.
+
++OUI:0CCFD1*
++ ID_OUI_FROM_DATABASE=SPRINGWAVE Co., Ltd
++
+ OUI:0CD292*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
+@@ -53089,6 +53113,9 @@ OUI:1010B6*
+ OUI:101212*
+ ID_OUI_FROM_DATABASE=Vivo International Corporation Pty Ltd
+
++OUI:101218*
++ ID_OUI_FROM_DATABASE=Korins Inc.
++
+ OUI:101248*
+ ID_OUI_FROM_DATABASE=ITG, Inc.
+
+@@ -53128,6 +53155,9 @@ OUI:102D96*
+ OUI:102EAF*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
++OUI:102F6B*
++ ID_OUI_FROM_DATABASE=Microsoft Corporation
++
+ OUI:103047*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
+@@ -53164,6 +53194,9 @@ OUI:104780*
+ OUI:1048B1*
+ ID_OUI_FROM_DATABASE=Beijing Duokan Technology Limited
+
++OUI:104B46*
++ ID_OUI_FROM_DATABASE=Mitsubishi Electric Corporation
++
+ OUI:104D77*
+ ID_OUI_FROM_DATABASE=Innovative Computer Engineering
+
+@@ -53242,6 +53275,9 @@ OUI:10880F*
+ OUI:1088CE*
+ ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Tech.Co.,Ltd.
+
++OUI:108A1B*
++ ID_OUI_FROM_DATABASE=RAONIX Inc.
++
+ OUI:108CCF*
+ ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC.
+
+@@ -53458,6 +53494,9 @@ OUI:144319*
+ OUI:1446E4*
+ ID_OUI_FROM_DATABASE=AVISTEL
+
++OUI:14488B*
++ ID_OUI_FROM_DATABASE=Shenzhen Doov Technology Co.,Ltd
++
+ OUI:144978*
+ ID_OUI_FROM_DATABASE=Digital Control Incorporated
+
+@@ -53473,6 +53512,9 @@ OUI:145412*
+ OUI:145645*
+ ID_OUI_FROM_DATABASE=Savitech Corp.
+
++OUI:1458D0*
++ ID_OUI_FROM_DATABASE=Hewlett Packard
++
+ OUI:145A05*
+ ID_OUI_FROM_DATABASE=Apple
+
+@@ -53608,6 +53650,9 @@ OUI:14EB33*
+ OUI:14EDA5*
+ ID_OUI_FROM_DATABASE=Wächter GmbH Sicherheitssysteme
+
++OUI:14EDE4*
++ ID_OUI_FROM_DATABASE=Kaiam Corporation
++
+ OUI:14EE9D*
+ ID_OUI_FROM_DATABASE=AirNav Systems LLC
+
+@@ -53794,6 +53839,9 @@ OUI:1867B0*
+ OUI:186D99*
+ ID_OUI_FROM_DATABASE=Adanis Inc.
+
++OUI:187117*
++ ID_OUI_FROM_DATABASE=eta plus electronic gmbh
++
+ OUI:1879A2*
+ ID_OUI_FROM_DATABASE=GMJ ELECTRIC LIMITED
+
+@@ -53812,6 +53860,9 @@ OUI:1880CE*
+ OUI:1880F5*
+ ID_OUI_FROM_DATABASE=Alcatel-Lucent Shanghai Bell Co., Ltd
+
++OUI:188219*
++ ID_OUI_FROM_DATABASE=Alibaba Cloud Computing Ltd.
++
+ OUI:188331*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
+@@ -53857,6 +53908,9 @@ OUI:189EFC*
+ OUI:18A905*
+ ID_OUI_FROM_DATABASE=Hewlett-Packard Company
+
++OUI:18A958*
++ ID_OUI_FROM_DATABASE=PROVISION THAI CO., LTD.
++
+ OUI:18A99B*
+ ID_OUI_FROM_DATABASE=Dell Inc
+
+@@ -54049,6 +54103,9 @@ OUI:1C43EC*
+ OUI:1C4593*
+ ID_OUI_FROM_DATABASE=Texas Instruments
+
++OUI:1C4840*
++ ID_OUI_FROM_DATABASE=IMS Messsysteme GmbH
++
+ OUI:1C48F9*
+ ID_OUI_FROM_DATABASE=GN Netcom A/S
+
+@@ -54064,6 +54121,9 @@ OUI:1C4BD6*
+ OUI:1C51B5*
+ ID_OUI_FROM_DATABASE=Techaya LTD
+
++OUI:1C5216*
++ ID_OUI_FROM_DATABASE=DONGGUAN HELE ELECTRONICS CO., LTD
++
+ OUI:1C52D6*
+ ID_OUI_FROM_DATABASE=FLAT DISPLAY TECHNOLOGY CORPORATION
+
+@@ -54100,6 +54160,9 @@ OUI:1C66AA*
+ OUI:1C69A5*
+ ID_OUI_FROM_DATABASE=Research In Motion
+
++OUI:1C6A7A*
++ ID_OUI_FROM_DATABASE=Cisco
++
+ OUI:1C6BCA*
+ ID_OUI_FROM_DATABASE=Mitsunami Co., Ltd.
+
+@@ -54163,6 +54226,12 @@ OUI:1C973D*
+ OUI:1C994C*
+ ID_OUI_FROM_DATABASE=Murata Manufactuaring Co.,Ltd.
+
++OUI:1C9C26*
++ ID_OUI_FROM_DATABASE=Zoovel Technologies
++
++OUI:1CA2B1*
++ ID_OUI_FROM_DATABASE=ruwido austria gmbh
++
+ OUI:1CA770*
+ ID_OUI_FROM_DATABASE=SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LT
+
+@@ -54217,6 +54286,9 @@ OUI:1CC63C*
+ OUI:1CD40C*
+ ID_OUI_FROM_DATABASE=Kriwan Industrie-Elektronik GmbH
+
++OUI:1CDEA7*
++ ID_OUI_FROM_DATABASE=Cisco
++
+ OUI:1CDF0F*
+ ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC.
+
+@@ -54286,6 +54358,9 @@ OUI:20107A*
+ OUI:201257*
+ ID_OUI_FROM_DATABASE=Most Lucky Trading Ltd
+
++OUI:2012D5*
++ ID_OUI_FROM_DATABASE=Scientech Materials Corporation
++
+ OUI:2013E0*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
+@@ -54370,6 +54445,9 @@ OUI:205A00*
+ OUI:205B5E*
+ ID_OUI_FROM_DATABASE=Shenzhen Wonhe Technology Co., Ltd
+
++OUI:205CFA*
++ ID_OUI_FROM_DATABASE=Yangzhou ChangLian Network Technology Co,ltd.
++
+ OUI:206432*
+ ID_OUI_FROM_DATABASE=SAMSUNG ELECTRO MECHANICS CO.,LTD.
+
+@@ -54439,6 +54517,9 @@ OUI:20A2E7*
+ OUI:20A787*
+ ID_OUI_FROM_DATABASE=Bointec Taiwan Corporation Limited
+
++OUI:20A99B*
++ ID_OUI_FROM_DATABASE=Microsoft Corporation
++
+ OUI:20AA25*
+ ID_OUI_FROM_DATABASE=IP-NET LLC
+
+@@ -54469,6 +54550,9 @@ OUI:20BFDB*
+ OUI:20C1AF*
+ ID_OUI_FROM_DATABASE=i Wit Digital Co., Limited
+
++OUI:20C38F*
++ ID_OUI_FROM_DATABASE=Texas Instruments Inc
++
+ OUI:20C60D*
+ ID_OUI_FROM_DATABASE=Shanghai annijie Information technology Co.,LTD
+
+@@ -54616,6 +54700,9 @@ OUI:2437EF*
+ OUI:243C20*
+ ID_OUI_FROM_DATABASE=Dynamode Group
+
++OUI:2442BC*
++ ID_OUI_FROM_DATABASE=Alinco,incorporated
++
+ OUI:244597*
+ ID_OUI_FROM_DATABASE=GEMUE Gebr. Mueller Apparatebau
+
+@@ -55027,6 +55114,9 @@ OUI:28A241*
+ OUI:28A574*
+ ID_OUI_FROM_DATABASE=Miller Electric Mfg. Co.
+
++OUI:28A5EE*
++ ID_OUI_FROM_DATABASE=Shenzhen SDGI CATV Co., Ltd
++
+ OUI:28AF0A*
+ ID_OUI_FROM_DATABASE=Sirius XM Radio Inc
+
+@@ -55177,6 +55267,9 @@ OUI:2C0033*
+ OUI:2C00F7*
+ ID_OUI_FROM_DATABASE=XOS
+
++OUI:2C010B*
++ ID_OUI_FROM_DATABASE=NASCENT Technology, LLC - RemKon
++
+ OUI:2C0623*
+ ID_OUI_FROM_DATABASE=Win Leader Inc.
+
+@@ -55192,6 +55285,9 @@ OUI:2C18AE*
+ OUI:2C1984*
+ ID_OUI_FROM_DATABASE=IDN Telecom, Inc.
+
++OUI:2C1A31*
++ ID_OUI_FROM_DATABASE=Electronics Company Limited
++
+ OUI:2C1EEA*
+ ID_OUI_FROM_DATABASE=AERODEV
+
+@@ -55369,6 +55465,9 @@ OUI:2C9EFC*
+ OUI:2CA157*
+ ID_OUI_FROM_DATABASE=acromate, Inc.
+
++OUI:2CA30E*
++ ID_OUI_FROM_DATABASE=POWER DRAGON DEVELOPMENT LIMITED
++
+ OUI:2CA780*
+ ID_OUI_FROM_DATABASE=True Technologies Inc.
+
+@@ -55540,6 +55639,9 @@ OUI:303EAD*
+ OUI:304174*
+ ID_OUI_FROM_DATABASE=ALTEC LANSING LLC
+
++OUI:304225*
++ ID_OUI_FROM_DATABASE=BURG-WÄCHTER KG
++
+ OUI:304449*
+ ID_OUI_FROM_DATABASE=PLATH GmbH
+
+@@ -55603,6 +55705,9 @@ OUI:306E5C*
+ OUI:3071B2*
+ ID_OUI_FROM_DATABASE=Hangzhou Prevail Optoelectronic Equipment Co.,LTD.
+
++OUI:307512*
++ ID_OUI_FROM_DATABASE=Sony Mobile Communications AB
++
+ OUI:30766F*
+ ID_OUI_FROM_DATABASE=LG Electronics
+
+@@ -55735,6 +55840,9 @@ OUI:3400A3*
+ OUI:340286*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
++OUI:34029B*
++ ID_OUI_FROM_DATABASE=CloudBerry Technologies Private Limited
++
+ OUI:3407FB*
+ ID_OUI_FROM_DATABASE=Ericsson AB
+
+@@ -55774,6 +55882,9 @@ OUI:3423BA*
+ OUI:34255D*
+ ID_OUI_FROM_DATABASE=Shenzhen Loadcom Technology Co.,Ltd
+
++OUI:3428F0*
++ ID_OUI_FROM_DATABASE=ATN International Limited
++
+ OUI:3429EA*
+ ID_OUI_FROM_DATABASE=MCD ELECTRONICS SP. Z O.O.
+
+@@ -55798,6 +55909,9 @@ OUI:344B3D*
+ OUI:344B50*
+ ID_OUI_FROM_DATABASE=ZTE Corporation
+
++OUI:344DF7*
++ ID_OUI_FROM_DATABASE=LG Electronics
++
+ OUI:344F3F*
+ ID_OUI_FROM_DATABASE=IO-Power Technology Co., Ltd.
+
+@@ -55825,6 +55939,9 @@ OUI:345D10*
+ OUI:346178*
+ ID_OUI_FROM_DATABASE=The Boeing Company
+
++OUI:346288*
++ ID_OUI_FROM_DATABASE=Cisco
++
+ OUI:34684A*
+ ID_OUI_FROM_DATABASE=Teraworks Co., Ltd.
+
+@@ -55939,6 +56056,9 @@ OUI:34B1F7*
+ OUI:34B571*
+ ID_OUI_FROM_DATABASE=PLDS
+
++OUI:34B7FD*
++ ID_OUI_FROM_DATABASE=Guangzhou Younghead Electronic Technology Co.,Ltd
++
+ OUI:34BA51*
+ ID_OUI_FROM_DATABASE=Se-Kure Controls, Inc.
+
+@@ -56047,6 +56167,9 @@ OUI:34F39B*
+ OUI:34F62D*
+ ID_OUI_FROM_DATABASE=SHARP Corporation
+
++OUI:34F6D2*
++ ID_OUI_FROM_DATABASE=Panasonic Taiwan Co.,Ltd.
++
+ OUI:34F968*
+ ID_OUI_FROM_DATABASE=ATEK Products, LLC
+
+@@ -56062,6 +56185,9 @@ OUI:380197*
+ OUI:3806B4*
+ ID_OUI_FROM_DATABASE=A.D.C. GmbH
+
++OUI:3808FD*
++ ID_OUI_FROM_DATABASE=Silca Spa
++
+ OUI:380A0A*
+ ID_OUI_FROM_DATABASE=Sky-City Communication and Electronics Limited Company
+
+@@ -56137,6 +56263,9 @@ OUI:384608*
+ OUI:38484C*
+ ID_OUI_FROM_DATABASE=Apple
+
++OUI:384B76*
++ ID_OUI_FROM_DATABASE=AIRTAME ApS
++
+ OUI:384FF0*
+ ID_OUI_FROM_DATABASE=Azurewave Technologies, Inc.
+
+@@ -56227,6 +56356,9 @@ OUI:38AA3C*
+ OUI:38B12D*
+ ID_OUI_FROM_DATABASE=Sonotronic Nagel GmbH
+
++OUI:38B1DB*
++ ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
++
+ OUI:38B5BD*
+ ID_OUI_FROM_DATABASE=E.G.O. Elektro-Ger
+
+@@ -56302,6 +56434,9 @@ OUI:38EE9D*
+ OUI:38F098*
+ ID_OUI_FROM_DATABASE=Vapor Stone Rail Systems
+
++OUI:38F33F*
++ ID_OUI_FROM_DATABASE=TATSUNO CORPORATION
++
+ OUI:38F597*
+ ID_OUI_FROM_DATABASE=home2net GmbH
+
+@@ -56443,6 +56578,9 @@ OUI:3C57D5*
+ OUI:3C5A37*
+ ID_OUI_FROM_DATABASE=Samsung Electronics
+
++OUI:3C5AB4*
++ ID_OUI_FROM_DATABASE=Google
++
+ OUI:3C5F01*
+ ID_OUI_FROM_DATABASE=Synerchip Co., Ltd.
+
+@@ -56803,6 +56941,9 @@ OUI:407074*
+ OUI:407496*
+ ID_OUI_FROM_DATABASE=aFUN TECHNOLOGY INC.
+
++OUI:40786A*
++ ID_OUI_FROM_DATABASE=Motorola Mobility LLC
++
+ OUI:407875*
+ ID_OUI_FROM_DATABASE=IMBEL - Industria de Material Belico do Brasil
+
+@@ -56929,6 +57070,9 @@ OUI:40D40E*
+ OUI:40D559*
+ ID_OUI_FROM_DATABASE=MICRO S.E.R.I.
+
++OUI:40E230*
++ ID_OUI_FROM_DATABASE=AzureWave Technologies, Inc.
++
+ OUI:40E730*
+ ID_OUI_FROM_DATABASE=DEY Storage Systems, Inc.
+
+@@ -57145,6 +57289,9 @@ OUI:4486C1*
+ OUI:4487FC*
+ ID_OUI_FROM_DATABASE=ELITEGROUP COMPUTER SYSTEM CO., LTD.
+
++OUI:4488CB*
++ ID_OUI_FROM_DATABASE=Camco Technologies NV
++
+ OUI:448A5B*
+ ID_OUI_FROM_DATABASE=Micro-Star INT'L CO., LTD.
+
+@@ -57337,6 +57484,9 @@ OUI:4851B7*
+ OUI:485261*
+ ID_OUI_FROM_DATABASE=SOREEL
+
++OUI:4857DD*
++ ID_OUI_FROM_DATABASE=Facebook
++
+ OUI:485929*
+ ID_OUI_FROM_DATABASE=LG Electronics
+
+@@ -57361,6 +57511,9 @@ OUI:4861A3*
+ OUI:486276*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
++OUI:486B2C*
++ ID_OUI_FROM_DATABASE=BBK Electronics Corp., Ltd.,
++
+ OUI:486B91*
+ ID_OUI_FROM_DATABASE=Fleetwood Group Inc.
+
+@@ -57391,6 +57544,9 @@ OUI:4891F6*
+ OUI:489BE2*
+ ID_OUI_FROM_DATABASE=SCI Innovations Ltd
+
++OUI:489D18*
++ ID_OUI_FROM_DATABASE=Flashbay Limited
++
+ OUI:489D24*
+ ID_OUI_FROM_DATABASE=Research In Motion
+
+@@ -57655,6 +57811,9 @@ OUI:4C7367*
+ OUI:4C73A5*
+ ID_OUI_FROM_DATABASE=KOVE
+
++OUI:4C7403*
++ ID_OUI_FROM_DATABASE=Mundo Reader (bq)
++
+ OUI:4C774F*
+ ID_OUI_FROM_DATABASE=Embedded Wireless Labs
+
+@@ -57745,6 +57904,9 @@ OUI:4CBAA3*
+ OUI:4CBB58*
+ ID_OUI_FROM_DATABASE=Chicony Electronics Co., Ltd.
+
++OUI:4CBC42*
++ ID_OUI_FROM_DATABASE=Shenzhen Hangsheng Electronics Co.,Ltd.
++
+ OUI:4CBCA5*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
+@@ -57784,6 +57946,9 @@ OUI:4CE1BB*
+ OUI:4CE676*
+ ID_OUI_FROM_DATABASE=Buffalo Inc.
+
++OUI:4CE933*
++ ID_OUI_FROM_DATABASE=RailComm, LLC
++
+ OUI:4CEB42*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
+@@ -57799,6 +57964,9 @@ OUI:4CF2BF*
+ OUI:4CF45B*
+ ID_OUI_FROM_DATABASE=Blue Clover Devices
+
++OUI:4CF5A0*
++ ID_OUI_FROM_DATABASE=Scalable Network Technologies Inc
++
+ OUI:4CF737*
+ ID_OUI_FROM_DATABASE=SamJi Electronics Co., Ltd
+
+@@ -57823,6 +57991,9 @@ OUI:500E6D*
+ OUI:5011EB*
+ ID_OUI_FROM_DATABASE=SilverNet Ltd
+
++OUI:5014B5*
++ ID_OUI_FROM_DATABASE=Richfit Information Technology Co., Ltd
++
+ OUI:5017FF*
+ ID_OUI_FROM_DATABASE=Cisco
+
+@@ -57847,6 +58018,9 @@ OUI:502690*
+ OUI:5027C7*
+ ID_OUI_FROM_DATABASE=TECHNART Co.,Ltd
+
++OUI:50294D*
++ ID_OUI_FROM_DATABASE=NANJING IOT SENSOR TECHNOLOGY CO,LTD
++
+ OUI:502A7E*
+ ID_OUI_FROM_DATABASE=Smart electronic GmbH
+
+@@ -57937,6 +58111,9 @@ OUI:506441*
+ OUI:506787*
+ ID_OUI_FROM_DATABASE=iTellus
+
++OUI:5067AE*
++ ID_OUI_FROM_DATABASE=Cisco
++
+ OUI:5067F0*
+ ID_OUI_FROM_DATABASE=ZyXEL Communications Corporation
+
+@@ -58276,6 +58453,9 @@ OUI:549B12*
+ OUI:549D85*
+ ID_OUI_FROM_DATABASE=EnerAccess inc
+
++OUI:549F35*
++ ID_OUI_FROM_DATABASE=Dell Inc.
++
+ OUI:54A04F*
+ ID_OUI_FROM_DATABASE=t-mac Technologies Ltd
+
+@@ -58366,6 +58546,9 @@ OUI:54F5B6*
+ OUI:54F666*
+ ID_OUI_FROM_DATABASE=Berthold Technologies GmbH and Co.KG
+
++OUI:54F876*
++ ID_OUI_FROM_DATABASE=ABB AG
++
+ OUI:54FA3E*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,LTD
+
+@@ -58375,6 +58558,9 @@ OUI:54FB58*
+ OUI:54FDBF*
+ ID_OUI_FROM_DATABASE=Scheidt & Bachmann GmbH
+
++OUI:54FFCF*
++ ID_OUI_FROM_DATABASE=Mopria Alliance
++
+ OUI:580528*
+ ID_OUI_FROM_DATABASE=LABRIS NETWORKS
+
+@@ -58390,6 +58576,9 @@ OUI:5809E5*
+ OUI:580A20*
+ ID_OUI_FROM_DATABASE=Cisco
+
++OUI:58108C*
++ ID_OUI_FROM_DATABASE=Intelbras
++
+ OUI:581243*
+ ID_OUI_FROM_DATABASE=AcSiP Technology Corp.
+
+@@ -58504,9 +58693,15 @@ OUI:587521*
+ OUI:587675*
+ ID_OUI_FROM_DATABASE=Beijing ECHO Technologies Co.,Ltd
+
++OUI:5876C5*
++ ID_OUI_FROM_DATABASE=DIGI I'S LTD
++
+ OUI:587A4D*
+ ID_OUI_FROM_DATABASE=Stonesoft Corporation
+
++OUI:587BE9*
++ ID_OUI_FROM_DATABASE=AirPro Technology India Pvt. Ltd
++
+ OUI:587E61*
+ ID_OUI_FROM_DATABASE=Hisense Electric Co., Ltd
+
+@@ -58633,6 +58828,9 @@ OUI:58EECE*
+ OUI:58F387*
+ ID_OUI_FROM_DATABASE=HCCP
+
++OUI:58F39C*
++ ID_OUI_FROM_DATABASE=Cisco
++
+ OUI:58F67B*
+ ID_OUI_FROM_DATABASE=Xia Men UnionCore Technology LTD.
+
+@@ -58810,6 +59008,12 @@ OUI:5C89D4*
+ OUI:5C8D4E*
+ ID_OUI_FROM_DATABASE=Apple
+
++OUI:5C8FE0*
++ ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
++
++OUI:5C93A2*
++ ID_OUI_FROM_DATABASE=Liteon Technology Corporation
++
+ OUI:5C95AE*
+ ID_OUI_FROM_DATABASE=Apple
+
+@@ -59011,6 +59215,9 @@ OUI:60334B*
+ OUI:603553*
+ ID_OUI_FROM_DATABASE=Buwon Technology
+
++OUI:603696*
++ ID_OUI_FROM_DATABASE=The Sapling Company
++
+ OUI:6036DD*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
+@@ -59038,9 +59245,18 @@ OUI:604616*
+ OUI:6047D4*
+ ID_OUI_FROM_DATABASE=FORICS Electronic Technology Co., Ltd.
+
++OUI:604826*
++ ID_OUI_FROM_DATABASE=Newbridge Technologies Int. Ltd.
++
+ OUI:604A1C*
+ ID_OUI_FROM_DATABASE=SUYIN Corporation
+
++OUI:6050C1*
++ ID_OUI_FROM_DATABASE=Kinetek Sports
++
++OUI:60512C*
++ ID_OUI_FROM_DATABASE=TCT mobile limited
++
+ OUI:6052D0*
+ ID_OUI_FROM_DATABASE=FACTS Engineering
+
+@@ -59125,6 +59341,9 @@ OUI:609084*
+ OUI:609217*
+ ID_OUI_FROM_DATABASE=Apple
+
++OUI:6099D1*
++ ID_OUI_FROM_DATABASE=Vuzix / Lenovo
++
+ OUI:609AA4*
+ ID_OUI_FROM_DATABASE=GVI SECURITY INC.
+
+@@ -59284,6 +59503,9 @@ OUI:60FEF9*
+ OUI:60FFDD*
+ ID_OUI_FROM_DATABASE=C.E. ELECTRONICS, INC
+
++OUI:64002D*
++ ID_OUI_FROM_DATABASE=Powerlinq Co., LTD
++
+ OUI:6400F1*
+ ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC.
+
+@@ -59557,6 +59779,9 @@ OUI:64B310*
+ OUI:64B370*
+ ID_OUI_FROM_DATABASE=PowerComm Solutons LLC
+
++OUI:64B473*
++ ID_OUI_FROM_DATABASE=Xiaomi inc.
++
+ OUI:64B64A*
+ ID_OUI_FROM_DATABASE=ViVOtech, Inc.
+
+@@ -59917,6 +60142,9 @@ OUI:68D247*
+ OUI:68D925*
+ ID_OUI_FROM_DATABASE=ProSys Development Services
+
++OUI:68D93C*
++ ID_OUI_FROM_DATABASE=Apple
++
+ OUI:68DB67*
+ ID_OUI_FROM_DATABASE=Nantong Coship Electronics Co., Ltd
+
+@@ -59950,6 +60178,9 @@ OUI:68EE96*
+ OUI:68EFBD*
+ ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC.
+
++OUI:68F06D*
++ ID_OUI_FROM_DATABASE=ALONG INDUSTRIAL CO., LIMITED
++
+ OUI:68F125*
+ ID_OUI_FROM_DATABASE=Data Controls Inc.
+
+@@ -60079,6 +60310,9 @@ OUI:6C626D*
+ OUI:6C641A*
+ ID_OUI_FROM_DATABASE=Penguin Computing
+
++OUI:6C6EFE*
++ ID_OUI_FROM_DATABASE=Core Logic Inc.
++
+ OUI:6C6F18*
+ ID_OUI_FROM_DATABASE=Stereotaxis, Inc.
+
+@@ -60091,6 +60325,9 @@ OUI:6C709F*
+ OUI:6C71D9*
+ ID_OUI_FROM_DATABASE=AzureWave Technologies, Inc
+
++OUI:6C7660*
++ ID_OUI_FROM_DATABASE=KYOCERA Corporation
++
+ OUI:6C81FE*
+ ID_OUI_FROM_DATABASE=Mitsuba Corporation
+
+@@ -60122,7 +60359,7 @@ OUI:6C92BF*
+ ID_OUI_FROM_DATABASE=Inspur Electronic Information Industry Co.,Ltd.
+
+ OUI:6C98EB*
+- ID_OUI_FROM_DATABASE=Xyne GmbH
++ ID_OUI_FROM_DATABASE=Ocedo GmbH
+
+ OUI:6C9989*
+ ID_OUI_FROM_DATABASE=Cisco
+@@ -60187,6 +60424,9 @@ OUI:6CB7F4*
+ OUI:6CBEE9*
+ ID_OUI_FROM_DATABASE=Alcatel-Lucent-IPD
+
++OUI:6CBFB5*
++ ID_OUI_FROM_DATABASE=Noon Technology Co., Ltd
++
+ OUI:6CC1D2*
+ ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
+
+@@ -60514,6 +60754,9 @@ OUI:70A8E3*
+ OUI:70AAB2*
+ ID_OUI_FROM_DATABASE=Research In Motion
+
++OUI:70AF25*
++ ID_OUI_FROM_DATABASE=Nishiyama Industry Co.,LTD.
++
+ OUI:70B035*
+ ID_OUI_FROM_DATABASE=Shenzhen Zowee Technology Co., Ltd
+
+@@ -60535,6 +60778,9 @@ OUI:70B599*
+ OUI:70B921*
+ ID_OUI_FROM_DATABASE=FiberHome Telecommunication Technologies CO.,LTD
+
++OUI:70BAEF*
++ ID_OUI_FROM_DATABASE=Hangzhou H3C Technologies Co., Limited
++
+ OUI:70C6AC*
+ ID_OUI_FROM_DATABASE=Bosch Automotive Aftermarket
+
+@@ -60586,6 +60832,9 @@ OUI:70EE50*
+ OUI:70F176*
+ ID_OUI_FROM_DATABASE=Data Modul AG
+
++OUI:70F196*
++ ID_OUI_FROM_DATABASE=Actiontec Electronics, Inc
++
+ OUI:70F1A1*
+ ID_OUI_FROM_DATABASE=Liteon Technology Corporation
+
+@@ -60796,6 +61045,9 @@ OUI:74B00C*
+ OUI:74B9EB*
+ ID_OUI_FROM_DATABASE=Fujian JinQianMao Electronic Technology Co.,Ltd
+
++OUI:74BADB*
++ ID_OUI_FROM_DATABASE=Longconn Electornics(shenzhen)Co.,Ltd
++
+ OUI:74BE08*
+ ID_OUI_FROM_DATABASE=ATEK Products, LLC
+
+@@ -60844,6 +61096,9 @@ OUI:74DE2B*
+ OUI:74E06E*
+ ID_OUI_FROM_DATABASE=Ergophone GmbH
+
++OUI:74E14A*
++ ID_OUI_FROM_DATABASE=IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information.
++
+ OUI:74E1B6*
+ ID_OUI_FROM_DATABASE=Apple
+
+@@ -61318,6 +61573,9 @@ OUI:7C092B*
+ OUI:7C0A50*
+ ID_OUI_FROM_DATABASE=J-MEX Inc.
+
++OUI:7C0ECE*
++ ID_OUI_FROM_DATABASE=Cisco
++
+ OUI:7C11BE*
+ ID_OUI_FROM_DATABASE=Apple
+
+@@ -61345,6 +61603,9 @@ OUI:7C2048*
+ OUI:7C2064*
+ ID_OUI_FROM_DATABASE=Alcatel Lucent IPD
+
++OUI:7C2587*
++ ID_OUI_FROM_DATABASE=chaowifi.com
++
+ OUI:7C2CF3*
+ ID_OUI_FROM_DATABASE=Secure Electrans Ltd
+
+@@ -61504,6 +61765,9 @@ OUI:7CAD74*
+ OUI:7CB03E*
+ ID_OUI_FROM_DATABASE=OSRAM GmbH
+
++OUI:7CB177*
++ ID_OUI_FROM_DATABASE=Satelco AG
++
+ OUI:7CB21B*
+ ID_OUI_FROM_DATABASE=Cisco SPVTG
+
+@@ -61774,6 +62038,9 @@ OUI:8065E9*
+ OUI:806629*
+ ID_OUI_FROM_DATABASE=Prescope Technologies CO.,LTD.
+
++OUI:806C1B*
++ ID_OUI_FROM_DATABASE=Motorola Mobility LLC
++
+ OUI:806C8B*
+ ID_OUI_FROM_DATABASE=KAESER KOMPRESSOREN AG
+
+@@ -61918,9 +62185,15 @@ OUI:80D733*
+ OUI:80DB31*
+ ID_OUI_FROM_DATABASE=Power Quotient International Co., Ltd.
+
++OUI:80E650*
++ ID_OUI_FROM_DATABASE=Apple
++
+ OUI:80EA96*
+ ID_OUI_FROM_DATABASE=Apple
+
++OUI:80EACA*
++ ID_OUI_FROM_DATABASE=Dialog Semiconductor Hellas SA
++
+ OUI:80EE73*
+ ID_OUI_FROM_DATABASE=Shuttle Inc.
+
+@@ -61933,6 +62206,9 @@ OUI:80F593*
+ OUI:80F62E*
+ ID_OUI_FROM_DATABASE=Hangzhou H3C Technologies Co., Limited
+
++OUI:80F8EB*
++ ID_OUI_FROM_DATABASE=RayTight
++
+ OUI:80FA5B*
+ ID_OUI_FROM_DATABASE=CLEVO CO.
+
+@@ -62116,6 +62392,9 @@ OUI:848506*
+ OUI:84850A*
+ ID_OUI_FROM_DATABASE=Hella Sonnen- und Wetterschutztechnik GmbH
+
++OUI:8486F3*
++ ID_OUI_FROM_DATABASE=Greenvity Communications
++
+ OUI:848D84*
+ ID_OUI_FROM_DATABASE=Rajant Corporation
+
+@@ -62134,9 +62413,15 @@ OUI:848F69*
+ OUI:849000*
+ ID_OUI_FROM_DATABASE=Arnold & Richter Cine Technik
+
++OUI:84930C*
++ ID_OUI_FROM_DATABASE=InCoax Networks Europe AB
++
+ OUI:84948C*
+ ID_OUI_FROM_DATABASE=Hitron Technologies. Inc
+
++OUI:849681*
++ ID_OUI_FROM_DATABASE=Cathay Communication Co.,Ltd
++
+ OUI:8496D8*
+ ID_OUI_FROM_DATABASE=Pace plc
+
+@@ -62206,6 +62491,9 @@ OUI:84DE3D*
+ OUI:84DF0C*
+ ID_OUI_FROM_DATABASE=NET2GRID BV
+
++OUI:84E058*
++ ID_OUI_FROM_DATABASE=Pace plc
++
+ OUI:84E4D9*
+ ID_OUI_FROM_DATABASE=Shenzhen NEED technology Ltd.
+
+@@ -62545,6 +62833,9 @@ OUI:8C0EE3*
+ OUI:8C11CB*
+ ID_OUI_FROM_DATABASE=ABUS Security-Center GmbH & Co. KG
+
++OUI:8C18D9*
++ ID_OUI_FROM_DATABASE=Shenzhen RF Technology Co., Ltd
++
+ OUI:8C1F94*
+ ID_OUI_FROM_DATABASE=RF Surgical System Inc.
+
+@@ -62632,6 +62923,9 @@ OUI:8C5AF0*
+ OUI:8C5CA1*
+ ID_OUI_FROM_DATABASE=d-broad,INC
+
++OUI:8C5D60*
++ ID_OUI_FROM_DATABASE=UCI Corporation Co.,Ltd.
++
+ OUI:8C5FDF*
+ ID_OUI_FROM_DATABASE=Beijing Railway Signal Factory
+
+@@ -62683,6 +62977,9 @@ OUI:8C7CFF*
+ OUI:8C7EB3*
+ ID_OUI_FROM_DATABASE=Lytro, Inc.
+
++OUI:8C7F3B*
++ ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
++
+ OUI:8C82A8*
+ ID_OUI_FROM_DATABASE=Insigma Technology Co.,Ltd
+
+@@ -62716,6 +63013,9 @@ OUI:8CAE4C*
+ OUI:8CAE89*
+ ID_OUI_FROM_DATABASE=Y-cam Solutions Ltd
+
++OUI:8CB094*
++ ID_OUI_FROM_DATABASE=Airtech I&C Co., Ltd
++
+ OUI:8CB64F*
+ ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC.
+
+@@ -62770,6 +63070,9 @@ OUI:8CD628*
+ OUI:8CDB25*
+ ID_OUI_FROM_DATABASE=ESG Solutions
+
++OUI:8CDCD4*
++ ID_OUI_FROM_DATABASE=Hewlett Packard
++
+ OUI:8CDD8D*
+ ID_OUI_FROM_DATABASE=Wifly-City System Inc.
+
+@@ -62788,6 +63091,9 @@ OUI:8CE7B3*
+ OUI:8CEEC6*
+ ID_OUI_FROM_DATABASE=Precepscion Pty. Ltd.
+
++OUI:8CF813*
++ ID_OUI_FROM_DATABASE=ORANGE POLSKA
++
+ OUI:8CF945*
+ ID_OUI_FROM_DATABASE=Power Automation pte Ltd
+
+@@ -62851,6 +63157,9 @@ OUI:901D27*
+ OUI:901EDD*
+ ID_OUI_FROM_DATABASE=GREAT COMPUTER CORPORATION
+
++OUI:90203A*
++ ID_OUI_FROM_DATABASE=BYD Precision Manufacture Co.,Ltd
++
+ OUI:902083*
+ ID_OUI_FROM_DATABASE=General Engine Management Systems Ltd.
+
+@@ -63127,6 +63436,9 @@ OUI:90E6BA*
+ OUI:90EA60*
+ ID_OUI_FROM_DATABASE=SPI Lasers Ltd
+
++OUI:90EF68*
++ ID_OUI_FROM_DATABASE=ZyXEL Communications Corporation
++
+ OUI:90F1AA*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,LTD
+
+@@ -63154,6 +63466,9 @@ OUI:90FB5B*
+ OUI:90FBA6*
+ ID_OUI_FROM_DATABASE=Hon Hai Precision Ind.Co.Ltd
+
++OUI:90FD61*
++ ID_OUI_FROM_DATABASE=Apple
++
+ OUI:90FF79*
+ ID_OUI_FROM_DATABASE=Metro Ethernet Forum
+
+@@ -63247,6 +63562,9 @@ OUI:945103*
+ OUI:9451BF*
+ ID_OUI_FROM_DATABASE=Hyundai ESG
+
++OUI:945493*
++ ID_OUI_FROM_DATABASE=Rigado, LLC
++
+ OUI:94592D*
+ ID_OUI_FROM_DATABASE=EKE Building Technology Systems Ltd
+
+@@ -63256,6 +63574,9 @@ OUI:945B7E*
+ OUI:946124*
+ ID_OUI_FROM_DATABASE=Pason Systems
+
++OUI:946269*
++ ID_OUI_FROM_DATABASE=Arris Group, Inc.
++
+ OUI:9463D1*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
+@@ -63622,6 +63943,9 @@ OUI:988EDD*
+ OUI:989080*
+ ID_OUI_FROM_DATABASE=Linkpower Network System Inc Ltd.
+
++OUI:989096*
++ ID_OUI_FROM_DATABASE=Dell Inc
++
+ OUI:9893CC*
+ ID_OUI_FROM_DATABASE=LG Electronics Inc.
+
+@@ -63781,6 +64105,9 @@ OUI:9C3178*
+ OUI:9C31B6*
+ ID_OUI_FROM_DATABASE=Kulite Semiconductor Products Inc
+
++OUI:9C3583*
++ ID_OUI_FROM_DATABASE=Nipro Diagnostics, Inc
++
+ OUI:9C3AAF*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
+@@ -64234,6 +64561,9 @@ OUI:A08C9B*
+ OUI:A090DE*
+ ID_OUI_FROM_DATABASE=VEEDIMS,LLC
+
++OUI:A09347*
++ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD.
++
+ OUI:A09805*
+ ID_OUI_FROM_DATABASE=OpenVox Communication Co Ltd
+
+@@ -64336,6 +64666,9 @@ OUI:A0E534*
+ OUI:A0E5E9*
+ ID_OUI_FROM_DATABASE=enimai Inc
+
++OUI:A0E6F8*
++ ID_OUI_FROM_DATABASE=Texas Instruments Inc
++
+ OUI:A0E9DB*
+ ID_OUI_FROM_DATABASE=Ningbo FreeWings Technologies Co.,Ltd
+
+@@ -64498,6 +64831,9 @@ OUI:A46CC1*
+ OUI:A46E79*
+ ID_OUI_FROM_DATABASE=DFT System Co.Ltd
+
++OUI:A470D6*
++ ID_OUI_FROM_DATABASE=Motorola Mobility LLC
++
+ OUI:A47733*
+ ID_OUI_FROM_DATABASE=Google
+
+@@ -64643,7 +64979,7 @@ OUI:A4D3B5*
+ ID_OUI_FROM_DATABASE=GLITEL Stropkov, s.r.o.
+
+ OUI:A4D856*
+- ID_OUI_FROM_DATABASE=Qualcomm Labs Inc.
++ ID_OUI_FROM_DATABASE=Gimbal, Inc
+
+ OUI:A4DA3F*
+ ID_OUI_FROM_DATABASE=Bionics Corp.
+@@ -64732,6 +65068,9 @@ OUI:A81758*
+ OUI:A81B18*
+ ID_OUI_FROM_DATABASE=XTS CORP
+
++OUI:A81B5D*
++ ID_OUI_FROM_DATABASE=Foxtel Management Pty Ltd
++
+ OUI:A81FAF*
+ ID_OUI_FROM_DATABASE=KRYPTON POLSKA
+
+@@ -64984,6 +65323,9 @@ OUI:AC0A61*
+ OUI:AC0DFE*
+ ID_OUI_FROM_DATABASE=Ekon GmbH - myGEKKO
+
++OUI:AC11D3*
++ ID_OUI_FROM_DATABASE=Suzhou HOTEK Video Technology Co. Ltd
++
+ OUI:AC1461*
+ ID_OUI_FROM_DATABASE=ATAW Co., Ltd.
+
+@@ -65023,6 +65365,9 @@ OUI:AC34CB*
+ OUI:AC3613*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
++OUI:AC3870*
++ ID_OUI_FROM_DATABASE=Lenovo Mobile Communication Technology Ltd.
++
+ OUI:AC3C0B*
+ ID_OUI_FROM_DATABASE=Apple
+
+@@ -65191,6 +65536,9 @@ OUI:ACAB8D*
+ OUI:ACB313*
+ ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
+
++OUI:ACB74F*
++ ID_OUI_FROM_DATABASE=METEL s.r.o.
++
+ OUI:ACB859*
+ ID_OUI_FROM_DATABASE=Uniband Electronic Corp,
+
+@@ -65356,6 +65704,9 @@ OUI:B03850*
+ OUI:B0435D*
+ ID_OUI_FROM_DATABASE=NuLEDs, Inc.
+
++OUI:B04515*
++ ID_OUI_FROM_DATABASE=mira fitness,LLC.
++
+ OUI:B04545*
+ ID_OUI_FROM_DATABASE=YACOUB Automation GmbH
+
+@@ -65635,6 +65986,9 @@ OUI:B41489*
+ OUI:B41513*
+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
+
++OUI:B41780*
++ ID_OUI_FROM_DATABASE=DTI Group Ltd
++
+ OUI:B418D1*
+ ID_OUI_FROM_DATABASE=Apple
+
+@@ -65746,6 +66100,12 @@ OUI:B4749F*
+ OUI:B4750E*
+ ID_OUI_FROM_DATABASE=Belkin International Inc.
+
++OUI:B479A7*
++ ID_OUI_FROM_DATABASE=Samsung Electro Mechanics co., LTD.
++
++OUI:B47C29*
++ ID_OUI_FROM_DATABASE=Shenzhen Guzidi Technology Co.,Ltd
++
+ OUI:B47F5E*
+ ID_OUI_FROM_DATABASE=Foresight Manufacture (S) Pte Ltd
+
+@@ -65923,6 +66283,9 @@ OUI:B81619*
+ OUI:B817C2*
+ ID_OUI_FROM_DATABASE=Apple
+
++OUI:B8186F*
++ ID_OUI_FROM_DATABASE=ORIENTAL MOTOR CO., LTD.
++
+ OUI:B81999*
+ ID_OUI_FROM_DATABASE=Nesys
+
+@@ -65989,6 +66352,9 @@ OUI:B843E4*
+ OUI:B847C6*
+ ID_OUI_FROM_DATABASE=SanJet Technology Corp.
+
++OUI:B84FD5*
++ ID_OUI_FROM_DATABASE=Microsoft Corporation
++
+ OUI:B85510*
+ ID_OUI_FROM_DATABASE=Zioncom Electronics (Shenzhen) Ltd.
+
+@@ -66109,6 +66475,9 @@ OUI:B89AED*
+ OUI:B89BC9*
+ ID_OUI_FROM_DATABASE=SMC Networks Inc
+
++OUI:B89BE4*
++ ID_OUI_FROM_DATABASE=ABB Power Systems Power Generation
++
+ OUI:B8A386*
+ ID_OUI_FROM_DATABASE=D-Link International
+
+@@ -66151,6 +66520,9 @@ OUI:B8BA72*
+ OUI:B8BB6D*
+ ID_OUI_FROM_DATABASE=ENERES Co.,Ltd.
+
++OUI:B8BD79*
++ ID_OUI_FROM_DATABASE=TrendPoint Systems
++
+ OUI:B8BEBF*
+ ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC.
+
+@@ -66226,6 +66598,9 @@ OUI:B8EE65*
+ OUI:B8EE79*
+ ID_OUI_FROM_DATABASE=YWire Technologies, Inc.
+
++OUI:B8F317*
++ ID_OUI_FROM_DATABASE=iSun Smasher Communications Private Limited
++
+ OUI:B8F4D0*
+ ID_OUI_FROM_DATABASE=Herrmann Ultraschalltechnik GmbH & Co. Kg
+
+@@ -66373,6 +66748,9 @@ OUI:BC5FF4*
+ OUI:BC629F*
+ ID_OUI_FROM_DATABASE=Telenet Systems P. Ltd.
+
++OUI:BC6641*
++ ID_OUI_FROM_DATABASE=IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information.
++
+ OUI:BC671C*
+ ID_OUI_FROM_DATABASE=Cisco
+
+@@ -66838,6 +67216,9 @@ OUI:C4017C*
+ OUI:C401B1*
+ ID_OUI_FROM_DATABASE=SeekTech INC
+
++OUI:C401CE*
++ ID_OUI_FROM_DATABASE=PRESITION (2000) CO., LTD.
++
+ OUI:C40415*
+ ID_OUI_FROM_DATABASE=NETGEAR INC.,
+
+@@ -66970,6 +67351,12 @@ OUI:C455C2*
+ OUI:C45600*
+ ID_OUI_FROM_DATABASE=Galleon Embedded Computing
+
++OUI:C456FE*
++ ID_OUI_FROM_DATABASE=Lava International Ltd.
++
++OUI:C4576E*
++ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,LTD
++
+ OUI:C458C2*
+ ID_OUI_FROM_DATABASE=Shenzhen TATFOOK Technology Co., Ltd.
+
+@@ -67081,6 +67468,9 @@ OUI:C4B512*
+ OUI:C4BA99*
+ ID_OUI_FROM_DATABASE=I+ME Actia Informatik und Mikro-Elektronik GmbH
+
++OUI:C4BD6A*
++ ID_OUI_FROM_DATABASE=SKF GmbH
++
+ OUI:C4C0AE*
+ ID_OUI_FROM_DATABASE=MIDORI ELECTRONIC CO., LTD.
+
+@@ -67429,6 +67819,9 @@ OUI:C8E1A7*
+ OUI:C8E42F*
+ ID_OUI_FROM_DATABASE=Technical Research Design and Development
+
++OUI:C8E7D8*
++ ID_OUI_FROM_DATABASE=SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.
++
+ OUI:C8EE08*
+ ID_OUI_FROM_DATABASE=TANGTOP TECHNOLOGY CO.,LTD
+
+@@ -67480,6 +67873,9 @@ OUI:C8FF77*
+ OUI:CC0080*
+ ID_OUI_FROM_DATABASE=BETTINI SRL
+
++OUI:CC03FA*
++ ID_OUI_FROM_DATABASE=Technicolor CH USA
++
+ OUI:CC047C*
+ ID_OUI_FROM_DATABASE=G-WAY Microwave
+
+@@ -67507,6 +67903,9 @@ OUI:CC0CDA*
+ OUI:CC0DEC*
+ ID_OUI_FROM_DATABASE=Cisco SPVTG
+
++OUI:CC10A3*
++ ID_OUI_FROM_DATABASE=Beijing Nan Bao Technology Co., Ltd.
++
+ OUI:CC14A6*
+ ID_OUI_FROM_DATABASE=Yichun MyEnergy Domain, Inc
+
+@@ -67531,6 +67930,9 @@ OUI:CC2A80*
+ OUI:CC2D8C*
+ ID_OUI_FROM_DATABASE=LG ELECTRONICS INC
+
++OUI:CC3080*
++ ID_OUI_FROM_DATABASE=VAIO Corporation
++
+ OUI:CC33BB*
+ ID_OUI_FROM_DATABASE=SAGEMCOM SAS
+
+@@ -67756,9 +68158,15 @@ OUI:CCD539*
+ OUI:CCD811*
+ ID_OUI_FROM_DATABASE=Aiconn Technology Corporation
+
++OUI:CCD8C1*
++ ID_OUI_FROM_DATABASE=Cisco
++
+ OUI:CCD9E9*
+ ID_OUI_FROM_DATABASE=SCR Engineers Ltd.
+
++OUI:CCE17F*
++ ID_OUI_FROM_DATABASE=juniper networks
++
+ OUI:CCE1D5*
+ ID_OUI_FROM_DATABASE=Buffalo Inc.
+
+@@ -67786,6 +68194,9 @@ OUI:CCF3A5*
+ OUI:CCF407*
+ ID_OUI_FROM_DATABASE=EUKREA ELECTROMATIQUE SARL
+
++OUI:CCF538*
++ ID_OUI_FROM_DATABASE=3isysnetworks
++
+ OUI:CCF67A*
+ ID_OUI_FROM_DATABASE=Ayecka Communication Systems LTD
+
+@@ -67825,6 +68236,9 @@ OUI:D00AAB*
+ OUI:D00EA4*
+ ID_OUI_FROM_DATABASE=Porsche Cars North America
+
++OUI:D01242*
++ ID_OUI_FROM_DATABASE=BIOS Corporation
++
+ OUI:D0131E*
+ ID_OUI_FROM_DATABASE=Sunrex Technology Corp
+
+@@ -67915,6 +68329,9 @@ OUI:D05FB8*
+ OUI:D05FCE*
+ ID_OUI_FROM_DATABASE=Hitachi Data Systems
+
++OUI:D062A0*
++ ID_OUI_FROM_DATABASE=China Essence Technology (Zhumadian) Co., Ltd.
++
+ OUI:D0634D*
+ ID_OUI_FROM_DATABASE=Meiko Maschinenbau GmbH & Co. KG
+
+@@ -67963,6 +68380,9 @@ OUI:D07E28*
+ OUI:D07E35*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
++OUI:D084B0*
++ ID_OUI_FROM_DATABASE=Sagemcom
++
+ OUI:D08999*
+ ID_OUI_FROM_DATABASE=APCON, Inc.
+
+@@ -68110,6 +68530,9 @@ OUI:D0F27F*
+ OUI:D0F73B*
+ ID_OUI_FROM_DATABASE=Helmut Mauell GmbH
+
++OUI:D0FA1D*
++ ID_OUI_FROM_DATABASE=Qihoo 360 Technology Co.,Ltd
++
+ OUI:D0FF50*
+ ID_OUI_FROM_DATABASE=Texas Instruments, Inc
+
+@@ -68191,6 +68614,9 @@ OUI:D42F23*
+ OUI:D4319D*
+ ID_OUI_FROM_DATABASE=Sinwatec
+
++OUI:D437D7*
++ ID_OUI_FROM_DATABASE=zte corporation
++
+ OUI:D43A65*
+ ID_OUI_FROM_DATABASE=IGRS Engineering Lab Ltd.
+
+@@ -68278,6 +68704,9 @@ OUI:D46F42*
+ OUI:D479C3*
+ ID_OUI_FROM_DATABASE=Cameronet GmbH & Co. KG
+
++OUI:D47B35*
++ ID_OUI_FROM_DATABASE=NEO Monitors AS
++
+ OUI:D47B75*
+ ID_OUI_FROM_DATABASE=HARTING Electronics GmbH
+
+@@ -68299,6 +68728,9 @@ OUI:D48890*
+ OUI:D48CB5*
+ ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC.
+
++OUI:D48F33*
++ ID_OUI_FROM_DATABASE=Microsoft Corporation
++
+ OUI:D48FAA*
+ ID_OUI_FROM_DATABASE=Sogecam Industrial, S.A.
+
+@@ -68440,6 +68872,9 @@ OUI:D4EA0E*
+ OUI:D4EC0C*
+ ID_OUI_FROM_DATABASE=Harley-Davidson Motor Company
+
++OUI:D4EC86*
++ ID_OUI_FROM_DATABASE=LinkedHope Intelligent Technologies Co., Ltd
++
+ OUI:D4EE07*
+ ID_OUI_FROM_DATABASE=HIWIFI Co., Ltd.
+
+@@ -68551,6 +68986,9 @@ OUI:D8490B*
+ OUI:D8492F*
+ ID_OUI_FROM_DATABASE=CANON INC.
+
++OUI:D84A87*
++ ID_OUI_FROM_DATABASE=OI ELECTRIC CO.,LTD
++
+ OUI:D84B2A*
+ ID_OUI_FROM_DATABASE=Cognitas Technologies, Inc.
+
+@@ -68860,6 +69298,9 @@ OUI:DC37D2*
+ OUI:DC38E1*
+ ID_OUI_FROM_DATABASE=Juniper networks
+
++OUI:DC3979*
++ ID_OUI_FROM_DATABASE=Skyport Systems
++
+ OUI:DC3A5E*
+ ID_OUI_FROM_DATABASE=Roku, Inc
+
+@@ -69199,6 +69640,9 @@ OUI:E09467*
+ OUI:E09579*
+ ID_OUI_FROM_DATABASE=ORTHOsoft inc, d/b/a Zimmer CAS
+
++OUI:E09796*
++ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
++
+ OUI:E097F2*
+ ID_OUI_FROM_DATABASE=Atomax Inc.
+
+@@ -69226,6 +69670,9 @@ OUI:E0AAB0*
+ OUI:E0ABFE*
+ ID_OUI_FROM_DATABASE=Orb Networks, Inc.
+
++OUI:E0ACF1*
++ ID_OUI_FROM_DATABASE=Cisco
++
+ OUI:E0AE5E*
+ ID_OUI_FROM_DATABASE=ALPS Co,. Ltd.
+
+@@ -69523,6 +69970,9 @@ OUI:E492E7*
+ OUI:E492FB*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
++OUI:E4956E*
++ ID_OUI_FROM_DATABASE=IEEE REGISTRATION AUTHORITY - Please see MAM public listing for more information.
++
+ OUI:E496AE*
+ ID_OUI_FROM_DATABASE=ALTOGRAPHICS Inc.
+
+@@ -69553,6 +70003,9 @@ OUI:E4B021*
+ OUI:E4C146*
+ ID_OUI_FROM_DATABASE=Objetivos y Servicios de Valor A
+
++OUI:E4C62B*
++ ID_OUI_FROM_DATABASE=Airware
++
+ OUI:E4C63D*
+ ID_OUI_FROM_DATABASE=Apple, Inc.
+
+@@ -69910,6 +70363,9 @@ OUI:E8EA6A*
+ OUI:E8EADA*
+ ID_OUI_FROM_DATABASE=Denkovi Assembly Electroncs LTD
+
++OUI:E8ED05*
++ ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
++
+ OUI:E8EDF3*
+ ID_OUI_FROM_DATABASE=Cisco
+
+@@ -69931,6 +70387,9 @@ OUI:E8FC60*
+ OUI:E8FCAF*
+ ID_OUI_FROM_DATABASE=NETGEAR INC.,
+
++OUI:EC0EC4*
++ ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
++
+ OUI:EC0ED6*
+ ID_OUI_FROM_DATABASE=ITECH INSTRUMENTS SAS
+
+@@ -69949,6 +70408,9 @@ OUI:EC1766*
+ OUI:EC1A59*
+ ID_OUI_FROM_DATABASE=Belkin International Inc.
+
++OUI:EC1D7F*
++ ID_OUI_FROM_DATABASE=zte corporation
++
+ OUI:EC219F*
+ ID_OUI_FROM_DATABASE=VidaBox LLC
+
+@@ -69982,6 +70444,9 @@ OUI:EC3586*
+ OUI:EC3BF0*
+ ID_OUI_FROM_DATABASE=NovelSat
+
++OUI:EC3C5A*
++ ID_OUI_FROM_DATABASE=SHEN ZHEN HENG SHENG HUI DIGITAL TECHNOLOGY CO.,LTD
++
+ OUI:EC3E09*
+ ID_OUI_FROM_DATABASE=PERFORMANCE DESIGNED PRODUCTS, LLC
+
+@@ -70522,6 +70987,9 @@ OUI:F4068D*
+ OUI:F406A5*
+ ID_OUI_FROM_DATABASE=Hangzhou Bianfeng Networking Technology Co., Ltd.
+
++OUI:F409D8*
++ ID_OUI_FROM_DATABASE=Samsung Electro Mechanics co., LTD.
++
+ OUI:F40B93*
+ ID_OUI_FROM_DATABASE=Research In Motion
+
+@@ -70555,6 +71023,9 @@ OUI:F42012*
+ OUI:F42833*
+ ID_OUI_FROM_DATABASE=MMPC Inc.
+
++OUI:F42853*
++ ID_OUI_FROM_DATABASE=Zioncom Electronics (Shenzhen) Ltd.
++
+ OUI:F42896*
+ ID_OUI_FROM_DATABASE=SPECTO PAINEIS ELETRONICOS LTDA
+
+@@ -70780,6 +71251,9 @@ OUI:F4EC38*
+ OUI:F4F15A*
+ ID_OUI_FROM_DATABASE=Apple
+
++OUI:F4F1E1*
++ ID_OUI_FROM_DATABASE=Motorola Mobility LLC
++
+ OUI:F4F26D*
+ ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO.,LTD.
+
+@@ -70855,6 +71329,9 @@ OUI:F81EDF*
+ OUI:F82285*
+ ID_OUI_FROM_DATABASE=Cypress Technology CO., LTD.
+
++OUI:F82441*
++ ID_OUI_FROM_DATABASE=Yeelink
++
+ OUI:F82793*
+ ID_OUI_FROM_DATABASE=Apple, Inc
+
+@@ -71119,6 +71596,9 @@ OUI:F8E4FB*
+ OUI:F8E7B5*
+ ID_OUI_FROM_DATABASE=µTech Tecnologia LTDA
+
++OUI:F8E811*
++ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
++
+ OUI:F8E968*
+ ID_OUI_FROM_DATABASE=Egker Kft.
+
+@@ -71221,6 +71701,9 @@ OUI:FC1BFF*
+ OUI:FC1D59*
+ ID_OUI_FROM_DATABASE=I Smart Cities HK Ltd
+
++OUI:FC1D84*
++ ID_OUI_FROM_DATABASE=Autobase
++
+ OUI:FC1E16*
+ ID_OUI_FROM_DATABASE=IPEVO corp
+
+@@ -71359,6 +71842,9 @@ OUI:FC9947*
+ OUI:FC9FAE*
+ ID_OUI_FROM_DATABASE=Fidus Systems Inc
+
++OUI:FC9FE1*
++ ID_OUI_FROM_DATABASE=CONWIN.Tech. Ltd
++
+ OUI:FCA13E*
+ ID_OUI_FROM_DATABASE=Samsung Electronics
+
+@@ -71419,6 +71905,9 @@ OUI:FCD817*
+ OUI:FCDB96*
+ ID_OUI_FROM_DATABASE=ENERVALLEY CO., LTD
+
++OUI:FCDBB3*
++ ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
++
+ OUI:FCDD55*
+ ID_OUI_FROM_DATABASE=Shenzhen WeWins wireless Co.,Ltd
+
+diff --git a/hwdb/20-pci-classes.hwdb b/hwdb/20-pci-classes.hwdb
+index fd1d5d0c61..5702c40114 100644
+--- a/hwdb/20-pci-classes.hwdb
++++ b/hwdb/20-pci-classes.hwdb
+@@ -47,12 +47,24 @@ pci:v*d*sv*sd*bc01sc06i00*
+ pci:v*d*sv*sd*bc01sc06i01*
+ ID_PCI_INTERFACE_FROM_DATABASE=AHCI 1.0
+
++pci:v*d*sv*sd*bc01sc06i02*
++ ID_PCI_INTERFACE_FROM_DATABASE=Serial Storage Bus
++
+ pci:v*d*sv*sd*bc01sc07*
+ ID_PCI_SUBCLASS_FROM_DATABASE=Serial Attached SCSI controller
+
++pci:v*d*sv*sd*bc01sc07i01*
++ ID_PCI_INTERFACE_FROM_DATABASE=Serial Storage Bus
++
+ pci:v*d*sv*sd*bc01sc08*
+ ID_PCI_SUBCLASS_FROM_DATABASE=Non-Volatile memory controller
+
++pci:v*d*sv*sd*bc01sc08i01*
++ ID_PCI_INTERFACE_FROM_DATABASE=NVMHCI
++
++pci:v*d*sv*sd*bc01sc08i02*
++ ID_PCI_INTERFACE_FROM_DATABASE=NVM Express
++
+ pci:v*d*sv*sd*bc01sc80*
+ ID_PCI_SUBCLASS_FROM_DATABASE=Mass storage controller
+
+@@ -80,6 +92,9 @@ pci:v*d*sv*sd*bc02sc05*
+ pci:v*d*sv*sd*bc02sc06*
+ ID_PCI_SUBCLASS_FROM_DATABASE=PICMG controller
+
++pci:v*d*sv*sd*bc02sc07*
++ ID_PCI_SUBCLASS_FROM_DATABASE=Infiniband controller
++
+ pci:v*d*sv*sd*bc02sc80*
+ ID_PCI_SUBCLASS_FROM_DATABASE=Network controller
+
+@@ -311,6 +326,9 @@ pci:v*d*sv*sd*bc08sc02i01*
+ pci:v*d*sv*sd*bc08sc02i02*
+ ID_PCI_INTERFACE_FROM_DATABASE=EISA Timers
+
++pci:v*d*sv*sd*bc08sc02i03*
++ ID_PCI_INTERFACE_FROM_DATABASE=HPET
++
+ pci:v*d*sv*sd*bc08sc03*
+ ID_PCI_SUBCLASS_FROM_DATABASE=RTC
+
+@@ -527,5 +545,14 @@ pci:v*d*sv*sd*bc11sc20*
+ pci:v*d*sv*sd*bc11sc80*
+ ID_PCI_SUBCLASS_FROM_DATABASE=Signal processing controller
+
++pci:v*d*sv*sd*bc12*
++ ID_PCI_CLASS_FROM_DATABASE=Processing accelerators
++
++pci:v*d*sv*sd*bc12sc00*
++ ID_PCI_SUBCLASS_FROM_DATABASE=Processing accelerators
++
++pci:v*d*sv*sd*bc13*
++ ID_PCI_CLASS_FROM_DATABASE=Non-Essential Instrumentation
++
+ pci:v*d*sv*sd*bcFF*
+ ID_PCI_CLASS_FROM_DATABASE=Unassigned class
+diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb/20-pci-vendor-model.hwdb
+index 62941b9a45..77c727dcc0 100644
+--- a/hwdb/20-pci-vendor-model.hwdb
++++ b/hwdb/20-pci-vendor-model.hwdb
+@@ -959,6 +959,15 @@ pci:v00001000d0000005Dsv00001028sd00001F49*
+ pci:v00001000d0000005Dsv00001028sd00001F4A*
+ ID_MODEL_FROM_DATABASE=MegaRAID SAS-3 3108 [Invader] (PERC H730 Mini (for blades))
+
++pci:v00001000d0000005Dsv00001028sd00001F4D*
++ ID_MODEL_FROM_DATABASE=MegaRAID SAS-3 3108 [Invader] (PERC FS33xS)
++
++pci:v00001000d0000005Dsv00001028sd00001F4F*
++ ID_MODEL_FROM_DATABASE=MegaRAID SAS-3 3108 [Invader] (PERC H730P Slim)
++
++pci:v00001000d0000005Dsv00001028sd00001F54*
++ ID_MODEL_FROM_DATABASE=MegaRAID SAS-3 3108 [Invader] (PERC FS33xD)
++
+ pci:v00001000d0000005Dsv000017AAsd00001052*
+ ID_MODEL_FROM_DATABASE=MegaRAID SAS-3 3108 [Invader] (ThinkServer RAID 720i)
+
+@@ -1677,7 +1686,7 @@ pci:v00001002d00001308*
+ ID_MODEL_FROM_DATABASE=Kaveri HDMI/DP Audio Controller
+
+ pci:v00001002d00001309*
+- ID_MODEL_FROM_DATABASE=Kaveri [Radeon R7 Graphics]
++ ID_MODEL_FROM_DATABASE=Kaveri [Radeon R6/R7 Graphics]
+
+ pci:v00001002d0000130A*
+ ID_MODEL_FROM_DATABASE=Kaveri [Radeon R6 Graphics]
+@@ -3003,7 +3012,7 @@ pci:v00001002d00004C57sv00001014sd00000517*
+ ID_MODEL_FROM_DATABASE=RV200/M7 [Mobility Radeon 7500] (ThinkPad T30)
+
+ pci:v00001002d00004C57sv00001014sd00000530*
+- ID_MODEL_FROM_DATABASE=RV200/M7 [Mobility Radeon 7500] (ThinkPad T42 2373-4WU)
++ ID_MODEL_FROM_DATABASE=RV200/M7 [Mobility Radeon 7500] (ThinkPad T4x Series)
+
+ pci:v00001002d00004C57sv00001028sd000000E6*
+ ID_MODEL_FROM_DATABASE=RV200/M7 [Mobility Radeon 7500] (Radeon Mobility M7 LW (Dell Inspiron 8100))
+@@ -4362,7 +4371,7 @@ pci:v00001002d00006667*
+ ID_MODEL_FROM_DATABASE=Jet ULT [Radeon R5 M230]
+
+ pci:v00001002d0000666F*
+- ID_MODEL_FROM_DATABASE=Sun LE [Radeon HD 8550M]
++ ID_MODEL_FROM_DATABASE=Sun LE [Radeon HD 8550M / R5 M230]
+
+ pci:v00001002d00006670*
+ ID_MODEL_FROM_DATABASE=Hainan
+@@ -5937,10 +5946,10 @@ pci:v00001002d0000679F*
+ ID_MODEL_FROM_DATABASE=Tahiti
+
+ pci:v00001002d000067A0*
+- ID_MODEL_FROM_DATABASE=Hawaii XT GL
++ ID_MODEL_FROM_DATABASE=Hawaii XT GL [FirePro W9100]
+
+ pci:v00001002d000067A1*
+- ID_MODEL_FROM_DATABASE=Hawaii GL
++ ID_MODEL_FROM_DATABASE=Hawaii PRO GL [FirePro W8100]
+
+ pci:v00001002d000067A2*
+ ID_MODEL_FROM_DATABASE=Hawaii GL
+@@ -5961,7 +5970,7 @@ pci:v00001002d000067B1*
+ ID_MODEL_FROM_DATABASE=Hawaii PRO [Radeon R9 290]
+
+ pci:v00001002d000067B9*
+- ID_MODEL_FROM_DATABASE=Vesuvius [Radeon R9 295 X2]
++ ID_MODEL_FROM_DATABASE=Vesuvius [Radeon R9 295X2]
+
+ pci:v00001002d000067BE*
+ ID_MODEL_FROM_DATABASE=Hawaii LE
+@@ -7860,7 +7869,13 @@ pci:v00001002d000068FE*
+ ID_MODEL_FROM_DATABASE=Cedar LE
+
+ pci:v00001002d00006900*
+- ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260]
++ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265]
++
++pci:v00001002d00006900sv00001028sd00000640*
++ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265] (Radeon R7 M265)
++
++pci:v00001002d00006900sv00001179sd0000F934*
++ ID_MODEL_FROM_DATABASE=Topaz XT [Radeon R7 M260/M265] (Radeon R7 M260)
+
+ pci:v00001002d00006901*
+ ID_MODEL_FROM_DATABASE=Topaz PRO [Radeon R5 M255]
+@@ -8027,6 +8042,9 @@ pci:v00001002d0000718A*
+ pci:v00001002d0000718B*
+ ID_MODEL_FROM_DATABASE=RV516/M62 [Mobility Radeon X1350]
+
++pci:v00001002d0000718Bsv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=RV516/M62 [Mobility Radeon X1350] (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00001002d0000718C*
+ ID_MODEL_FROM_DATABASE=RV516/M62-CSP64 [Mobility Radeon X1350]
+
+@@ -8969,26 +8987,29 @@ pci:v00001002d0000983E*
+ pci:v00001002d0000983F*
+ ID_MODEL_FROM_DATABASE=Kabini
+
++pci:v00001002d00009840*
++ ID_MODEL_FROM_DATABASE=Kabini HDMI/DP Audio
++
+ pci:v00001002d00009850*
+- ID_MODEL_FROM_DATABASE=Mullins [Radeon APU A6-6200 with R3 Graphics]
++ ID_MODEL_FROM_DATABASE=Mullins [Radeon R3 Graphics]
+
+ pci:v00001002d00009851*
+- ID_MODEL_FROM_DATABASE=Mullins [Radeon APU A4-6000 with R2 Graphics]
++ ID_MODEL_FROM_DATABASE=Mullins [Radeon R4/R5 Graphics]
+
+ pci:v00001002d00009852*
+- ID_MODEL_FROM_DATABASE=Mullins [Radeon APU A4-6000 with R2 Graphics]
++ ID_MODEL_FROM_DATABASE=Mullins [Radeon R2 Graphics]
+
+ pci:v00001002d00009853*
+- ID_MODEL_FROM_DATABASE=Mullins [Radeon APU E2-4000 with R2 Graphics]
++ ID_MODEL_FROM_DATABASE=Mullins [Radeon R2 Graphics]
+
+ pci:v00001002d00009854*
+- ID_MODEL_FROM_DATABASE=Mullins [Radeon APU E2-3700 with R2 Graphics]
++ ID_MODEL_FROM_DATABASE=Mullins [Radeon R3 Graphics]
+
+ pci:v00001002d00009855*
+- ID_MODEL_FROM_DATABASE=Mullins [Radeon APU XX-2450M with R3 Graphics]
++ ID_MODEL_FROM_DATABASE=Mullins [Radeon R6 Graphics]
+
+ pci:v00001002d00009856*
+- ID_MODEL_FROM_DATABASE=Mullins [Radeon APU XX-2200M with R2 Graphics]
++ ID_MODEL_FROM_DATABASE=Mullins [Radeon R2 Graphics]
+
+ pci:v00001002d00009857*
+ ID_MODEL_FROM_DATABASE=Mullins [Radeon APU XX-2200M with R2 Graphics]
+@@ -12347,6 +12368,9 @@ pci:v0000102Bd00000532sv00001028sd0000029C*
+ pci:v0000102Bd00000532sv00001028sd000002A4*
+ ID_MODEL_FROM_DATABASE=MGA G200eW WPCM450 (PowerEdge T310 MGA G200eW WPCM450)
+
++pci:v0000102Bd00000532sv000015D9sd00000624*
++ ID_MODEL_FROM_DATABASE=MGA G200eW WPCM450 (X9SCM-F Motherboard)
++
+ pci:v0000102Bd00000532sv000015D9sd0000A811*
+ ID_MODEL_FROM_DATABASE=MGA G200eW WPCM450 (H8DGU)
+
+@@ -13169,6 +13193,9 @@ pci:v00001039d00000016*
+ pci:v00001039d00000018*
+ ID_MODEL_FROM_DATABASE=SiS85C503/5513 (LPC Bridge)
+
++pci:v00001039d00000163*
++ ID_MODEL_FROM_DATABASE=163 802.11b/g Wireless LAN Adapter
++
+ pci:v00001039d00000180*
+ ID_MODEL_FROM_DATABASE=RAID bus controller 180 SATA/PATA [SiS]
+
+@@ -14141,6 +14168,9 @@ pci:v00001042d00003020*
+ pci:v00001043*
+ ID_VENDOR_FROM_DATABASE=ASUSTeK Computer Inc.
+
++pci:v00001043d00000464*
++ ID_MODEL_FROM_DATABASE=Radeon R9 270x GPU
++
+ pci:v00001043d00000675*
+ ID_MODEL_FROM_DATABASE=ISDNLink P-IN100-ST-D
+
+@@ -17978,6 +18008,9 @@ pci:v00001095d00003512sv00001095sd00006512*
+ pci:v00001095d00003531*
+ ID_MODEL_FROM_DATABASE=SiI 3531 [SATALink/SATARaid] Serial ATA Controller
+
++pci:v00001095d00003531sv000017C0sd00004083*
++ ID_MODEL_FROM_DATABASE=SiI 3531 [SATALink/SATARaid] Serial ATA Controller (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00001096*
+ ID_VENDOR_FROM_DATABASE=Alacron
+
+@@ -26261,6 +26294,9 @@ pci:v000010DEd00000F00*
+ pci:v000010DEd00000F01*
+ ID_MODEL_FROM_DATABASE=GF108 [GeForce GT 620]
+
++pci:v000010DEd00000F02*
++ ID_MODEL_FROM_DATABASE=GF108 [GeForce GT 730]
++
+ pci:v000010DEd00000FC0*
+ ID_MODEL_FROM_DATABASE=GK107 [GeForce GT 640 OEM]
+
+@@ -26276,6 +26312,9 @@ pci:v000010DEd00000FC6*
+ pci:v000010DEd00000FC6sv00001043sd00008428*
+ ID_MODEL_FROM_DATABASE=GK107 [GeForce GTX 650] (GTX650-DC-1GD5)
+
++pci:v000010DEd00000FC8*
++ ID_MODEL_FROM_DATABASE=GK107 [GeForce GT 740]
++
+ pci:v000010DEd00000FCD*
+ ID_MODEL_FROM_DATABASE=GK107M [GeForce GT 755M]
+
+@@ -26420,6 +26459,9 @@ pci:v000010DEd00000FFE*
+ pci:v000010DEd00000FFF*
+ ID_MODEL_FROM_DATABASE=GK107GL [Quadro 410]
+
++pci:v000010DEd00001001*
++ ID_MODEL_FROM_DATABASE=GK110B [GeForce GTX TITAN Z]
++
+ pci:v000010DEd00001003*
+ ID_MODEL_FROM_DATABASE=GK110 [GeForce GTX Titan LE]
+
+@@ -26828,9 +26870,57 @@ pci:v000010DEd00001140sv00001025sd00000830*
+ pci:v000010DEd00001140sv00001025sd00000837*
+ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce GT 720M)
+
++pci:v000010DEd00001140sv00001025sd0000083E*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
++
+ pci:v000010DEd00001140sv00001025sd00000841*
+ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 710M)
+
++pci:v000010DEd00001140sv00001025sd00000854*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
++
++pci:v000010DEd00001140sv00001025sd00000855*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
++
++pci:v000010DEd00001140sv00001025sd00000856*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
++
++pci:v000010DEd00001140sv00001025sd00000857*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
++
++pci:v000010DEd00001140sv00001025sd00000858*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
++
++pci:v000010DEd00001140sv00001025sd00000868*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
++
++pci:v000010DEd00001140sv00001025sd00000869*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 810M)
++
++pci:v000010DEd00001140sv00001025sd00000873*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
++
++pci:v000010DEd00001140sv00001025sd00000878*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
++
++pci:v000010DEd00001140sv00001025sd0000087B*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
++
++pci:v000010DEd00001140sv00001025sd0000087C*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 810M)
++
++pci:v000010DEd00001140sv00001025sd00000881*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
++
++pci:v000010DEd00001140sv00001025sd0000088A*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
++
++pci:v000010DEd00001140sv00001025sd0000090F*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
++
++pci:v000010DEd00001140sv00001025sd00000921*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
++
+ pci:v000010DEd00001140sv00001028sd0000054D*
+ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce GT 630M)
+
+@@ -26966,6 +27056,18 @@ pci:v000010DEd00001140sv00001043sd000016DD*
+ pci:v000010DEd00001140sv00001043sd0000170D*
+ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
+
++pci:v000010DEd00001140sv00001043sd0000176D*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
++
++pci:v000010DEd00001140sv00001043sd0000178D*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
++
++pci:v000010DEd00001140sv00001043sd0000179D*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
++
++pci:v000010DEd00001140sv00001043sd000017DD*
++ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce 820M)
++
+ pci:v000010DEd00001140sv00001043sd00002132*
+ ID_MODEL_FROM_DATABASE=GF117M [GeForce 610M/710M/820M / GT 620M/625M/630M/720M] (GeForce GT 620M)
+
+@@ -27713,6 +27815,9 @@ pci:v000010DEd00001284*
+ pci:v000010DEd00001286*
+ ID_MODEL_FROM_DATABASE=GK208 [GeForce GT 720]
+
++pci:v000010DEd00001287*
++ ID_MODEL_FROM_DATABASE=GK208 [GeForce GT 730]
++
+ pci:v000010DEd00001290*
+ ID_MODEL_FROM_DATABASE=GK208M [GeForce GT 730M]
+
+@@ -27749,6 +27854,21 @@ pci:v000010DEd00001294*
+ pci:v000010DEd00001295*
+ ID_MODEL_FROM_DATABASE=GK208M [GeForce 710M]
+
++pci:v000010DEd00001295sv0000103Csd00002B0D*
++ ID_MODEL_FROM_DATABASE=GK208M [GeForce 710M] (GeForce GT 710A)
++
++pci:v000010DEd00001295sv0000103Csd00002B0F*
++ ID_MODEL_FROM_DATABASE=GK208M [GeForce 710M] (GeForce GT 710A)
++
++pci:v000010DEd00001295sv0000103Csd00002B11*
++ ID_MODEL_FROM_DATABASE=GK208M [GeForce 710M] (GeForce GT 710A)
++
++pci:v000010DEd00001295sv0000103Csd00002B21*
++ ID_MODEL_FROM_DATABASE=GK208M [GeForce 710M] (GeForce GT 810A)
++
++pci:v000010DEd00001295sv0000103Csd00002B22*
++ ID_MODEL_FROM_DATABASE=GK208M [GeForce 710M] (GeForce GT 810A)
++
+ pci:v000010DEd00001296*
+ ID_MODEL_FROM_DATABASE=GK208M [GeForce 825M]
+
+@@ -28302,7 +28422,7 @@ pci:v000010ECd00008136*
+ ID_MODEL_FROM_DATABASE=RTL8101E/RTL8102E PCI Express Fast Ethernet controller
+
+ pci:v000010ECd00008136sv0000103Csd00002AB1*
+- ID_MODEL_FROM_DATABASE=RTL8101E/RTL8102E PCI Express Fast Ethernet controller (Pavillion p6774)
++ ID_MODEL_FROM_DATABASE=RTL8101E/RTL8102E PCI Express Fast Ethernet controller (Pavilion p6774)
+
+ pci:v000010ECd00008136sv0000103Csd000030CC*
+ ID_MODEL_FROM_DATABASE=RTL8101E/RTL8102E PCI Express Fast Ethernet controller (Pavilion dv6700)
+@@ -28310,6 +28430,9 @@ pci:v000010ECd00008136sv0000103Csd000030CC*
+ pci:v000010ECd00008136sv00001179sd0000FF64*
+ ID_MODEL_FROM_DATABASE=RTL8101E/RTL8102E PCI Express Fast Ethernet controller (RTL8102E PCI-E Fast Ethernet NIC)
+
++pci:v000010ECd00008136sv000017C0sd00001053*
++ ID_MODEL_FROM_DATABASE=RTL8101E/RTL8102E PCI Express Fast Ethernet controller (AzureWave AW-NE766 802.11B/G/N Mini PCIe Card Model RT2700E)
++
+ pci:v000010ECd00008138*
+ ID_MODEL_FROM_DATABASE=RT8139 (B/C) Cardbus Fast Ethernet Adapter
+
+@@ -29036,6 +29159,9 @@ pci:v00001102d0000000B*
+ pci:v00001102d0000000Bsv00001102sd00000041*
+ ID_MODEL_FROM_DATABASE=EMU20k2 [X-Fi Titanium Series] (SB0880 [SoundBlaster X-Fi Titanium PCI-e])
+
++pci:v00001102d00000012*
++ ID_MODEL_FROM_DATABASE=SB Recon3D
++
+ pci:v00001102d00004001*
+ ID_MODEL_FROM_DATABASE=SB Audigy FireWire Port
+
+@@ -30878,6 +31004,9 @@ pci:v00001106d0000E340*
+ pci:v00001106d0000E353*
+ ID_MODEL_FROM_DATABASE=VX800/VX820 PCI Express Root Port
+
++pci:v00001106d0000E410*
++ ID_MODEL_FROM_DATABASE=VX900 PCI Express Physical Layer Electrical Sub-block
++
+ pci:v00001106d0000F208*
+ ID_MODEL_FROM_DATABASE=PT890 PCI to PCI Bridge Controller
+
+@@ -35045,6 +35174,9 @@ pci:v000011ABd00004353sv0000104Dsd0000902D*
+ pci:v000011ABd00004354*
+ ID_MODEL_FROM_DATABASE=88E8040 PCI-E Fast Ethernet Controller
+
++pci:v000011ABd00004354sv0000144Dsd0000C06A*
++ ID_MODEL_FROM_DATABASE=88E8040 PCI-E Fast Ethernet Controller (R730 Laptop)
++
+ pci:v000011ABd00004354sv0000144Dsd0000C072*
+ ID_MODEL_FROM_DATABASE=88E8040 PCI-E Fast Ethernet Controller (Notebook N150P)
+
+@@ -36557,6 +36689,9 @@ pci:v00001217*
+ pci:v00001217d000000F7*
+ ID_MODEL_FROM_DATABASE=Firewire (IEEE 1394)
+
++pci:v00001217d000000F7sv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=Firewire (IEEE 1394) (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00001217d000000F7sv00001179sd0000FF50*
+ ID_MODEL_FROM_DATABASE=Firewire (IEEE 1394) (Satellite P305D-S8995E)
+
+@@ -36635,12 +36770,18 @@ pci:v00001217d00007114*
+ pci:v00001217d00007120*
+ ID_MODEL_FROM_DATABASE=Integrated MMC/SD Controller
+
++pci:v00001217d00007120sv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=Integrated MMC/SD Controller (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00001217d00007120sv00001179sd0000FF50*
+ ID_MODEL_FROM_DATABASE=Integrated MMC/SD Controller (Satellite P305D-S8995E)
+
+ pci:v00001217d00007130*
+ ID_MODEL_FROM_DATABASE=Integrated MS/xD Controller
+
++pci:v00001217d00007130sv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=Integrated MS/xD Controller (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00001217d00007130sv00001179sd0000FF50*
+ ID_MODEL_FROM_DATABASE=Integrated MS/xD Controller (Satellite P305D-S8995E)
+
+@@ -42276,7 +42417,7 @@ pci:v00001425d00004083*
+ ID_MODEL_FROM_DATABASE=T420X-4083 Unified Wire Ethernet Controller
+
+ pci:v00001425d00004084*
+- ID_MODEL_FROM_DATABASE=T420-4084 Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T440-4084 Unified Wire Ethernet Controller
+
+ pci:v00001425d00004085*
+ ID_MODEL_FROM_DATABASE=T420-4085 SFP+ Unified Wire Ethernet Controller
+@@ -42348,7 +42489,7 @@ pci:v00001425d00004483*
+ ID_MODEL_FROM_DATABASE=T420X-4083 Unified Wire Ethernet Controller
+
+ pci:v00001425d00004484*
+- ID_MODEL_FROM_DATABASE=T420-4084 Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T440-4084 Unified Wire Ethernet Controller
+
+ pci:v00001425d00004485*
+ ID_MODEL_FROM_DATABASE=T420-4085 SFP+ Unified Wire Ethernet Controller
+@@ -42420,7 +42561,7 @@ pci:v00001425d00004583*
+ ID_MODEL_FROM_DATABASE=T420X-4083 Unified Wire Storage Controller
+
+ pci:v00001425d00004584*
+- ID_MODEL_FROM_DATABASE=T420-4084 Unified Wire Storage Controller
++ ID_MODEL_FROM_DATABASE=T440-4084 Unified Wire Storage Controller
+
+ pci:v00001425d00004585*
+ ID_MODEL_FROM_DATABASE=T420-4085 SFP+ Unified Wire Storage Controller
+@@ -42492,7 +42633,7 @@ pci:v00001425d00004683*
+ ID_MODEL_FROM_DATABASE=T420X-4083 Unified Wire Storage Controller
+
+ pci:v00001425d00004684*
+- ID_MODEL_FROM_DATABASE=T420-4084 Unified Wire Storage Controller
++ ID_MODEL_FROM_DATABASE=T440-4084 Unified Wire Storage Controller
+
+ pci:v00001425d00004685*
+ ID_MODEL_FROM_DATABASE=T420-4085 SFP+ Unified Wire Storage Controller
+@@ -42564,7 +42705,7 @@ pci:v00001425d00004783*
+ ID_MODEL_FROM_DATABASE=T420X-4083 Unified Wire Ethernet Controller
+
+ pci:v00001425d00004784*
+- ID_MODEL_FROM_DATABASE=T420-4084 Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T440-4084 Unified Wire Ethernet Controller
+
+ pci:v00001425d00004785*
+ ID_MODEL_FROM_DATABASE=T420-4085 SFP+ Unified Wire Ethernet Controller
+@@ -42579,76 +42720,76 @@ pci:v00001425d00004788*
+ ID_MODEL_FROM_DATABASE=T440-4088 Unified Wire Ethernet Controller
+
+ pci:v00001425d00004801*
+- ID_MODEL_FROM_DATABASE=T420-CR Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T420-CR Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00004802*
+- ID_MODEL_FROM_DATABASE=T422-CR Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T422-CR Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00004803*
+- ID_MODEL_FROM_DATABASE=T440-CR Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T440-CR Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00004804*
+- ID_MODEL_FROM_DATABASE=T420-BCH Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T420-BCH Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00004805*
+- ID_MODEL_FROM_DATABASE=T440-BCH Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T440-BCH Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00004806*
+- ID_MODEL_FROM_DATABASE=T440-CH Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T440-CH Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00004807*
+- ID_MODEL_FROM_DATABASE=T420-SO Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T420-SO Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00004808*
+- ID_MODEL_FROM_DATABASE=T420-CX Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T420-CX Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00004809*
+- ID_MODEL_FROM_DATABASE=T420-BT Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T420-BT Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d0000480A*
+- ID_MODEL_FROM_DATABASE=T404-BT Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T404-BT Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d0000480B*
+- ID_MODEL_FROM_DATABASE=B420-SR Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=B420-SR Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d0000480C*
+- ID_MODEL_FROM_DATABASE=B404-BT Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=B404-BT Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d0000480D*
+- ID_MODEL_FROM_DATABASE=T480 Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T480 Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d0000480E*
+- ID_MODEL_FROM_DATABASE=T440-LP-CR Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T440-LP-CR Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d0000480F*
+- ID_MODEL_FROM_DATABASE=T440 [Amsterdam] Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T440 [Amsterdam] Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00004880*
+- ID_MODEL_FROM_DATABASE=T480-4080 T480 Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T480-4080 T480 Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00004881*
+- ID_MODEL_FROM_DATABASE=T440F-4081 T440-FCoE Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T440F-4081 T440-FCoE Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00004882*
+- ID_MODEL_FROM_DATABASE=T420-4082 Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T420-4082 Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00004883*
+- ID_MODEL_FROM_DATABASE=T420X-4083 Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T420X-4083 Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00004884*
+- ID_MODEL_FROM_DATABASE=T420-4084 Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T440-4084 Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00004885*
+- ID_MODEL_FROM_DATABASE=T420-4085 SFP+ Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T420-4085 SFP+ Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00004886*
+- ID_MODEL_FROM_DATABASE=T440-4086 10Gbase-T Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T440-4086 10Gbase-T Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00004887*
+- ID_MODEL_FROM_DATABASE=T440T-4087 Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T440T-4087 Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00004888*
+- ID_MODEL_FROM_DATABASE=T440-4088 Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T440-4088 Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005001*
+ ID_MODEL_FROM_DATABASE=T520-CR Unified Wire Ethernet Controller
+@@ -43041,82 +43182,82 @@ pci:v00001425d00005785*
+ ID_MODEL_FROM_DATABASE=T580-5085 Unified Wire Ethernet Controller
+
+ pci:v00001425d00005801*
+- ID_MODEL_FROM_DATABASE=T520-CR Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T520-CR Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005802*
+- ID_MODEL_FROM_DATABASE=T522-CR Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T522-CR Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005803*
+- ID_MODEL_FROM_DATABASE=T540-CR Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T540-CR Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005804*
+- ID_MODEL_FROM_DATABASE=T520-BCH Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T520-BCH Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005805*
+- ID_MODEL_FROM_DATABASE=T540-BCH Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T540-BCH Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005806*
+- ID_MODEL_FROM_DATABASE=T540-CH Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T540-CH Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005807*
+- ID_MODEL_FROM_DATABASE=T520-SO Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T520-SO Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005808*
+- ID_MODEL_FROM_DATABASE=T520-CX Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T520-CX Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005809*
+- ID_MODEL_FROM_DATABASE=T520-BT Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T520-BT Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d0000580A*
+- ID_MODEL_FROM_DATABASE=T504-BT Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T504-BT Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d0000580B*
+- ID_MODEL_FROM_DATABASE=B520-SR Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=B520-SR Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d0000580C*
+- ID_MODEL_FROM_DATABASE=B504-BT Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=B504-BT Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d0000580D*
+- ID_MODEL_FROM_DATABASE=T580-CR Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T580-CR Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d0000580E*
+- ID_MODEL_FROM_DATABASE=T540-LP-CR Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T540-LP-CR Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d0000580F*
+- ID_MODEL_FROM_DATABASE=T540 [Amsterdam] Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T540 [Amsterdam] Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005810*
+- ID_MODEL_FROM_DATABASE=T580-LP-CR Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T580-LP-CR Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005811*
+- ID_MODEL_FROM_DATABASE=T520-LL-CR Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T520-LL-CR Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005812*
+- ID_MODEL_FROM_DATABASE=T560-CR Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T560-CR Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005813*
+- ID_MODEL_FROM_DATABASE=T580-CR Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T580-CR Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005814*
+- ID_MODEL_FROM_DATABASE=T580-LP-SO-CR Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T580-LP-SO-CR Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005815*
+- ID_MODEL_FROM_DATABASE=T502-BT Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T502-BT Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005880*
+- ID_MODEL_FROM_DATABASE=T540-5080 Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T540-5080 Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005881*
+- ID_MODEL_FROM_DATABASE=T540-5081 Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T540-5081 Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005883*
+- ID_MODEL_FROM_DATABASE=T540-5083 Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T540-5083 Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005884*
+- ID_MODEL_FROM_DATABASE=T580-5084 Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T580-5084 Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d00005885*
+- ID_MODEL_FROM_DATABASE=T580-5085 Unified Wire Ethernet Controller
++ ID_MODEL_FROM_DATABASE=T580-5085 Unified Wire Ethernet Controller [VF]
+
+ pci:v00001425d0000A000*
+ ID_MODEL_FROM_DATABASE=PE10K Unified Wire Ethernet Controller
+@@ -43562,6 +43703,9 @@ pci:v0000148E*
+ pci:v0000148F*
+ ID_VENDOR_FROM_DATABASE=Plant Equipment, Inc.
+
++pci:v0000148Fd00005370*
++ ID_MODEL_FROM_DATABASE=Dexlink AUWL15I1
++
+ pci:v00001490*
+ ID_VENDOR_FROM_DATABASE=Stone Microsystems PTY Ltd.
+
+@@ -44885,6 +45029,9 @@ pci:v000014E4d000016A2sv0000103Csd00001916*
+ pci:v000014E4d000016A2sv0000103Csd00001917*
+ ID_MODEL_FROM_DATABASE=BCM57840 NetXtreme II 10/20-Gigabit Ethernet (HP FlexFabric 20Gb 2-port 630M Adapter)
+
++pci:v000014E4d000016A3*
++ ID_MODEL_FROM_DATABASE=NetXtreme BCM57786 Gigabit Ethernet PCIe
++
+ pci:v000014E4d000016A4*
+ ID_MODEL_FROM_DATABASE=BCM57840 NetXtreme II Ethernet Multi Function
+
+@@ -47796,7 +47943,7 @@ pci:v000015B3d00001003*
+ ID_MODEL_FROM_DATABASE=MT27500 Family [ConnectX-3]
+
+ pci:v000015B3d00001004*
+- ID_MODEL_FROM_DATABASE=MT27500 Family [ConnectX-3 Virtual Function]
++ ID_MODEL_FROM_DATABASE=MT27500/MT27520 Family [ConnectX-3/ConnectX-3 Pro Virtual Function]
+
+ pci:v000015B3d00001005*
+ ID_MODEL_FROM_DATABASE=MT27510 Family
+@@ -47807,9 +47954,6 @@ pci:v000015B3d00001006*
+ pci:v000015B3d00001007*
+ ID_MODEL_FROM_DATABASE=MT27520 Family [ConnectX-3 Pro]
+
+-pci:v000015B3d00001008*
+- ID_MODEL_FROM_DATABASE=MT27520 Family [ConnectX-3 Pro Virtual Function]
+-
+ pci:v000015B3d00001009*
+ ID_MODEL_FROM_DATABASE=MT27530 Family
+
+@@ -49187,6 +49331,9 @@ pci:v0000168Cd0000002Bsv0000105Bsd0000E017*
+ pci:v0000168Cd0000002Bsv0000105Bsd0000E023*
+ ID_MODEL_FROM_DATABASE=AR9285 Wireless Network Adapter (PCI-Express) (T77H121.04 802.11bgn Wireless Half-size Mini PCIe Card)
+
++pci:v0000168Cd0000002Bsv0000105Bsd0000E025*
++ ID_MODEL_FROM_DATABASE=AR9285 Wireless Network Adapter (PCI-Express) (T77H121.05 802.11bgn Wireless Half-size Mini PCIe Card)
++
+ pci:v0000168Cd0000002Bsv00001113sd0000E811*
+ ID_MODEL_FROM_DATABASE=AR9285 Wireless Network Adapter (PCI-Express) (WN7811A (Toshiba PA3722U-1MPC) 802.11bgn Wireless Half-size Mini PCIe Card)
+
+@@ -50471,6 +50618,9 @@ pci:v00001814d00000701sv00001737sd00000074*
+ pci:v00001814d00000781*
+ ID_MODEL_FROM_DATABASE=RT2790 Wireless 802.11n 1T/2R PCIe
+
++pci:v00001814d00000781sv00001814sd00002790*
++ ID_MODEL_FROM_DATABASE=RT2790 Wireless 802.11n 1T/2R PCIe
++
+ pci:v00001814d00003060*
+ ID_MODEL_FROM_DATABASE=RT3060 Wireless 802.11n 1T/1R
+
+@@ -51911,6 +52061,9 @@ pci:v00001969d00001063*
+ pci:v00001969d00001063sv00001458sd0000E000*
+ ID_MODEL_FROM_DATABASE=AR8131 Gigabit Ethernet (GA-G31M-ES2L Motherboard)
+
++pci:v00001969d00001063sv000017C0sd000010D2*
++ ID_MODEL_FROM_DATABASE=AR8131 Gigabit Ethernet (Medion Akoya E7214 Notebook PC [MD98410])
++
+ pci:v00001969d00001066*
+ ID_MODEL_FROM_DATABASE=Attansic L2c Gigabit Ethernet
+
+@@ -52358,6 +52511,18 @@ pci:v00001A2Bd0000000A*
+ pci:v00001A2Bd0000000E*
+ ID_MODEL_FROM_DATABASE=DSLP-104 v1.1
+
++pci:v00001A30*
++ ID_VENDOR_FROM_DATABASE=Lantiq
++
++pci:v00001A30d00000680*
++ ID_MODEL_FROM_DATABASE=MtW8171 [Hyperion II]
++
++pci:v00001A30d00000700*
++ ID_MODEL_FROM_DATABASE=Wave300 PSB8224 [Hyperion III]
++
++pci:v00001A30d00000710*
++ ID_MODEL_FROM_DATABASE=Wave300 PSB8231 [Hyperion III]
++
+ pci:v00001A32*
+ ID_VENDOR_FROM_DATABASE=Quanta Microsystems, Inc
+
+@@ -52497,19 +52662,19 @@ pci:v00001A78*
+ ID_VENDOR_FROM_DATABASE=Virident Systems Inc.
+
+ pci:v00001A78d00000031*
+- ID_MODEL_FROM_DATABASE=Virident FlashMAX Drive
++ ID_MODEL_FROM_DATABASE=FlashMAX Drive
+
+ pci:v00001A78d00000031sv00001A78sd00000034*
+- ID_MODEL_FROM_DATABASE=Virident FlashMAX Drive (FlashMAX PCIe SSD [rev 3])
++ ID_MODEL_FROM_DATABASE=FlashMAX Drive (FlashMAX PCIe SSD [rev 3])
+
+ pci:v00001A78d00000031sv00001A78sd00000037*
+- ID_MODEL_FROM_DATABASE=Virident FlashMAX Drive (FlashMAX PCIe SSD [rev 3D])
++ ID_MODEL_FROM_DATABASE=FlashMAX Drive (FlashMAX PCIe SSD [rev 3D])
+
+ pci:v00001A78d00000031sv00001A78sd00000038*
+- ID_MODEL_FROM_DATABASE=Virident FlashMAX Drive (FlashMAX PCIe SSD [rev 4])
++ ID_MODEL_FROM_DATABASE=FlashMAX Drive (FlashMAX PCIe SSD [rev 4])
+
+ pci:v00001A78d00000031sv00001A78sd00000039*
+- ID_MODEL_FROM_DATABASE=Virident FlashMAX Drive (FlashMAX PCIe SSD [rev 4D])
++ ID_MODEL_FROM_DATABASE=FlashMAX Drive (FlashMAX PCIe SSD [rev 4D])
+
+ pci:v00001A78d00000040*
+ ID_MODEL_FROM_DATABASE=FlashMAX II
+@@ -52520,6 +52685,9 @@ pci:v00001A78d00000041*
+ pci:v00001A78d00000042*
+ ID_MODEL_FROM_DATABASE=FlashMAX II
+
++pci:v00001A78d00000050*
++ ID_MODEL_FROM_DATABASE=FlashMAX III
++
+ pci:v00001A84*
+ ID_VENDOR_FROM_DATABASE=Commex Technologies
+
+@@ -52682,6 +52850,15 @@ pci:v00001AEDd00001008*
+ pci:v00001AEDd00002001*
+ ID_MODEL_FROM_DATABASE=ioDrive2
+
++pci:v00001AEDd00003001*
++ ID_MODEL_FROM_DATABASE=ioMemory FHHL
++
++pci:v00001AEDd00003002*
++ ID_MODEL_FROM_DATABASE=ioMemory HHHL
++
++pci:v00001AEDd00003003*
++ ID_MODEL_FROM_DATABASE=ioMemory Mezzanine
++
+ pci:v00001AEE*
+ ID_VENDOR_FROM_DATABASE=Caustic Graphics Inc.
+
+@@ -52775,6 +52952,9 @@ pci:v00001B21d00001080*
+ pci:v00001B21d00001080sv00001849sd00001080*
+ ID_MODEL_FROM_DATABASE=ASM1083/1085 PCIe to PCI Bridge (Motherboard)
+
++pci:v00001B21d00001142*
++ ID_MODEL_FROM_DATABASE=ASM1042A USB 3.0 Host Controller
++
+ pci:v00001B2C*
+ ID_VENDOR_FROM_DATABASE=Opal-RT Technologies Inc.
+
+@@ -52916,6 +53096,9 @@ pci:v00001B4Bd00009485*
+ pci:v00001B55*
+ ID_VENDOR_FROM_DATABASE=NetUP Inc.
+
++pci:v00001B55d000018F6*
++ ID_MODEL_FROM_DATABASE=Dual DVB Universal CI card
++
+ pci:v00001B55d00002A2C*
+ ID_MODEL_FROM_DATABASE=Dual DVB-S2-CI card
+
+@@ -53135,6 +53318,9 @@ pci:v00001CE4d00000002*
+ pci:v00001CF7*
+ ID_VENDOR_FROM_DATABASE=Subspace Dynamics
+
++pci:v00001D21*
++ ID_VENDOR_FROM_DATABASE=Allo
++
+ pci:v00001D44*
+ ID_VENDOR_FROM_DATABASE=DPT
+
+@@ -54956,15 +55142,30 @@ pci:v00008086d00000044sv00001025sd00000347*
+ pci:v00008086d00000044sv00001025sd00000487*
+ ID_MODEL_FROM_DATABASE=Core Processor DRAM Controller (TravelMate 5742)
+
++pci:v00008086d00000044sv0000144Dsd0000C06A*
++ ID_MODEL_FROM_DATABASE=Core Processor DRAM Controller (R730 Laptop)
++
++pci:v00008086d00000044sv000017C0sd000010D2*
++ ID_MODEL_FROM_DATABASE=Core Processor DRAM Controller (Medion Akoya E7214 Notebook PC [MD98410])
++
+ pci:v00008086d00000044sv0000E4BFsd000050C1*
+ ID_MODEL_FROM_DATABASE=Core Processor DRAM Controller (PC1-GROOVE)
+
+ pci:v00008086d00000045*
+ ID_MODEL_FROM_DATABASE=Core Processor PCI Express x16 Root Port
+
++pci:v00008086d00000045sv000017C0sd000010D2*
++ ID_MODEL_FROM_DATABASE=Core Processor PCI Express x16 Root Port (Medion Akoya E7214 Notebook PC [MD98410])
++
+ pci:v00008086d00000046*
+ ID_MODEL_FROM_DATABASE=Core Processor Integrated Graphics Controller
+
++pci:v00008086d00000046sv0000144Dsd0000C06A*
++ ID_MODEL_FROM_DATABASE=Core Processor Integrated Graphics Controller (R730 Laptop)
++
++pci:v00008086d00000046sv000017C0sd000010D9*
++ ID_MODEL_FROM_DATABASE=Core Processor Integrated Graphics Controller (Medion Akoya E7214 Notebook PC [MD98410])
++
+ pci:v00008086d00000046sv0000E4BFsd000050C1*
+ ID_MODEL_FROM_DATABASE=Core Processor Integrated Graphics Controller (PC1-GROOVE)
+
+@@ -55238,6 +55439,9 @@ pci:v00008086d00000150*
+ pci:v00008086d00000150sv00001043sd000084CA*
+ ID_MODEL_FROM_DATABASE=Xeon E3-1200 v2/3rd Gen Core processor DRAM Controller (P8 series motherboard)
+
++pci:v00008086d00000150sv000015D9sd00000624*
++ ID_MODEL_FROM_DATABASE=Xeon E3-1200 v2/3rd Gen Core processor DRAM Controller (X9SCM-F Motherboard)
++
+ pci:v00008086d00000150sv00001849sd00000150*
+ ID_MODEL_FROM_DATABASE=Xeon E3-1200 v2/3rd Gen Core processor DRAM Controller (Motherboard)
+
+@@ -55445,6 +55649,9 @@ pci:v00008086d00000416sv000017AAsd0000220E*
+ pci:v00008086d0000041A*
+ ID_MODEL_FROM_DATABASE=Xeon E3-1200 v3 Processor Integrated Graphics Controller
+
++pci:v00008086d0000041E*
++ ID_MODEL_FROM_DATABASE=4th Generation Core Processor Family Integrated Graphics Controller
++
+ pci:v00008086d00000433*
+ ID_MODEL_FROM_DATABASE=Coleto Creek ACC - ME/CPM interface
+
+@@ -56727,241 +56934,85 @@ pci:v00008086d00000EFD*
+ ID_MODEL_FROM_DATABASE=Xeon E7 v2/Xeon E5 v2/Core i7 DDRIO
+
+ pci:v00008086d00000F00*
+- ID_MODEL_FROM_DATABASE=ValleyView SSA-CUnit
+-
+-pci:v00008086d00000F01*
+- ID_MODEL_FROM_DATABASE=ValleyView SSA-CUnit
+-
+-pci:v00008086d00000F02*
+- ID_MODEL_FROM_DATABASE=ValleyView SSA-CUnit
+-
+-pci:v00008086d00000F03*
+- ID_MODEL_FROM_DATABASE=ValleyView SSA-CUnit
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series SoC Transaction Register
+
+ pci:v00008086d00000F04*
+- ID_MODEL_FROM_DATABASE=ValleyView High Definition Audio Controller
+-
+-pci:v00008086d00000F05*
+- ID_MODEL_FROM_DATABASE=ValleyView High Definition Audio Controller
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series High Definition Audio Controller
+
+ pci:v00008086d00000F06*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 DMA Controller
+-
+-pci:v00008086d00000F07*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 DMA Controller
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO1 DMA Controller
+
+ pci:v00008086d00000F08*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 PWM Controller
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO1 PWM Controller
+
+ pci:v00008086d00000F09*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 PWM Controller
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO1 PWM Controller
+
+ pci:v00008086d00000F0A*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 HSUART Controller #1
+-
+-pci:v00008086d00000F0B*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 HSUART Controller #1
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO1 HSUART Controller #1
+
+ pci:v00008086d00000F0C*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 HSUART Controller #2
+-
+-pci:v00008086d00000F0D*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 HSUART Controller #2
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO1 HSUART Controller #2
+
+ pci:v00008086d00000F0E*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 SPI Controller
+-
+-pci:v00008086d00000F0F*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 SPI Controller
+-
+-pci:v00008086d00000F10*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 Controller
+-
+-pci:v00008086d00000F11*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO1 Controller
+-
+-pci:v00008086d00000F12*
+- ID_MODEL_FROM_DATABASE=ValleyView SMBus Controller
+-
+-pci:v00008086d00000F13*
+- ID_MODEL_FROM_DATABASE=ValleyView SMBus Controller
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO1 SPI Controller
+
+ pci:v00008086d00000F14*
+- ID_MODEL_FROM_DATABASE=ValleyView SDIO Controller
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series SDIO Controller
+
+ pci:v00008086d00000F15*
+- ID_MODEL_FROM_DATABASE=ValleyView SDIO Controller
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series SDIO Controller
+
+ pci:v00008086d00000F16*
+- ID_MODEL_FROM_DATABASE=ValleyView SDIO Controller
+-
+-pci:v00008086d00000F17*
+- ID_MODEL_FROM_DATABASE=ValleyView SDIO Controller
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series SDIO Controller
+
+ pci:v00008086d00000F18*
+- ID_MODEL_FROM_DATABASE=ValleyView SEC
+-
+-pci:v00008086d00000F19*
+- ID_MODEL_FROM_DATABASE=ValleyView SEC
+-
+-pci:v00008086d00000F1A*
+- ID_MODEL_FROM_DATABASE=ValleyView SEC
+-
+-pci:v00008086d00000F1B*
+- ID_MODEL_FROM_DATABASE=ValleyView SEC
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series Trusted Execution Engine
+
+ pci:v00008086d00000F1C*
+- ID_MODEL_FROM_DATABASE=ValleyView Power Control Unit
+-
+-pci:v00008086d00000F1D*
+- ID_MODEL_FROM_DATABASE=ValleyView Power Control Unit
+-
+-pci:v00008086d00000F1E*
+- ID_MODEL_FROM_DATABASE=ValleyView Power Control Unit
+-
+-pci:v00008086d00000F1F*
+- ID_MODEL_FROM_DATABASE=ValleyView Power Control Unit
+-
+-pci:v00008086d00000F20*
+- ID_MODEL_FROM_DATABASE=ValleyView 4-Port SATA Storage Controller
+-
+-pci:v00008086d00000F21*
+- ID_MODEL_FROM_DATABASE=ValleyView 4-Port SATA Storage Controller
+-
+-pci:v00008086d00000F22*
+- ID_MODEL_FROM_DATABASE=ValleyView 6-Port SATA AHCI Controller
+-
+-pci:v00008086d00000F23*
+- ID_MODEL_FROM_DATABASE=ValleyView 6-Port SATA AHCI Controller
+-
+-pci:v00008086d00000F24*
+- ID_MODEL_FROM_DATABASE=ValleyView SATA RAID Storage Controller
+-
+-pci:v00008086d00000F25*
+- ID_MODEL_FROM_DATABASE=ValleyView SATA RAID Storage Controller
+-
+-pci:v00008086d00000F26*
+- ID_MODEL_FROM_DATABASE=ValleyView 2-Port SATA Storage Controller
+-
+-pci:v00008086d00000F27*
+- ID_MODEL_FROM_DATABASE=ValleyView 2-Port SATA Storage Controller
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series Power Control Unit
+
+ pci:v00008086d00000F28*
+- ID_MODEL_FROM_DATABASE=ValleyView LPE Audio Controller
+-
+-pci:v00008086d00000F29*
+- ID_MODEL_FROM_DATABASE=ValleyView LPE Audio Controller
+-
+-pci:v00008086d00000F2A*
+- ID_MODEL_FROM_DATABASE=ValleyView LPE Audio Controller
+-
+-pci:v00008086d00000F2B*
+- ID_MODEL_FROM_DATABASE=ValleyView LPE Audio Controller
+-
+-pci:v00008086d00000F2E*
+- ID_MODEL_FROM_DATABASE=ValleyView SATA RAID Storage Controller
+-
+-pci:v00008086d00000F2F*
+- ID_MODEL_FROM_DATABASE=ValleyView SATA RAID Storage Controller
+-
+-pci:v00008086d00000F30*
+- ID_MODEL_FROM_DATABASE=ValleyView Gen7
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPE Audio Controller
+
+ pci:v00008086d00000F31*
+- ID_MODEL_FROM_DATABASE=ValleyView Gen7
+-
+-pci:v00008086d00000F32*
+- ID_MODEL_FROM_DATABASE=ValleyView Gen7
+-
+-pci:v00008086d00000F33*
+- ID_MODEL_FROM_DATABASE=ValleyView Gen7
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series Graphics & Display
+
+ pci:v00008086d00000F34*
+- ID_MODEL_FROM_DATABASE=ValleyView USB Enhanced Host Controller
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series USB EHCI
+
+ pci:v00008086d00000F35*
+- ID_MODEL_FROM_DATABASE=ValleyView USB xHCI Host Controller
+-
+-pci:v00008086d00000F36*
+- ID_MODEL_FROM_DATABASE=ValleyView USB xHCI Host Controller
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series USB xHCI
+
+ pci:v00008086d00000F37*
+- ID_MODEL_FROM_DATABASE=ValleyView OTG
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series OTG USB Device
+
+ pci:v00008086d00000F38*
+- ID_MODEL_FROM_DATABASE=ValleyView ISP
+-
+-pci:v00008086d00000F39*
+- ID_MODEL_FROM_DATABASE=ValleyView ISP
+-
+-pci:v00008086d00000F3A*
+- ID_MODEL_FROM_DATABASE=ValleyView ISP
+-
+-pci:v00008086d00000F3B*
+- ID_MODEL_FROM_DATABASE=ValleyView ISP
+-
+-pci:v00008086d00000F3C*
+- ID_MODEL_FROM_DATABASE=ValleyView ISP
+-
+-pci:v00008086d00000F3D*
+- ID_MODEL_FROM_DATABASE=ValleyView ISP
+-
+-pci:v00008086d00000F3E*
+- ID_MODEL_FROM_DATABASE=ValleyView ISP
+-
+-pci:v00008086d00000F3F*
+- ID_MODEL_FROM_DATABASE=ValleyView ISP
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series Camera ISP
+
+ pci:v00008086d00000F40*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO2 DMA Controller
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO2 DMA Controller
+
+ pci:v00008086d00000F41*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO2 I2C Controller #1
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #1
+
+ pci:v00008086d00000F42*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO2 I2C Controller #2
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #2
+
+ pci:v00008086d00000F43*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO2 I2C Controller #3
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #3
+
+ pci:v00008086d00000F44*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO2 I2C Controller #4
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #4
+
+ pci:v00008086d00000F45*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO2 I2C Controller #5
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #5
+
+ pci:v00008086d00000F46*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO2 I2C Controller #6
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #6
+
+ pci:v00008086d00000F47*
+- ID_MODEL_FROM_DATABASE=ValleyView LPIO2 I2C Controller #7
+-
+-pci:v00008086d00000F48*
+- ID_MODEL_FROM_DATABASE=ValleyView PCI Express Root Port
+-
+-pci:v00008086d00000F49*
+- ID_MODEL_FROM_DATABASE=ValleyView PCI Express Root Port
+-
+-pci:v00008086d00000F4A*
+- ID_MODEL_FROM_DATABASE=ValleyView PCI Express Root Port
+-
+-pci:v00008086d00000F4B*
+- ID_MODEL_FROM_DATABASE=ValleyView PCI Express Root Port
+-
+-pci:v00008086d00000F4C*
+- ID_MODEL_FROM_DATABASE=ValleyView PCI Express Root Port
+-
+-pci:v00008086d00000F4D*
+- ID_MODEL_FROM_DATABASE=ValleyView PCI Express Root Port
+-
+-pci:v00008086d00000F4E*
+- ID_MODEL_FROM_DATABASE=ValleyView PCI Express Root Port
+-
+-pci:v00008086d00000F4F*
+- ID_MODEL_FROM_DATABASE=ValleyView PCI Express Root Port
+-
+-pci:v00008086d00000F50*
+- ID_MODEL_FROM_DATABASE=ValleyView MIPI-HSI Controller
++ ID_MODEL_FROM_DATABASE=Atom Processor Z36xxx/Z37xxx Series LPIO2 I2C Controller #7
+
+ pci:v00008086d00001000*
+ ID_MODEL_FROM_DATABASE=82542 Gigabit Ethernet Controller (Fiber)
+@@ -57842,6 +57893,9 @@ pci:v00008086d00001091*
+ pci:v00008086d00001092*
+ ID_MODEL_FROM_DATABASE=PRO/100 VE Network Connection
+
++pci:v00008086d00001092sv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=PRO/100 VE Network Connection (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00008086d00001093*
+ ID_MODEL_FROM_DATABASE=PRO/100 VM Network Connection
+
+@@ -59403,7 +59457,7 @@ pci:v00008086d0000154Asv00008086sd0000011C*
+ ID_MODEL_FROM_DATABASE=Ethernet Server Adapter X520-4 (Ethernet Converged Network Adapter X520-4)
+
+ pci:v00008086d0000154C*
+- ID_MODEL_FROM_DATABASE=XL710 X710 Virtual Function
++ ID_MODEL_FROM_DATABASE=XL710/X710 Virtual Function
+
+ pci:v00008086d0000154D*
+ ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X520 Adapter
+@@ -59460,34 +59514,37 @@ pci:v00008086d00001570*
+ ID_MODEL_FROM_DATABASE=Ethernet Connection I219-V
+
+ pci:v00008086d00001571*
+- ID_MODEL_FROM_DATABASE=XL710 X710 Virtual Function
++ ID_MODEL_FROM_DATABASE=XL710/X710 Virtual Function
+
+ pci:v00008086d00001572*
+- ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X710 Adapter
++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+
+
+ pci:v00008086d00001572sv00001028sd00001F99*
+- ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X710 Adapter (Ethernet 10G 4P X710/I350 rNDC)
++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet 10G 4P X710/I350 rNDC)
++
++pci:v00008086d00001572sv00008086sd00000000*
++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Converged Network Adapter X710)
+
+ pci:v00008086d00001572sv00008086sd00000001*
+- ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X710 Adapter (Ethernet Converged Network Adapter X710-4)
++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Converged Network Adapter X710-4)
+
+ pci:v00008086d00001572sv00008086sd00000002*
+- ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X710 Adapter (Ethernet Converged Network Adapter X710-4)
++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Converged Network Adapter X710-4)
+
+ pci:v00008086d00001572sv00008086sd00000004*
+- ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X710 Adapter (Ethernet Converged Network Adapter X710-4)
++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Converged Network Adapter X710-4)
+
+ pci:v00008086d00001572sv00008086sd00000005*
+- ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X710 Adapter (Ethernet 10G 4P X710 Adapter)
++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet 10G 4P X710 Adapter)
+
+ pci:v00008086d00001572sv00008086sd00000006*
+- ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X710 Adapter (Ethernet 10G2P X710 Adapter)
++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet 10G 2P X710 Adapter)
+
+ pci:v00008086d00001572sv00008086sd00000007*
+- ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X710 Adapter (Ethernet Converged Network Adapter X710-2)
++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Converged Network Adapter X710-2)
+
+ pci:v00008086d00001572sv00008086sd00000008*
+- ID_MODEL_FROM_DATABASE=Ethernet 10G 2P X710 Adapter (Ethernet Converged Network Adapter X710-2)
++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Converged Network Adapter X710-2)
+
+ pci:v00008086d0000157B*
+ ID_MODEL_FROM_DATABASE=I210 Gigabit Network Connection
+@@ -59496,17 +59553,20 @@ pci:v00008086d0000157C*
+ ID_MODEL_FROM_DATABASE=I210 Gigabit Backplane Connection
+
+ pci:v00008086d00001580*
+- ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40Gbe backplane
++ ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40GbE backplane
+
+ pci:v00008086d00001581*
+- ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10Gbe backplane
++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE backplane
+
+ pci:v00008086d00001581sv00001028sd00001F98*
+- ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10Gbe backplane (Ethernet 10G 4P X710-k bNDC)
++ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE backplane (Ethernet 10G 4P X710-k bNDC)
+
+ pci:v00008086d00001583*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40GbE QSFP+
+
++pci:v00008086d00001583sv00008086sd00000000*
++ ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40GbE QSFP+ (Ethernet Converged Network Adapter XL710-Q2)
++
+ pci:v00008086d00001583sv00008086sd00000001*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40GbE QSFP+ (Ethernet Converged Network Adapter XL710-Q2)
+
+@@ -59519,6 +59579,9 @@ pci:v00008086d00001583sv00008086sd00000003*
+ pci:v00008086d00001584*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40GbE QSFP+
+
++pci:v00008086d00001584sv00008086sd00000000*
++ ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40GbE QSFP+ (Ethernet Converged Network Adapter XL710-Q1)
++
+ pci:v00008086d00001584sv00008086sd00000001*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XL710 for 40GbE QSFP+ (Ethernet Converged Network Adapter XL710-Q1)
+
+@@ -61244,9 +61307,15 @@ pci:v00008086d00002448sv0000104Dsd0000902D*
+ pci:v00008086d00002448sv0000105Bsd00000D7C*
+ ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (D270S/D250S Motherboard)
+
++pci:v00008086d00002448sv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00008086d00002448sv0000144Dsd0000C00C*
+ ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (P30 notebook)
+
++pci:v00008086d00002448sv0000144Dsd0000C06A*
++ ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (R730 Laptop)
++
+ pci:v00008086d00002448sv0000144Dsd0000C072*
+ ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (Notebook N150P)
+
+@@ -61259,6 +61328,12 @@ pci:v00008086d00002448sv00001734sd00001055*
+ pci:v00008086d00002448sv000017AAsd000020AE*
+ ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (ThinkPad T61/R61)
+
++pci:v00008086d00002448sv000017C0sd000010D2*
++ ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (Medion Akoya E7214 Notebook PC [MD98410])
++
++pci:v00008086d00002448sv000017C0sd00004083*
++ ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d00002448sv00008086sd0000544B*
+ ID_MODEL_FROM_DATABASE=82801 Mobile PCI Bridge (Desktop Board D425KT)
+
+@@ -61872,7 +61947,7 @@ pci:v00008086d000024C5sv00001014sd00000267*
+ ID_MODEL_FROM_DATABASE=82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Audio Controller (NetVista A30p)
+
+ pci:v00008086d000024C5sv00001014sd00000537*
+- ID_MODEL_FROM_DATABASE=82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Audio Controller (ThinkPad T41)
++ ID_MODEL_FROM_DATABASE=82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Audio Controller (ThinkPad T4x Series)
+
+ pci:v00008086d000024C5sv00001014sd0000055F*
+ ID_MODEL_FROM_DATABASE=82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Audio Controller (Thinkpad R50e model 1634)
+@@ -61944,7 +62019,7 @@ pci:v00008086d000024C6*
+ ID_MODEL_FROM_DATABASE=82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller
+
+ pci:v00008086d000024C6sv00001014sd00000524*
+- ID_MODEL_FROM_DATABASE=82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller (ThinkPad T41)
++ ID_MODEL_FROM_DATABASE=82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller (ThinkPad T4x Series)
+
+ pci:v00008086d000024C6sv00001014sd00000525*
+ ID_MODEL_FROM_DATABASE=82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller (ThinkPad)
+@@ -64358,6 +64433,9 @@ pci:v00008086d000027A0sv0000103Csd000030A3*
+ pci:v00008086d000027A0sv00001043sd00001237*
+ ID_MODEL_FROM_DATABASE=Mobile 945GM/PM/GMS, 943/940GML and 945GT Express Memory Controller Hub (A6J-Q008)
+
++pci:v00008086d000027A0sv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=Mobile 945GM/PM/GMS, 943/940GML and 945GT Express Memory Controller Hub (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00008086d000027A0sv000017AAsd00002015*
+ ID_MODEL_FROM_DATABASE=Mobile 945GM/PM/GMS, 943/940GML and 945GT Express Memory Controller Hub (ThinkPad T60)
+
+@@ -64373,6 +64451,9 @@ pci:v00008086d000027A1sv0000103Csd0000309F*
+ pci:v00008086d000027A1sv0000103Csd000030A3*
+ ID_MODEL_FROM_DATABASE=Mobile 945GM/PM/GMS, 943/940GML and 945GT Express PCI Express Root Port (Compaq nw8440)
+
++pci:v00008086d000027A1sv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=Mobile 945GM/PM/GMS, 943/940GML and 945GT Express PCI Express Root Port (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00008086d000027A2*
+ ID_MODEL_FROM_DATABASE=Mobile 945GM/GMS, 943/940GML Express Integrated Graphics Controller
+
+@@ -64457,6 +64538,9 @@ pci:v00008086d000027B9sv0000103Csd000030A1*
+ pci:v00008086d000027B9sv0000103Csd000030A3*
+ ID_MODEL_FROM_DATABASE=82801GBM (ICH7-M) LPC Interface Bridge (Compaq nw8440)
+
++pci:v00008086d000027B9sv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=82801GBM (ICH7-M) LPC Interface Bridge (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00008086d000027B9sv000010F7sd00008338*
+ ID_MODEL_FROM_DATABASE=82801GBM (ICH7-M) LPC Interface Bridge (Panasonic CF-Y5 laptop)
+
+@@ -64568,6 +64652,9 @@ pci:v00008086d000027C4sv00001025sd0000006C*
+ pci:v00008086d000027C4sv00001028sd000001D7*
+ ID_MODEL_FROM_DATABASE=82801GBM/GHM (ICH7-M Family) SATA Controller [IDE mode] (XPS M1210)
+
++pci:v00008086d000027C4sv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=82801GBM/GHM (ICH7-M Family) SATA Controller [IDE mode] (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00008086d000027C4sv000017AAsd0000200E*
+ ID_MODEL_FROM_DATABASE=82801GBM/GHM (ICH7-M Family) SATA Controller [IDE mode] (ThinkPad T60)
+
+@@ -64625,6 +64712,9 @@ pci:v00008086d000027C8sv00001043sd00008179*
+ pci:v00008086d000027C8sv0000105Bsd00000D7C*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #1 (D270S/D250S Motherboard)
+
++pci:v00008086d000027C8sv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #1 (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00008086d000027C8sv0000107Bsd00005048*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #1 (E4500)
+
+@@ -64691,6 +64781,9 @@ pci:v00008086d000027C9sv00001043sd00008179*
+ pci:v00008086d000027C9sv0000105Bsd00000D7C*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #2 (D270S/D250S Motherboard)
+
++pci:v00008086d000027C9sv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #2 (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00008086d000027C9sv0000107Bsd00005048*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #2 (E4500)
+
+@@ -64757,6 +64850,9 @@ pci:v00008086d000027CAsv00001043sd00008179*
+ pci:v00008086d000027CAsv0000105Bsd00000D7C*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #3 (D270S/D250S Motherboard)
+
++pci:v00008086d000027CAsv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #3 (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00008086d000027CAsv0000107Bsd00005048*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #3 (E4500)
+
+@@ -64817,6 +64913,9 @@ pci:v00008086d000027CBsv00001043sd00008179*
+ pci:v00008086d000027CBsv0000105Bsd00000D7C*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #4 (D270S/D250S Motherboard)
+
++pci:v00008086d000027CBsv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #4 (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00008086d000027CBsv0000107Bsd00005048*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB UHCI Controller #4 (E4500)
+
+@@ -64880,6 +64979,9 @@ pci:v00008086d000027CCsv00001043sd00008179*
+ pci:v00008086d000027CCsv0000105Bsd00000D7C*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB2 EHCI Controller (D270S/D250S Motherboard)
+
++pci:v00008086d000027CCsv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB2 EHCI Controller (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00008086d000027CCsv0000144Dsd0000C072*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family USB2 EHCI Controller (Notebook N150P)
+
+@@ -64913,6 +65015,9 @@ pci:v00008086d000027D0sv0000103Csd0000309F*
+ pci:v00008086d000027D0sv0000103Csd000030A3*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 1 (Compaq nw8440)
+
++pci:v00008086d000027D0sv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 1 (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00008086d000027D0sv0000144Dsd0000C072*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 1 (Notebook N150P)
+
+@@ -64937,6 +65042,9 @@ pci:v00008086d000027D2sv0000103Csd0000309F*
+ pci:v00008086d000027D2sv0000103Csd000030A3*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 2 (Compaq nw8440)
+
++pci:v00008086d000027D2sv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 2 (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00008086d000027D2sv0000144Dsd0000C072*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 2 (Notebook N150P)
+
+@@ -64952,6 +65060,9 @@ pci:v00008086d000027D2sv00008086sd0000544B*
+ pci:v00008086d000027D4*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 3
+
++pci:v00008086d000027D4sv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 3 (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00008086d000027D4sv0000144Dsd0000C072*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 3 (Notebook N150P)
+
+@@ -64970,6 +65081,9 @@ pci:v00008086d000027D6*
+ pci:v00008086d000027D6sv0000103Csd000030A3*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 4 (Compaq nw8440)
+
++pci:v00008086d000027D6sv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 4 (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00008086d000027D6sv0000144Dsd0000C072*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family PCI Express Port 4 (Notebook N150P)
+
+@@ -65021,6 +65135,9 @@ pci:v00008086d000027D8sv00001043sd000082EA*
+ pci:v00008086d000027D8sv0000105Bsd00000D7C*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family High Definition Audio Controller (D270S/D250S Motherboard)
+
++pci:v00008086d000027D8sv00001071sd00008207*
++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family High Definition Audio Controller (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00008086d000027D8sv0000107Bsd00005048*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family High Definition Audio Controller (E4500)
+
+@@ -65099,6 +65216,9 @@ pci:v00008086d000027DAsv00001043sd00008179*
+ pci:v00008086d000027DAsv0000105Bsd00000D7C*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family SMBus Controller (D270S/D250S Motherboard)
+
++pci:v00008086d000027DAsv00001071sd00008209*
++ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family SMBus Controller (Medion MIM 2240 Notebook PC [MD98100])
++
+ pci:v00008086d000027DAsv000010F7sd00008338*
+ ID_MODEL_FROM_DATABASE=NM10/ICH7 Family SMBus Controller (Panasonic CF-Y5 laptop)
+
+@@ -65258,6 +65378,9 @@ pci:v00008086d00002815sv0000104Dsd00009005*
+ pci:v00008086d00002815sv0000104Dsd0000902D*
+ ID_MODEL_FROM_DATABASE=82801HM (ICH8M) LPC Interface Controller (VAIO VGN-NR120E)
+
++pci:v00008086d00002815sv000017C0sd00004083*
++ ID_MODEL_FROM_DATABASE=82801HM (ICH8M) LPC Interface Controller (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d00002820*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) 4 port SATA Controller [IDE mode]
+
+@@ -65342,6 +65465,9 @@ pci:v00008086d00002829sv0000104Dsd0000902D*
+ pci:v00008086d00002829sv000017AAsd000020A7*
+ ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) SATA Controller [AHCI mode] (ThinkPad T61/R61)
+
++pci:v00008086d00002829sv000017C0sd00004083*
++ ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) SATA Controller [AHCI mode] (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d00002829sv0000E4BFsd0000CC47*
+ ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) SATA Controller [AHCI mode] (CCG-RUMBA)
+
+@@ -65393,6 +65519,9 @@ pci:v00008086d00002830sv00001462sd00007235*
+ pci:v00008086d00002830sv000017AAsd000020AA*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #1 (ThinkPad T61/R61)
+
++pci:v00008086d00002830sv000017C0sd00004083*
++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #1 (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d00002830sv0000E4BFsd0000CC47*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #1 (CCG-RUMBA)
+
+@@ -65435,6 +65564,9 @@ pci:v00008086d00002831sv00001462sd00007235*
+ pci:v00008086d00002831sv000017AAsd000020AA*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #2 (ThinkPad T61/R61)
+
++pci:v00008086d00002831sv000017C0sd00004083*
++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #2 (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d00002831sv0000E4BFsd0000CC47*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #2 (CCG-RUMBA)
+
+@@ -65474,6 +65606,9 @@ pci:v00008086d00002832sv0000104Dsd0000902D*
+ pci:v00008086d00002832sv000017AAsd000020AA*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #3 (ThinkPad T61/R61)
+
++pci:v00008086d00002832sv000017C0sd00004083*
++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #3 (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d00002832sv0000E4BFsd0000CC47*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #3 (CCG-RUMBA)
+
+@@ -65519,6 +65654,9 @@ pci:v00008086d00002834sv00001462sd00007235*
+ pci:v00008086d00002834sv000017AAsd000020AA*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #4 (ThinkPad T61/R61)
+
++pci:v00008086d00002834sv000017C0sd00004083*
++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #4 (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d00002834sv0000E4BFsd0000CC47*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #4 (CCG-RUMBA)
+
+@@ -65555,6 +65693,9 @@ pci:v00008086d00002835sv0000104Dsd0000902D*
+ pci:v00008086d00002835sv000017AAsd000020AA*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #5 (Thinkpad T61/R61)
+
++pci:v00008086d00002835sv000017C0sd00004083*
++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #5 (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d00002835sv0000E4BFsd0000CC47*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB UHCI Controller #5 (CCG-RUMBA)
+
+@@ -65597,6 +65738,9 @@ pci:v00008086d00002836sv00001462sd00007235*
+ pci:v00008086d00002836sv000017AAsd000020AB*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB2 EHCI Controller #1 (ThinkPad T61/R61)
+
++pci:v00008086d00002836sv000017C0sd00004083*
++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB2 EHCI Controller #1 (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d00002836sv0000E4BFsd0000CC47*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB2 EHCI Controller #1 (CCG-RUMBA)
+
+@@ -65633,6 +65777,9 @@ pci:v00008086d0000283Asv0000104Dsd0000902D*
+ pci:v00008086d0000283Asv000017AAsd000020AB*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB2 EHCI Controller #2 (ThinkPad T61/R61)
+
++pci:v00008086d0000283Asv000017C0sd00004083*
++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB2 EHCI Controller #2 (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d0000283Asv0000E4BFsd0000CC47*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) USB2 EHCI Controller #2 (CCG-RUMBA)
+
+@@ -65669,6 +65816,9 @@ pci:v00008086d0000283Esv00001462sd00007235*
+ pci:v00008086d0000283Esv000017AAsd000020A9*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) SMBus Controller (ThinkPad T61/R61)
+
++pci:v00008086d0000283Esv000017C0sd00004083*
++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) SMBus Controller (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d0000283Esv0000E4BFsd0000CC47*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) SMBus Controller (CCG-RUMBA)
+
+@@ -65687,6 +65837,9 @@ pci:v00008086d0000283Fsv0000104Dsd0000902D*
+ pci:v00008086d0000283Fsv000017AAsd000020AD*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 1 (ThinkPad T61/R61)
+
++pci:v00008086d0000283Fsv000017C0sd00004083*
++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 1 (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d00002841*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 2
+
+@@ -65699,6 +65852,9 @@ pci:v00008086d00002841sv0000104Dsd0000902D*
+ pci:v00008086d00002841sv000017AAsd000020AD*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 2 (ThinkPad T61/R61)
+
++pci:v00008086d00002841sv000017C0sd00004083*
++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 2 (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d00002843*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 3
+
+@@ -65708,12 +65864,18 @@ pci:v00008086d00002843sv0000104Dsd0000902D*
+ pci:v00008086d00002843sv000017AAsd000020AD*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 3 (ThinkPad T61/R61)
+
++pci:v00008086d00002843sv000017C0sd00004083*
++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 3 (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d00002845*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 4
+
+ pci:v00008086d00002845sv000017AAsd000020AD*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 4 (ThinkPad T61/R61)
+
++pci:v00008086d00002845sv000017C0sd00004083*
++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 4 (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d00002847*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 5
+
+@@ -65726,6 +65888,9 @@ pci:v00008086d00002847sv0000103Csd000030C1*
+ pci:v00008086d00002847sv000017AAsd000020AD*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 5 (ThinkPad T61/R61)
+
++pci:v00008086d00002847sv000017C0sd00004083*
++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 5 (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d00002849*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) PCI Express Port 6
+
+@@ -65792,6 +65957,9 @@ pci:v00008086d0000284Bsv000014F1sd00005051*
+ pci:v00008086d0000284Bsv000017AAsd000020AC*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) HD Audio Controller (ThinkPad T61/R61)
+
++pci:v00008086d0000284Bsv000017C0sd00004088*
++ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) HD Audio Controller (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d0000284Bsv00008384sd00007616*
+ ID_MODEL_FROM_DATABASE=82801H (ICH8 Family) HD Audio Controller (Dell Vostro 1400)
+
+@@ -65831,6 +65999,9 @@ pci:v00008086d00002850sv0000104Dsd0000902D*
+ pci:v00008086d00002850sv000017AAsd000020A6*
+ ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) IDE Controller (ThinkPad T61/R61)
+
++pci:v00008086d00002850sv000017C0sd00004083*
++ ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) IDE Controller (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d00002850sv0000E4BFsd0000CC47*
+ ID_MODEL_FROM_DATABASE=82801HM/HEM (ICH8M/ICH8M-E) IDE Controller (CCG-RUMBA)
+
+@@ -66794,6 +66965,9 @@ pci:v00008086d00002A00sv000017AAsd000020B1*
+ pci:v00008086d00002A00sv000017AAsd000020B3*
+ ID_MODEL_FROM_DATABASE=Mobile PM965/GM965/GL960 Memory Controller Hub (ThinkPad T61/R61)
+
++pci:v00008086d00002A00sv000017C0sd00004082*
++ ID_MODEL_FROM_DATABASE=Mobile PM965/GM965/GL960 Memory Controller Hub (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d00002A00sv0000E4BFsd0000CC47*
+ ID_MODEL_FROM_DATABASE=Mobile PM965/GM965/GL960 Memory Controller Hub (CCG-RUMBA)
+
+@@ -66821,6 +66995,9 @@ pci:v00008086d00002A02sv0000104Dsd0000902D*
+ pci:v00008086d00002A02sv000017AAsd000020B5*
+ ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (primary) (ThinkPad T61/R61)
+
++pci:v00008086d00002A02sv000017C0sd00004082*
++ ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (primary) (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d00002A02sv0000E4BFsd0000CC47*
+ ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (primary) (CCG-RUMBA)
+
+@@ -66828,7 +67005,7 @@ pci:v00008086d00002A03*
+ ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (secondary)
+
+ pci:v00008086d00002A03sv00001028sd000001F3*
+- ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (secondary) (Dell Inspiron 1420)
++ ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (secondary) (Inspiron 1420)
+
+ pci:v00008086d00002A03sv0000103Csd000030C0*
+ ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (secondary) (Compaq 6710b)
+@@ -66842,6 +67019,9 @@ pci:v00008086d00002A03sv0000104Dsd0000902D*
+ pci:v00008086d00002A03sv000017AAsd000020B5*
+ ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (secondary) (ThinkPad T61/R61)
+
++pci:v00008086d00002A03sv000017C0sd00004082*
++ ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (secondary) (Medion WIM 2210 Notebook PC [MD96850])
++
+ pci:v00008086d00002A03sv0000E4BFsd0000CC47*
+ ID_MODEL_FROM_DATABASE=Mobile GM965/GL960 Integrated Graphics Controller (secondary) (CCG-RUMBA)
+
+@@ -67317,13 +67497,13 @@ pci:v00008086d00002D10*
+ ID_MODEL_FROM_DATABASE=Core Processor QPI Link 0
+
+ pci:v00008086d00002D11*
+- ID_MODEL_FROM_DATABASE=Core Processor QPI Physical 0
++ ID_MODEL_FROM_DATABASE=1st Generation Core Processor QPI Physical 0
+
+ pci:v00008086d00002D12*
+- ID_MODEL_FROM_DATABASE=Core Processor Reserved
++ ID_MODEL_FROM_DATABASE=1st Generation Core Processor Reserved
+
+ pci:v00008086d00002D13*
+- ID_MODEL_FROM_DATABASE=Core Processor Reserved
++ ID_MODEL_FROM_DATABASE=1st Generation Core Processor Reserved
+
+ pci:v00008086d00002D81*
+ ID_MODEL_FROM_DATABASE=Xeon 5600 Series QuickPath Architecture System Address Decoder
+@@ -67427,6 +67607,9 @@ pci:v00008086d00002E11*
+ pci:v00008086d00002E12*
+ ID_MODEL_FROM_DATABASE=4 Series Chipset Integrated Graphics Controller
+
++pci:v00008086d00002E12sv000017AAsd00003048*
++ ID_MODEL_FROM_DATABASE=4 Series Chipset Integrated Graphics Controller (ThinkCentre M6258)
++
+ pci:v00008086d00002E13*
+ ID_MODEL_FROM_DATABASE=4 Series Chipset Integrated Graphics Controller
+
+@@ -69317,6 +69500,12 @@ pci:v00008086d00003B09*
+ pci:v00008086d00003B09sv00001025sd00000347*
+ ID_MODEL_FROM_DATABASE=Mobile 5 Series Chipset LPC Interface Controller (Aspire 7740G)
+
++pci:v00008086d00003B09sv0000144Dsd0000C06A*
++ ID_MODEL_FROM_DATABASE=Mobile 5 Series Chipset LPC Interface Controller (R730 Laptop)
++
++pci:v00008086d00003B09sv000017C0sd000010D2*
++ ID_MODEL_FROM_DATABASE=Mobile 5 Series Chipset LPC Interface Controller (Medion Akoya E7214 Notebook PC [MD98410])
++
+ pci:v00008086d00003B0A*
+ ID_MODEL_FROM_DATABASE=5 Series Chipset LPC Interface Controller
+
+@@ -69416,18 +69605,36 @@ pci:v00008086d00003B26*
+ pci:v00008086d00003B28*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 4 port SATA IDE Controller
+
++pci:v00008086d00003B28sv0000144Dsd0000C06A*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 4 port SATA IDE Controller (R730 Laptop)
++
++pci:v00008086d00003B28sv000017C0sd000010D2*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 4 port SATA IDE Controller (Medion Akoya E7214 Notebook PC [MD98410])
++
+ pci:v00008086d00003B29*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 4 port SATA AHCI Controller
+
+ pci:v00008086d00003B29sv00001025sd00000347*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 4 port SATA AHCI Controller (Aspire 7740G)
+
++pci:v00008086d00003B29sv0000144Dsd0000C06A*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 4 port SATA AHCI Controller (R730 Laptop)
++
++pci:v00008086d00003B29sv000017C0sd000010D2*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 4 port SATA AHCI Controller (Medion Akoya E7214 Notebook PC [MD98410])
++
+ pci:v00008086d00003B2C*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset SATA RAID Controller
+
+ pci:v00008086d00003B2D*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 2 port SATA IDE Controller
+
++pci:v00008086d00003B2Dsv0000144Dsd0000C06A*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 2 port SATA IDE Controller (R730 Laptop)
++
++pci:v00008086d00003B2Dsv000017C0sd000010D2*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 2 port SATA IDE Controller (Medion Akoya E7214 Notebook PC [MD98410])
++
+ pci:v00008086d00003B2Dsv0000E4BFsd000050C1*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset 2 port SATA IDE Controller (PC1-GROOVE)
+
+@@ -69458,9 +69665,15 @@ pci:v00008086d00003B30sv00001028sd000002DA*
+ pci:v00008086d00003B30sv00001028sd0000040B*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset SMBus Controller (Latitude E6510)
+
++pci:v00008086d00003B30sv0000144Dsd0000C06A*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset SMBus Controller (R730 Laptop)
++
+ pci:v00008086d00003B30sv000015D9sd0000060D*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset SMBus Controller (C7SIM-Q Motherboard)
+
++pci:v00008086d00003B30sv000017C0sd000010D2*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset SMBus Controller (Medion Akoya E7214 Notebook PC [MD98410])
++
+ pci:v00008086d00003B30sv0000E4BFsd000050C1*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset SMBus Controller (PC1-GROOVE)
+
+@@ -69470,6 +69683,12 @@ pci:v00008086d00003B32*
+ pci:v00008086d00003B32sv00001025sd00000347*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset Thermal Subsystem (Aspire 7740G)
+
++pci:v00008086d00003B32sv0000144Dsd0000C06A*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset Thermal Subsystem (R730 Laptop)
++
++pci:v00008086d00003B32sv000017C0sd000010D2*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset Thermal Subsystem (Medion Akoya E7214 Notebook PC [MD98410])
++
+ pci:v00008086d00003B34*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller
+
+@@ -69482,9 +69701,15 @@ pci:v00008086d00003B34sv00001028sd000002DA*
+ pci:v00008086d00003B34sv00001028sd0000040B*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (Latitude E6510)
+
++pci:v00008086d00003B34sv0000144Dsd0000C06A*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (R730 Laptop)
++
+ pci:v00008086d00003B34sv000015D9sd0000060D*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (C7SIM-Q Motherboard)
+
++pci:v00008086d00003B34sv000017C0sd000010D2*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (Medion Akoya E7214 Notebook PC [MD98410])
++
+ pci:v00008086d00003B34sv0000E4BFsd000050C1*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (PC1-GROOVE)
+
+@@ -69518,9 +69743,15 @@ pci:v00008086d00003B3Csv00001028sd000002DA*
+ pci:v00008086d00003B3Csv00001028sd0000040B*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (Latitude E6510)
+
++pci:v00008086d00003B3Csv0000144Dsd0000C06A*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (R730 Laptop)
++
+ pci:v00008086d00003B3Csv000015D9sd0000060D*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (C7SIM-Q Motherboard)
+
++pci:v00008086d00003B3Csv000017C0sd000010D2*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (Medion Akoya E7214 Notebook PC [MD98410])
++
+ pci:v00008086d00003B3Csv0000E4BFsd000050C1*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset USB2 Enhanced Host Controller (PC1-GROOVE)
+
+@@ -69545,9 +69776,15 @@ pci:v00008086d00003B42sv00001028sd000002DA*
+ pci:v00008086d00003B42sv00001028sd0000040B*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 1 (Latitude E6510)
+
++pci:v00008086d00003B42sv0000144Dsd0000C06A*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 1 (R730 Laptop)
++
+ pci:v00008086d00003B42sv000015D9sd0000060D*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 1 (C7SIM-Q Motherboard)
+
++pci:v00008086d00003B42sv000017C0sd000010D2*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 1 (Medion Akoya E7214 Notebook PC [MD98410])
++
+ pci:v00008086d00003B44*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 2
+
+@@ -69557,24 +69794,39 @@ pci:v00008086d00003B44sv00001028sd0000040B*
+ pci:v00008086d00003B44sv000015D9sd0000060D*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 2 (C7SIM-Q Motherboard)
+
++pci:v00008086d00003B44sv000017C0sd000010D2*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 2 (Medion Akoya E7214 Notebook PC [MD98410])
++
+ pci:v00008086d00003B46*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 3
+
+ pci:v00008086d00003B46sv00001028sd0000040B*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 3 (Latitude E6510)
+
++pci:v00008086d00003B46sv0000144Dsd0000C06A*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 3 (R730 Laptop)
++
++pci:v00008086d00003B46sv000017C0sd000010D2*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 3 (Medion Akoya E7214 Notebook PC [MD98410])
++
+ pci:v00008086d00003B48*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 4
+
+ pci:v00008086d00003B48sv00001028sd0000040B*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 4 (Latitude E6510)
+
++pci:v00008086d00003B48sv0000144Dsd0000C06A*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 4 (R730 Laptop)
++
+ pci:v00008086d00003B4A*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 5
+
+ pci:v00008086d00003B4Asv00001028sd000002DA*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 5 (OptiPlex 980)
+
++pci:v00008086d00003B4Asv000017C0sd000010D2*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 5 (Medion Akoya E7214 Notebook PC [MD98410])
++
+ pci:v00008086d00003B4C*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset PCI Express Root Port 6
+
+@@ -69599,9 +69851,15 @@ pci:v00008086d00003B56sv00001028sd000002DA*
+ pci:v00008086d00003B56sv00001028sd0000040B*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset High Definition Audio (Latitude E6510)
+
++pci:v00008086d00003B56sv0000144Dsd0000C06A*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset High Definition Audio (R730 Laptop)
++
+ pci:v00008086d00003B56sv000015D9sd0000060D*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset High Definition Audio (C7SIM-Q Motherboard)
+
++pci:v00008086d00003B56sv000017C0sd000010D2*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset High Definition Audio (Medion Akoya E7214 Notebook PC [MD98410])
++
+ pci:v00008086d00003B56sv0000E4BFsd000050C1*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset High Definition Audio (PC1-GROOVE)
+
+@@ -69617,6 +69875,9 @@ pci:v00008086d00003B64sv00001025sd00000347*
+ pci:v00008086d00003B64sv000015D9sd0000060D*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset HECI Controller (C7SIM-Q Motherboard)
+
++pci:v00008086d00003B64sv000017C0sd000010D2*
++ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset HECI Controller (Medion Akoya E7214 Notebook PC [MD98410])
++
+ pci:v00008086d00003B64sv0000E4BFsd000050C1*
+ ID_MODEL_FROM_DATABASE=5 Series/3400 Series Chipset HECI Controller (PC1-GROOVE)
+
+@@ -69990,7 +70251,7 @@ pci:v00008086d00004222sv00008086sd00001000*
+ ID_MODEL_FROM_DATABASE=PRO/Wireless 3945ABG [Golan] Network Connection (PRO/Wireless 3945ABG Network Connection)
+
+ pci:v00008086d00004222sv00008086sd00001001*
+- ID_MODEL_FROM_DATABASE=PRO/Wireless 3945ABG [Golan] Network Connection (PRO/Wireless 3945ABG Network Connection)
++ ID_MODEL_FROM_DATABASE=PRO/Wireless 3945ABG [Golan] Network Connection (WM3945ABG MOW2)
+
+ pci:v00008086d00004222sv00008086sd00001005*
+ ID_MODEL_FROM_DATABASE=PRO/Wireless 3945ABG [Golan] Network Connection (PRO/Wireless 3945BG Network Connection)
+@@ -71168,6 +71429,114 @@ pci:v00008086d00008C5E*
+ pci:v00008086d00008C5F*
+ ID_MODEL_FROM_DATABASE=8 Series/C220 Series Chipset Family LPC Controller
+
++pci:v00008086d00008C80*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [IDE Mode]
++
++pci:v00008086d00008C81*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [IDE Mode]
++
++pci:v00008086d00008C82*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [AHCI Mode]
++
++pci:v00008086d00008C83*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [AHCI Mode]
++
++pci:v00008086d00008C84*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [RAID Mode]
++
++pci:v00008086d00008C85*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [RAID Mode]
++
++pci:v00008086d00008C86*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [RAID Mode]
++
++pci:v00008086d00008C87*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [RAID Mode]
++
++pci:v00008086d00008C88*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [IDE Mode]
++
++pci:v00008086d00008C89*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [IDE Mode]
++
++pci:v00008086d00008C8E*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [RAID Mode]
++
++pci:v00008086d00008C8F*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SATA Controller [RAID Mode]
++
++pci:v00008086d00008C90*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family PCI Express Root Port 1
++
++pci:v00008086d00008C92*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family PCI Express Root Port 2
++
++pci:v00008086d00008C94*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family PCI Express Root Port 3
++
++pci:v00008086d00008C96*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family PCI Express Root Port 4
++
++pci:v00008086d00008C98*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family PCI Express Root Port 5
++
++pci:v00008086d00008C9A*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family PCI Express Root Port 6
++
++pci:v00008086d00008C9C*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family PCI Express Root Port 7
++
++pci:v00008086d00008C9E*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family PCI Express Root Port 8
++
++pci:v00008086d00008CA0*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family HD Audio Controller
++
++pci:v00008086d00008CA2*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family SMBus Controller
++
++pci:v00008086d00008CA4*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family Thermal Controller
++
++pci:v00008086d00008CA6*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family USB EHCI Controller #1
++
++pci:v00008086d00008CAD*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family USB EHCI Controller #2
++
++pci:v00008086d00008CB1*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family USB xHCI Controller
++
++pci:v00008086d00008CB3*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family LAN Controller
++
++pci:v00008086d00008CBA*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family ME Interface #1
++
++pci:v00008086d00008CBB*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family ME Interface #2
++
++pci:v00008086d00008CBC*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family IDE-R Controller
++
++pci:v00008086d00008CBD*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family KT Controller
++
++pci:v00008086d00008CC1*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family LPC Controller
++
++pci:v00008086d00008CC2*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family LPC Controller
++
++pci:v00008086d00008CC3*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family HM97 LPC Controller
++
++pci:v00008086d00008CC4*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family Z97 LPC Controller
++
++pci:v00008086d00008CC6*
++ ID_MODEL_FROM_DATABASE=9 Series Chipset Family H97 Controller
++
+ pci:v00008086d00008D00*
+ ID_MODEL_FROM_DATABASE=Wellsburg 4-port SATA Controller [IDE mode]
+
+@@ -71379,208 +71748,208 @@ pci:v00008086d000096A1*
+ ID_MODEL_FROM_DATABASE=Integrated RAID
+
+ pci:v00008086d00009C00*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [IDE mode]
++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [IDE mode]
+
+ pci:v00008086d00009C01*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [IDE mode]
++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [IDE mode]
+
+ pci:v00008086d00009C02*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [AHCI mode]
++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [AHCI mode]
+
+ pci:v00008086d00009C03*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [AHCI mode]
++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [AHCI mode]
+
+ pci:v00008086d00009C03sv000017AAsd00002214*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [AHCI mode] (ThinkPad X240)
++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [AHCI mode] (ThinkPad X240)
+
+ pci:v00008086d00009C04*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [RAID mode]
++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [RAID mode]
+
+ pci:v00008086d00009C05*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [RAID mode]
++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [RAID mode]
+
+ pci:v00008086d00009C06*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [RAID mode]
++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [RAID mode]
+
+ pci:v00008086d00009C07*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [RAID mode]
++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [RAID mode]
+
+ pci:v00008086d00009C08*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 2 [IDE mode]
++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 2 [IDE mode]
+
+ pci:v00008086d00009C09*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 2 [IDE mode]
++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 2 [IDE mode]
+
+ pci:v00008086d00009C0A*
+- ID_MODEL_FROM_DATABASE=LynxPoint-LP SATA Controller [Reserved]
++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller [Reserved]
+
+ pci:v00008086d00009C0B*
+- ID_MODEL_FROM_DATABASE=LynxPoint-LP SATA Controller [Reserved]
++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller [Reserved]
+
+ pci:v00008086d00009C0C*
+- ID_MODEL_FROM_DATABASE=LynxPoint-LP SATA Controller [Reserved]
++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller [Reserved]
+
+ pci:v00008086d00009C0D*
+- ID_MODEL_FROM_DATABASE=LynxPoint-LP SATA Controller [Reserved]
++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller [Reserved]
+
+ pci:v00008086d00009C0E*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [RAID mode]
++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [RAID mode]
+
+ pci:v00008086d00009C0F*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP SATA Controller 1 [RAID mode]
++ ID_MODEL_FROM_DATABASE=8 Series SATA Controller 1 [RAID mode]
+
+ pci:v00008086d00009C10*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 1
++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 1
+
+ pci:v00008086d00009C11*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 1
++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 1
+
+ pci:v00008086d00009C12*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 2
++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 2
+
+ pci:v00008086d00009C13*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 2
++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 2
+
+ pci:v00008086d00009C14*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 3
++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 3
+
+ pci:v00008086d00009C15*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 3
++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 3
+
+ pci:v00008086d00009C16*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 4
++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 4
+
+ pci:v00008086d00009C17*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 4
++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 4
+
+ pci:v00008086d00009C18*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 5
++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 5
+
+ pci:v00008086d00009C19*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 5
++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 5
+
+ pci:v00008086d00009C1A*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 6
++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 6
+
+ pci:v00008086d00009C1B*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 6
++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 6
+
+ pci:v00008086d00009C1C*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 7
++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 7
+
+ pci:v00008086d00009C1D*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 7
++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 7
+
+ pci:v00008086d00009C1E*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 8
++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 8
+
+ pci:v00008086d00009C1F*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP PCI Express Root Port 8
++ ID_MODEL_FROM_DATABASE=8 Series PCI Express Root Port 8
+
+ pci:v00008086d00009C20*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP HD Audio Controller
++ ID_MODEL_FROM_DATABASE=8 Series HD Audio Controller
+
+ pci:v00008086d00009C20sv000017AAsd00002214*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP HD Audio Controller (ThinkPad X240)
++ ID_MODEL_FROM_DATABASE=8 Series HD Audio Controller (ThinkPad X240)
+
+ pci:v00008086d00009C21*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP HD Audio Controller
++ ID_MODEL_FROM_DATABASE=8 Series HD Audio Controller
+
+ pci:v00008086d00009C22*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP SMBus Controller
++ ID_MODEL_FROM_DATABASE=8 Series SMBus Controller
+
+ pci:v00008086d00009C22sv000017AAsd00002214*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP SMBus Controller (ThinkPad X240)
++ ID_MODEL_FROM_DATABASE=8 Series SMBus Controller (ThinkPad X240)
+
+ pci:v00008086d00009C23*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP CHAP Counters
++ ID_MODEL_FROM_DATABASE=8 Series CHAP Counters
+
+ pci:v00008086d00009C24*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP Thermal
++ ID_MODEL_FROM_DATABASE=8 Series Thermal
+
+ pci:v00008086d00009C26*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP USB EHCI #1
++ ID_MODEL_FROM_DATABASE=8 Series USB EHCI #1
+
+ pci:v00008086d00009C26sv000017AAsd00002214*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP USB EHCI #1 (ThinkPad X240)
++ ID_MODEL_FROM_DATABASE=8 Series USB EHCI #1 (ThinkPad X240)
+
+ pci:v00008086d00009C2D*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP USB EHCI #2
++ ID_MODEL_FROM_DATABASE=8 Series USB EHCI #2
+
+ pci:v00008086d00009C31*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP USB xHCI HC
++ ID_MODEL_FROM_DATABASE=8 Series USB xHCI HC
+
+ pci:v00008086d00009C31sv000017AAsd00002214*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP USB xHCI HC (ThinkPad X240)
++ ID_MODEL_FROM_DATABASE=8 Series USB xHCI HC (ThinkPad X240)
+
+ pci:v00008086d00009C35*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP SDIO Controller
++ ID_MODEL_FROM_DATABASE=8 Series SDIO Controller
+
+ pci:v00008086d00009C36*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP Audio DSP Controller
++ ID_MODEL_FROM_DATABASE=8 Series Audio DSP Controller
+
+ pci:v00008086d00009C3A*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP HECI #0
++ ID_MODEL_FROM_DATABASE=8 Series HECI #0
+
+ pci:v00008086d00009C3Asv000017AAsd00002214*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP HECI #0 (ThinkPad X240)
++ ID_MODEL_FROM_DATABASE=8 Series HECI #0 (ThinkPad X240)
+
+ pci:v00008086d00009C3B*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP HECI #1
++ ID_MODEL_FROM_DATABASE=8 Series HECI #1
+
+ pci:v00008086d00009C3C*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP HECI IDER
++ ID_MODEL_FROM_DATABASE=8 Series HECI IDER
+
+ pci:v00008086d00009C3D*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP HECI KT
++ ID_MODEL_FROM_DATABASE=8 Series HECI KT
+
+ pci:v00008086d00009C40*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP LPC Controller
++ ID_MODEL_FROM_DATABASE=8 Series LPC Controller
+
+ pci:v00008086d00009C41*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP LPC Controller
++ ID_MODEL_FROM_DATABASE=8 Series LPC Controller
+
+ pci:v00008086d00009C42*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP LPC Controller
++ ID_MODEL_FROM_DATABASE=8 Series LPC Controller
+
+ pci:v00008086d00009C43*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP LPC Controller
++ ID_MODEL_FROM_DATABASE=8 Series LPC Controller
+
+ pci:v00008086d00009C43sv000017AAsd00002214*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP LPC Controller (ThinkPad X240)
++ ID_MODEL_FROM_DATABASE=8 Series LPC Controller (ThinkPad X240)
+
+ pci:v00008086d00009C44*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP LPC Controller
++ ID_MODEL_FROM_DATABASE=8 Series LPC Controller
+
+ pci:v00008086d00009C45*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP LPC Controller
++ ID_MODEL_FROM_DATABASE=8 Series LPC Controller
+
+ pci:v00008086d00009C46*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP LPC Controller
++ ID_MODEL_FROM_DATABASE=8 Series LPC Controller
+
+ pci:v00008086d00009C47*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP LPC Controller
++ ID_MODEL_FROM_DATABASE=8 Series LPC Controller
+
+ pci:v00008086d00009C60*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP Low Power Sub-System DMA
++ ID_MODEL_FROM_DATABASE=8 Series Low Power Sub-System DMA
+
+ pci:v00008086d00009C61*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP I2C Controller #0
++ ID_MODEL_FROM_DATABASE=8 Series I2C Controller #0
+
+ pci:v00008086d00009C62*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP I2C Controller #1
++ ID_MODEL_FROM_DATABASE=8 Series I2C Controller #1
+
+ pci:v00008086d00009C63*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP UART Controller #0
++ ID_MODEL_FROM_DATABASE=8 Series UART Controller #0
+
+ pci:v00008086d00009C64*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP UART Controller #1
++ ID_MODEL_FROM_DATABASE=8 Series UART Controller #1
+
+ pci:v00008086d00009C65*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP SPI Controller #0
++ ID_MODEL_FROM_DATABASE=8 Series SPI Controller #0
+
+ pci:v00008086d00009C66*
+- ID_MODEL_FROM_DATABASE=Lynx Point-LP SPI Controller #1
++ ID_MODEL_FROM_DATABASE=8 Series SPI Controller #1
+
+ pci:v00008086d00009C83*
+ ID_MODEL_FROM_DATABASE=Wildcat Point-LP SATA Controller [AHCI Mode]
+diff --git a/hwdb/20-usb-classes.hwdb b/hwdb/20-usb-classes.hwdb
+index 3294d8a816..418d39bb84 100644
+--- a/hwdb/20-usb-classes.hwdb
++++ b/hwdb/20-usb-classes.hwdb
+@@ -311,6 +311,9 @@ usb:v*p*d*dcEFdsc02dp02*
+ usb:v*p*d*dcEFdsc03dp01*
+ ID_USB_PROTOCOL_FROM_DATABASE=Cable Based Association
+
++usb:v*p*d*dcEFdsc05*
++ ID_USB_SUBCLASS_FROM_DATABASE=USB3 Vision
++
+ usb:v*p*d*dcFE*
+ ID_USB_CLASS_FROM_DATABASE=Application Specific Interface
+
+diff --git a/hwdb/20-usb-vendor-model.hwdb b/hwdb/20-usb-vendor-model.hwdb
+index 05f267d3a5..89cd5b1cfb 100644
+--- a/hwdb/20-usb-vendor-model.hwdb
++++ b/hwdb/20-usb-vendor-model.hwdb
+@@ -284,9 +284,18 @@ usb:v03EBp2310*
+ usb:v03EBp2FE4*
+ ID_MODEL_FROM_DATABASE=ATxmega32A4U DFU bootloader
+
++usb:v03EBp2FE6*
++ ID_MODEL_FROM_DATABASE=Cactus V6 (DFU)
++
++usb:v03EBp2FEA*
++ ID_MODEL_FROM_DATABASE=Cactus RF60 (DFU)
++
+ usb:v03EBp2FF0*
+ ID_MODEL_FROM_DATABASE=atmega32u2 DFU bootloader
+
++usb:v03EBp2FF4*
++ ID_MODEL_FROM_DATABASE=atmega32u4 DFU bootloader
++
+ usb:v03EBp2FFA*
+ ID_MODEL_FROM_DATABASE=at90usb162 DFU bootloader
+
+@@ -4409,6 +4418,9 @@ usb:v0424p2602*
+ usb:v0424p2640*
+ ID_MODEL_FROM_DATABASE=USB 2.0 Hub
+
++usb:v0424p2660*
++ ID_MODEL_FROM_DATABASE=Hub
++
+ usb:v0424p4060*
+ ID_MODEL_FROM_DATABASE=Ultra Fast Media Reader
+
+@@ -5373,7 +5385,7 @@ usb:v0457p0162*
+ ID_MODEL_FROM_DATABASE=SiS162 usb Wireless LAN Adapter
+
+ usb:v0457p0163*
+- ID_MODEL_FROM_DATABASE=802.11 Wireless LAN Adapter
++ ID_MODEL_FROM_DATABASE=SiS163U 802.11 Wireless LAN Adapter
+
+ usb:v0457p0817*
+ ID_MODEL_FROM_DATABASE=SiS-184-ASUS-4352.17 touch panel
+@@ -6947,6 +6959,9 @@ usb:v046Dp082D*
+ usb:v046Dp0830*
+ ID_MODEL_FROM_DATABASE=QuickClip
+
++usb:v046Dp0837*
++ ID_MODEL_FROM_DATABASE=BCC950 ConferenceCam
++
+ usb:v046Dp0840*
+ ID_MODEL_FROM_DATABASE=QuickCam Express
+
+@@ -7856,6 +7871,9 @@ usb:v046DpC52F*
+ usb:v046DpC532*
+ ID_MODEL_FROM_DATABASE=Unifying Receiver
+
++usb:v046DpC534*
++ ID_MODEL_FROM_DATABASE=Unifying Receiver
++
+ usb:v046DpC603*
+ ID_MODEL_FROM_DATABASE=3Dconnexion Spacemouse Plus XT
+
+@@ -8738,6 +8756,9 @@ usb:v0480pA007*
+ usb:v0480pA009*
+ ID_MODEL_FROM_DATABASE=Stor.E Basics
+
++usb:v0480pA00D*
++ ID_MODEL_FROM_DATABASE=STOR.E BASICS 500GB
++
+ usb:v0480pD010*
+ ID_MODEL_FROM_DATABASE=External Disk 3TB
+
+@@ -10943,6 +10964,9 @@ usb:v04A9p3196*
+ usb:v04A9p319A*
+ ID_MODEL_FROM_DATABASE=EOS 7D
+
++usb:v04A9p319B*
++ ID_MODEL_FROM_DATABASE=EOS 50D
++
+ usb:v04A9p31AA*
+ ID_MODEL_FROM_DATABASE=SELPHY CP770
+
+@@ -11219,6 +11243,15 @@ usb:v04A9p3277*
+ usb:v04A9p327D*
+ ID_MODEL_FROM_DATABASE=Powershot ELPH 115 IS / IXUS 132
+
++usb:v04A9p327F*
++ ID_MODEL_FROM_DATABASE=EOS Rebel T5 / EOS 1200D / EOS Kiss X70
++
++usb:v04A9p3284*
++ ID_MODEL_FROM_DATABASE=PowerShot D30
++
++usb:v04A9p3286*
++ ID_MODEL_FROM_DATABASE=PowerShot SX600 HS
++
+ usb:v04A9p3288*
+ ID_MODEL_FROM_DATABASE=Powershot ELPH 135 / IXUS 145
+
+@@ -13040,6 +13073,9 @@ usb:v04D8p0036*
+ usb:v04D8p00E0*
+ ID_MODEL_FROM_DATABASE=PIC32 Starter Board
+
++usb:v04D8p04CD*
++ ID_MODEL_FROM_DATABASE=28Cxxx EEPROM Programmer
++
+ usb:v04D8p0A04*
+ ID_MODEL_FROM_DATABASE=AGP LIN Serial Analyzer
+
+@@ -14093,6 +14129,9 @@ usb:v04E8p5F05*
+ usb:v04E8p6032*
+ ID_MODEL_FROM_DATABASE=G2 Portable hard drive
+
++usb:v04E8p6033*
++ ID_MODEL_FROM_DATABASE=G2 Portable device
++
+ usb:v04E8p6034*
+ ID_MODEL_FROM_DATABASE=G2 Portable hard drive
+
+@@ -14102,6 +14141,9 @@ usb:v04E8p60B3*
+ usb:v04E8p60C4*
+ ID_MODEL_FROM_DATABASE=M2 Portable Hard Drive USB 3.0
+
++usb:v04E8p6124*
++ ID_MODEL_FROM_DATABASE=D3 Station External Hard Drive
++
+ usb:v04E8p61B6*
+ ID_MODEL_FROM_DATABASE=M3 Portable Hard Drive 1TB
+
+@@ -15224,6 +15266,9 @@ usb:v04F9p0223*
+ usb:v04F9p0248*
+ ID_MODEL_FROM_DATABASE=DCP-7055 scanner/printer
+
++usb:v04F9p02B3*
++ ID_MODEL_FROM_DATABASE=MFC J4510DW
++
+ usb:v04F9p1000*
+ ID_MODEL_FROM_DATABASE=Printer
+
+@@ -15546,7 +15591,7 @@ usb:v050Dp0013*
+ ID_MODEL_FROM_DATABASE=F8T013 Bluetooth Adapter
+
+ usb:v050Dp0017*
+- ID_MODEL_FROM_DATABASE=B8T017 Bluetooth+EDR 2.1
++ ID_MODEL_FROM_DATABASE=B8T017 Bluetooth+EDR 2.1 / F4U017 USB 2.0 7-port Hub
+
+ usb:v050Dp003A*
+ ID_MODEL_FROM_DATABASE=Universal Media Reader
+@@ -15683,6 +15728,9 @@ usb:v050Dp1106*
+ usb:v050Dp1109*
+ ID_MODEL_FROM_DATABASE=F9L1109v1 802.11a/b/g/n/ac Wireless Adapter [Realtek RTL8812AU]
+
++usb:v050Dp110A*
++ ID_MODEL_FROM_DATABASE=F9L1101v2 802.11abgn Wireless Adapter [Realtek RTL8192DU]
++
+ usb:v050Dp11F2*
+ ID_MODEL_FROM_DATABASE=ISY Wireless Micro Adapter IWL 2000 [RTL8188CUS]
+
+@@ -15723,7 +15771,7 @@ usb:v050Dp6051*
+ ID_MODEL_FROM_DATABASE=F5D6051 802.11b Wireless Network Adapter [ZyDAS ZD1201]
+
+ usb:v050Dp615A*
+- ID_MODEL_FROM_DATABASE=F7D4101 / F9L1101 802.11abgn Wireless Adapter [Broadcom BCM4323]
++ ID_MODEL_FROM_DATABASE=F7D4101 / F9L1101v1 802.11abgn Wireless Adapter [Broadcom BCM4323]
+
+ usb:v050Dp7050*
+ ID_MODEL_FROM_DATABASE=F5D7050 Wireless G Adapter v1000/v2000 [Intersil ISL3887]
+@@ -16358,6 +16406,9 @@ usb:v0547p2810*
+ usb:v0547p4D90*
+ ID_MODEL_FROM_DATABASE=AmScope MD1900 camera
+
++usb:v0547p7000*
++ ID_MODEL_FROM_DATABASE=PowerSpec MCE460 Front Panel LED Display
++
+ usb:v0547p7777*
+ ID_MODEL_FROM_DATABASE=Bluetooth Device
+
+@@ -21677,6 +21728,9 @@ usb:v05F9p2601*
+ usb:v05F9p2602*
+ ID_MODEL_FROM_DATABASE=Datalogic Magellan 1100i Barcode Scanner
+
++usb:v05F9p4204*
++ ID_MODEL_FROM_DATABASE=Datalogic Gryphon GFS4470 Fixed Scanner
++
+ usb:v05F9p5204*
+ ID_MODEL_FROM_DATABASE=Datalogic Gryphon GFS4170 (config mode)
+
+@@ -23234,6 +23288,9 @@ usb:v068Ep00D3*
+ usb:v068Ep00E2*
+ ID_MODEL_FROM_DATABASE=HFX OEM Joystick
+
++usb:v068Ep00F0*
++ ID_MODEL_FROM_DATABASE=Multi-Function Panel
++
+ usb:v068Ep00F1*
+ ID_MODEL_FROM_DATABASE=Pro Throttle
+
+@@ -25838,6 +25895,9 @@ usb:v0781p74D0*
+ usb:v0781p74D1*
+ ID_MODEL_FROM_DATABASE=Sansa Clip+ (msc)
+
++usb:v0781p74E5*
++ ID_MODEL_FROM_DATABASE=Sansa Clip Zip
++
+ usb:v0781p8181*
+ ID_MODEL_FROM_DATABASE=Pen Flash
+
+@@ -26219,6 +26279,9 @@ usb:v07AAp001A*
+ usb:v07AAp001C*
+ ID_MODEL_FROM_DATABASE=CG-WLUSB2GT 802.11g Wireless Adapter [Intersil ISL3880]
+
++usb:v07AAp0020*
++ ID_MODEL_FROM_DATABASE=CG-WLUSB2GTST 802.11g Wireless Adapter [Intersil ISL3887]
++
+ usb:v07AAp002E*
+ ID_MODEL_FROM_DATABASE=CG-WLUSB2GPX [Ralink RT2571W]
+
+@@ -26939,6 +27002,9 @@ usb:v07CApA827*
+ usb:v07CApA867*
+ ID_MODEL_FROM_DATABASE=AVerTV DVB-T (A867)
+
++usb:v07CApB300*
++ ID_MODEL_FROM_DATABASE=A300 DVB-T TV receiver
++
+ usb:v07CApB800*
+ ID_MODEL_FROM_DATABASE=MR800 FM Radio
+
+@@ -27941,6 +28007,9 @@ usb:v083Ap4507*
+ usb:v083Ap4521*
+ ID_MODEL_FROM_DATABASE=Siemens S30863-S1016-R107-2 802.11g Wireless Adapter [Intersil ISL3887]
+
++usb:v083Ap4531*
++ ID_MODEL_FROM_DATABASE=T-Com Sinus 154 data II [Intersil ISL3887]
++
+ usb:v083Ap5046*
+ ID_MODEL_FROM_DATABASE=SpeedStream 10/100 Ethernet [pegasus]
+
+@@ -30476,6 +30545,9 @@ usb:v0957p0518*
+ usb:v0957p0A07*
+ ID_MODEL_FROM_DATABASE=34411A Multimeter
+
++usb:v0957p1507*
++ ID_MODEL_FROM_DATABASE=33210A Waveform Generator
++
+ usb:v0957p1745*
+ ID_MODEL_FROM_DATABASE=Test and Measurement Device (IVI)
+
+@@ -30876,13 +30948,13 @@ usb:v09D9*
+ ID_VENDOR_FROM_DATABASE=KRF Tech, Ltd
+
+ usb:v09DA*
+- ID_VENDOR_FROM_DATABASE=A4 Tech Co., Ltd
++ ID_VENDOR_FROM_DATABASE=A4Tech Co., Ltd.
+
+ usb:v09DAp0006*
+ ID_MODEL_FROM_DATABASE=Optical Mouse WOP-35 / Trust 450L Optical Mouse
+
+ usb:v09DAp000A*
+- ID_MODEL_FROM_DATABASE=Optical Mouse Opto 510D
++ ID_MODEL_FROM_DATABASE=Optical Mouse Opto 510D / OP-620D
+
+ usb:v09DAp000E*
+ ID_MODEL_FROM_DATABASE=X-F710F Optical Mouse 3xFire Gaming Mouse
+@@ -32174,6 +32246,9 @@ usb:v0AB1*
+ usb:v0AB1p0002*
+ ID_MODEL_FROM_DATABASE=OBID RFID-Reader
+
++usb:v0AB1p0004*
++ ID_MODEL_FROM_DATABASE=OBID classic-pro
++
+ usb:v0ABA*
+ ID_VENDOR_FROM_DATABASE=Ellisys
+
+@@ -32571,7 +32646,7 @@ usb:v0B05p1708*
+ ID_MODEL_FROM_DATABASE=Mass Storage Device
+
+ usb:v0B05p170B*
+- ID_MODEL_FROM_DATABASE=Mass Storage Device
++ ID_MODEL_FROM_DATABASE=Multi card reader
+
+ usb:v0B05p170C*
+ ID_MODEL_FROM_DATABASE=WL-159g 802.11bg
+@@ -32687,6 +32762,9 @@ usb:v0B05p17A1*
+ usb:v0B05p17AB*
+ ID_MODEL_FROM_DATABASE=USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU]
+
++usb:v0B05p17C7*
++ ID_MODEL_FROM_DATABASE=WL-330NUL
++
+ usb:v0B05p17C9*
+ ID_MODEL_FROM_DATABASE=USB-AC53 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526]
+
+@@ -32714,6 +32792,9 @@ usb:v0B05p5410*
+ usb:v0B05p5412*
+ ID_MODEL_FROM_DATABASE=MeMO Pad HD 7 (PTP mode)
+
++usb:v0B05p550F*
++ ID_MODEL_FROM_DATABASE=ASUS fonepad 7
++
+ usb:v0B05p6101*
+ ID_MODEL_FROM_DATABASE=Cable Modem
+
+@@ -32756,6 +32837,9 @@ usb:v0B0Dp0000*
+ usb:v0B0E*
+ ID_VENDOR_FROM_DATABASE=GN Netcom
+
++usb:v0B0Ep034C*
++ ID_MODEL_FROM_DATABASE=Jabra UC Voice 750 MS
++
+ usb:v0B0Ep0420*
+ ID_MODEL_FROM_DATABASE=Jabra SPEAK 510
+
+@@ -49610,6 +49694,12 @@ usb:v2659p1212*
+ usb:v2659p1213*
+ ID_MODEL_FROM_DATABASE=MediaTV Pro III MiniPCIe (US)
+
++usb:v2676*
++ ID_VENDOR_FROM_DATABASE=Basler AG
++
++usb:v2676pBA02*
++ ID_MODEL_FROM_DATABASE=ace
++
+ usb:v2730*
+ ID_VENDOR_FROM_DATABASE=Citizen
+
diff --git a/0499-units-conditionalize-static-device-node-logic-on-CAP.patch b/0499-units-conditionalize-static-device-node-logic-on-CAP.patch
new file mode 100644
index 0000000..6c0589f
--- /dev/null
+++ b/0499-units-conditionalize-static-device-node-logic-on-CAP.patch
@@ -0,0 +1,51 @@
+From 734ab69b24660065d2ca95291b0f38798ccfd9f2 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering
+Date: Fri, 4 Jul 2014 03:07:20 +0200
+Subject: [PATCH] units: conditionalize static device node logic on
+ CAP_SYS_MODULES instead of CAP_MKNOD
+
+npsawn containers generally have CAP_MKNOD, since this is required
+to make PrviateDevices= work. Thus, it's not useful anymore to
+conditionalize the kmod static device node units.
+
+Use CAP_SYS_MODULES instead which is not available for nspawn
+containers. However, the static device node logic is only done for being
+able to autoload modules with it, and if we can't do that there's no
+point in doing it.
+
+(cherry picked from commit e0c74691c41a204eba2fd5f39615049fc9ff1648)
+(cherry picked from commit fce5e80589911d813dd13d1d0d64df96e0ab7939)
+
+Conflicts:
+ units/systemd-tmpfiles-setup-dev.service.in
+---
+ units/kmod-static-nodes.service.in | 2 +-
+ units/systemd-tmpfiles-setup-dev.service.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in
+index 368f980fd1..0934a8751f 100644
+--- a/units/kmod-static-nodes.service.in
++++ b/units/kmod-static-nodes.service.in
+@@ -9,7 +9,7 @@
+ Description=Create list of required static device nodes for the current kernel
+ DefaultDependencies=no
+ Before=sysinit.target systemd-tmpfiles-setup-dev.service
+-ConditionCapability=CAP_MKNOD
++ConditionCapability=CAP_SYS_MODULE
+ ConditionPathExists=/lib/modules/%v/modules.devname
+
+ [Service]
+diff --git a/units/systemd-tmpfiles-setup-dev.service.in b/units/systemd-tmpfiles-setup-dev.service.in
+index 579e7c6a4f..11c5ce24ea 100644
+--- a/units/systemd-tmpfiles-setup-dev.service.in
++++ b/units/systemd-tmpfiles-setup-dev.service.in
+@@ -10,7 +10,7 @@ Description=Create static device nodes in /dev
+ Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8)
+ DefaultDependencies=no
+ Before=sysinit.target local-fs-pre.target systemd-udevd.service
+-ConditionCapability=CAP_MKNOD
++ConditionCapability=CAP_SYS_MODULE
+
+ [Service]
+ Type=oneshot
diff --git a/0500-units-conditionalize-configfs-and-debugfs-with-CAP_S.patch b/0500-units-conditionalize-configfs-and-debugfs-with-CAP_S.patch
new file mode 100644
index 0000000..23eac7a
--- /dev/null
+++ b/0500-units-conditionalize-configfs-and-debugfs-with-CAP_S.patch
@@ -0,0 +1,43 @@
+From c7e3453e029be08ccbea520b3466d2a71149951a Mon Sep 17 00:00:00 2001
+From: Lennart Poettering
+Date: Fri, 4 Jul 2014 03:10:09 +0200
+Subject: [PATCH] units: conditionalize configfs and debugfs with CAP_SYS_RAWIO
+
+We really don't want these in containers as they provide a too lowlevel
+look on the system.
+
+Conditionalize them with CAP_SYS_RAWIO since that's required to access
+/proc/kcore, /dev/kmem and similar, which feel similar in style. Also,
+npsawn containers lack that capability.
+
+(cherry picked from commit fa229d09281d435153b4cfd138a2a62fa66d889b)
+(cherry picked from commit b654a1065f278c93b3891cc5993645026e0d3702)
+---
+ units/sys-kernel-config.mount | 1 +
+ units/sys-kernel-debug.mount | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/units/sys-kernel-config.mount b/units/sys-kernel-config.mount
+index 020101c0d8..21648eff6a 100644
+--- a/units/sys-kernel-config.mount
++++ b/units/sys-kernel-config.mount
+@@ -11,6 +11,7 @@ Documentation=https://www.kernel.org/doc/Documentation/filesystems/configfs/conf
+ Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
+ DefaultDependencies=no
+ ConditionPathExists=/sys/kernel/config
++ConditionCapability=CAP_SYS_RAWIO
+ After=systemd-modules-load.service
+ Before=sysinit.target
+
+diff --git a/units/sys-kernel-debug.mount b/units/sys-kernel-debug.mount
+index 5369728a9f..1e94387bac 100644
+--- a/units/sys-kernel-debug.mount
++++ b/units/sys-kernel-debug.mount
+@@ -11,6 +11,7 @@ Documentation=https://www.kernel.org/doc/Documentation/filesystems/debugfs.txt
+ Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
+ DefaultDependencies=no
+ ConditionPathExists=/sys/kernel/debug
++ConditionCapability=CAP_SYS_RAWIO
+ Before=sysinit.target
+
+ [Mount]
diff --git a/0501-machine-don-t-return-uninitialized-variable.patch b/0501-machine-don-t-return-uninitialized-variable.patch
new file mode 100644
index 0000000..3124070
--- /dev/null
+++ b/0501-machine-don-t-return-uninitialized-variable.patch
@@ -0,0 +1,26 @@
+From d91371b51d7df166d52a3d0ddd0bc93e2ba527ac Mon Sep 17 00:00:00 2001
+From: Tom Gundersen
+Date: Sun, 6 Jul 2014 14:12:28 +0200
+Subject: [PATCH] machine: don't return uninitialized variable
+
+Repotred by Ronny Chevalier
+
+(cherry picked from commit f14aa1f1b2e4e99ee20393871b5f64f1378ed6c3)
+(cherry picked from commit 6e07a1c070376b7c2bcc8d57e8adbc8f6f78e8d5)
+---
+ src/machine/machine.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/machine/machine.c b/src/machine/machine.c
+index 3df9c4508f..56986c8a5d 100644
+--- a/src/machine/machine.c
++++ b/src/machine/machine.c
+@@ -342,7 +342,7 @@ static int machine_stop_scope(Machine *m) {
+ free(m->scope_job);
+ m->scope_job = job;
+
+- return r;
++ return 0;
+ }
+
+ int machine_stop(Machine *m) {
diff --git a/0502-vconsole-setup-run-setfont-before-loadkeys.patch b/0502-vconsole-setup-run-setfont-before-loadkeys.patch
new file mode 100644
index 0000000..4fd88a4
--- /dev/null
+++ b/0502-vconsole-setup-run-setfont-before-loadkeys.patch
@@ -0,0 +1,93 @@
+From baacdfcb2903450fe98842ffea96c0916753bfdb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
+Date: Tue, 1 Jul 2014 22:20:11 -0400
+Subject: [PATCH] vconsole-setup: run setfont before loadkeys
+
+https://bugs.freedesktop.org/show_bug.cgi?id=80685
+(cherry picked from commit abee28c56d523e55751b0c007d0bf812cc285c00)
+(cherry picked from commit 20a575e8935cf5d2d078bbe3acf21fff56f2345c)
+---
+ src/vconsole/vconsole-setup.c | 48 +++++++++++++++++++++----------------------
+ 1 file changed, 23 insertions(+), 25 deletions(-)
+
+diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
+index e0c4050611..25d15afd5c 100644
+--- a/src/vconsole/vconsole-setup.c
++++ b/src/vconsole/vconsole-setup.c
+@@ -238,12 +238,10 @@ static void font_copy_to_all_vcs(int fd) {
+
+ int main(int argc, char **argv) {
+ const char *vc;
+- char *vc_keymap = NULL;
+- char *vc_keymap_toggle = NULL;
+- char *vc_font = NULL;
+- char *vc_font_map = NULL;
+- char *vc_font_unimap = NULL;
+- int fd = -1;
++ _cleanup_free_ char
++ *vc_keymap = NULL, *vc_keymap_toggle = NULL,
++ *vc_font = NULL, *vc_font_map = NULL, *vc_font_unimap = NULL;
++ _cleanup_close_ int fd = -1;
+ bool utf8;
+ pid_t font_pid = 0, keymap_pid = 0;
+ bool font_copy = false;
+@@ -265,12 +263,12 @@ int main(int argc, char **argv) {
+ fd = open_terminal(vc, O_RDWR|O_CLOEXEC);
+ if (fd < 0) {
+ log_error("Failed to open %s: %m", vc);
+- goto finish;
++ return EXIT_FAILURE;
+ }
+
+ if (!is_vconsole(fd)) {
+ log_error("Device %s is not a virtual console.", vc);
+- goto finish;
++ return EXIT_FAILURE;
+ }
+
+ utf8 = is_locale_utf8();
+@@ -305,27 +303,27 @@ int main(int argc, char **argv) {
+ else
+ disable_utf8(fd);
+
+- r = EXIT_FAILURE;
+- if (keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid) >= 0 &&
+- font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0)
+- r = EXIT_SUCCESS;
+-
+-finish:
+- if (keymap_pid > 0)
+- wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid);
++ r = font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid);
++ if (r < 0) {
++ log_error("Failed to start " KBD_LOADKEYS ": %s", strerror(-r));
++ return EXIT_FAILURE;
++ }
+
+- if (font_pid > 0) {
++ if (font_pid > 0)
+ wait_for_terminate_and_warn(KBD_SETFONT, font_pid);
+- if (font_copy)
+- font_copy_to_all_vcs(fd);
++
++ r = keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid);
++ if (r < 0) {
++ log_error("Failed to start " KBD_SETFONT ": %s", strerror(-r));
++ return EXIT_FAILURE;
+ }
+
+- free(vc_keymap);
+- free(vc_font);
+- free(vc_font_map);
+- free(vc_font_unimap);
++ if (keymap_pid > 0)
++ wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid);
+
+- safe_close(fd);
++ /* Only copy the font when we started setfont successfully */
++ if (font_copy && font_pid > 0)
++ font_copy_to_all_vcs(fd);
+
+- return r;
++ return EXIT_SUCCESS;
+ }
diff --git a/0503-vconsole-setup-fix-inverted-error-messages.patch b/0503-vconsole-setup-fix-inverted-error-messages.patch
new file mode 100644
index 0000000..89b95aa
--- /dev/null
+++ b/0503-vconsole-setup-fix-inverted-error-messages.patch
@@ -0,0 +1,36 @@
+From a2bdf1cc143701386a40ca381f8aa54bbf72a0c8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
+Date: Mon, 7 Jul 2014 08:55:30 -0400
+Subject: [PATCH] vconsole-setup: fix inverted error messages
+
+Introduced in abee28c56d.
+
+Pointed-out-by: Werner Fink
+(cherry picked from commit 3dde3f819732aaa66ab8e881305488adaea17641)
+(cherry picked from commit 14c30a407a7599c96af2e9998c3038574005c368)
+---
+ src/vconsole/vconsole-setup.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
+index 25d15afd5c..645b1e6994 100644
+--- a/src/vconsole/vconsole-setup.c
++++ b/src/vconsole/vconsole-setup.c
+@@ -305,7 +305,7 @@ int main(int argc, char **argv) {
+
+ r = font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid);
+ if (r < 0) {
+- log_error("Failed to start " KBD_LOADKEYS ": %s", strerror(-r));
++ log_error("Failed to start " KBD_SETFONT ": %s", strerror(-r));
+ return EXIT_FAILURE;
+ }
+
+@@ -314,7 +314,7 @@ int main(int argc, char **argv) {
+
+ r = keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid);
+ if (r < 0) {
+- log_error("Failed to start " KBD_SETFONT ": %s", strerror(-r));
++ log_error("Failed to start " KBD_LOADKEYS ": %s", strerror(-r));
+ return EXIT_FAILURE;
+ }
+
diff --git a/0504-util-consider-0x7F-a-control-chracter-which-it-is-DE.patch b/0504-util-consider-0x7F-a-control-chracter-which-it-is-DE.patch
new file mode 100644
index 0000000..8bc08fc
--- /dev/null
+++ b/0504-util-consider-0x7F-a-control-chracter-which-it-is-DE.patch
@@ -0,0 +1,54 @@
+From 3fe476cebbefc3094e0483d9f81d1c5928b7da23 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering
+Date: Mon, 7 Jul 2014 11:47:10 +0200
+Subject: [PATCH] util: consider 0x7F a control chracter (which it is: DEL)
+
+Let's better be safe than sorry.
+
+(cherry picked from commit 3a8a916338d8446b938f3cf40f6aae0c611892e3)
+(cherry picked from commit a71b7b7e52f312c7a9fc19154ac0d444e057e1d4)
+---
+ src/shared/util.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/util.c b/src/shared/util.c
+index 6de527ed44..a634b9dc17 100644
+--- a/src/shared/util.c
++++ b/src/shared/util.c
+@@ -1716,8 +1716,9 @@ int read_one_char(FILE *f, char *ret, usec_t t, bool *need_nl) {
+ if (fd_wait_for_event(fileno(f), POLLIN, t) <= 0)
+ return -ETIMEDOUT;
+
++ errno = 0;
+ if (!fgets(line, sizeof(line), f))
+- return -EIO;
++ return errno ? -errno : -EIO;
+
+ truncate_nl(line);
+
+@@ -5344,6 +5345,9 @@ bool string_is_safe(const char *p) {
+ if (*t > 0 && *t < ' ')
+ return false;
+
++ if (*t == 127)
++ return false;
++
+ if (strchr("\\\"\'", *t))
+ return false;
+ }
+@@ -5360,10 +5364,14 @@ bool string_has_cc(const char *p) {
+
+ assert(p);
+
+- for (t = p; *t; t++)
++ for (t = p; *t; t++) {
+ if (*t > 0 && *t < ' ' && *t != '\t')
+ return true;
+
++ if (*t == 127)
++ return true;
++ }
++
+ return false;
+ }
+
diff --git a/0505-service-flush-status-text-and-errno-values-each-time.patch b/0505-service-flush-status-text-and-errno-values-each-time.patch
new file mode 100644
index 0000000..b6364c5
--- /dev/null
+++ b/0505-service-flush-status-text-and-errno-values-each-time.patch
@@ -0,0 +1,28 @@
+From d49a0afefd7b3f0e573513f4449ab700c45f3620 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering
+Date: Mon, 7 Jul 2014 17:33:46 +0200
+Subject: [PATCH] service: flush status text and errno values each time a
+ service is started
+
+We shouldn't show status texts from previous service starts
+
+(cherry picked from commit 8cfdb077b8e3da1c47fc1d735d051f21f33144c1)
+(cherry picked from commit 853896f09d35f8c2db3bf25376d1c3ab240287ed)
+---
+ src/core/service.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/core/service.c b/src/core/service.c
+index 9fd58fab09..c616fbecec 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -2575,6 +2575,9 @@ static int service_start(Unit *u) {
+ s->main_pid_alien = false;
+ s->forbid_restart = false;
+
++ free(s->status_text);
++ s->status_text = NULL;
++
+ service_enter_start_pre(s);
+ return 0;
+ }
diff --git a/0506-accelerometer-Don-t-wait-for-new-data-from-the-senso.patch b/0506-accelerometer-Don-t-wait-for-new-data-from-the-senso.patch
new file mode 100644
index 0000000..016af62
--- /dev/null
+++ b/0506-accelerometer-Don-t-wait-for-new-data-from-the-senso.patch
@@ -0,0 +1,75 @@
+From 3a7dd9f82fb71309bd642db6f17c9e5aebbc844b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera
+Date: Tue, 8 Jul 2014 18:29:06 +0200
+Subject: [PATCH] accelerometer: Don't wait for new data from the sensor
+
+Instead of waiting for new data from the sensor, which might be
+a long time coming, depending on the sensor device, ask the kernel
+for the last state for that particular input device.
+
+(cherry picked from commit a545c6e1aa31b4d7e80c9d3609d9fc4fc9921498)
+(cherry picked from commit e27bfc22bba932950a398b32bf57be6f825438ee)
+---
+ src/udev/accelerometer/accelerometer.c | 33 ++++++---------------------------
+ 1 file changed, 6 insertions(+), 27 deletions(-)
+
+diff --git a/src/udev/accelerometer/accelerometer.c b/src/udev/accelerometer/accelerometer.c
+index 9610d7c2b2..d192e573db 100644
+--- a/src/udev/accelerometer/accelerometer.c
++++ b/src/udev/accelerometer/accelerometer.c
+@@ -179,7 +179,7 @@ get_prev_orientation(struct udev_device *dev)
+ return string_to_orientation(value);
+ }
+
+-#define SET_AXIS(axis, code_) if (ev[i].code == code_) { if (got_##axis == 0) { axis = ev[i].value; got_##axis = true; } }
++#define READ_AXIS(axis, var) { memzero(&abs_info, sizeof(abs_info)); r = ioctl(fd, EVIOCGABS(axis), &abs_info); if (r < 0) return; var = abs_info.value; }
+
+ /* accelerometers */
+ static void test_orientation(struct udev *udev,
+@@ -188,10 +188,9 @@ static void test_orientation(struct udev *udev,
+ {
+ OrientationUp old, new;
+ _cleanup_close_ int fd = -1;
+- struct input_event ev[64];
+- bool got_syn = false;
+- bool got_x = false, got_y = false, got_z = false;
++ struct input_absinfo abs_info;
+ int x = 0, y = 0, z = 0;
++ int r;
+ char text[64];
+
+ old = get_prev_orientation(dev);
+@@ -200,30 +199,10 @@ static void test_orientation(struct udev *udev,
+ if (fd < 0)
+ return;
+
+- while (1) {
+- int i, r;
+-
+- r = read(fd, ev, sizeof(struct input_event) * 64);
+-
+- if (r < (int) sizeof(struct input_event))
+- return;
+-
+- for (i = 0; i < r / (int) sizeof(struct input_event); i++) {
+- if (got_syn) {
+- if (ev[i].type == EV_ABS) {
+- SET_AXIS(x, ABS_X);
+- SET_AXIS(y, ABS_Y);
+- SET_AXIS(z, ABS_Z);
+- }
+- }
+- if (ev[i].type == EV_SYN && ev[i].code == SYN_REPORT)
+- got_syn = true;
+- if (got_x && got_y && got_z)
+- goto read_dev;
+- }
+- }
++ READ_AXIS(ABS_X, x);
++ READ_AXIS(ABS_Y, y);
++ READ_AXIS(ABS_Z, z);
+
+-read_dev:
+ new = orientation_calc(old, x, y, z);
+ snprintf(text, sizeof(text),
+ "ID_INPUT_ACCELEROMETER_ORIENTATION=%s", orientation_to_string(new));
diff --git a/0507-journal-compress-simplify-compress_blob.patch b/0507-journal-compress-simplify-compress_blob.patch
new file mode 100644
index 0000000..1ee9adf
--- /dev/null
+++ b/0507-journal-compress-simplify-compress_blob.patch
@@ -0,0 +1,62 @@
+From b566dc04c910c97bb3d45f9f4b5f81dc65237865 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
+Date: Tue, 24 Jun 2014 21:24:09 -0400
+Subject: [PATCH] journal/compress: simplify compress_blob
+
+(cherry picked from commit 76cc0bf682b944d4cb611f1b37c71fce140f8fe7)
+---
+ src/journal/compress.c | 28 +++++++---------------------
+ 1 file changed, 7 insertions(+), 21 deletions(-)
+
+diff --git a/src/journal/compress.c b/src/journal/compress.c
+index a4427be75a..cafe8f4f54 100644
+--- a/src/journal/compress.c
++++ b/src/journal/compress.c
+@@ -28,9 +28,8 @@
+ #include "compress.h"
+
+ bool compress_blob(const void *src, uint64_t src_size, void *dst, uint64_t *dst_size) {
+- lzma_stream s = LZMA_STREAM_INIT;
+ lzma_ret ret;
+- bool b = false;
++ size_t out_pos = 0;
+
+ assert(src);
+ assert(src_size > 0);
+@@ -40,30 +39,17 @@ bool compress_blob(const void *src, uint64_t src_size, void *dst, uint64_t *dst_
+ /* Returns false if we couldn't compress the data or the
+ * compressed result is longer than the original */
+
+- ret = lzma_easy_encoder(&s, LZMA_PRESET_DEFAULT, LZMA_CHECK_NONE);
++ ret = lzma_easy_buffer_encode(LZMA_PRESET_DEFAULT, LZMA_CHECK_NONE, NULL,
++ src, src_size, dst, &out_pos, *dst_size);
+ if (ret != LZMA_OK)
+ return false;
+
+- s.next_in = src;
+- s.avail_in = src_size;
+- s.next_out = dst;
+- s.avail_out = src_size;
+-
+- /* Does it fit? */
+- if (lzma_code(&s, LZMA_FINISH) != LZMA_STREAM_END)
+- goto fail;
+-
+ /* Is it actually shorter? */
+- if (s.avail_out == 0)
+- goto fail;
+-
+- *dst_size = src_size - s.avail_out;
+- b = true;
+-
+-fail:
+- lzma_end(&s);
++ if (out_pos == *dst_size)
++ return false;
+
+- return b;
++ *dst_size = out_pos;
++ return true;
+ }
+
+ bool uncompress_blob(const void *src, uint64_t src_size,
diff --git a/0508-journal-compress-add-stream-compression-decompressio.patch b/0508-journal-compress-add-stream-compression-decompressio.patch
new file mode 100644
index 0000000..638f07c
--- /dev/null
+++ b/0508-journal-compress-add-stream-compression-decompressio.patch
@@ -0,0 +1,46 @@
+From 63f877db164c15752c40716b47fc2d623cdb851d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
+Date: Tue, 24 Jun 2014 21:24:46 -0400
+Subject: [PATCH] journal/compress: add stream compression/decompression
+ functions
+
+(cherry picked from commit 355b59e252c9910e44a1ad95c045ba8db58a4f6a)
+
+Conflicts:
+ src/journal/test-compress.c
+ src/shared/copy.c
+
+Actually keep only compress_blob changes.
+---
+ src/journal/compress.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/journal/compress.c b/src/journal/compress.c
+index cafe8f4f54..a83dcea3c7 100644
+--- a/src/journal/compress.c
++++ b/src/journal/compress.c
+@@ -24,8 +24,8 @@
+ #include
+ #include
+
+-#include "macro.h"
+ #include "compress.h"
++#include "macro.h"
+
+ bool compress_blob(const void *src, uint64_t src_size, void *dst, uint64_t *dst_size) {
+ lzma_ret ret;
+@@ -40,12 +40,12 @@ bool compress_blob(const void *src, uint64_t src_size, void *dst, uint64_t *dst_
+ * compressed result is longer than the original */
+
+ ret = lzma_easy_buffer_encode(LZMA_PRESET_DEFAULT, LZMA_CHECK_NONE, NULL,
+- src, src_size, dst, &out_pos, *dst_size);
++ src, src_size, dst, &out_pos, src_size);
+ if (ret != LZMA_OK)
+ return false;
+
+ /* Is it actually shorter? */
+- if (out_pos == *dst_size)
++ if (out_pos == src_size)
+ return false;
+
+ *dst_size = out_pos;
diff --git a/0509-journal-compress-improve-xz-compression-performance.patch b/0509-journal-compress-improve-xz-compression-performance.patch
new file mode 100644
index 0000000..f8eff86
--- /dev/null
+++ b/0509-journal-compress-improve-xz-compression-performance.patch
@@ -0,0 +1,69 @@
+From b4f5701719e11b3a0de93ef181a11808158fbcc9 Mon Sep 17 00:00:00 2001
+From: Jon Severinsson
+Date: Tue, 8 Jul 2014 18:29:46 +0200
+Subject: [PATCH] journal/compress: improve xz compression performance
+
+The new lzma2 compression options at the top of compress_blob_xz are
+equivalent to using preset "0", exept for using a 1 MiB dictionary
+(the same as preset "1"). This makes the memory usage at most 7.5 MiB
+in the compressor, and 1 MiB in the decompressor, instead of the
+previous 92 MiB in the compressor and 8 MiB in the decompressor.
+
+According to test-compress-benchmark this commit makes XZ compression
+20 times faster, with no increase in compressed data size.
+Using more realistic test data (an ELF binary rather than repeating
+ASCII letters 'a' through 'z' in order) it only provides a factor 10
+speedup, and at a cost if a 10% increase in compressed data size.
+But that is still a worthwhile trade-off.
+
+According to test-compress-benchmark XZ compression is still 25 times
+slower than LZ4, but the compressed data is one eighth the size.
+Using more realistic test data XZ compression is only 18 times slower
+than LZ4, and the compressed data is only one quarter the size.
+
+$ ./test-compress-benchmark
+XZ: compressed & decompressed 2535300963 bytes in 42.30s (57.15MiB/s), mean compresion 99.95%, skipped 3570 bytes
+LZ4: compressed & decompressed 2535303543 bytes in 1.60s (1510.60MiB/s), mean compresion 99.60%, skipped 990 bytes
+
+(cherry picked from commit 1930eed2a7855d2df06ccf51f9e394428bf547e2)
+
+Conflicts:
+ src/journal/compress.c
+
+(cherry picked from commit 00464ad8a698fe7735737fab57420f8a44013890)
+---
+ src/journal/compress.c | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/journal/compress.c b/src/journal/compress.c
+index a83dcea3c7..77465c767c 100644
+--- a/src/journal/compress.c
++++ b/src/journal/compress.c
+@@ -28,6 +28,13 @@
+ #include "macro.h"
+
+ bool compress_blob(const void *src, uint64_t src_size, void *dst, uint64_t *dst_size) {
++ static const lzma_options_lzma opt = {
++ 1u << 20u, NULL, 0, LZMA_LC_DEFAULT, LZMA_LP_DEFAULT,
++ LZMA_PB_DEFAULT, LZMA_MODE_FAST, 128, LZMA_MF_HC3, 4};
++ static const lzma_filter filters[2] = {
++ {LZMA_FILTER_LZMA2, (lzma_options_lzma*) &opt},
++ {LZMA_VLI_UNKNOWN, NULL}
++ };
+ lzma_ret ret;
+ size_t out_pos = 0;
+
+@@ -39,8 +46,11 @@ bool compress_blob(const void *src, uint64_t src_size, void *dst, uint64_t *dst_
+ /* Returns false if we couldn't compress the data or the
+ * compressed result is longer than the original */
+
+- ret = lzma_easy_buffer_encode(LZMA_PRESET_DEFAULT, LZMA_CHECK_NONE, NULL,
+- src, src_size, dst, &out_pos, src_size);
++ if (src_size < 80)
++ return -ENOBUFS;
++
++ ret = lzma_stream_buffer_encode((lzma_filter*) filters, LZMA_CHECK_NONE, NULL,
++ src, src_size, dst, &out_pos, src_size - 1);
+ if (ret != LZMA_OK)
+ return false;
+
diff --git a/0510-hostnamed-add-a-new-chassis-type-for-watches.patch b/0510-hostnamed-add-a-new-chassis-type-for-watches.patch
new file mode 100644
index 0000000..d211ccf
--- /dev/null
+++ b/0510-hostnamed-add-a-new-chassis-type-for-watches.patch
@@ -0,0 +1,25 @@
+From 5f983db6375877c7dd77521fc65ca6dd4c4261b9 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering
+Date: Wed, 9 Jul 2014 13:20:05 +0200
+Subject: [PATCH] hostnamed: add a new chassis type for watches
+
+(cherry picked from commit c49e59c1831f20fe02276d7bc6ba7d23d24c4ab3)
+(cherry picked from commit 6f977a8c14c4cec72a85f20d0986daa391dd3319)
+---
+ src/hostname/hostnamed.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
+index 0c24b65141..769f25cad0 100644
+--- a/src/hostname/hostnamed.c
++++ b/src/hostname/hostnamed.c
+@@ -155,7 +155,8 @@ static bool valid_chassis(const char *chassis) {
+ "laptop\0"
+ "server\0"
+ "tablet\0"
+- "handset\0",
++ "handset\0"
++ "watch\0",
+ chassis);
+ }
+
diff --git a/0511-hostnamed-update-documentation-with-new-watch-chassi.patch b/0511-hostnamed-update-documentation-with-new-watch-chassi.patch
new file mode 100644
index 0000000..3e63522
--- /dev/null
+++ b/0511-hostnamed-update-documentation-with-new-watch-chassi.patch
@@ -0,0 +1,40 @@
+From 8df8f766e8196a1b921a337ba7e6e3943b3e9bc2 Mon Sep 17 00:00:00 2001
+From: Tomasz Torcz
+Date: Wed, 9 Jul 2014 13:37:50 +0200
+Subject: [PATCH] hostnamed: update documentation with new "watch" chassis type
+
+(cherry picked from commit efab8d0b0ebf6d715949b7af66fecaf5e5e5d77b)
+(cherry picked from commit 710348ce7349b224ba58bae765611455320f68d1)
+---
+ man/hostnamectl.xml | 3 ++-
+ man/machine-info.xml | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
+index a0776f55bc..f3038b3251 100644
+--- a/man/hostnamectl.xml
++++ b/man/hostnamectl.xml
+@@ -236,7 +236,8 @@
+ laptop,
+ server,
+ tablet,
+- handset, as well as
++ handset,
++ watch, as well as
+ the special chassis types
+ vm and
+ container for
+diff --git a/man/machine-info.xml b/man/machine-info.xml
+index 7448e68fd4..244e9b69cf 100644
+--- a/man/machine-info.xml
++++ b/man/machine-info.xml
+@@ -138,7 +138,8 @@
+ laptop,
+ server,
+ tablet,
+- handset, as well as
++ handset,
++ watch, as well as
+ the special chassis types
+ vm and
+ container for
diff --git a/0512-units-make-ExecStopPost-action-part-of-ExecStart.patch b/0512-units-make-ExecStopPost-action-part-of-ExecStart.patch
new file mode 100644
index 0000000..60799f6
--- /dev/null
+++ b/0512-units-make-ExecStopPost-action-part-of-ExecStart.patch
@@ -0,0 +1,52 @@
+From 1db855c61fb9f7d4bb03c9e6f78d36beced6acf3 Mon Sep 17 00:00:00 2001
+From: Michal Sekletar
+Date: Tue, 8 Jul 2014 17:42:23 +0200
+Subject: [PATCH] units: make ExecStopPost action part of ExecStart
+
+Currently after exiting rescue shell we isolate default target. User
+might want to isolate to some other target than default one. However
+issuing systemctl isolate command to desired target would bring system
+to default target as a consequence of running ExecStopPost action.
+
+Having common ancestor for rescue shell and possible followup systemctl
+default command should fix this. If user exits rescue shell we will
+proceed with isolating default target, otherwise, on manual isolate,
+parent shell process is terminated and we don't isolate default target,
+but target chosen by user.
+
+Suggested-by: Michal Schmidt
+(cherry picked from commit d3381512282f2ca1c7669f77fb736a90fdce6982)
+(cherry picked from commit 7a4ab10135c2b8fdeedb53c0585c67a0d6448ce6)
+---
+ units/emergency.service.in | 3 +--
+ units/rescue.service.m4.in | 3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/units/emergency.service.in b/units/emergency.service.in
+index 94c090f654..91fc1bbf51 100644
+--- a/units/emergency.service.in
++++ b/units/emergency.service.in
+@@ -17,8 +17,7 @@ Environment=HOME=/root
+ WorkingDirectory=/root
+ ExecStartPre=-/bin/plymouth quit
+ ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.'
+-ExecStart=-/sbin/sulogin
+-ExecStopPost=@SYSTEMCTL@ --fail --no-block default
++ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
+ Type=idle
+ StandardInput=tty-force
+ StandardOutput=inherit
+diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
+index 552ef8981b..ef5436960f 100644
+--- a/units/rescue.service.m4.in
++++ b/units/rescue.service.m4.in
+@@ -18,8 +18,7 @@ Environment=HOME=/root
+ WorkingDirectory=/root
+ ExecStartPre=-/bin/plymouth quit
+ ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.'
+-ExecStart=-/sbin/sulogin
+-ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
++ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
+ Type=idle
+ StandardInput=tty-force
+ StandardOutput=inherit
diff --git a/0513-shell-completion-man-beef-up-chassis-completions-and.patch b/0513-shell-completion-man-beef-up-chassis-completions-and.patch
new file mode 100644
index 0000000..a9a3a7d
--- /dev/null
+++ b/0513-shell-completion-man-beef-up-chassis-completions-and.patch
@@ -0,0 +1,225 @@
+From 7eb1f731eaf65b28e1bc80d26087bf44bdbe62be Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
+Date: Fri, 11 Jul 2014 08:25:20 -0400
+Subject: [PATCH] shell-completion,man: beef up chassis completions and
+ description
+
+Parameters to hostnamectl command are not optional and should not be marked
+as such in the man page.
+
+(cherry picked from commit 1ed774956406941d4812a3fb4493d2915f130f12)
+(cherry picked from commit ba838f7f9b3de1777f3528c0fe211f9bedbd2a8b)
+---
+ man/hostnamectl.xml | 73 +++++++++++++++++++++------------------
+ shell-completion/bash/hostnamectl | 3 ++
+ shell-completion/zsh/_hostnamectl | 32 +++++++++++++++--
+ shell-completion/zsh/_localectl | 4 +--
+ 4 files changed, 75 insertions(+), 37 deletions(-)
+
+diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
+index f3038b3251..b4aa43d365 100644
+--- a/man/hostnamectl.xml
++++ b/man/hostnamectl.xml
+@@ -172,13 +172,14 @@
+
+
+
+- set-hostname [NAME]
++ set-hostname NAME
+
+ Set the system
+- hostname. By default, this will alter
+- the pretty, the static, and the
+- transient hostname alike; however, if
+- one or more of
++ hostname to
++ NAME. By
++ default, this will alter the pretty,
++ the static, and the transient hostname
++ alike; however, if one or more of
+ ,
+ ,
+ are used,
+@@ -199,55 +200,61 @@
+ the hostname string is not done if
+ only the transient and/or static host
+ names are set, and the pretty host
+- name is left untouched. Pass the empty
+- string as the
+- hostname to reset the selected
+- hostnames to their default (usually
++ name is left untouched.
++
++ Pass the empty string
++ as the hostname to
++ reset the selected hostnames to their
++ default (usually
+ localhost).
+
+
+
+- set-icon-name [NAME]
++ set-icon-name NAME
+
+ Set the system icon
+- name. The icon name is used by some
+- graphical applications to visualize
+- this host. The icon name should follow
+- the NAME. The
++ icon name is used by some graphical
++ applications to visualize this host.
++ The icon name should follow the Icon
+- Naming Specification. Pass an
+- empty string to this operation to
+- reset the icon name to the default
+- value, which is determined from chassis
+- type (see below) and possibly other
++ Naming Specification.
++
++ Pass an empty string to reset
++ the icon name to the default value,
++ which is determined from chassis type
++ (see below) and possibly other
+ parameters.
+
+
+
+- set-chassis [TYPE]
++ set-chassis TYPE
+
+- Set the chassis
+- type. The chassis type is used by some
++ Set the chassis type
++ to TYPE.
++ The chassis type is used by some
+ graphical applications to visualize
+- the host or alter user
+- interaction. Currently, the following
+- chassis types are defined:
++ the host or alter user interaction.
++ Currently, the following chassis types
++ are defined:
+ desktop,
+ laptop,
+ server,
+ tablet,
+- handset,
+- watch, as well as
++ handset,
++ watch, as well as
+ the special chassis types
+ vm and
+ container for
+ virtualized systems that lack an
+- immediate physical chassis. Pass an
+- empty string to this operation to
+- reset the chassis type to the default
+- value which is determined from the
+- firmware and possibly other
+- parameters.
++ immediate physical chassis.
++
++ Pass an empty string to reset
++ the chassis type to the default value
++ which is determined from the firmware
++ and possibly other parameters.
++
+
+
+
+diff --git a/shell-completion/bash/hostnamectl b/shell-completion/bash/hostnamectl
+index 9c75da9e7f..22f8f06b69 100644
+--- a/shell-completion/bash/hostnamectl
++++ b/shell-completion/bash/hostnamectl
+@@ -39,6 +39,7 @@ _hostnamectl() {
+ [STANDALONE]='status'
+ [ICONS]='set-icon-name'
+ [NAME]='set-hostname'
++ [CHASSIS]='set-chassis'
+ )
+
+ for ((i=0; i < COMP_CWORD; i++)); do
+@@ -50,6 +51,8 @@ _hostnamectl() {
+
+ if [[ -z $verb ]]; then
+ comps=${VERBS[*]}
++ elif __contains_word "$verb" ${VERBS[CHASSIS]}; then
++ comps='desktop laptop server tablet handset watch vm container'
+ elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[ICONS]} ${VERBS[NAME]}; then
+ comps=''
+ fi
+diff --git a/shell-completion/zsh/_hostnamectl b/shell-completion/zsh/_hostnamectl
+index 45b9597897..52945d8f2a 100644
+--- a/shell-completion/zsh/_hostnamectl
++++ b/shell-completion/zsh/_hostnamectl
+@@ -1,5 +1,30 @@
+ #compdef hostnamectl
+
++_hostnamectl_set-hostname() {
++ if (( CURRENT <= 3 )); then
++ _message "new hostname"
++ else
++ _message "no more options"
++ fi
++}
++
++_hostnamectl_set-icon-name() {
++ if (( CURRENT <= 3 )); then
++ _message "new icon name"
++ else
++ _message "no more options"
++ fi
++}
++
++_hostnamectl_set-chassis() {
++ if (( CURRENT <= 3 )); then
++ _chassis=( desktop laptop server tablet handset watch vm container )
++ _describe chassis _chassis
++ else
++ _message "no more options"
++ fi
++}
++
+ _hostnamectl_command() {
+ local -a _hostnamectl_cmds
+ _hostnamectl_cmds=(
+@@ -13,8 +38,11 @@ _hostnamectl_command() {
+ local curcontext="$curcontext"
+ cmd="${${_hostnamectl_cmds[(r)$words[1]:*]%%:*}}"
+ if (( $#cmd )); then
+- [[ $cmd == status ]] && msg="no options" || msg="options for $cmd"
+- _message "$msg"
++ if [[ $cmd == status ]]; then
++ _message "no options"
++ else
++ _hostnamectl_$cmd
++ fi
+ else
+ _message "unknown hostnamectl command: $words[1]"
+ fi
+diff --git a/shell-completion/zsh/_localectl b/shell-completion/zsh/_localectl
+index c04f4f3109..7756eb9657 100644
+--- a/shell-completion/zsh/_localectl
++++ b/shell-completion/zsh/_localectl
+@@ -22,8 +22,8 @@ _localectl_set-locale() {
+
+ _localectl_set-keymap() {
+ local -a _keymaps
+- _keymaps=( ${(f)"$(_call_program locales "$service" list-keymaps)"} )
+ if (( CURRENT <= 3 )); then
++ _keymaps=( ${(f)"$(_call_program locales "$service" list-keymaps)"} )
+ _describe keymaps _keymaps
+ else
+ _message "no more options"
+@@ -73,7 +73,7 @@ _localectl_command() {
+ if (( $+functions[_localectl_$cmd] )); then
+ _localectl_$cmd
+ else
+- _message "no more options"
++ _message "unknown localectl command: $words[1]"
+ fi
+ fi
+ }
diff --git a/0514-rules-consistently-use-instead-of.patch b/0514-rules-consistently-use-instead-of.patch
new file mode 100644
index 0000000..b396a33
--- /dev/null
+++ b/0514-rules-consistently-use-instead-of.patch
@@ -0,0 +1,68 @@
+From d6889f067e291cc0c2fb8589cb4afbd27f766b24 Mon Sep 17 00:00:00 2001
+From: Kay Sievers
+Date: Tue, 15 Jul 2014 02:04:47 +0200
+Subject: [PATCH] rules: consistently use "?*" instead of "*?"
+
+(cherry picked from commit 64dfe7b74446bd56e2d0e1588f900372ac13ae42)
+(cherry picked from commit 9221fcfe485a71dd206691f25fc7db3b02076bf3)
+---
+ rules/99-systemd.rules.in | 2 +-
+ src/login/70-uaccess.rules | 12 ++++++------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
+index 713e0528f7..ed0df756f7 100644
+--- a/rules/99-systemd.rules.in
++++ b/rules/99-systemd.rules.in
+@@ -43,7 +43,7 @@ SUBSYSTEM=="net", KERNEL!="lo", TAG+="systemd", ENV{SYSTEMD_ALIAS}+="/sys/subsys
+ SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_ALIAS}+="/sys/subsystem/bluetooth/devices/%k"
+
+ SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_WANTS}+="bluetooth.target"
+-ENV{ID_SMARTCARD_READER}=="*?", TAG+="systemd", ENV{SYSTEMD_WANTS}+="smartcard.target"
++ENV{ID_SMARTCARD_READER}=="?*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="smartcard.target"
+ SUBSYSTEM=="sound", KERNEL=="card*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="sound.target"
+
+ SUBSYSTEM=="printer", TAG+="systemd", ENV{SYSTEMD_WANTS}+="printer.target"
+diff --git a/src/login/70-uaccess.rules b/src/login/70-uaccess.rules
+index 01484c95f1..c4fc956387 100644
+--- a/src/login/70-uaccess.rules
++++ b/src/login/70-uaccess.rules
+@@ -12,7 +12,7 @@ ENV{MAJOR}=="", GOTO="uaccess_end"
+ SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="*:060101:*", TAG+="uaccess"
+
+ # Digicams with proprietary protocol
+-ENV{ID_GPHOTO2}=="*?", TAG+="uaccess"
++ENV{ID_GPHOTO2}=="?*", TAG+="uaccess"
+
+ # SCSI and USB scanners
+ ENV{libsane_matched}=="yes", TAG+="uaccess"
+@@ -49,13 +49,13 @@ SUBSYSTEM=="drm", KERNEL=="card*", TAG+="uaccess"
+ SUBSYSTEM=="misc", KERNEL=="kvm", TAG+="uaccess"
+
+ # smart-card readers
+-ENV{ID_SMARTCARD_READER}=="*?", TAG+="uaccess"
++ENV{ID_SMARTCARD_READER}=="?*", TAG+="uaccess"
+
+ # (USB) authentication devices
+-ENV{ID_SECURITY_TOKEN}=="*?", TAG+="uaccess"
++ENV{ID_SECURITY_TOKEN}=="?*", TAG+="uaccess"
+
+ # PDA devices
+-ENV{ID_PDA}=="*?", TAG+="uaccess"
++ENV{ID_PDA}=="?*", TAG+="uaccess"
+
+ # Programmable remote control
+ ENV{ID_REMOTE_CONTROL}=="1", TAG+="uaccess"
+@@ -64,10 +64,10 @@ ENV{ID_REMOTE_CONTROL}=="1", TAG+="uaccess"
+ SUBSYSTEM=="input", ENV{ID_INPUT_JOYSTICK}=="?*", TAG+="uaccess"
+
+ # color measurement devices
+-ENV{COLOR_MEASUREMENT_DEVICE}=="*?", TAG+="uaccess"
++ENV{COLOR_MEASUREMENT_DEVICE}=="?*", TAG+="uaccess"
+
+ # DDC/CI device, usually high-end monitors such as the DreamColor
+-ENV{DDC_DEVICE}=="*?", TAG+="uaccess"
++ENV{DDC_DEVICE}=="?*", TAG+="uaccess"
+
+ # media player raw devices (for user-mode drivers, Android SDK, etc.)
+ SUBSYSTEM=="usb", ENV{ID_MEDIA_PLAYER}=="?*", TAG+="uaccess"
diff --git a/0515-rules-uaccess-add-ID_SOFTWARE_RADIO.patch b/0515-rules-uaccess-add-ID_SOFTWARE_RADIO.patch
new file mode 100644
index 0000000..e9c1c32
--- /dev/null
+++ b/0515-rules-uaccess-add-ID_SOFTWARE_RADIO.patch
@@ -0,0 +1,45 @@
+From fa6ce82a4c63b7c50e6c461e3c947db61232b7b5 Mon Sep 17 00:00:00 2001
+From: Kay Sievers
+Date: Tue, 15 Jul 2014 17:35:53 +0200
+Subject: [PATCH] rules: uaccess - add ID_SOFTWARE_RADIO
+
+On Tue, Jul 15, 2014 at 1:52 PM, Alick Zhao wrote:
+>>>
+>>> So maybe ID_SOFTWARE_RADIO ?
+>>
+>> Hmm, SDR is more a term for a generic technology than for a device
+>> class. To me it does not really sound like an administrator would know
+>> what this is.
+>>
+>> What exactly is the device or subsystem you want to make accessible to
+>> locally logged-in users only?
+>
+> Initially it is bladeRF, but many more are of interest: USRP, rtl-sdr,
+> HackRF, ... [1]
+>
+> I agree an administrator might not know what SDR is, since it is
+> currently still not widely known, and makes sense only for amateurs
+> and researchers. But as a SDR fan, I see many new SDR peripherals
+> are created recently, and expect to see more. So a generic ID seems
+> reasonable to me.
+>
+> [1] http://en.wikipedia.org/wiki/List_of_software-defined_radios
+
+(cherry picked from commit 30632d97d9d68c8202e562f34afae8f8d6e9c377)
+(cherry picked from commit 4e0d085ff52a7d7858a30c651e37b18f3e92618b)
+---
+ src/login/70-uaccess.rules | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/login/70-uaccess.rules b/src/login/70-uaccess.rules
+index c4fc956387..6bbd182229 100644
+--- a/src/login/70-uaccess.rules
++++ b/src/login/70-uaccess.rules
+@@ -72,4 +72,7 @@ ENV{DDC_DEVICE}=="?*", TAG+="uaccess"
+ # media player raw devices (for user-mode drivers, Android SDK, etc.)
+ SUBSYSTEM=="usb", ENV{ID_MEDIA_PLAYER}=="?*", TAG+="uaccess"
+
++# software-defined radio communication devices
++ENV{ID_SOFTWARE_RADIO}=="?*", TAG+="uaccess"
++
+ LABEL="uaccess_end"
diff --git a/0516-journal-allow-files-with-no-data-whatsoever.patch b/0516-journal-allow-files-with-no-data-whatsoever.patch
new file mode 100644
index 0000000..579318b
--- /dev/null
+++ b/0516-journal-allow-files-with-no-data-whatsoever.patch
@@ -0,0 +1,33 @@
+From 70576d825cd412d9ed40a3dd34bb4999760a1ead Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
+Date: Sun, 30 Mar 2014 14:20:34 -0400
+Subject: [PATCH] journal: allow files with no data whatsoever
+
+If a file was opened for writing, and then closed immediately without
+actually writing any entries, on subsequent opening, it would be
+considered "corrupted". This should be totally fine, and even in
+read mode, an empty file can become non-empty later on.
+
+(cherry picked from commit b3306e9c3c1e036396bc6bf74555eecea3f45ad9)
+(cherry picked from commit ae1d412f96829802688194e6957f75d37da9d7e9)
+---
+ src/journal/journal-file.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
+index 2d2d289260..2d79dcee70 100644
+--- a/src/journal/journal-file.c
++++ b/src/journal/journal-file.c
+@@ -274,12 +274,6 @@ static int journal_file_verify_header(JournalFile *f) {
+ !VALID64(le64toh(f->header->entry_array_offset)))
+ return -ENODATA;
+
+- if (le64toh(f->header->data_hash_table_offset) < le64toh(f->header->header_size) ||
+- le64toh(f->header->field_hash_table_offset) < le64toh(f->header->header_size) ||
+- le64toh(f->header->tail_object_offset) < le64toh(f->header->header_size) ||
+- le64toh(f->header->entry_array_offset) < le64toh(f->header->header_size))
+- return -ENODATA;
+-
+ if (f->writable) {
+ uint8_t state;
+ sd_id128_t machine_id;
diff --git a/0517-units-serial-getty-.service-use-the-default-RestartS.patch b/0517-units-serial-getty-.service-use-the-default-RestartS.patch
new file mode 100644
index 0000000..aa02647
--- /dev/null
+++ b/0517-units-serial-getty-.service-use-the-default-RestartS.patch
@@ -0,0 +1,34 @@
+From 880fa850aef7f5a28834f5c08a28ac4e9d885f8e Mon Sep 17 00:00:00 2001
+From: Michael Olbrich
+Date: Tue, 15 Jul 2014 18:28:10 +0200
+Subject: [PATCH] units/serial-getty@.service: use the default RestartSec
+
+For pluggable ttys such as USB serial devices, the getty is restarted
+and exits in a loop until the remove event reaches systemd. Under
+certain circumstances the restart loop can overload the system in a
+way that prevents the remove event from reaching systemd for a long
+time (e.g. at least several minutes on a small embedded system).
+
+Use the default RestartSec to prevent the restart loop from
+overloading the system. Serial gettys are interactive units, so
+waiting an extra 100ms really doesn't make a difference anyways
+compared to the time it takes the user to log in.
+
+(cherry picked from commit 4bf04322b8b7ecca4f3d65cfc642d0ac16356129)
+(cherry picked from commit 89b958ef6a43400d1f7b25c58b02f4b5c3c59b36)
+---
+ units/serial-getty@.service.m4 | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
+index aea078f48f..1c2a52174b 100644
+--- a/units/serial-getty@.service.m4
++++ b/units/serial-getty@.service.m4
+@@ -25,7 +25,6 @@ IgnoreOnIsolate=yes
+ ExecStart=-/sbin/agetty --keep-baud %I 115200,38400,9600
+ Type=idle
+ Restart=always
+-RestartSec=0
+ UtmpIdentifier=%I
+ TTYPath=/dev/%I
+ TTYReset=yes
diff --git a/0518-build-sys-don-t-move-libgudev-to-lib.patch b/0518-build-sys-don-t-move-libgudev-to-lib.patch
new file mode 100644
index 0000000..290a161
--- /dev/null
+++ b/0518-build-sys-don-t-move-libgudev-to-lib.patch
@@ -0,0 +1,34 @@
+From 78c27a998f1d05c55710d9e00f28916eb263c201 Mon Sep 17 00:00:00 2001
+From: Michael Biebl
+Date: Wed, 16 Jul 2014 12:09:47 +0200
+Subject: [PATCH] build-sys: don't move libgudev to /lib
+
+It depends on libgobject and libgmodule which are installed in /usr/lib.
+
+(cherry picked from commit 5c059d2ead0787a90732d27ed1b485d236abf641)
+(cherry picked from commit c46cee9156e8785fc70e8528d6deb402bef06ca0)
+---
+ Makefile.am | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d57d890185..205ea50e35 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2682,16 +2682,6 @@ typelibs_DATA = \
+
+ CLEANFILES += $(gir_DATA) $(typelibs_DATA)
+ endif # HAVE_INTROSPECTION
+-
+-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+-libgudev-install-hook:
+- libname=libgudev-1.0.so && $(move-to-rootlibdir)
+-
+-libgudev-uninstall-hook:
+- rm -f $(DESTDIR)$(rootlibdir)/libgudev-1.0.so*
+-
+-INSTALL_EXEC_HOOKS += libgudev-install-hook
+-UNINSTALL_EXEC_HOOKS += libgudev-uninstall-hook
+ endif
+
+ EXTRA_DIST += \
diff --git a/0519-core-nicer-message-when-inotify-watches-are-exhauste.patch b/0519-core-nicer-message-when-inotify-watches-are-exhauste.patch
new file mode 100644
index 0000000..1a8c285
--- /dev/null
+++ b/0519-core-nicer-message-when-inotify-watches-are-exhauste.patch
@@ -0,0 +1,29 @@
+From 7f70164f5cce9f63b5fe103c81c47b29a2fd8a99 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
+Date: Wed, 16 Jul 2014 22:52:53 -0400
+Subject: [PATCH] core: nicer message when inotify watches are exhausted
+
+inotify_add_watch returns ENOSPC, which translates to
+"No space left on device", which is misleading.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=73628
+(cherry picked from commit 18abe7bd3e13525b257da69ac49ff7841c289567)
+(cherry picked from commit fe85271fb6090e58b36e182ce3e20a388f0ca006)
+---
+ src/core/path.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/path.c b/src/core/path.c
+index 5e4f6d5b69..538c1eaebd 100644
+--- a/src/core/path.c
++++ b/src/core/path.c
+@@ -95,7 +95,8 @@ int path_spec_watch(PathSpec *s, Unit *u) {
+ break;
+ }
+
+- log_warning("Failed to add watch on %s: %m", s->path);
++ log_warning("Failed to add watch on %s: %s", s->path,
++ errno == ENOSPC ? "too many watches" : strerror(-r));
+ r = -errno;
+ if (cut)
+ *cut = tmp;
diff --git a/0520-journal-reduce-test-journal-send-timeout-from-10s-to.patch b/0520-journal-reduce-test-journal-send-timeout-from-10s-to.patch
new file mode 100644
index 0000000..2dd51e4
--- /dev/null
+++ b/0520-journal-reduce-test-journal-send-timeout-from-10s-to.patch
@@ -0,0 +1,28 @@
+From 6fd930fae5ed070bb7d14bf1066a33cf1bac5344 Mon Sep 17 00:00:00 2001
+From: David Herrmann
+Date: Fri, 18 Jul 2014 12:58:00 +0200
+Subject: [PATCH] journal: reduce test-journal-send timeout from 10s to 1s
+
+The sleep(10) in test-journal-send is quite aggressive. We need it only
+for the journal to get our cgroup information. But even that information
+is not vital to the test, so a sleep(1) should be just fine.
+
+(cherry picked from commit 037ee337f0f64bd35ced765f2e2d97f496d4e7c7)
+(cherry picked from commit 918af53be96fe4284538ebf8eb4fac1aa8839529)
+---
+ src/journal/test-journal-send.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/journal/test-journal-send.c b/src/journal/test-journal-send.c
+index 3e986ed99a..45eb327609 100644
+--- a/src/journal/test-journal-send.c
++++ b/src/journal/test-journal-send.c
+@@ -72,7 +72,7 @@ int main(int argc, char *argv[]) {
+ "N_CPUS=%li", sysconf(_SC_NPROCESSORS_ONLN),
+ NULL);
+
+- sleep(10);
++ sleep(1);
+
+ return 0;
+ }
diff --git a/0521-socket-add-SocketUser-and-SocketGroup-for-chown-ing-.patch b/0521-socket-add-SocketUser-and-SocketGroup-for-chown-ing-.patch
new file mode 100644
index 0000000..0f7b95e
--- /dev/null
+++ b/0521-socket-add-SocketUser-and-SocketGroup-for-chown-ing-.patch
@@ -0,0 +1,584 @@
+From 45d1e4a9908ca1e152fe0b0e8da236d5a6b40b75 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering
+Date: Thu, 5 Jun 2014 09:55:53 +0200
+Subject: [PATCH] socket: add SocketUser= and SocketGroup= for chown()ing
+ sockets in the file system
+
+This is relatively complex, as we cannot invoke NSS from PID 1, and thus
+need to fork a helper process temporarily.
+
+(cherry picked from commit 3900e5fdff688dc3c273f177d9d913b7389d5561)
+
+Conflicts:
+ src/core/dbus-socket.c
+ src/core/socket.c
+ src/shared/exit-status.c
+ src/shared/exit-status.h
+---
+ man/systemd.socket.xml | 38 ++++--
+ src/core/dbus-socket.c | 4 +-
+ src/core/load-fragment-gperf.gperf.m4 | 4 +-
+ src/core/socket.c | 224 +++++++++++++++++++++++++++-------
+ src/core/socket.h | 4 +
+ src/shared/exit-status.c | 3 +
+ src/shared/exit-status.h | 3 +-
+ 7 files changed, 222 insertions(+), 58 deletions(-)
+
+diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
+index 67267b2744..d0c2595022 100644
+--- a/man/systemd.socket.xml
++++ b/man/systemd.socket.xml
+@@ -372,16 +372,21 @@
+
+
+
+- DirectoryMode=
+- If listening on a file
+- system socket or FIFO, the parent
+- directories are automatically created
+- if needed. This option specifies the
+- file system access mode used when
+- creating these directories. Takes an
+- access mode in octal
+- notation. Defaults to
+- 0755.
++ SocketUser=
++ SocketGroup=
++
++ Takes a UNIX
++ user/group name. When specified
++ all AF_UNIX sockets and FIFO nodes in
++ the file system are owned by the
++ specified user and group. If unset
++ (the default), the nodes are owned by
++ the root user/group (if run in system
++ context) or the invoking user/group
++ (if run in user context). If only a
++ user is specified but no group, then
++ the group is derived from the user's
++ default group.
+
+
+
+@@ -396,6 +401,19 @@
+
+
+
++ DirectoryMode=
++ If listening on a file
++ system socket or FIFO, the parent
++ directories are automatically created
++ if needed. This option specifies the
++ file system access mode used when
++ creating these directories. Takes an
++ access mode in octal
++ notation. Defaults to
++ 0755.
++
++
++
+ Accept=
+ Takes a boolean
+ argument. If true, a service instance
+diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c
+index 30c4b6302c..d6743da6a8 100644
+--- a/src/core/dbus-socket.c
++++ b/src/core/dbus-socket.c
+@@ -172,8 +172,10 @@ static const BusProperty bus_socket_properties[] = {
+ BUS_EXEC_COMMAND_PROPERTY("ExecStopPost", offsetof(Socket, exec_command[SOCKET_EXEC_STOP_POST]), true ),
+ { "ControlPID", bus_property_append_pid, "u", offsetof(Socket, control_pid) },
+ { "BindToDevice", bus_property_append_string, "s", offsetof(Socket, bind_to_device), true },
+- { "DirectoryMode", bus_property_append_mode, "u", offsetof(Socket, directory_mode) },
++ { "SocketUser", bus_property_append_string, "s", offsetof(Socket, user), true },
++ { "SocketGroup", bus_property_append_string, "s", offsetof(Socket, group), true },
+ { "SocketMode", bus_property_append_mode, "u", offsetof(Socket, socket_mode) },
++ { "DirectoryMode", bus_property_append_mode, "u", offsetof(Socket, directory_mode) },
+ { "Accept", bus_property_append_bool, "b", offsetof(Socket, accept) },
+ { "KeepAlive", bus_property_append_bool, "b", offsetof(Socket, keep_alive) },
+ { "Priority", bus_property_append_int, "i", offsetof(Socket, priority) },
+diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
+index d65bcc1a77..0991cb953e 100644
+--- a/src/core/load-fragment-gperf.gperf.m4
++++ b/src/core/load-fragment-gperf.gperf.m4
+@@ -193,8 +193,10 @@ Socket.ExecStartPost, config_parse_exec, SOCKET_EXEC
+ Socket.ExecStopPre, config_parse_exec, SOCKET_EXEC_STOP_PRE, offsetof(Socket, exec_command)
+ Socket.ExecStopPost, config_parse_exec, SOCKET_EXEC_STOP_POST, offsetof(Socket, exec_command)
+ Socket.TimeoutSec, config_parse_sec, 0, offsetof(Socket, timeout_usec)
+-Socket.DirectoryMode, config_parse_mode, 0, offsetof(Socket, directory_mode)
++Socket.SocketUser, config_parse_unit_string_printf, 0, offsetof(Socket, user)
++Socket.SocketGroup, config_parse_unit_string_printf, 0, offsetof(Socket, group)
+ Socket.SocketMode, config_parse_mode, 0, offsetof(Socket, socket_mode)
++Socket.DirectoryMode, config_parse_mode, 0, offsetof(Socket, directory_mode)
+ Socket.Accept, config_parse_bool, 0, offsetof(Socket, accept)
+ Socket.MaxConnections, config_parse_unsigned, 0, offsetof(Socket, max_connections)
+ Socket.KeepAlive, config_parse_bool, 0, offsetof(Socket, keep_alive)
+diff --git a/src/core/socket.c b/src/core/socket.c
+index 8e02c036b3..1bf1f0574e 100644
+--- a/src/core/socket.c
++++ b/src/core/socket.c
+@@ -54,6 +54,7 @@
+ static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = {
+ [SOCKET_DEAD] = UNIT_INACTIVE,
+ [SOCKET_START_PRE] = UNIT_ACTIVATING,
++ [SOCKET_START_CHOWN] = UNIT_ACTIVATING,
+ [SOCKET_START_POST] = UNIT_ACTIVATING,
+ [SOCKET_LISTENING] = UNIT_ACTIVE,
+ [SOCKET_RUNNING] = UNIT_ACTIVE,
+@@ -149,6 +150,9 @@ static void socket_done(Unit *u) {
+ free(s->smack_ip_out);
+
+ unit_unwatch_timer(u, &s->timer_watch);
++
++ free(s->user);
++ free(s->group);
+ }
+
+ static int socket_instantiate_service(Socket *s) {
+@@ -527,6 +531,13 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
+ "%sSmackLabelIPOut: %s\n",
+ prefix, s->smack_ip_out);
+
++ if (!isempty(s->user) || !isempty(s->group))
++ fprintf(f,
++ "%sOwnerUser: %s\n"
++ "%sOwnerGroup: %s\n",
++ prefix, strna(s->user),
++ prefix, strna(s->group));
++
+ LIST_FOREACH(port, p, s->ports) {
+
+ if (p->type == SOCKET_SOCKET) {
+@@ -1093,6 +1104,7 @@ static void socket_set_state(Socket *s, SocketState state) {
+ s->state = state;
+
+ if (state != SOCKET_START_PRE &&
++ state != SOCKET_START_CHOWN &&
+ state != SOCKET_START_POST &&
+ state != SOCKET_STOP_PRE &&
+ state != SOCKET_STOP_PRE_SIGTERM &&
+@@ -1109,7 +1121,8 @@ static void socket_set_state(Socket *s, SocketState state) {
+ if (state != SOCKET_LISTENING)
+ socket_unwatch_fds(s);
+
+- if (state != SOCKET_START_POST &&
++ if (state != SOCKET_START_CHOWN &&
++ state != SOCKET_START_POST &&
+ state != SOCKET_LISTENING &&
+ state != SOCKET_RUNNING &&
+ state != SOCKET_STOP_PRE &&
+@@ -1136,6 +1149,7 @@ static int socket_coldplug(Unit *u) {
+ if (s->deserialized_state != s->state) {
+
+ if (s->deserialized_state == SOCKET_START_PRE ||
++ s->deserialized_state == SOCKET_START_CHOWN ||
+ s->deserialized_state == SOCKET_START_POST ||
+ s->deserialized_state == SOCKET_STOP_PRE ||
+ s->deserialized_state == SOCKET_STOP_PRE_SIGTERM ||
+@@ -1156,7 +1170,8 @@ static int socket_coldplug(Unit *u) {
+ return r;
+ }
+
+- if (s->deserialized_state == SOCKET_START_POST ||
++ if (s->deserialized_state == SOCKET_START_CHOWN ||
++ s->deserialized_state == SOCKET_START_POST ||
+ s->deserialized_state == SOCKET_LISTENING ||
+ s->deserialized_state == SOCKET_RUNNING ||
+ s->deserialized_state == SOCKET_STOP_PRE ||
+@@ -1176,9 +1191,9 @@ static int socket_coldplug(Unit *u) {
+ }
+
+ static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) {
++ _cleanup_free_ char **argv = NULL;
+ pid_t pid;
+ int r;
+- char **argv;
+
+ assert(s);
+ assert(c);
+@@ -1211,21 +1226,95 @@ static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) {
+ if (r < 0)
+ goto fail;
+
+- strv_free(argv);
++ r = unit_watch_pid(UNIT(s), pid);
+ if (r < 0)
+- goto fail;
+-
+- if ((r = unit_watch_pid(UNIT(s), pid)) < 0)
+ /* FIXME: we need to do something here */
+ goto fail;
+
+ *_pid = pid;
+-
+ return 0;
+
+ fail:
+ unit_unwatch_timer(UNIT(s), &s->timer_watch);
++ return r;
++}
++
++static int socket_chown(Socket *s, pid_t *_pid) {
++ pid_t pid;
++ int r;
++
++ /* We have to resolve the user names out-of-process, hence
++ * let's fork here. It's messy, but well, what can we do? */
++
++ pid = fork();
++ if (pid < 0)
++ return -errno;
++
++ if (pid == 0) {
++ SocketPort *p;
++ uid_t uid = (uid_t) -1;
++ gid_t gid = (gid_t) -1;
++ int ret;
++
++ default_signals(SIGNALS_CRASH_HANDLER, SIGNALS_IGNORE, -1);
++ ignore_signals(SIGPIPE, -1);
++ log_forget_fds();
++
++ if (!isempty(s->user)) {
++ const char *user = s->user;
++
++ r = get_user_creds(&user, &uid, &gid, NULL, NULL);
++ if (r < 0) {
++ ret = EXIT_USER;
++ goto fail_child;
++ }
++ }
++
++ if (!isempty(s->group)) {
++ const char *group = s->group;
+
++ r = get_group_creds(&group, &gid);
++ if (r < 0) {
++ ret = EXIT_GROUP;
++ goto fail_child;
++ }
++ }
++
++ LIST_FOREACH(port, p, s->ports) {
++ const char *path;
++
++ if (p->type == SOCKET_SOCKET)
++ path = socket_address_get_path(&p->address);
++ else if (p->type == SOCKET_FIFO)
++ path = p->path;
++
++ if (!path)
++ continue;
++
++ if (chown(path, uid, gid) < 0) {
++ r = -errno;
++ ret = EXIT_CHOWN;
++ goto fail_child;
++ }
++ }
++
++ _exit(0);
++
++ fail_child:
++ log_open();
++ log_error("Failed to chown socket at step %s: %s", exit_status_to_string(ret, EXIT_STATUS_SYSTEMD), strerror(-r));
++
++ _exit(ret);
++ }
++
++ r = unit_watch_pid(UNIT(s), pid);
++ if (r < 0)
++ goto fail;
++
++ *_pid = pid;
++ return 0;
++
++fail:
+ return r;
+ }
+
+@@ -1249,11 +1338,12 @@ static void socket_enter_stop_post(Socket *s, SocketResult f) {
+ s->result = f;
+
+ socket_unwatch_control_pid(s);
+-
+ s->control_command_id = SOCKET_EXEC_STOP_POST;
++ s->control_command = s->exec_command[SOCKET_EXEC_STOP_POST];
+
+- if ((s->control_command = s->exec_command[SOCKET_EXEC_STOP_POST])) {
+- if ((r = socket_spawn(s, s->control_command, &s->control_pid)) < 0)
++ if (s->control_command) {
++ r = socket_spawn(s, s->control_command, &s->control_pid);
++ if (r < 0)
+ goto fail;
+
+ socket_set_state(s, SOCKET_STOP_POST);
+@@ -1319,11 +1409,12 @@ static void socket_enter_stop_pre(Socket *s, SocketResult f) {
+ s->result = f;
+
+ socket_unwatch_control_pid(s);
+-
+ s->control_command_id = SOCKET_EXEC_STOP_PRE;
++ s->control_command = s->exec_command[SOCKET_EXEC_STOP_PRE];
+
+- if ((s->control_command = s->exec_command[SOCKET_EXEC_STOP_PRE])) {
+- if ((r = socket_spawn(s, s->control_command, &s->control_pid)) < 0)
++ if (s->control_command) {
++ r = socket_spawn(s, s->control_command, &s->control_pid);
++ if (r < 0)
+ goto fail;
+
+ socket_set_state(s, SOCKET_STOP_PRE);
+@@ -1362,6 +1453,32 @@ static void socket_enter_start_post(Socket *s) {
+ int r;
+ assert(s);
+
++ socket_unwatch_control_pid(s);
++ s->control_command_id = SOCKET_EXEC_START_POST;
++ s->control_command = s->exec_command[SOCKET_EXEC_START_POST];
++
++ if (s->control_command) {
++ r = socket_spawn(s, s->control_command, &s->control_pid);
++ if (r < 0) {
++ log_warning_unit(UNIT(s)->id, "%s failed to run 'start-post' task: %s", UNIT(s)->id, strerror(-r));
++ goto fail;
++ }
++
++ socket_set_state(s, SOCKET_START_POST);
++ } else
++ socket_enter_listening(s);
++
++ return;
++
++fail:
++ socket_enter_stop_pre(s, SOCKET_FAILURE_RESOURCES);
++}
++
++static void socket_enter_start_chown(Socket *s) {
++ int r;
++
++ assert(s);
++
+ r = socket_open_fds(s);
+ if (r < 0) {
+ log_warning_unit(UNIT(s)->id,
+@@ -1370,22 +1487,23 @@ static void socket_enter_start_post(Socket *s) {
+ goto fail;
+ }
+
+- socket_unwatch_control_pid(s);
++ if (!isempty(s->user) || !isempty(s->group)) {
+
+- s->control_command_id = SOCKET_EXEC_START_POST;
++ socket_unwatch_control_pid(s);
++ s->control_command_id = SOCKET_EXEC_START_CHOWN;
++ s->control_command = NULL;
+
+- if ((s->control_command = s->exec_command[SOCKET_EXEC_START_POST])) {
+- r = socket_spawn(s, s->control_command, &s->control_pid);
++ r = socket_chown(s, &s->control_pid);
+ if (r < 0) {
+ log_warning_unit(UNIT(s)->id,
+- "%s failed to run 'start-post' task: %s",
++ "%s failed to fork 'start-chown' task: %s",
+ UNIT(s)->id, strerror(-r));
+ goto fail;
+ }
+
+- socket_set_state(s, SOCKET_START_POST);
++ socket_set_state(s, SOCKET_START_CHOWN);
+ } else
+- socket_enter_listening(s);
++ socket_enter_start_post(s);
+
+ return;
+
+@@ -1398,23 +1516,23 @@ static void socket_enter_start_pre(Socket *s) {
+ assert(s);
+
+ socket_unwatch_control_pid(s);
+-
+ s->control_command_id = SOCKET_EXEC_START_PRE;
++ s->control_command = s->exec_command[SOCKET_EXEC_START_PRE];
+
+- if ((s->control_command = s->exec_command[SOCKET_EXEC_START_PRE])) {
+- if ((r = socket_spawn(s, s->control_command, &s->control_pid)) < 0)
++ if (s->control_command) {
++ r = socket_spawn(s, s->control_command, &s->control_pid);
++ if (r < 0) {
++ log_warning_unit(UNIT(s)->id, "%s failed to run 'start-pre' task: %s", UNIT(s)->id, strerror(-r));
+ goto fail;
++ }
+
+ socket_set_state(s, SOCKET_START_PRE);
+ } else
+- socket_enter_start_post(s);
++ socket_enter_start_chown(s);
+
+ return;
+
+ fail:
+- log_warning_unit(UNIT(s)->id,
+- "%s failed to run 'start-pre' task: %s",
+- UNIT(s)->id, strerror(-r));
+ socket_enter_dead(s, SOCKET_FAILURE_RESOURCES);
+ }
+
+@@ -1600,16 +1718,19 @@ static int socket_start(Unit *u) {
+
+ /* We cannot fulfill this request right now, try again later
+ * please! */
+- if (s->state == SOCKET_STOP_PRE ||
+- s->state == SOCKET_STOP_PRE_SIGKILL ||
+- s->state == SOCKET_STOP_PRE_SIGTERM ||
+- s->state == SOCKET_STOP_POST ||
+- s->state == SOCKET_FINAL_SIGTERM ||
+- s->state == SOCKET_FINAL_SIGKILL)
++ if (IN_SET(s->state,
++ SOCKET_STOP_PRE,
++ SOCKET_STOP_PRE_SIGKILL,
++ SOCKET_STOP_PRE_SIGTERM,
++ SOCKET_STOP_POST,
++ SOCKET_FINAL_SIGTERM,
++ SOCKET_FINAL_SIGKILL))
+ return -EAGAIN;
+
+- if (s->state == SOCKET_START_PRE ||
+- s->state == SOCKET_START_POST)
++ if (IN_SET(s->state,
++ SOCKET_START_PRE,
++ SOCKET_START_CHOWN,
++ SOCKET_START_POST))
+ return 0;
+
+ /* Cannot run this without the service being around */
+@@ -1658,18 +1779,21 @@ static int socket_stop(Unit *u) {
+ assert(s);
+
+ /* Already on it */
+- if (s->state == SOCKET_STOP_PRE ||
+- s->state == SOCKET_STOP_PRE_SIGTERM ||
+- s->state == SOCKET_STOP_PRE_SIGKILL ||
+- s->state == SOCKET_STOP_POST ||
+- s->state == SOCKET_FINAL_SIGTERM ||
+- s->state == SOCKET_FINAL_SIGKILL)
++ if (IN_SET(s->state,
++ SOCKET_STOP_PRE,
++ SOCKET_STOP_PRE_SIGTERM,
++ SOCKET_STOP_PRE_SIGKILL,
++ SOCKET_STOP_POST,
++ SOCKET_FINAL_SIGTERM,
++ SOCKET_FINAL_SIGKILL))
+ return 0;
+
+ /* If there's already something running we go directly into
+ * kill mode. */
+- if (s->state == SOCKET_START_PRE ||
+- s->state == SOCKET_START_POST) {
++ if (IN_SET(s->state,
++ SOCKET_START_PRE,
++ SOCKET_START_CHOWN,
++ SOCKET_START_POST)) {
+ socket_enter_signal(s, SOCKET_STOP_PRE_SIGTERM, SOCKET_SUCCESS);
+ return -EAGAIN;
+ }
+@@ -2093,11 +2217,18 @@ static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) {
+
+ case SOCKET_START_PRE:
+ if (f == SOCKET_SUCCESS)
+- socket_enter_start_post(s);
++ socket_enter_start_chown(s);
+ else
+ socket_enter_signal(s, SOCKET_FINAL_SIGTERM, f);
+ break;
+
++ case SOCKET_START_CHOWN:
++ if (f == SOCKET_SUCCESS)
++ socket_enter_start_post(s);
++ else
++ socket_enter_stop_pre(s, f);
++ break;
++
+ case SOCKET_START_POST:
+ if (f == SOCKET_SUCCESS)
+ socket_enter_listening(s);
+@@ -2141,6 +2272,7 @@ static void socket_timer_event(Unit *u, uint64_t elapsed, Watch *w) {
+ socket_enter_signal(s, SOCKET_FINAL_SIGTERM, SOCKET_FAILURE_TIMEOUT);
+ break;
+
++ case SOCKET_START_CHOWN:
+ case SOCKET_START_POST:
+ log_warning_unit(u->id,
+ "%s starting timed out. Stopping.", u->id);
+@@ -2328,6 +2460,7 @@ static int socket_kill(Unit *u, KillWho who, int signo, DBusError *error) {
+ static const char* const socket_state_table[_SOCKET_STATE_MAX] = {
+ [SOCKET_DEAD] = "dead",
+ [SOCKET_START_PRE] = "start-pre",
++ [SOCKET_START_CHOWN] = "start-chown",
+ [SOCKET_START_POST] = "start-post",
+ [SOCKET_LISTENING] = "listening",
+ [SOCKET_RUNNING] = "running",
+@@ -2344,6 +2477,7 @@ DEFINE_STRING_TABLE_LOOKUP(socket_state, SocketState);
+
+ static const char* const socket_exec_command_table[_SOCKET_EXEC_COMMAND_MAX] = {
+ [SOCKET_EXEC_START_PRE] = "StartPre",
++ [SOCKET_EXEC_START_CHOWN] = "StartChown",
+ [SOCKET_EXEC_START_POST] = "StartPost",
+ [SOCKET_EXEC_STOP_PRE] = "StopPre",
+ [SOCKET_EXEC_STOP_POST] = "StopPost"
+diff --git a/src/core/socket.h b/src/core/socket.h
+index 3d7eadc9fe..d87b483a15 100644
+--- a/src/core/socket.h
++++ b/src/core/socket.h
+@@ -32,6 +32,7 @@ typedef struct Socket Socket;
+ typedef enum SocketState {
+ SOCKET_DEAD,
+ SOCKET_START_PRE,
++ SOCKET_START_CHOWN,
+ SOCKET_START_POST,
+ SOCKET_LISTENING,
+ SOCKET_RUNNING,
+@@ -48,6 +49,7 @@ typedef enum SocketState {
+
+ typedef enum SocketExecCommand {
+ SOCKET_EXEC_START_PRE,
++ SOCKET_EXEC_START_CHOWN,
+ SOCKET_EXEC_START_POST,
+ SOCKET_EXEC_STOP_PRE,
+ SOCKET_EXEC_STOP_POST,
+@@ -151,6 +153,8 @@ struct Socket {
+ char *smack;
+ char *smack_ip_in;
+ char *smack_ip_out;
++
++ char *user, *group;
+ };
+
+ /* Called from the service code when collecting fds */
+diff --git a/src/shared/exit-status.c b/src/shared/exit-status.c
+index 45131f2b2a..92ac520cce 100644
+--- a/src/shared/exit-status.c
++++ b/src/shared/exit-status.c
+@@ -130,6 +130,9 @@ const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) {
+
+ case EXIT_SECCOMP:
+ return "SECCOMP";
++
++ case EXIT_CHOWN:
++ return "CHOWN";
+ }
+ }
+
+diff --git a/src/shared/exit-status.h b/src/shared/exit-status.h
+index 1f035a3007..babef31879 100644
+--- a/src/shared/exit-status.h
++++ b/src/shared/exit-status.h
+@@ -67,7 +67,8 @@ typedef enum ExitStatus {
+ EXIT_NETWORK,
+ EXIT_NAMESPACE,
+ EXIT_NO_NEW_PRIVILEGES,
+- EXIT_SECCOMP
++ EXIT_SECCOMP,
++ EXIT_CHOWN,
+ } ExitStatus;
+
+ typedef enum ExitStatusLevel {
diff --git a/systemd.spec b/systemd.spec
index 60b5841..b0a7707 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -16,7 +16,7 @@
Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 208
-Release: 19%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release: 20%{?gitcommit:.git%{gitcommit}}%{?dist}
# For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+
Summary: A System and Service Manager
@@ -518,6 +518,48 @@ Patch476: 0476-shared-fix-search_and_fopen-with-alternate-roots.patch
Patch477: 0477-Reset-signal-mask-on-re-exec-to-init.patch
Patch478: 0478-core-clean-up-signal-reset-logic-when-reexec.patch
Patch479: 0479-util-treat-fuse.sshfs-as-a-network-filesystem.patch
+Patch480: 0480-units-systemd-sysctl.service.in-run-after-load-modul.patch
+Patch481: 0481-man-document-statically-loading-modules-for-sysctl-s.patch
+Patch482: 0482-man-also-describe-an-udev-rule-for-bridge-sysctl.patch
+Patch483: 0483-util-do-not-strip-dev-prefix-twice.patch
+Patch484: 0484-core-transaction-avoid-misleading-error-message-when.patch
+Patch485: 0485-core-snapshot-log-info-when-snapshots-are-created-an.patch
+Patch486: 0486-vconsole-also-copy-character-maps-not-just-fonts-fro.patch
+Patch487: 0487-core-You-can-not-put-the-cached-result-of-use_smack-.patch
+Patch488: 0488-cryptsetup-don-t-add-unit-dependency-on-dev-null-dev.patch
+Patch489: 0489-man-fix-path-in-crypttab-5.patch
+Patch490: 0490-core-transaction-fix-cycle-break-attempts-outside-tr.patch
+Patch491: 0491-journald-make-MaxFileSec-really-default-to-1month.patch
+Patch492: 0492-rules-don-t-enable-usb-pm-for-Avocent-devices.patch
+Patch493: 0493-units-remove-RefuseManualStart-from-units-which-are-.patch
+Patch494: 0494-units-skip-mounting-tmp-if-it-is-a-symlink.patch
+Patch495: 0495-man-sd_journal_next-fix-argument-in-example.patch
+Patch496: 0496-man-sd_journal_get_data-fix-variable-naming-in-examp.patch
+Patch497: 0497-hwdb-Update-database-of-Bluetooth-company-identifier.patch
+Patch498: 0498-hwdb-update.patch
+Patch499: 0499-units-conditionalize-static-device-node-logic-on-CAP.patch
+Patch500: 0500-units-conditionalize-configfs-and-debugfs-with-CAP_S.patch
+Patch501: 0501-machine-don-t-return-uninitialized-variable.patch
+Patch502: 0502-vconsole-setup-run-setfont-before-loadkeys.patch
+Patch503: 0503-vconsole-setup-fix-inverted-error-messages.patch
+Patch504: 0504-util-consider-0x7F-a-control-chracter-which-it-is-DE.patch
+Patch505: 0505-service-flush-status-text-and-errno-values-each-time.patch
+Patch506: 0506-accelerometer-Don-t-wait-for-new-data-from-the-senso.patch
+Patch507: 0507-journal-compress-simplify-compress_blob.patch
+Patch508: 0508-journal-compress-add-stream-compression-decompressio.patch
+Patch509: 0509-journal-compress-improve-xz-compression-performance.patch
+Patch510: 0510-hostnamed-add-a-new-chassis-type-for-watches.patch
+Patch511: 0511-hostnamed-update-documentation-with-new-watch-chassi.patch
+Patch512: 0512-units-make-ExecStopPost-action-part-of-ExecStart.patch
+Patch513: 0513-shell-completion-man-beef-up-chassis-completions-and.patch
+Patch514: 0514-rules-consistently-use-instead-of.patch
+Patch515: 0515-rules-uaccess-add-ID_SOFTWARE_RADIO.patch
+Patch516: 0516-journal-allow-files-with-no-data-whatsoever.patch
+Patch517: 0517-units-serial-getty-.service-use-the-default-RestartS.patch
+Patch518: 0518-build-sys-don-t-move-libgudev-to-lib.patch
+Patch519: 0519-core-nicer-message-when-inotify-watches-are-exhauste.patch
+Patch520: 0520-journal-reduce-test-journal-send-timeout-from-10s-to.patch
+Patch521: 0521-socket-add-SocketUser-and-SocketGroup-for-chown-ing-.patch
# kernel-install patch for grubby, drop if grubby is obsolete
@@ -1166,6 +1208,18 @@ getent passwd systemd-journal-gateway >/dev/null 2>&1 || useradd -r -l -u 191 -g
%{_datadir}/systemd/gatewayd
%changelog
+* Sat Jul 19 2014 Zbigniew Jędrzejewski-Szmek - 208-20
+- Make it easier to apply sysctl settings delaying
+ systemd-sysctl.service after modules have been loaded
+- Terminal font loading fixes
+- Man page updates (#1022977)
+- Hardware database update
+- Journal XZ compression settings updated for speed
+- Add "watch" as new chassis type
+- Add udev tag "ID_SOFTWARE_RADIO" to allow access for users
+- SocketUser and SocketGroup settings backported from v214 (#1119282)
+- Other small tweaks (#996133)
+
* Fri Jun 20 2014 Zbigniew Jędrzejewski-Szmek - 208-19
- Fix patch
- Some more --root support and other assorted fixes