diff --git a/SOURCES/0001-kernel-install-add-fedora-specific-callouts-to-new-k.patch b/SOURCES/0001-kernel-install-add-fedora-specific-callouts-to-new-k.patch
index b8ca9b2..c3b9c3a 100644
--- a/SOURCES/0001-kernel-install-add-fedora-specific-callouts-to-new-k.patch
+++ b/SOURCES/0001-kernel-install-add-fedora-specific-callouts-to-new-k.patch
@@ -12,7 +12,7 @@ Subject: [PATCH] kernel-install: add fedora specific callouts to
diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install
old mode 100644
new mode 100755
-index 3ae1d77e3..f1c74de27
+index 3ae1d77e33..f1c74de27e
--- a/src/kernel-install/kernel-install
+++ b/src/kernel-install/kernel-install
@@ -71,6 +71,42 @@ fi
diff --git a/SOURCES/0002-Revert-fsck-re-enable-fsck-l.patch b/SOURCES/0002-Revert-fsck-re-enable-fsck-l.patch
index 8adaa52..f61c9b1 100644
--- a/SOURCES/0002-Revert-fsck-re-enable-fsck-l.patch
+++ b/SOURCES/0002-Revert-fsck-re-enable-fsck-l.patch
@@ -15,7 +15,7 @@ Conflicts:
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/README b/README
-index c72209262..5f5783a68 100644
+index c72209262e..5f5783a684 100644
--- a/README
+++ b/README
@@ -135,7 +135,8 @@ REQUIREMENTS:
@@ -29,7 +29,7 @@ index c72209262..5f5783a68 100644
dracut (optional)
PolicyKit (optional)
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
-index 78ceeb6fa..d8976809d 100644
+index 78ceeb6fab..d8976809d1 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -323,11 +323,16 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0003-sysctl-bring-back-etc-sysctl.conf.patch b/SOURCES/0003-sysctl-bring-back-etc-sysctl.conf.patch
index b1ba2d4..e528319 100644
--- a/SOURCES/0003-sysctl-bring-back-etc-sysctl.conf.patch
+++ b/SOURCES/0003-sysctl-bring-back-etc-sysctl.conf.patch
@@ -9,7 +9,7 @@ Read /etc/sysctl.conf as the last file, overwriting everything.
1 file changed, 4 insertions(+)
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index 275a5b74a..d007c932c 100644
+index 275a5b74ae..d007c932c6 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -320,6 +320,10 @@ int main(int argc, char *argv[]) {
diff --git a/SOURCES/0004-remove-user-.service.patch b/SOURCES/0004-remove-user-.service.patch
index 0ea024f..5c38570 100644
--- a/SOURCES/0004-remove-user-.service.patch
+++ b/SOURCES/0004-remove-user-.service.patch
@@ -11,7 +11,7 @@ Conflicts:
2 files changed, 40 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index bf04d3184..75459f74d 100644
+index bf04d31840..75459f74d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -535,7 +535,6 @@ nodist_systemunit_DATA = \
@@ -31,7 +31,7 @@ index bf04d3184..75459f74d 100644
units/systemd-suspend.service.in \
units/quotaon.service.in \
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
-index f4c4490e8..97eb4feca 100644
+index f4c4490e8f..97eb4feca9 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -399,39 +399,6 @@ static int user_start_slice(User *u) {
diff --git a/SOURCES/0005-logind-session-save-stopping-flag.patch b/SOURCES/0005-logind-session-save-stopping-flag.patch
index e478ac6..904227a 100644
--- a/SOURCES/0005-logind-session-save-stopping-flag.patch
+++ b/SOURCES/0005-logind-session-save-stopping-flag.patch
@@ -10,7 +10,7 @@ Conflicts:
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index a02a537f7..d2e7b4012 100644
+index a02a537f7c..d2e7b40124 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -181,12 +181,14 @@ int session_save(Session *s) {
diff --git a/SOURCES/0006-man-mention-System-Administrator-s-Guide-in-systemct.patch b/SOURCES/0006-man-mention-System-Administrator-s-Guide-in-systemct.patch
index e536cd8..6f45bda 100644
--- a/SOURCES/0006-man-mention-System-Administrator-s-Guide-in-systemct.patch
+++ b/SOURCES/0006-man-mention-System-Administrator-s-Guide-in-systemct.patch
@@ -10,7 +10,7 @@ Resolves: #978948
1 file changed, 11 insertions(+)
diff --git a/man/systemctl.xml b/man/systemctl.xml
-index 338c1d328..6f30474c3 100644
+index 338c1d3280..6f30474c39 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -1713,6 +1713,17 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
diff --git a/SOURCES/0007-rules-automatically-online-hot-added-CPUs.patch b/SOURCES/0007-rules-automatically-online-hot-added-CPUs.patch
index df8ec5c..0b09ee8 100644
--- a/SOURCES/0007-rules-automatically-online-hot-added-CPUs.patch
+++ b/SOURCES/0007-rules-automatically-online-hot-added-CPUs.patch
@@ -16,7 +16,7 @@ Conflicts:
create mode 100644 rules/40-redhat.rules
diff --git a/Makefile.am b/Makefile.am
-index 75459f74d..a734e9c48 100644
+index 75459f74d3..a734e9c486 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3564,7 +3564,8 @@ dist_udevrules_DATA += \
@@ -31,7 +31,7 @@ index 75459f74d..a734e9c48 100644
rules/99-systemd.rules
diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules
new file mode 100644
-index 000000000..2b494e57c
+index 0000000000..2b494e57cf
--- /dev/null
+++ b/rules/40-redhat.rules
@@ -0,0 +1,3 @@
diff --git a/SOURCES/0008-Revert-remove-references-of-readahead.patch b/SOURCES/0008-Revert-remove-references-of-readahead.patch
index 264938b..28fd9ff 100644
--- a/SOURCES/0008-Revert-remove-references-of-readahead.patch
+++ b/SOURCES/0008-Revert-remove-references-of-readahead.patch
@@ -11,7 +11,7 @@ This reverts commit 3b71c18d3e3906f8606c66bea98b327684394e61.
3 files changed, 9 insertions(+)
diff --git a/.gitignore b/.gitignore
-index e8a4085a3..0360f7c6b 100644
+index e8a4085a3a..0360f7c6bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,6 +107,7 @@
@@ -23,7 +23,7 @@ index e8a4085a3..0360f7c6b 100644
/systemd-remount-fs
/systemd-reply-password
diff --git a/README b/README
-index 5f5783a68..287d05c9b 100644
+index 5f5783a684..287d05c9b4 100644
--- a/README
+++ b/README
@@ -30,6 +30,7 @@ AUTHOR:
@@ -35,7 +35,7 @@ index 5f5783a68..287d05c9b 100644
- except src/shared/siphash24.c which is CC0 Public Domain
- except src/journal/lookup3.c which is Public Domain
diff --git a/TODO b/TODO
-index 255a4f2d0..90b2c4b30 100644
+index 255a4f2d07..90b2c4b30a 100644
--- a/TODO
+++ b/TODO
@@ -786,6 +786,13 @@ Features:
diff --git a/SOURCES/0009-Revert-missing-remove-fanotify.patch b/SOURCES/0009-Revert-missing-remove-fanotify.patch
index 447c020..7e22f05 100644
--- a/SOURCES/0009-Revert-missing-remove-fanotify.patch
+++ b/SOURCES/0009-Revert-missing-remove-fanotify.patch
@@ -16,7 +16,7 @@ Conflicts:
create mode 100644 src/shared/linux/fanotify.h
diff --git a/Makefile.am b/Makefile.am
-index a734e9c48..70e4fbc6d 100644
+index a734e9c486..70e4fbc6d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -749,6 +749,7 @@ libsystemd_shared_la_SOURCES = \
@@ -28,7 +28,7 @@ index a734e9c48..70e4fbc6d 100644
src/shared/missing.h \
src/shared/initreq.h \
diff --git a/configure.ac b/configure.ac
-index 97a29d63f..3f50887a8 100644
+index 97a29d63fd..3f50887a8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -310,6 +310,7 @@ RT_LIBS="$LIBS"
@@ -41,7 +41,7 @@ index 97a29d63f..3f50887a8 100644
AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, getrandom, renameat2, kcmp, LO_FLAGS_PARTSCAN],
diff --git a/src/shared/linux/fanotify.h b/src/shared/linux/fanotify.h
new file mode 100644
-index 000000000..5cc1a7e67
+index 0000000000..5cc1a7e676
--- /dev/null
+++ b/src/shared/linux/fanotify.h
@@ -0,0 +1,98 @@
@@ -144,7 +144,7 @@ index 000000000..5cc1a7e67
+
+#endif /* _LINUX_FANOTIFY_H */
diff --git a/src/shared/missing.h b/src/shared/missing.h
-index b33a70cb2..06a55769a 100644
+index b33a70cb2c..06a55769a4 100644
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -156,6 +156,70 @@ static inline int pivot_root(const char *new_root, const char *put_old) {
diff --git a/SOURCES/0010-Revert-readahead-wipe-out-readahead.patch b/SOURCES/0010-Revert-readahead-wipe-out-readahead.patch
index 4dad621..7a692c0 100644
--- a/SOURCES/0010-Revert-readahead-wipe-out-readahead.patch
+++ b/SOURCES/0010-Revert-readahead-wipe-out-readahead.patch
@@ -89,7 +89,7 @@ Conflicts:
create mode 100644 units/systemd-readahead-replay.service.in
diff --git a/Makefile-man.am b/Makefile-man.am
-index d0fb9aa1a..ac6f69af7 100644
+index d0fb9aa1ae..ac6f69af70 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -1234,6 +1234,34 @@ man/systemd-random-seed.html: man/systemd-random-seed.service.html
@@ -152,7 +152,7 @@ index d0fb9aa1a..ac6f69af7 100644
man/systemd-resolved.service.xml \
man/systemd-rfkill@.service.xml \
diff --git a/Makefile.am b/Makefile.am
-index 70e4fbc6d..b0e4b5a42 100644
+index 70e4fbc6d4..b0e4b5a42a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2603,7 +2603,8 @@ systemctl_LDADD = \
@@ -224,7 +224,7 @@ index 70e4fbc6d..b0e4b5a42 100644
if ENABLE_BOOTCHART
systemd_bootchart_SOURCES = \
diff --git a/configure.ac b/configure.ac
-index 3f50887a8..f701bcf71 100644
+index 3f50887a8d..f701bcf716 100644
--- a/configure.ac
+++ b/configure.ac
@@ -930,6 +930,14 @@ if test "x$enable_vconsole" != "xno"; then
@@ -251,7 +251,7 @@ index 3f50887a8..f701bcf71 100644
quotacheck: ${have_quotacheck}
tmpfiles: ${have_tmpfiles}
diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
-index b7ba36365..b12abe2dc 100644
+index b7ba363656..b12abe2dc8 100644
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.xml
@@ -137,6 +137,7 @@
@@ -263,7 +263,7 @@ index b7ba36365..b12abe2dc 100644
diff --git a/man/sd-login.xml b/man/sd-login.xml
-index 328f71164..abcdb99f6 100644
+index 328f71164d..abcdb99f6f 100644
--- a/man/sd-login.xml
+++ b/man/sd-login.xml
@@ -128,6 +128,7 @@
@@ -276,7 +276,7 @@ index 328f71164..abcdb99f6 100644
diff --git a/man/sd-readahead.xml b/man/sd-readahead.xml
new file mode 100644
-index 000000000..bcc46b24d
+index 0000000000..bcc46b24d8
--- /dev/null
+++ b/man/sd-readahead.xml
@@ -0,0 +1,117 @@
@@ -399,7 +399,7 @@ index 000000000..bcc46b24d
+
diff --git a/man/sd_readahead.xml b/man/sd_readahead.xml
new file mode 100644
-index 000000000..98272997c
+index 0000000000..98272997cb
--- /dev/null
+++ b/man/sd_readahead.xml
@@ -0,0 +1,178 @@
@@ -582,7 +582,7 @@ index 000000000..98272997c
+
+
diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml
-index 06d5ae531..46ede1ab8 100644
+index 06d5ae5319..46ede1ab8f 100644
--- a/man/systemd-notify.xml
+++ b/man/systemd-notify.xml
@@ -127,6 +127,17 @@
@@ -605,7 +605,7 @@ index 06d5ae531..46ede1ab8 100644
diff --git a/man/systemd-readahead-replay.service.xml b/man/systemd-readahead-replay.service.xml
new file mode 100644
-index 000000000..669fe7894
+index 0000000000..669fe78942
--- /dev/null
+++ b/man/systemd-readahead-replay.service.xml
@@ -0,0 +1,203 @@
@@ -813,7 +813,7 @@ index 000000000..669fe7894
+
+
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
-index 51254ec53..b552029b8 100644
+index 51254ec533..b552029b82 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -17,5 +17,6 @@ src/hostname/hostnamed.c
@@ -824,7 +824,7 @@ index 51254ec53..b552029b8 100644
units/user@.service.in
units/debug-shell.service.in
diff --git a/shell-completion/zsh/_systemd b/shell-completion/zsh/_systemd
-index 58b1c7b4e..06f03bd1e 100644
+index 58b1c7b4e5..06f03bd1e7 100644
--- a/shell-completion/zsh/_systemd
+++ b/shell-completion/zsh/_systemd
@@ -63,7 +63,8 @@ case "$service" in
@@ -838,7 +838,7 @@ index 58b1c7b4e..06f03bd1e 100644
systemd-tty-ask-password-agent)
_arguments \
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index 05061c070..dfbca8754 100644
+index 05061c0704..dfbca8754f 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -111,7 +111,7 @@ static int create_disk(
@@ -851,7 +851,7 @@ index 05061c070..dfbca8754 100644
if (!nofail)
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
-index 5c58b58f8..7d5a6c650 100644
+index 5c58b58f8a..7d5a6c6508 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -133,6 +133,7 @@ static int add_cryptsetup(const char *id, const char *what, bool rw, char **devi
@@ -863,7 +863,7 @@ index 5c58b58f8..7d5a6c650 100644
"Type=oneshot\n"
"RemainAfterExit=yes\n"
diff --git a/src/notify/notify.c b/src/notify/notify.c
-index f98075d51..e4a128b0b 100644
+index f98075d513..e4a128b0b2 100644
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -31,6 +31,7 @@
@@ -944,7 +944,7 @@ index f98075d51..e4a128b0b 100644
diff --git a/src/readahead/Makefile b/src/readahead/Makefile
new file mode 120000
-index 000000000..d0b0e8e00
+index 0000000000..d0b0e8e008
--- /dev/null
+++ b/src/readahead/Makefile
@@ -0,0 +1 @@
@@ -952,7 +952,7 @@ index 000000000..d0b0e8e00
\ No newline at end of file
diff --git a/src/readahead/readahead-analyze.c b/src/readahead/readahead-analyze.c
new file mode 100644
-index 000000000..76db3cb7e
+index 0000000000..76db3cb7e4
--- /dev/null
+++ b/src/readahead/readahead-analyze.c
@@ -0,0 +1,146 @@
@@ -1104,7 +1104,7 @@ index 000000000..76db3cb7e
+}
diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c
new file mode 100644
-index 000000000..822a803a4
+index 0000000000..822a803a41
--- /dev/null
+++ b/src/readahead/readahead-collect.c
@@ -0,0 +1,650 @@
@@ -1760,7 +1760,7 @@ index 000000000..822a803a4
+}
diff --git a/src/readahead/readahead-common.c b/src/readahead/readahead-common.c
new file mode 100644
-index 000000000..3ca48a725
+index 0000000000..3ca48a7257
--- /dev/null
+++ b/src/readahead/readahead-common.c
@@ -0,0 +1,398 @@
@@ -2164,7 +2164,7 @@ index 000000000..3ca48a725
+}
diff --git a/src/readahead/readahead-common.h b/src/readahead/readahead-common.h
new file mode 100644
-index 000000000..b34f3aadd
+index 0000000000..b34f3aadd7
--- /dev/null
+++ b/src/readahead/readahead-common.h
@@ -0,0 +1,61 @@
@@ -2231,7 +2231,7 @@ index 000000000..b34f3aadd
+int main_analyze(const char *pack_path);
diff --git a/src/readahead/readahead-replay.c b/src/readahead/readahead-replay.c
new file mode 100644
-index 000000000..f81e0fe55
+index 0000000000..f81e0fe55d
--- /dev/null
+++ b/src/readahead/readahead-replay.c
@@ -0,0 +1,281 @@
@@ -2518,7 +2518,7 @@ index 000000000..f81e0fe55
+}
diff --git a/src/readahead/readahead.c b/src/readahead/readahead.c
new file mode 100644
-index 000000000..35176e937
+index 0000000000..35176e9379
--- /dev/null
+++ b/src/readahead/readahead.c
@@ -0,0 +1,163 @@
@@ -2687,7 +2687,7 @@ index 000000000..35176e937
+}
diff --git a/src/readahead/sd-readahead.c b/src/readahead/sd-readahead.c
new file mode 100644
-index 000000000..675d82cdd
+index 0000000000..675d82cdd1
--- /dev/null
+++ b/src/readahead/sd-readahead.c
@@ -0,0 +1,89 @@
@@ -2782,7 +2782,7 @@ index 000000000..675d82cdd
+}
diff --git a/src/readahead/test-ssd.c b/src/readahead/test-ssd.c
new file mode 100644
-index 000000000..808faf359
+index 0000000000..808faf359c
--- /dev/null
+++ b/src/readahead/test-ssd.c
@@ -0,0 +1,41 @@
@@ -2829,7 +2829,7 @@ index 000000000..808faf359
+}
diff --git a/src/systemd/sd-readahead.h b/src/systemd/sd-readahead.h
new file mode 100644
-index 000000000..bb30f9a45
+index 0000000000..bb30f9a45e
--- /dev/null
+++ b/src/systemd/sd-readahead.h
@@ -0,0 +1,73 @@
@@ -2907,7 +2907,7 @@ index 000000000..bb30f9a45
+
+#endif
diff --git a/system-preset/90-systemd.preset b/system-preset/90-systemd.preset
-index ee1b864bc..24963f062 100644
+index ee1b864bcf..24963f0623 100644
--- a/system-preset/90-systemd.preset
+++ b/system-preset/90-systemd.preset
@@ -12,6 +12,7 @@ enable remote-fs.target
@@ -2919,7 +2919,7 @@ index ee1b864bc..24963f062 100644
enable systemd-networkd.service
enable systemd-resolved.service
diff --git a/units/.gitignore b/units/.gitignore
-index 6fdb629c3..638a7abc4 100644
+index 6fdb629c3d..638a7abc4c 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -52,6 +52,9 @@
@@ -2933,7 +2933,7 @@ index 6fdb629c3..638a7abc4 100644
/systemd-remount-fs.service
/systemd-resolved.service
diff --git a/units/ldconfig.service b/units/ldconfig.service
-index f9691e2f2..43c145b72 100644
+index f9691e2f2d..43c145b726 100644
--- a/units/ldconfig.service
+++ b/units/ldconfig.service
@@ -10,7 +10,7 @@ Description=Rebuild Dynamic Linker Cache
@@ -2946,7 +2946,7 @@ index f9691e2f2..43c145b72 100644
ConditionNeedsUpdate=/etc
diff --git a/units/quotaon.service.in b/units/quotaon.service.in
-index 7d59a4019..49a50a7fe 100644
+index 7d59a40195..49a50a7feb 100644
--- a/units/quotaon.service.in
+++ b/units/quotaon.service.in
@@ -9,7 +9,7 @@
@@ -2959,7 +2959,7 @@ index 7d59a4019..49a50a7fe 100644
ConditionPathExists=@QUOTAON@
diff --git a/units/system-update.target b/units/system-update.target
-index 48d46fcbd..d0f847f95 100644
+index 48d46fcbda..d0f847f957 100644
--- a/units/system-update.target
+++ b/units/system-update.target
@@ -10,7 +10,7 @@ Description=System Update
@@ -2972,7 +2972,7 @@ index 48d46fcbd..d0f847f95 100644
Before=shutdown.target
AllowIsolate=yes
diff --git a/units/systemd-backlight@.service.in b/units/systemd-backlight@.service.in
-index 5e6706c11..b146e30f2 100644
+index 5e6706c11c..b146e30f2d 100644
--- a/units/systemd-backlight@.service.in
+++ b/units/systemd-backlight@.service.in
@@ -11,7 +11,7 @@ Documentation=man:systemd-backlight@.service(8)
@@ -2985,7 +2985,7 @@ index 5e6706c11..b146e30f2 100644
[Service]
diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
-index 34a5d5237..02dfe774d 100644
+index 34a5d5237b..02dfe774df 100644
--- a/units/systemd-binfmt.service.in
+++ b/units/systemd-binfmt.service.in
@@ -11,7 +11,7 @@ Documentation=man:systemd-binfmt.service(8) man:binfmt.d(5)
@@ -2998,7 +2998,7 @@ index 34a5d5237..02dfe774d 100644
ConditionPathIsReadWrite=/proc/sys/
ConditionDirectoryNotEmpty=|/lib/binfmt.d
diff --git a/units/systemd-firstboot.service.in b/units/systemd-firstboot.service.in
-index 405c6f3fd..89fa7e1dd 100644
+index 405c6f3fd2..89fa7e1dd7 100644
--- a/units/systemd-firstboot.service.in
+++ b/units/systemd-firstboot.service.in
@@ -10,7 +10,7 @@ Description=First Boot Wizard
@@ -3011,7 +3011,7 @@ index 405c6f3fd..89fa7e1dd 100644
ConditionPathIsReadWrite=/etc
ConditionFirstBoot=yes
diff --git a/units/systemd-fsck-root.service.in b/units/systemd-fsck-root.service.in
-index 6d7657853..26cce5131 100644
+index 6d7657853e..26cce5131e 100644
--- a/units/systemd-fsck-root.service.in
+++ b/units/systemd-fsck-root.service.in
@@ -9,6 +9,7 @@
@@ -3023,7 +3023,7 @@ index 6d7657853..26cce5131 100644
ConditionPathIsReadWrite=!/
diff --git a/units/systemd-fsck@.service.in b/units/systemd-fsck@.service.in
-index 857e62567..d2cda6a46 100644
+index 857e625679..d2cda6a466 100644
--- a/units/systemd-fsck@.service.in
+++ b/units/systemd-fsck@.service.in
@@ -10,7 +10,7 @@ Description=File System Check on %f
@@ -3036,7 +3036,7 @@ index 857e62567..d2cda6a46 100644
[Service]
diff --git a/units/systemd-hwdb-update.service.in b/units/systemd-hwdb-update.service.in
-index 791528e2b..4bed482f8 100644
+index 791528e2b2..4bed482f8c 100644
--- a/units/systemd-hwdb-update.service.in
+++ b/units/systemd-hwdb-update.service.in
@@ -10,7 +10,7 @@ Description=Rebuild Hardware Database
@@ -3049,7 +3049,7 @@ index 791528e2b..4bed482f8 100644
ConditionNeedsUpdate=/etc
ConditionPathExists=|!@udevlibexecdir@/hwdb.bin
diff --git a/units/systemd-journal-catalog-update.service.in b/units/systemd-journal-catalog-update.service.in
-index 6370dd478..5b85889dd 100644
+index 6370dd478f..5b85889dda 100644
--- a/units/systemd-journal-catalog-update.service.in
+++ b/units/systemd-journal-catalog-update.service.in
@@ -10,7 +10,7 @@ Description=Rebuild Journal Catalog
@@ -3062,7 +3062,7 @@ index 6370dd478..5b85889dd 100644
ConditionNeedsUpdate=/etc
diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in
-index 040a0febe..32deb52e2 100644
+index 040a0febe8..32deb52e26 100644
--- a/units/systemd-modules-load.service.in
+++ b/units/systemd-modules-load.service.in
@@ -10,6 +10,7 @@ Description=Load Kernel Modules
@@ -3074,7 +3074,7 @@ index 040a0febe..32deb52e2 100644
ConditionCapability=CAP_SYS_MODULE
ConditionDirectoryNotEmpty=|/lib/modules-load.d
diff --git a/units/systemd-quotacheck.service.in b/units/systemd-quotacheck.service.in
-index 5cb9bc3bc..f726ea1bc 100644
+index 5cb9bc3bc9..f726ea1bcd 100644
--- a/units/systemd-quotacheck.service.in
+++ b/units/systemd-quotacheck.service.in
@@ -9,7 +9,7 @@
@@ -3087,7 +3087,7 @@ index 5cb9bc3bc..f726ea1bc 100644
ConditionPathExists=@QUOTACHECK@
diff --git a/units/systemd-random-seed.service.in b/units/systemd-random-seed.service.in
-index b55844b36..1879b2f24 100644
+index b55844b36f..1879b2f24c 100644
--- a/units/systemd-random-seed.service.in
+++ b/units/systemd-random-seed.service.in
@@ -11,7 +11,7 @@ Documentation=man:systemd-random-seed.service(8) man:random(4)
@@ -3101,7 +3101,7 @@ index b55844b36..1879b2f24 100644
[Service]
diff --git a/units/systemd-readahead-collect.service.in b/units/systemd-readahead-collect.service.in
new file mode 100644
-index 000000000..d4b8e6793
+index 0000000000..d4b8e67932
--- /dev/null
+++ b/units/systemd-readahead-collect.service.in
@@ -0,0 +1,28 @@
@@ -3135,7 +3135,7 @@ index 000000000..d4b8e6793
+Also=systemd-readahead-drop.service
diff --git a/units/systemd-readahead-done.service.in b/units/systemd-readahead-done.service.in
new file mode 100644
-index 000000000..e0d957944
+index 0000000000..e0d9579449
--- /dev/null
+++ b/units/systemd-readahead-done.service.in
@@ -0,0 +1,22 @@
@@ -3163,7 +3163,7 @@ index 000000000..e0d957944
+Also=systemd-readahead-collect.service
diff --git a/units/systemd-readahead-done.timer b/units/systemd-readahead-done.timer
new file mode 100644
-index 000000000..c58e09616
+index 0000000000..c58e09616e
--- /dev/null
+++ b/units/systemd-readahead-done.timer
@@ -0,0 +1,22 @@
@@ -3191,7 +3191,7 @@ index 000000000..c58e09616
+Also=systemd-readahead-collect.service
diff --git a/units/systemd-readahead-drop.service b/units/systemd-readahead-drop.service
new file mode 100644
-index 000000000..d9d12bc53
+index 0000000000..d9d12bc533
--- /dev/null
+++ b/units/systemd-readahead-drop.service
@@ -0,0 +1,19 @@
@@ -3216,7 +3216,7 @@ index 000000000..d9d12bc53
+Also=systemd-readahead-collect.service
diff --git a/units/systemd-readahead-replay.service.in b/units/systemd-readahead-replay.service.in
new file mode 100644
-index 000000000..c64a533e4
+index 0000000000..c64a533e4e
--- /dev/null
+++ b/units/systemd-readahead-replay.service.in
@@ -0,0 +1,26 @@
@@ -3247,7 +3247,7 @@ index 000000000..c64a533e4
+[Install]
+WantedBy=default.target
diff --git a/units/systemd-remount-fs.service.in b/units/systemd-remount-fs.service.in
-index 8d9daacaa..70e1a8680 100644
+index 8d9daacaa5..70e1a8680a 100644
--- a/units/systemd-remount-fs.service.in
+++ b/units/systemd-remount-fs.service.in
@@ -11,7 +11,7 @@ Documentation=man:systemd-remount-fs.service(8)
@@ -3260,7 +3260,7 @@ index 8d9daacaa..70e1a8680 100644
Wants=local-fs-pre.target
ConditionPathExists=/etc/fstab
diff --git a/units/systemd-rfkill@.service.in b/units/systemd-rfkill@.service.in
-index b48efe5d9..0d2757d61 100644
+index b48efe5d99..0d2757d61c 100644
--- a/units/systemd-rfkill@.service.in
+++ b/units/systemd-rfkill@.service.in
@@ -12,7 +12,7 @@ DefaultDependencies=no
@@ -3273,7 +3273,7 @@ index b48efe5d9..0d2757d61 100644
[Service]
diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in
-index fa72085f9..ade9dc300 100644
+index fa72085f9e..ade9dc3007 100644
--- a/units/systemd-sysctl.service.in
+++ b/units/systemd-sysctl.service.in
@@ -10,6 +10,7 @@ Description=Apply Kernel Variables
@@ -3285,7 +3285,7 @@ index fa72085f9..ade9dc300 100644
Before=sysinit.target shutdown.target
ConditionPathIsReadWrite=/proc/sys/
diff --git a/units/systemd-sysusers.service.in b/units/systemd-sysusers.service.in
-index ffd6d7747..69fea11fb 100644
+index ffd6d7747b..69fea11fb1 100644
--- a/units/systemd-sysusers.service.in
+++ b/units/systemd-sysusers.service.in
@@ -10,7 +10,7 @@ Description=Create System Users
@@ -3298,7 +3298,7 @@ index ffd6d7747..69fea11fb 100644
ConditionNeedsUpdate=/etc
diff --git a/units/systemd-tmpfiles-clean.service.in b/units/systemd-tmpfiles-clean.service.in
-index 133c8c94c..31b237841 100644
+index 133c8c94c4..31b2378410 100644
--- a/units/systemd-tmpfiles-clean.service.in
+++ b/units/systemd-tmpfiles-clean.service.in
@@ -10,7 +10,7 @@ Description=Cleanup of Temporary Directories
@@ -3311,7 +3311,7 @@ index 133c8c94c..31b237841 100644
[Service]
diff --git a/units/systemd-tmpfiles-setup-dev.service.in b/units/systemd-tmpfiles-setup-dev.service.in
-index 0123a030e..0b66c53fe 100644
+index 0123a030e4..0b66c53fe0 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
@@ -3324,7 +3324,7 @@ index 0123a030e..0b66c53fe 100644
ConditionCapability=CAP_SYS_MODULE
diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in
-index e895cda0e..72ab083d5 100644
+index e895cda0e6..72ab083d54 100644
--- a/units/systemd-tmpfiles-setup.service.in
+++ b/units/systemd-tmpfiles-setup.service.in
@@ -10,7 +10,7 @@ Description=Create Volatile Files and Directories
@@ -3337,7 +3337,7 @@ index e895cda0e..72ab083d5 100644
RefuseManualStop=yes
diff --git a/units/systemd-update-done.service.in b/units/systemd-update-done.service.in
-index ec7d90639..7031bff61 100644
+index ec7d906392..7031bff614 100644
--- a/units/systemd-update-done.service.in
+++ b/units/systemd-update-done.service.in
@@ -10,7 +10,7 @@ Description=Update is Completed
@@ -3350,7 +3350,7 @@ index ec7d90639..7031bff61 100644
ConditionNeedsUpdate=|/etc
ConditionNeedsUpdate=|/var
diff --git a/units/systemd-update-utmp.service.in b/units/systemd-update-utmp.service.in
-index 163eccd91..da7dda76b 100644
+index 163eccd91f..da7dda76ba 100644
--- a/units/systemd-update-utmp.service.in
+++ b/units/systemd-update-utmp.service.in
@@ -11,7 +11,7 @@ Documentation=man:systemd-update-utmp.service(8) man:utmp(5)
@@ -3363,7 +3363,7 @@ index 163eccd91..da7dda76b 100644
[Service]
diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in
-index 616036187..18faa63f2 100644
+index 6160361871..18faa63f28 100644
--- a/units/systemd-vconsole-setup.service.in
+++ b/units/systemd-vconsole-setup.service.in
@@ -10,6 +10,7 @@ Description=Setup Virtual Console
diff --git a/SOURCES/0011-rules-add-rule-for-naming-Dell-iDRAC-USB-Virtual-NIC.patch b/SOURCES/0011-rules-add-rule-for-naming-Dell-iDRAC-USB-Virtual-NIC.patch
index 224549e..573205c 100644
--- a/SOURCES/0011-rules-add-rule-for-naming-Dell-iDRAC-USB-Virtual-NIC.patch
+++ b/SOURCES/0011-rules-add-rule-for-naming-Dell-iDRAC-USB-Virtual-NIC.patch
@@ -14,7 +14,7 @@ Resolves: #1054477
create mode 100644 rules/73-idrac.rules
diff --git a/Makefile.am b/Makefile.am
-index b0e4b5a42..9e64d6f98 100644
+index b0e4b5a42a..9e64d6f988 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3567,7 +3567,8 @@ dist_udevrules_DATA += \
@@ -29,7 +29,7 @@ index b0e4b5a42..9e64d6f98 100644
rules/99-systemd.rules
diff --git a/rules/73-idrac.rules b/rules/73-idrac.rules
new file mode 100644
-index 000000000..d67fc425b
+index 0000000000..d67fc425b1
--- /dev/null
+++ b/rules/73-idrac.rules
@@ -0,0 +1,6 @@
diff --git a/SOURCES/0012-udev-net_id-correctly-name-netdevs-based-on-dev_port.patch b/SOURCES/0012-udev-net_id-correctly-name-netdevs-based-on-dev_port.patch
index 8f2ca1f..d9d9682 100644
--- a/SOURCES/0012-udev-net_id-correctly-name-netdevs-based-on-dev_port.patch
+++ b/SOURCES/0012-udev-net_id-correctly-name-netdevs-based-on-dev_port.patch
@@ -25,7 +25,7 @@ Conflicts:
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
-index 37ff1b800..99caa0a2a 100644
+index 37ff1b8008..99caa0a2ab 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -38,7 +38,7 @@
diff --git a/SOURCES/0013-Revert-blkid-Warn-when-rejecting-a-superblock-with-a.patch b/SOURCES/0013-Revert-blkid-Warn-when-rejecting-a-superblock-with-a.patch
index f43c278..ae948e9 100644
--- a/SOURCES/0013-Revert-blkid-Warn-when-rejecting-a-superblock-with-a.patch
+++ b/SOURCES/0013-Revert-blkid-Warn-when-rejecting-a-superblock-with-a.patch
@@ -12,7 +12,7 @@ This reverts commit d47f6ca5f9b7a0b400d8bdb050151a0284fb4bdb.
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/README b/README
-index 287d05c9b..ac2a81c0c 100644
+index 287d05c9b4..ac2a81c0cc 100644
--- a/README
+++ b/README
@@ -115,7 +115,7 @@ REQUIREMENTS:
@@ -25,7 +25,7 @@ index 287d05c9b..ac2a81c0c 100644
PAM >= 1.1.2 (optional)
libcryptsetup (optional)
diff --git a/configure.ac b/configure.ac
-index f701bcf71..9c25c3c6f 100644
+index f701bcf716..9c25c3c6fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -437,7 +437,7 @@ AM_CONDITIONAL(HAVE_XKBCOMMON, [test "$have_xkbcommon" = "yes"])
@@ -38,7 +38,7 @@ index f701bcf71..9c25c3c6f 100644
if test "x$have_blkid" = xno -a "x$enable_blkid" = xyes; then
AC_MSG_ERROR([*** blkid support requested but libraries not found])
diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c
-index 03e3dc286..89995831b 100644
+index 03e3dc2867..89995831b1 100644
--- a/src/udev/udev-builtin-blkid.c
+++ b/src/udev/udev-builtin-blkid.c
@@ -221,7 +221,6 @@ static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t
diff --git a/SOURCES/0014-journald-audit-exit-gracefully-in-the-case-we-can-t-.patch b/SOURCES/0014-journald-audit-exit-gracefully-in-the-case-we-can-t-.patch
index 74d8ed2..ad6558d 100644
--- a/SOURCES/0014-journald-audit-exit-gracefully-in-the-case-we-can-t-.patch
+++ b/SOURCES/0014-journald-audit-exit-gracefully-in-the-case-we-can-t-.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] journald-audit: exit gracefully in the case we can't join
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
-index c2f1545cc..151097a6e 100644
+index c2f1545cc9..151097a6e6 100644
--- a/src/journal/journald-audit.c
+++ b/src/journal/journald-audit.c
@@ -529,8 +529,10 @@ int server_open_audit(Server *s) {
diff --git a/SOURCES/0015-fedora-disable-resolv.conf-symlink.patch b/SOURCES/0015-fedora-disable-resolv.conf-symlink.patch
index 12ce6da..2e944f8 100644
--- a/SOURCES/0015-fedora-disable-resolv.conf-symlink.patch
+++ b/SOURCES/0015-fedora-disable-resolv.conf-symlink.patch
@@ -10,7 +10,7 @@ Conflicts:
1 file changed, 3 deletions(-)
diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4
-index 9b0e080e6..125d6e0a1 100644
+index 9b0e080e6f..125d6e0a17 100644
--- a/tmpfiles.d/etc.conf.m4
+++ b/tmpfiles.d/etc.conf.m4
@@ -10,8 +10,5 @@
diff --git a/SOURCES/0016-Revert-timedated-manage-systemd-timesyncd-directly-i.patch b/SOURCES/0016-Revert-timedated-manage-systemd-timesyncd-directly-i.patch
index 6ca0904..d961513 100644
--- a/SOURCES/0016-Revert-timedated-manage-systemd-timesyncd-directly-i.patch
+++ b/SOURCES/0016-Revert-timedated-manage-systemd-timesyncd-directly-i.patch
@@ -16,7 +16,7 @@ Conflicts:
2 files changed, 170 insertions(+), 91 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 9e64d6f98..bf65b2406 100644
+index 9e64d6f988..bf65b24060 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,6 +111,7 @@ catalogdir=$(prefix)/lib/systemd/catalog
@@ -50,7 +50,7 @@ index 9e64d6f98..bf65b2406 100644
# ------------------------------------------------------------------------------
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index 753c3d1d6..66097ef74 100644
+index 753c3d1d65..66097ef741 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -186,141 +186,211 @@ static int context_write_data_local_rtc(Context *c) {
diff --git a/SOURCES/0017-journal-remote-fix-certificate-status-memory-leak.patch b/SOURCES/0017-journal-remote-fix-certificate-status-memory-leak.patch
index 9d0405c..ec96e4f 100644
--- a/SOURCES/0017-journal-remote-fix-certificate-status-memory-leak.patch
+++ b/SOURCES/0017-journal-remote-fix-certificate-status-memory-leak.patch
@@ -15,7 +15,7 @@ possibly confuse gcc5 on armv7hl to segfault during compilation.
1 file changed, 1 insertion(+)
diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
-index 34d93379d..de9c6ab32 100644
+index 34d93379da..de9c6ab32d 100644
--- a/src/journal-remote/microhttpd-util.c
+++ b/src/journal-remote/microhttpd-util.c
@@ -179,6 +179,7 @@ static int verify_cert_authorized(gnutls_session_t session) {
diff --git a/SOURCES/0018-journal-remote-fix-client_cert-memory-leak.patch b/SOURCES/0018-journal-remote-fix-client_cert-memory-leak.patch
index 11dbfd4..33846e8 100644
--- a/SOURCES/0018-journal-remote-fix-client_cert-memory-leak.patch
+++ b/SOURCES/0018-journal-remote-fix-client_cert-memory-leak.patch
@@ -11,7 +11,7 @@ Found by Valgrind while testing the previous memory leak fix.
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
-index de9c6ab32..a95fff18f 100644
+index de9c6ab32d..a95fff18f3 100644
--- a/src/journal-remote/microhttpd-util.c
+++ b/src/journal-remote/microhttpd-util.c
@@ -239,10 +239,14 @@ static int get_auth_dn(gnutls_x509_crt_t client_cert, char **buf) {
diff --git a/SOURCES/0019-tmpfiles-Fix-parse_acl-error-message.patch b/SOURCES/0019-tmpfiles-Fix-parse_acl-error-message.patch
index 7df522b..e31dc92 100644
--- a/SOURCES/0019-tmpfiles-Fix-parse_acl-error-message.patch
+++ b/SOURCES/0019-tmpfiles-Fix-parse_acl-error-message.patch
@@ -11,7 +11,7 @@ parse_acl() returns the error instead of setting errno.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index c948d4d21..88ba7e46a 100644
+index c948d4d218..88ba7e46a2 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -689,7 +689,7 @@ static int get_acls_from_arg(Item *item) {
diff --git a/SOURCES/0020-test-utf8-fix-utf16-tests-on-BE-machines.patch b/SOURCES/0020-test-utf8-fix-utf16-tests-on-BE-machines.patch
index f153626..628c688 100644
--- a/SOURCES/0020-test-utf8-fix-utf16-tests-on-BE-machines.patch
+++ b/SOURCES/0020-test-utf8-fix-utf16-tests-on-BE-machines.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] test: utf8 - fix utf16 tests on BE machines
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c
-index befa38575..346f8524c 100644
+index befa385754..346f8524c6 100644
--- a/src/test/test-utf8.c
+++ b/src/test/test-utf8.c
@@ -95,7 +95,7 @@ static void test_utf8_escaping_printable(void) {
diff --git a/SOURCES/0021-tmpfiles-avoid-creating-duplicate-acl-entries.patch b/SOURCES/0021-tmpfiles-avoid-creating-duplicate-acl-entries.patch
index dcfd099..1d72b94 100644
--- a/SOURCES/0021-tmpfiles-avoid-creating-duplicate-acl-entries.patch
+++ b/SOURCES/0021-tmpfiles-avoid-creating-duplicate-acl-entries.patch
@@ -16,7 +16,7 @@ Status quo ante can be restored with:
2 files changed, 81 insertions(+), 2 deletions(-)
diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
-index a4ff1ab87..cbe09d7ab 100644
+index a4ff1ab878..cbe09d7aba 100644
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -282,6 +282,77 @@ int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask)
@@ -113,7 +113,7 @@ index a4ff1ab87..cbe09d7ab 100644
if (acl_copy_entry(j, i) < 0)
return -errno;
diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h
-index 90e88ffa2..fdb90063f 100644
+index 90e88ffa26..fdb90063fa 100644
--- a/src/shared/acl-util.h
+++ b/src/shared/acl-util.h
@@ -41,5 +41,9 @@ int acls_for_file(const char *path, acl_type_t type, acl_t new, acl_t *acl);
diff --git a/SOURCES/0022-shared-time-util-fix-gcc5-warning.patch b/SOURCES/0022-shared-time-util-fix-gcc5-warning.patch
index c88d977..3e500df 100644
--- a/SOURCES/0022-shared-time-util-fix-gcc5-warning.patch
+++ b/SOURCES/0022-shared-time-util-fix-gcc5-warning.patch
@@ -15,7 +15,7 @@ src/shared/time-util.c:789:25: warning: logical not is only applied to the left
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/time-util.c b/src/shared/time-util.c
-index 947ac1fcf..1c36c577c 100644
+index 947ac1fcfb..1c36c577c4 100644
--- a/src/shared/time-util.c
+++ b/src/shared/time-util.c
@@ -786,7 +786,7 @@ int parse_nsec(const char *t, nsec_t *nsec) {
diff --git a/SOURCES/0023-test-time-test-infinity-parsing-in-nanoseconds.patch b/SOURCES/0023-test-time-test-infinity-parsing-in-nanoseconds.patch
index 32071ee..cee0f61 100644
--- a/SOURCES/0023-test-time-test-infinity-parsing-in-nanoseconds.patch
+++ b/SOURCES/0023-test-time-test-infinity-parsing-in-nanoseconds.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] test-time: test "infinity" parsing in nanoseconds
1 file changed, 6 insertions(+)
diff --git a/src/test/test-time.c b/src/test/test-time.c
-index 8cfc4cc4f..3840fff06 100644
+index 8cfc4cc4fe..3840fff061 100644
--- a/src/test/test-time.c
+++ b/src/test/test-time.c
@@ -78,12 +78,18 @@ static void test_parse_nsec(void) {
diff --git a/SOURCES/0024-bootchart-fix-default-init-path.patch b/SOURCES/0024-bootchart-fix-default-init-path.patch
index 5412474..ede2395 100644
--- a/SOURCES/0024-bootchart-fix-default-init-path.patch
+++ b/SOURCES/0024-bootchart-fix-default-init-path.patch
@@ -15,7 +15,7 @@ https://launchpad.net/bugs/1423867
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
-index bf65b2406..2e6455f6e 100644
+index bf65b24060..2e6455f6e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -199,6 +199,7 @@ AM_CPPFLAGS = \
@@ -27,7 +27,7 @@ index bf65b2406..2e6455f6e 100644
-I $(top_srcdir)/src \
-I $(top_builddir)/src/shared \
diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
-index 64a384bac..175be6868 100644
+index 64a384bacf..175be68688 100644
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -76,7 +76,7 @@ int sysfd=-1;
diff --git a/SOURCES/0025-systemctl-bump-NOFILE-only-for-systemctl_main.patch b/SOURCES/0025-systemctl-bump-NOFILE-only-for-systemctl_main.patch
index 711be45..b78b75e 100644
--- a/SOURCES/0025-systemctl-bump-NOFILE-only-for-systemctl_main.patch
+++ b/SOURCES/0025-systemctl-bump-NOFILE-only-for-systemctl_main.patch
@@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1184712
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 21cb898b9..6b93ec844 100644
+index 21cb898b9a..6b93ec8446 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -7204,6 +7204,11 @@ found:
diff --git a/SOURCES/0026-acl-util-avoid-freeing-uninitialized-pointer.patch b/SOURCES/0026-acl-util-avoid-freeing-uninitialized-pointer.patch
index 8905c89..af1f944 100644
--- a/SOURCES/0026-acl-util-avoid-freeing-uninitialized-pointer.patch
+++ b/SOURCES/0026-acl-util-avoid-freeing-uninitialized-pointer.patch
@@ -11,7 +11,7 @@ CID#1271344/1271345
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
-index cbe09d7ab..e67e9acb6 100644
+index cbe09d7aba..e67e9acb6a 100644
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -302,7 +302,7 @@ static int acl_entry_equal(acl_entry_t a, acl_entry_t b) {
diff --git a/SOURCES/0027-bootchart-svg-fix-checking-of-list-end.patch b/SOURCES/0027-bootchart-svg-fix-checking-of-list-end.patch
index 9aa8e4c..e7920e8 100644
--- a/SOURCES/0027-bootchart-svg-fix-checking-of-list-end.patch
+++ b/SOURCES/0027-bootchart-svg-fix-checking-of-list-end.patch
@@ -11,7 +11,7 @@ If we have less samples than expected, systemd-bootchart will crash.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c
-index e111fa9cc..144177cd4 100644
+index e111fa9cce..144177cd47 100644
--- a/src/bootchart/svg.c
+++ b/src/bootchart/svg.c
@@ -1170,7 +1170,7 @@ static void svg_ps_bars(void) {
diff --git a/SOURCES/0028-systemd-add-getrandom-syscall-numbers-for-MIPS.patch b/SOURCES/0028-systemd-add-getrandom-syscall-numbers-for-MIPS.patch
index 540dc28..0b62bdc 100644
--- a/SOURCES/0028-systemd-add-getrandom-syscall-numbers-for-MIPS.patch
+++ b/SOURCES/0028-systemd-add-getrandom-syscall-numbers-for-MIPS.patch
@@ -13,7 +13,7 @@ syscalls getrandom and memfd_create").
1 file changed, 10 insertions(+)
diff --git a/src/shared/missing.h b/src/shared/missing.h
-index 06a55769a..8cb0b2c96 100644
+index 06a55769a4..8cb0b2c96e 100644
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -243,6 +243,16 @@ static inline int memfd_create(const char *name, unsigned int flags) {
diff --git a/SOURCES/0029-unit-use-weaker-dependencies-between-mount-and-devic.patch b/SOURCES/0029-unit-use-weaker-dependencies-between-mount-and-devic.patch
index b0c98a8..6394ebd 100644
--- a/SOURCES/0029-unit-use-weaker-dependencies-between-mount-and-devic.patch
+++ b/SOURCES/0029-unit-use-weaker-dependencies-between-mount-and-devic.patch
@@ -16,7 +16,7 @@ in --user mode, but leave a BindsTo= dependency in --system mode.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index ee8e607c2..9f1e55e2f 100644
+index ee8e607c27..9f1e55e2f1 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2845,7 +2845,7 @@ int unit_add_node_link(Unit *u, const char *what, bool wants) {
diff --git a/SOURCES/0030-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch b/SOURCES/0030-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch
index ee8e413..efd1243 100644
--- a/SOURCES/0030-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch
+++ b/SOURCES/0030-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch
@@ -18,7 +18,7 @@ deactivate, as there's no point in further iteration.
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/core/unit.c b/src/core/unit.c
-index 9f1e55e2f..563f6fe85 100644
+index 9f1e55e2f1..563f6fe850 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1648,12 +1648,14 @@ static void unit_check_binds_to(Unit *u) {
diff --git a/SOURCES/0031-sysctl-downgrade-message-about-sysctl-overrides-to-d.patch b/SOURCES/0031-sysctl-downgrade-message-about-sysctl-overrides-to-d.patch
index 9789955..62c8734 100644
--- a/SOURCES/0031-sysctl-downgrade-message-about-sysctl-overrides-to-d.patch
+++ b/SOURCES/0031-sysctl-downgrade-message-about-sysctl-overrides-to-d.patch
@@ -12,7 +12,7 @@ overrides.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index d007c932c..b6945eda5 100644
+index d007c932c6..b6945eda54 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -176,7 +176,7 @@ found:
diff --git a/SOURCES/0032-sysctl-add-some-hints-how-to-override-settings.patch b/SOURCES/0032-sysctl-add-some-hints-how-to-override-settings.patch
index e2ed67c..90d037d 100644
--- a/SOURCES/0032-sysctl-add-some-hints-how-to-override-settings.patch
+++ b/SOURCES/0032-sysctl-add-some-hints-how-to-override-settings.patch
@@ -13,7 +13,7 @@ https://lists.fedoraproject.org/pipermail/devel/2015-February/208412.html
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/sysctl.d/50-default.conf b/sysctl.d/50-default.conf
-index f18923399..def151bb8 100644
+index f18923399b..def151bb84 100644
--- a/sysctl.d/50-default.conf
+++ b/sysctl.d/50-default.conf
@@ -5,9 +5,16 @@
diff --git a/SOURCES/0033-core-rework-device-state-logic.patch b/SOURCES/0033-core-rework-device-state-logic.patch
index 6c79277..de711bd 100644
--- a/SOURCES/0033-core-rework-device-state-logic.patch
+++ b/SOURCES/0033-core-rework-device-state-logic.patch
@@ -25,7 +25,7 @@ its BindTo dependency on the device would not be fulfilled.
6 files changed, 285 insertions(+), 180 deletions(-)
diff --git a/src/core/device.c b/src/core/device.c
-index d3deac393..75b9a4628 100644
+index d3deac3936..75b9a46287 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -36,7 +36,8 @@
@@ -595,7 +595,7 @@ index d3deac393..75b9a4628 100644
DEFINE_STRING_TABLE_LOOKUP(device_state, DeviceState);
diff --git a/src/core/device.h b/src/core/device.h
-index bb7ae0783..0609b20fd 100644
+index bb7ae07834..0609b20fdb 100644
--- a/src/core/device.h
+++ b/src/core/device.h
@@ -29,20 +29,28 @@ typedef struct Device Device;
@@ -636,7 +636,7 @@ index bb7ae0783..0609b20fd 100644
+
+int device_found_node(Manager *m, const char *node, bool add, DeviceFound found, bool now);
diff --git a/src/core/mount.c b/src/core/mount.c
-index f3977e62d..c971330af 100644
+index f3977e62de..c971330af2 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1391,7 +1391,7 @@ static int mount_dispatch_timer(sd_event_source *source, usec_t usec, void *user
@@ -754,7 +754,7 @@ index f3977e62d..c971330af 100644
/* New or changed mount entry */
diff --git a/src/core/swap.c b/src/core/swap.c
-index 6997921fd..5c19af5d9 100644
+index 6997921fde..5c19af5d91 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -338,7 +338,7 @@ static int swap_load(Unit *u) {
@@ -881,7 +881,7 @@ index 6997921fd..5c19af5d9 100644
int r = 0;
Swap *s;
diff --git a/src/core/swap.h b/src/core/swap.h
-index 73e64d87a..914a2dbcc 100644
+index 73e64d87a4..914a2dbccd 100644
--- a/src/core/swap.h
+++ b/src/core/swap.h
@@ -116,8 +116,8 @@ struct Swap {
@@ -896,7 +896,7 @@ index 73e64d87a..914a2dbcc 100644
const char* swap_state_to_string(SwapState i) _const_;
SwapState swap_state_from_string(const char *s) _pure_;
diff --git a/src/core/unit.c b/src/core/unit.c
-index 563f6fe85..a6558ee23 100644
+index 563f6fe850..a6558ee23b 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2843,7 +2843,6 @@ int unit_add_node_link(Unit *u, const char *what, bool wants) {
diff --git a/SOURCES/0034-core-fix-return-value-on-OOM.patch b/SOURCES/0034-core-fix-return-value-on-OOM.patch
index e1916e0..d20be17 100644
--- a/SOURCES/0034-core-fix-return-value-on-OOM.patch
+++ b/SOURCES/0034-core-fix-return-value-on-OOM.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] core: fix return value on OOM
1 file changed, 2 insertions(+)
diff --git a/src/core/device.c b/src/core/device.c
-index 75b9a4628..1cc103c29 100644
+index 75b9a46287..1cc103c290 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -211,6 +211,8 @@ static int device_update_description(Unit *u, struct udev_device *dev, const cha
diff --git a/SOURCES/0035-machined-use-x-machine-unix-prefix-for-the-container.patch b/SOURCES/0035-machined-use-x-machine-unix-prefix-for-the-container.patch
index 65398d5..cd115ec 100644
--- a/SOURCES/0035-machined-use-x-machine-unix-prefix-for-the-container.patch
+++ b/SOURCES/0035-machined-use-x-machine-unix-prefix-for-the-container.patch
@@ -16,7 +16,7 @@ Failed to get machine PTY: Input/output error
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
-index b46f0a8da..b0f0f66e0 100644
+index b46f0a8dac..b0f0f66e09 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -477,7 +477,7 @@ int bus_machine_method_open_login(sd_bus *bus, sd_bus_message *message, void *us
diff --git a/SOURCES/0036-shared-AFS-is-also-a-network-filesystem.patch b/SOURCES/0036-shared-AFS-is-also-a-network-filesystem.patch
index 25f87b1..39b3589 100644
--- a/SOURCES/0036-shared-AFS-is-also-a-network-filesystem.patch
+++ b/SOURCES/0036-shared-AFS-is-also-a-network-filesystem.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] shared: AFS is also a network filesystem
1 file changed, 1 insertion(+)
diff --git a/src/shared/util.c b/src/shared/util.c
-index ba035caed..f24b5b4ec 100644
+index ba035caed0..f24b5b4ec5 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1689,6 +1689,7 @@ bool chars_intersect(const char *a, const char *b) {
diff --git a/SOURCES/0037-core-downgrade-unit-type-not-supported-message.patch b/SOURCES/0037-core-downgrade-unit-type-not-supported-message.patch
index 29e00dd..05144dd 100644
--- a/SOURCES/0037-core-downgrade-unit-type-not-supported-message.patch
+++ b/SOURCES/0037-core-downgrade-unit-type-not-supported-message.patch
@@ -14,7 +14,7 @@ systemd[1]: Unit type .swap is not supported on this system.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/manager.c b/src/core/manager.c
-index 4775219e4..bc9b7ec62 100644
+index 4775219e4a..bc9b7ec620 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -961,7 +961,7 @@ int manager_enumerate(Manager *m) {
diff --git a/SOURCES/0038-journal-remote-fix-saving-of-binary-fields.patch b/SOURCES/0038-journal-remote-fix-saving-of-binary-fields.patch
index 1c337ce..8c3adb7 100644
--- a/SOURCES/0038-journal-remote-fix-saving-of-binary-fields.patch
+++ b/SOURCES/0038-journal-remote-fix-saving-of-binary-fields.patch
@@ -14,7 +14,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89391
2 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c
-index d9dea8deb..afded7e38 100644
+index d9dea8deb0..afded7e380 100644
--- a/src/journal-remote/journal-remote-parse.c
+++ b/src/journal-remote/journal-remote-parse.c
@@ -344,22 +344,25 @@ int process_data(RemoteSource *source) {
@@ -78,7 +78,7 @@ index d9dea8deb..afded7e38 100644
source->state = STATE_DATA_FINISH;
diff --git a/src/journal-remote/journal-remote-parse.h b/src/journal-remote/journal-remote-parse.h
-index 8499f4eb8..22db55091 100644
+index 8499f4eb82..22db550913 100644
--- a/src/journal-remote/journal-remote-parse.h
+++ b/src/journal-remote/journal-remote-parse.h
@@ -42,7 +42,9 @@ typedef struct RemoteSource {
diff --git a/SOURCES/0039-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch b/SOURCES/0039-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch
index b628a6a..d915722 100644
--- a/SOURCES/0039-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch
+++ b/SOURCES/0039-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch
@@ -18,7 +18,7 @@ This is because ext4 does not support FS_NOCOW_FL.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 2845e05ce..0f28718b0 100644
+index 2845e05ce0..0f28718b0e 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2611,8 +2611,8 @@ int journal_file_open(
diff --git a/SOURCES/0040-sd-daemon-replace-VLA-with-alloca-to-make-llvm-happy.patch b/SOURCES/0040-sd-daemon-replace-VLA-with-alloca-to-make-llvm-happy.patch
index e31e45d..58c8cee 100644
--- a/SOURCES/0040-sd-daemon-replace-VLA-with-alloca-to-make-llvm-happy.patch
+++ b/SOURCES/0040-sd-daemon-replace-VLA-with-alloca-to-make-llvm-happy.patch
@@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89379
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
-index 028c2a7a5..22a3a5347 100644
+index 028c2a7a5b..22a3a5347a 100644
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -352,11 +352,7 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char
diff --git a/SOURCES/0041-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch b/SOURCES/0041-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch
index a360030..cccf37c 100644
--- a/SOURCES/0041-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch
+++ b/SOURCES/0041-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch
@@ -12,7 +12,7 @@ than -ENOSYS. For -ENOSYS, debug log is printed.
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 88ba7e46a..187997e1f 100644
+index 88ba7e46a2..187997e1f4 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -704,6 +704,9 @@ static int path_set_acl(const char *path, acl_type_t type, acl_t acl, bool modif
diff --git a/SOURCES/0042-shared-util-assume-ac-when-sys-class-power_supply-is.patch b/SOURCES/0042-shared-util-assume-ac-when-sys-class-power_supply-is.patch
index 6489de5..d3aa3e5 100644
--- a/SOURCES/0042-shared-util-assume-ac-when-sys-class-power_supply-is.patch
+++ b/SOURCES/0042-shared-util-assume-ac-when-sys-class-power_supply-is.patch
@@ -13,7 +13,7 @@ treat this like if this directory was empty, and not an error.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index f24b5b4ec..85487230a 100644
+index f24b5b4ec5..85487230a2 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -5994,7 +5994,7 @@ int on_ac_power(void) {
diff --git a/SOURCES/0043-import-remove-unused-variable.patch b/SOURCES/0043-import-remove-unused-variable.patch
index 2f53c5d..c1b250a 100644
--- a/SOURCES/0043-import-remove-unused-variable.patch
+++ b/SOURCES/0043-import-remove-unused-variable.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] import: remove unused variable
1 file changed, 1 deletion(-)
diff --git a/src/import/import-tar.c b/src/import/import-tar.c
-index 999aa8ab5..493252a13 100644
+index 999aa8ab5e..493252a132 100644
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -301,7 +301,6 @@ finish:
diff --git a/SOURCES/0044-hwdb-fix-ThinkPad-X-Tablet-special-keys.patch b/SOURCES/0044-hwdb-fix-ThinkPad-X-Tablet-special-keys.patch
index ca351d0..76d6e19 100644
--- a/SOURCES/0044-hwdb-fix-ThinkPad-X-Tablet-special-keys.patch
+++ b/SOURCES/0044-hwdb-fix-ThinkPad-X-Tablet-special-keys.patch
@@ -22,7 +22,7 @@ System Information
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index 1b7d87101..2cb976923 100644
+index 1b7d87101a..2cb976923d 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -586,7 +586,6 @@ keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pnS10-*:pvr*
diff --git a/SOURCES/0045-man-add-newlines-to-the-pull-raw-example-in-machinec.patch b/SOURCES/0045-man-add-newlines-to-the-pull-raw-example-in-machinec.patch
index ffc4ab6..7955280 100644
--- a/SOURCES/0045-man-add-newlines-to-the-pull-raw-example-in-machinec.patch
+++ b/SOURCES/0045-man-add-newlines-to-the-pull-raw-example-in-machinec.patch
@@ -11,7 +11,7 @@ They were removed in commit 798d3a52 ("Reindent man pages to 2ch").
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/man/machinectl.xml b/man/machinectl.xml
-index 9b07af422..640cb8b7d 100644
+index 9b07af4226..640cb8b7d6 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -715,11 +715,12 @@
diff --git a/SOURCES/0046-core-shared-in-deserializing-match-same-files-reache.patch b/SOURCES/0046-core-shared-in-deserializing-match-same-files-reache.patch
index 80be3a9..e8a2d25 100644
--- a/SOURCES/0046-core-shared-in-deserializing-match-same-files-reache.patch
+++ b/SOURCES/0046-core-shared-in-deserializing-match-same-files-reache.patch
@@ -33,7 +33,7 @@ Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1186018
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/core/socket.c b/src/core/socket.c
-index 48c43a288..88aae4815 100644
+index 48c43a2880..88aae4815b 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -2100,7 +2100,7 @@ static int socket_deserialize_item(Unit *u, const char *key, const char *value,
@@ -64,7 +64,7 @@ index 48c43a288..88aae4815 100644
if (p) {
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
-index b9db7f104..70bc1caa2 100644
+index b9db7f1047..70bc1caa2a 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -436,6 +436,10 @@ bool path_equal(const char *a, const char *b) {
@@ -79,7 +79,7 @@ index b9db7f104..70bc1caa2 100644
assert(path);
diff --git a/src/shared/path-util.h b/src/shared/path-util.h
-index bd0d32473..bcf116ed3 100644
+index bd0d32473f..bcf116ed3d 100644
--- a/src/shared/path-util.h
+++ b/src/shared/path-util.h
@@ -45,6 +45,7 @@ int path_make_relative(const char *from_dir, const char *to_path, char **_r);
@@ -91,7 +91,7 @@ index bd0d32473..bcf116ed3 100644
char** path_strv_make_absolute_cwd(char **l);
diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
-index c6f64876b..c278d6f9d 100644
+index c6f64876be..c278d6f9d4 100644
--- a/src/shared/socket-util.c
+++ b/src/shared/socket-util.c
@@ -325,9 +325,6 @@ bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) {
diff --git a/SOURCES/0047-shared-use-SocketAddress-in-socket_address_matches_f.patch b/SOURCES/0047-shared-use-SocketAddress-in-socket_address_matches_f.patch
index 8fd388d..f1daf0d 100644
--- a/SOURCES/0047-shared-use-SocketAddress-in-socket_address_matches_f.patch
+++ b/SOURCES/0047-shared-use-SocketAddress-in-socket_address_matches_f.patch
@@ -11,7 +11,7 @@ Cleanup. No behavior change.
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
-index c278d6f9d..c31f60ec7 100644
+index c278d6f9d4..c31f60ec7e 100644
--- a/src/shared/socket-util.c
+++ b/src/shared/socket-util.c
@@ -435,48 +435,48 @@ bool socket_ipv6_is_supported(void) {
diff --git a/SOURCES/0048-shared-avoid-semi-duplicating-socket_address_equal.patch b/SOURCES/0048-shared-avoid-semi-duplicating-socket_address_equal.patch
index 7bda801..cddcfc4 100644
--- a/SOURCES/0048-shared-avoid-semi-duplicating-socket_address_equal.patch
+++ b/SOURCES/0048-shared-avoid-semi-duplicating-socket_address_equal.patch
@@ -12,7 +12,7 @@ instead of implementing similar comparing of addresses.
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
-index c31f60ec7..deecce8a8 100644
+index c31f60ec7e..deecce8a80 100644
--- a/src/shared/socket-util.c
+++ b/src/shared/socket-util.c
@@ -464,23 +464,7 @@ bool socket_address_matches_fd(const SocketAddress *a, int fd) {
diff --git a/SOURCES/0049-shared-handle-unnamed-sockets-in-socket_address_equa.patch b/SOURCES/0049-shared-handle-unnamed-sockets-in-socket_address_equa.patch
index 052866b..b90180a 100644
--- a/SOURCES/0049-shared-handle-unnamed-sockets-in-socket_address_equa.patch
+++ b/SOURCES/0049-shared-handle-unnamed-sockets-in-socket_address_equa.patch
@@ -13,7 +13,7 @@ socket, just return false.
1 file changed, 4 insertions(+)
diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
-index deecce8a8..a4e26b1d8 100644
+index deecce8a80..a4e26b1d8c 100644
--- a/src/shared/socket-util.c
+++ b/src/shared/socket-util.c
@@ -349,6 +349,10 @@ bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) {
diff --git a/SOURCES/0050-man-make-bootup-graph-consistent.patch b/SOURCES/0050-man-make-bootup-graph-consistent.patch
index 35d03cd..c96d103 100644
--- a/SOURCES/0050-man-make-bootup-graph-consistent.patch
+++ b/SOURCES/0050-man-make-bootup-graph-consistent.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] man: make bootup graph consistent
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/bootup.xml b/man/bootup.xml
-index d97d55023..b92057af2 100644
+index d97d550236..b92057af29 100644
--- a/man/bootup.xml
+++ b/man/bootup.xml
@@ -134,7 +134,7 @@
diff --git a/SOURCES/0051-nspawn-fix-whitespace-and-typo-in-partition-table-bl.patch b/SOURCES/0051-nspawn-fix-whitespace-and-typo-in-partition-table-bl.patch
index b38325f..6373c1b 100644
--- a/SOURCES/0051-nspawn-fix-whitespace-and-typo-in-partition-table-bl.patch
+++ b/SOURCES/0051-nspawn-fix-whitespace-and-typo-in-partition-table-bl.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] nspawn: fix whitespace and typo in partition table blurb
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index fb672510b..7724df96b 100644
+index fb672510b4..7724df96bd 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2676,7 +2676,7 @@ static int setup_image(char **device_path, int *loop_nr) {
diff --git a/SOURCES/0052-man-explain-time-units-in-tmpfiles.patch b/SOURCES/0052-man-explain-time-units-in-tmpfiles.patch
index 84321a7..616571a 100644
--- a/SOURCES/0052-man-explain-time-units-in-tmpfiles.patch
+++ b/SOURCES/0052-man-explain-time-units-in-tmpfiles.patch
@@ -10,7 +10,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1195294
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
-index 8815bf997..4bd0fcf75 100644
+index 8815bf9970..4bd0fcf751 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -443,23 +443,22 @@
diff --git a/SOURCES/0053-systemctl-check-validity-of-PID-we-received.patch b/SOURCES/0053-systemctl-check-validity-of-PID-we-received.patch
index be25640..6241468 100644
--- a/SOURCES/0053-systemctl-check-validity-of-PID-we-received.patch
+++ b/SOURCES/0053-systemctl-check-validity-of-PID-we-received.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] systemctl: check validity of PID we received
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 6b93ec844..3da4d3d4f 100644
+index 6b93ec8446..3da4d3d4f1 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2881,6 +2881,9 @@ static int check_inhibitors(sd_bus *bus, enum action a) {
diff --git a/SOURCES/0054-systemctl-support-auditd.service-better.patch b/SOURCES/0054-systemctl-support-auditd.service-better.patch
index 71dfcd4..679f672 100644
--- a/SOURCES/0054-systemctl-support-auditd.service-better.patch
+++ b/SOURCES/0054-systemctl-support-auditd.service-better.patch
@@ -17,7 +17,7 @@ a file.
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 3da4d3d4f..4ec0cff21 100644
+index 3da4d3d4f1..4ec0cff21d 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4555,6 +4555,23 @@ static int init_home_and_lookup_paths(char **user_home, char **user_runtime, Loo
diff --git a/SOURCES/0055-shared-unit-name-fix-gcc5-warning.patch b/SOURCES/0055-shared-unit-name-fix-gcc5-warning.patch
index 6a35a44..3845afe 100644
--- a/SOURCES/0055-shared-unit-name-fix-gcc5-warning.patch
+++ b/SOURCES/0055-shared-unit-name-fix-gcc5-warning.patch
@@ -17,7 +17,7 @@ src/shared/unit-name.c:102:34: warning: logical not is only applied to the left
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c
-index 21b66913c..f728af4a8 100644
+index 21b66913c9..f728af4a81 100644
--- a/src/shared/unit-name.c
+++ b/src/shared/unit-name.c
@@ -100,7 +100,7 @@ bool unit_name_is_valid(const char *n, enum template_valid template_ok) {
diff --git a/SOURCES/0056-test-hashmap-fix-gcc5-warning.patch b/SOURCES/0056-test-hashmap-fix-gcc5-warning.patch
index 8790fa0..5136e00 100644
--- a/SOURCES/0056-test-hashmap-fix-gcc5-warning.patch
+++ b/SOURCES/0056-test-hashmap-fix-gcc5-warning.patch
@@ -18,7 +18,7 @@ src/test/test-hashmap.c:76:79: warning: logical not is only applied to the left
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c
-index 6900da9e8..351563b96 100644
+index 6900da9e89..351563b967 100644
--- a/src/test/test-hashmap.c
+++ b/src/test/test-hashmap.c
@@ -75,7 +75,7 @@ static void test_trivial_compare_func(void) {
diff --git a/SOURCES/0057-shared-fix-wrong-assertion-in-barrier_set_role.patch b/SOURCES/0057-shared-fix-wrong-assertion-in-barrier_set_role.patch
index bb838a9..cec7336 100644
--- a/SOURCES/0057-shared-fix-wrong-assertion-in-barrier_set_role.patch
+++ b/SOURCES/0057-shared-fix-wrong-assertion-in-barrier_set_role.patch
@@ -15,7 +15,7 @@ Test the same condition twice, pretty sure we mean
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/barrier.c b/src/shared/barrier.c
-index f65363a67..b7dca7509 100644
+index f65363a67b..b7dca75097 100644
--- a/src/shared/barrier.c
+++ b/src/shared/barrier.c
@@ -178,7 +178,7 @@ void barrier_set_role(Barrier *b, unsigned int role) {
diff --git a/SOURCES/0058-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/SOURCES/0058-hwdb-Update-database-of-Bluetooth-company-identifier.patch
index fca08a7..091c43c 100644
--- a/SOURCES/0058-hwdb-Update-database-of-Bluetooth-company-identifier.patch
+++ b/SOURCES/0058-hwdb-Update-database-of-Bluetooth-company-identifier.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
1 file changed, 42 insertions(+)
diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb/20-bluetooth-vendor-product.hwdb
-index fb789fd49..4fd951a58 100644
+index fb789fd495..4fd951a584 100644
--- a/hwdb/20-bluetooth-vendor-product.hwdb
+++ b/hwdb/20-bluetooth-vendor-product.hwdb
@@ -1430,3 +1430,45 @@ bluetooth:v01D9*
diff --git a/SOURCES/0059-journal-make-skipping-of-exhausted-journal-files-eff.patch b/SOURCES/0059-journal-make-skipping-of-exhausted-journal-files-eff.patch
index 7b188fa..f861327 100644
--- a/SOURCES/0059-journal-make-skipping-of-exhausted-journal-files-eff.patch
+++ b/SOURCES/0059-journal-make-skipping-of-exhausted-journal-files-eff.patch
@@ -30,7 +30,7 @@ except that:
3 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 0f28718b0..24c49b916 100644
+index 0f28718b0e..24c49b916a 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2014,8 +2014,7 @@ void journal_file_reset_location(JournalFile *f) {
@@ -44,7 +44,7 @@ index 0f28718b0..24c49b916 100644
f->current_offset = offset;
f->current_seqnum = le64toh(o->entry.seqnum);
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
-index 2526e14d6..403c8f760 100644
+index 2526e14d65..403c8f760c 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -199,7 +199,7 @@ int journal_file_find_field_object(JournalFile *f, const void *field, uint64_t s
@@ -57,7 +57,7 @@ index 2526e14d6..403c8f760 100644
int journal_file_next_entry(JournalFile *f, uint64_t p, direction_t direction, Object **ret, uint64_t *offset);
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index 94891cdf3..9b57e5945 100644
+index 94891cdf35..9b57e5945d 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -723,13 +723,17 @@ static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direc
diff --git a/SOURCES/0060-shared-condition-fix-gcc5-warning.patch b/SOURCES/0060-shared-condition-fix-gcc5-warning.patch
index 741690b..054a8c7 100644
--- a/SOURCES/0060-shared-condition-fix-gcc5-warning.patch
+++ b/SOURCES/0060-shared-condition-fix-gcc5-warning.patch
@@ -28,7 +28,7 @@ src/shared/condition.c:47:9: note: in expansion of macro ‘assert’
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/condition.c b/src/shared/condition.c
-index da7560f05..796cc520d 100644
+index da7560f05f..796cc520d7 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -46,7 +46,7 @@ Condition* condition_new(ConditionType type, const char *parameter, bool trigger
diff --git a/SOURCES/0061-man-correct-description-of-systemd-user-sessions.patch b/SOURCES/0061-man-correct-description-of-systemd-user-sessions.patch
index ccf7ab1..ec3f25d 100644
--- a/SOURCES/0061-man-correct-description-of-systemd-user-sessions.patch
+++ b/SOURCES/0061-man-correct-description-of-systemd-user-sessions.patch
@@ -11,7 +11,7 @@ That part of functionality was removed in 7fb3ee51c1b377.
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/man/systemd-user-sessions.service.xml b/man/systemd-user-sessions.service.xml
-index 9d796b1ae..e75ef11c4 100644
+index 9d796b1ae1..e75ef11c4e 100644
--- a/man/systemd-user-sessions.service.xml
+++ b/man/systemd-user-sessions.service.xml
@@ -55,13 +55,12 @@
diff --git a/SOURCES/0062-build-sys-allow-lto-and-FORTIFY_SOURCE-with-O-sz.patch b/SOURCES/0062-build-sys-allow-lto-and-FORTIFY_SOURCE-with-O-sz.patch
index 1e141bd..f3982bc 100644
--- a/SOURCES/0062-build-sys-allow-lto-and-FORTIFY_SOURCE-with-O-sz.patch
+++ b/SOURCES/0062-build-sys-allow-lto-and-FORTIFY_SOURCE-with-O-sz.patch
@@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89382
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 9c25c3c6f..3201428c4 100644
+index 9c25c3c6fc..3201428c44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,13 +208,13 @@ AS_CASE([$CC], [*clang*],
diff --git a/SOURCES/0063-man-fix-typo.patch b/SOURCES/0063-man-fix-typo.patch
index 08edf6c..651613d 100644
--- a/SOURCES/0063-man-fix-typo.patch
+++ b/SOURCES/0063-man-fix-typo.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] man: fix typo
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
-index 4480e1999..ef58887dc 100644
+index 4480e1999d..ef58887dc8 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -108,7 +108,7 @@
diff --git a/SOURCES/0064-bus-proxyd-avoid-logging-oom-twice.patch b/SOURCES/0064-bus-proxyd-avoid-logging-oom-twice.patch
index 4156898..7c1b294 100644
--- a/SOURCES/0064-bus-proxyd-avoid-logging-oom-twice.patch
+++ b/SOURCES/0064-bus-proxyd-avoid-logging-oom-twice.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] bus-proxyd: avoid logging oom twice
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
-index b6b005636..b6550ed3c 100644
+index b6b0056362..b6550ed3cf 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -82,7 +82,7 @@ static int client_context_new(ClientContext **out) {
diff --git a/SOURCES/0065-Do-not-run-sysv-generator-test-when-sysv-compat-is-d.patch b/SOURCES/0065-Do-not-run-sysv-generator-test-when-sysv-compat-is-d.patch
index c376514..57410e0 100644
--- a/SOURCES/0065-Do-not-run-sysv-generator-test-when-sysv-compat-is-d.patch
+++ b/SOURCES/0065-Do-not-run-sysv-generator-test-when-sysv-compat-is-d.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] Do not run sysv-generator-test when sysv compat is disabled
1 file changed, 5 insertions(+)
diff --git a/Makefile.am b/Makefile.am
-index 2e6455f6e..4933f76bd 100644
+index 2e6455f6e3..4933f76bdd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3789,9 +3789,14 @@ TESTS += \
diff --git a/SOURCES/0066-README-mention-ACLs-more.patch b/SOURCES/0066-README-mention-ACLs-more.patch
index 7785e09..8abe0bb 100644
--- a/SOURCES/0066-README-mention-ACLs-more.patch
+++ b/SOURCES/0066-README-mention-ACLs-more.patch
@@ -11,7 +11,7 @@ They are now useful for any fs used for journal storage.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README b/README
-index ac2a81c0c..ffc2cf9f2 100644
+index ac2a81c0cc..ffc2cf9f20 100644
--- a/README
+++ b/README
@@ -78,8 +78,8 @@ REQUIREMENTS:
diff --git a/SOURCES/0067-Do-not-advertise-.d-snippets-over-main-config-file.patch b/SOURCES/0067-Do-not-advertise-.d-snippets-over-main-config-file.patch
index 80f3c11..5fa65b9 100644
--- a/SOURCES/0067-Do-not-advertise-.d-snippets-over-main-config-file.patch
+++ b/SOURCES/0067-Do-not-advertise-.d-snippets-over-main-config-file.patch
@@ -31,7 +31,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89397
16 files changed, 73 insertions(+), 45 deletions(-)
diff --git a/man/bootchart.conf.xml b/man/bootchart.conf.xml
-index 8d9700d30..bf6ca0bf9 100644
+index 8d9700d300..bf6ca0bf9e 100644
--- a/man/bootchart.conf.xml
+++ b/man/bootchart.conf.xml
@@ -68,8 +68,7 @@
@@ -45,7 +45,7 @@ index 8d9700d30..bf6ca0bf9 100644