systemd package update

Signed-off-by: basebuilder_pel7ppc64lebuilder0 <basebuilder@powerel.org>

SOURCES/0001-kernel-install-add-fedora-specific-callouts-to-new-k.patch

@@ -5,14 +5,14 @@ Subject: [PATCH] kernel-install: add fedora specific callouts to
  new-kernel-pkg
 
 ---
- src/kernel-install/kernel-install | 36 ++++++++++++++++++++++++++++++++++++
+ src/kernel-install/kernel-install | 36 +++++++++++++++++++++++++++++++
  1 file changed, 36 insertions(+)
  mode change 100644 => 100755 src/kernel-install/kernel-install
 
 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

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[]) {

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[]) {

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) {

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) {

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

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 @@

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:

SOURCES/0009-Revert-missing-remove-fanotify.patch

@@ -10,13 +10,13 @@ Conflicts:
 ---
  Makefile.am                 |  1 +
  configure.ac                |  1 +
- src/shared/linux/fanotify.h | 98 +++++++++++++++++++++++++++++++++++++++++++++
- src/shared/missing.h        | 64 +++++++++++++++++++++++++++++
+ src/shared/linux/fanotify.h | 98 +++++++++++++++++++++++++++++++++++++
+ src/shared/missing.h        | 64 ++++++++++++++++++++++++
  4 files changed, 164 insertions(+)
  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) {

SOURCES/0010-Revert-readahead-wipe-out-readahead.patch

@@ -14,60 +14,60 @@ Conflicts:
 	man/systemd-notify.xml
 	src/notify/notify.c
 ---
- Makefile-man.am                                 |  31 ++
- Makefile.am                                     |  54 +-
- configure.ac                                    |   9 +
- man/sd-daemon.xml                               |   1 +
- man/sd-login.xml                                |   1 +
- man/sd-readahead.xml                            | 117 +++++
- man/sd_readahead.xml                            | 178 +++++++
- man/systemd-notify.xml                          |  11 +
- man/systemd-readahead-replay.service.xml        | 203 ++++++++
- po/POTFILES.skip                                |   1 +
- shell-completion/zsh/_systemd                   |   3 +-
- src/cryptsetup/cryptsetup-generator.c           |   2 +-
- src/gpt-auto-generator/gpt-auto-generator.c     |   1 +
- src/notify/notify.c                             |  20 +-
- src/readahead/Makefile                          |   1 +
- src/readahead/readahead-analyze.c               | 146 ++++++
- src/readahead/readahead-collect.c               | 650 ++++++++++++++++++++++++
- src/readahead/readahead-common.c                | 398 +++++++++++++++
- src/readahead/readahead-common.h                |  61 +++
- src/readahead/readahead-replay.c                | 281 ++++++++++
- src/readahead/readahead.c                       | 163 ++++++
- src/readahead/sd-readahead.c                    |  89 ++++
- src/readahead/test-ssd.c                        |  41 ++
- src/systemd/sd-readahead.h                      |  73 +++
- system-preset/90-systemd.preset                 |   1 +
- units/.gitignore                                |   3 +
- units/ldconfig.service                          |   2 +-
- units/quotaon.service.in                        |   2 +-
- units/system-update.target                      |   2 +-
- units/systemd-backlight@.service.in             |   2 +-
- units/systemd-binfmt.service.in                 |   2 +-
- units/systemd-firstboot.service.in              |   2 +-
- units/systemd-fsck-root.service.in              |   1 +
- units/systemd-fsck@.service.in                  |   2 +-
- units/systemd-hwdb-update.service.in            |   2 +-
- units/systemd-journal-catalog-update.service.in |   2 +-
- units/systemd-modules-load.service.in           |   1 +
- units/systemd-quotacheck.service.in             |   2 +-
- units/systemd-random-seed.service.in            |   2 +-
- units/systemd-readahead-collect.service.in      |  28 +
- units/systemd-readahead-done.service.in         |  22 +
- units/systemd-readahead-done.timer              |  22 +
- units/systemd-readahead-drop.service            |  19 +
- units/systemd-readahead-replay.service.in       |  26 +
- units/systemd-remount-fs.service.in             |   2 +-
- units/systemd-rfkill@.service.in                |   2 +-
- units/systemd-sysctl.service.in                 |   1 +
- units/systemd-sysusers.service.in               |   2 +-
- units/systemd-tmpfiles-clean.service.in         |   2 +-
- units/systemd-tmpfiles-setup-dev.service.in     |   2 +-
- units/systemd-tmpfiles-setup.service.in         |   2 +-
- units/systemd-update-done.service.in            |   2 +-
- units/systemd-update-utmp.service.in            |   2 +-
- units/systemd-vconsole-setup.service.in         |   1 +
+ Makefile-man.am                               |  31 +
+ Makefile.am                                   |  54 +-
+ configure.ac                                  |   9 +
+ man/sd-daemon.xml                             |   1 +
+ man/sd-login.xml                              |   1 +
+ man/sd-readahead.xml                          | 117 ++++
+ man/sd_readahead.xml                          | 178 +++++
+ man/systemd-notify.xml                        |  11 +
+ man/systemd-readahead-replay.service.xml      | 203 ++++++
+ po/POTFILES.skip                              |   1 +
+ shell-completion/zsh/_systemd                 |   3 +-
+ src/cryptsetup/cryptsetup-generator.c         |   2 +-
+ src/gpt-auto-generator/gpt-auto-generator.c   |   1 +
+ src/notify/notify.c                           |  20 +-
+ src/readahead/Makefile                        |   1 +
+ src/readahead/readahead-analyze.c             | 146 ++++
+ src/readahead/readahead-collect.c             | 650 ++++++++++++++++++
+ src/readahead/readahead-common.c              | 398 +++++++++++
+ src/readahead/readahead-common.h              |  61 ++
+ src/readahead/readahead-replay.c              | 281 ++++++++
+ src/readahead/readahead.c                     | 163 +++++
+ src/readahead/sd-readahead.c                  |  89 +++
+ src/readahead/test-ssd.c                      |  41 ++
+ src/systemd/sd-readahead.h                    |  73 ++
+ system-preset/90-systemd.preset               |   1 +
+ units/.gitignore                              |   3 +
+ units/ldconfig.service                        |   2 +-
+ units/quotaon.service.in                      |   2 +-
+ units/system-update.target                    |   2 +-
+ units/systemd-backlight@.service.in           |   2 +-
+ units/systemd-binfmt.service.in               |   2 +-
+ units/systemd-firstboot.service.in            |   2 +-
+ units/systemd-fsck-root.service.in            |   1 +
+ units/systemd-fsck@.service.in                |   2 +-
+ units/systemd-hwdb-update.service.in          |   2 +-
+ .../systemd-journal-catalog-update.service.in |   2 +-
+ units/systemd-modules-load.service.in         |   1 +
+ units/systemd-quotacheck.service.in           |   2 +-
+ units/systemd-random-seed.service.in          |   2 +-
+ units/systemd-readahead-collect.service.in    |  28 +
+ units/systemd-readahead-done.service.in       |  22 +
+ units/systemd-readahead-done.timer            |  22 +
+ units/systemd-readahead-drop.service          |  19 +
+ units/systemd-readahead-replay.service.in     |  26 +
+ units/systemd-remount-fs.service.in           |   2 +-
+ units/systemd-rfkill@.service.in              |   2 +-
+ units/systemd-sysctl.service.in               |   1 +
+ units/systemd-sysusers.service.in             |   2 +-
+ units/systemd-tmpfiles-clean.service.in       |   2 +-
+ units/systemd-tmpfiles-setup-dev.service.in   |   2 +-
+ units/systemd-tmpfiles-setup.service.in       |   2 +-
+ units/systemd-update-done.service.in          |   2 +-
+ units/systemd-update-utmp.service.in          |   2 +-
+ units/systemd-vconsole-setup.service.in       |   1 +
  54 files changed, 2675 insertions(+), 23 deletions(-)
  create mode 100644 man/sd-readahead.xml
  create mode 100644 man/sd_readahead.xml
@@ -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
      </para>
    </refsect1>
 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
    </refsect1>
 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
 +</refentry>
 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
 +
 +</refentry>
 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
      </variablelist>
 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
 +
 +</refentry>
 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

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 @@

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 @@

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

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) {

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 @@

SOURCES/0016-Revert-timedated-manage-systemd-timesyncd-directly-i.patch

@@ -12,11 +12,11 @@ Conflicts:
 	src/timedate/timedated.c
 ---
  Makefile.am              |   9 ++
- src/timedate/timedated.c | 252 ++++++++++++++++++++++++++++++-----------------
+ src/timedate/timedated.c | 252 +++++++++++++++++++++++++--------------
  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) {

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) {

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) {

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) {

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) {

SOURCES/0021-tmpfiles-avoid-creating-duplicate-acl-entries.patch

@@ -11,12 +11,12 @@ Status quo ante can be restored with:
 
 (cherry picked from commit 1c73f3bc29111a00738569c9d40a989b161a0624)
 ---
- src/shared/acl-util.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++--
+ src/shared/acl-util.c | 79 +++++++++++++++++++++++++++++++++++++++++--
  src/shared/acl-util.h |  4 +++
  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);

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) {

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) {

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;

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:

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) {

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) {

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) {

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) {

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) {

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:

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 @@

SOURCES/0033-core-rework-device-state-logic.patch

@@ -16,16 +16,16 @@ its BindTo dependency on the device would not be fulfilled.
 
 (cherry picked from commit 628c89cc68ab96fce2de7ebba5933725d147aecc)
 ---
- src/core/device.c | 368 +++++++++++++++++++++++++++++++++---------------------
- src/core/device.h |  14 ++-
- src/core/mount.c  |  46 ++++---
- src/core/swap.c   |  32 +++--
+ src/core/device.c | 368 ++++++++++++++++++++++++++++------------------
+ src/core/device.h |  14 +-
+ src/core/mount.c  |  46 +++---
+ src/core/swap.c   |  32 ++--
  src/core/swap.h   |   4 +-
  src/core/unit.c   |   1 -
  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) {

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

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

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) {

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) {

SOURCES/0038-journal-remote-fix-saving-of-binary-fields.patch

@@ -9,12 +9,12 @@ were non-conforming, resulting in an error ("Invalid field.") when reading.
 https://bugs.freedesktop.org/show_bug.cgi?id=89391
 (cherry picked from commit 09d801a82a46df518dd752e40bf13ac404daa2ce)
 ---
- src/journal-remote/journal-remote-parse.c | 31 ++++++++++++++++++-------------
- src/journal-remote/journal-remote-parse.h |  4 +++-
+ src/journal-remote/journal-remote-parse.c | 31 +++++++++++++----------
+ src/journal-remote/journal-remote-parse.h |  4 ++-
  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 {

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(

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

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

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) {

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:

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*

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 @@

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) {

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) {

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) {

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) {

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 @@

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) {

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 @@

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) {

SOURCES/0054-systemctl-support-auditd.service-better.patch

@@ -13,11 +13,11 @@ a file.
 
 (cherry picked from commit 8527b07be1c5211b50a1a6496585952857a25c73)
 ---
- src/systemctl/systemctl.c | 46 +++++++++++++++++++++++-----------------------
+ src/systemctl/systemctl.c | 46 +++++++++++++++++++--------------------
  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

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) {

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) {

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) {

SOURCES/0058-hwdb-Update-database-of-Bluetooth-company-identifier.patch

@@ -5,11 +5,11 @@ Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
 
 (cherry picked from commit 3cabeab1197d3e45f16f514f5a396e0fb311e867)
 ---
- hwdb/20-bluetooth-vendor-product.hwdb | 42 +++++++++++++++++++++++++++++++++++
+ hwdb/20-bluetooth-vendor-product.hwdb | 42 +++++++++++++++++++++++++++
  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*

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

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

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 @@

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*],

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 @@

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) {

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 += \

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:

SOURCES/0067-Do-not-advertise-.d-snippets-over-main-config-file.patch

@@ -15,23 +15,23 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89397
  man/bootchart.conf.xml         |  3 +--
  man/coredump.conf.xml          |  3 +--
  man/journald.conf.xml          |  3 +--
- man/logind.conf.xml            |  8 +++++---
+ man/logind.conf.xml            |  8 ++++---
  man/resolved.conf.xml          |  3 +--
- man/standard-conf.xml          | 42 ++++++++++++++++++++++++++++++++++--------
+ man/standard-conf.xml          | 42 +++++++++++++++++++++++++++-------
  man/systemd-sleep.conf.xml     |  3 +--
  man/systemd-system.conf.xml    |  3 +--
  man/timesyncd.conf.xml         |  3 +--
- src/bootchart/bootchart.conf   |  7 ++++---
- src/core/system.conf           |  7 ++++---
- src/journal/coredump.conf      |  7 ++++---
- src/journal/journald.conf      |  7 ++++---
- src/login/logind.conf          |  7 ++++---
- src/resolve/resolved.conf.in   |  5 +++--
- src/timesync/timesyncd.conf.in |  7 ++++---
+ src/bootchart/bootchart.conf   |  7 +++---
+ src/core/system.conf           |  7 +++---
+ src/journal/coredump.conf      |  7 +++---
+ src/journal/journald.conf      |  7 +++---
+ src/login/logind.conf          |  7 +++---
+ src/resolve/resolved.conf.in   |  5 ++--
+ src/timesync/timesyncd.conf.in |  7 +++---
  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
    <refsect1>
      <title>Options</title>
 diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml
-index 3d325e6ad..0b7329bf5 100644
+index 3d325e6ad7..0b7329bf55 100644
 --- a/man/coredump.conf.xml
 +++ b/man/coredump.conf.xml
 @@ -63,8 +63,7 @@
@@ -59,7 +59,7 @@ index 3d325e6ad..0b7329bf5 100644
    <refsect1>
      <title>Options</title>
 diff --git a/man/journald.conf.xml b/man/journald.conf.xml
-index 364b58f07..85146b0d8 100644
+index 364b58f07e..85146b0d82 100644
 --- a/man/journald.conf.xml
 +++ b/man/journald.conf.xml
 @@ -64,8 +64,7 @@
@@ -73,7 +73,7 @@ index 364b58f07..85146b0d8 100644
    <refsect1>
      <title>Options</title>
 diff --git a/man/logind.conf.xml b/man/logind.conf.xml
-index ffaec5035..ca2b18783 100644
+index ffaec50351..ca2b18783c 100644
 --- a/man/logind.conf.xml
 +++ b/man/logind.conf.xml
 @@ -58,11 +58,13 @@
@@ -94,7 +94,7 @@ index ffaec5035..ca2b18783 100644
    <refsect1>
      <title>Options</title>
 diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
-index 36cae2706..8047a4ea7 100644
+index 36cae2706c..8047a4ea75 100644
 --- a/man/resolved.conf.xml
 +++ b/man/resolved.conf.xml
 @@ -63,8 +63,7 @@
@@ -108,7 +108,7 @@ index 36cae2706..8047a4ea7 100644
    <refsect1>
      <title>Options</title>
 diff --git a/man/standard-conf.xml b/man/standard-conf.xml
-index b87d7e955..36af45927 100644
+index b87d7e955b..36af45927d 100644
 --- a/man/standard-conf.xml
 +++ b/man/standard-conf.xml
 @@ -33,13 +33,39 @@
@@ -160,7 +160,7 @@ index b87d7e955..36af45927 100644
    </refsection>
  </refsection>
 diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
-index 433f2f83a..bb17ec866 100644
+index 433f2f83a0..bb17ec8669 100644
 --- a/man/systemd-sleep.conf.xml
 +++ b/man/systemd-sleep.conf.xml
 @@ -112,8 +112,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
@@ -174,7 +174,7 @@ index 433f2f83a..bb17ec866 100644
    <refsect1>
      <title>Options</title>
 diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
-index 7c3f23756..c7bcfaee4 100644
+index 7c3f237567..c7bcfaee4d 100644
 --- a/man/systemd-system.conf.xml
 +++ b/man/systemd-system.conf.xml
 @@ -74,8 +74,7 @@
@@ -188,7 +188,7 @@ index 7c3f23756..c7bcfaee4 100644
    <refsect1>
      <title>Options</title>
 diff --git a/man/timesyncd.conf.xml b/man/timesyncd.conf.xml
-index 1127970a1..89a651c66 100644
+index 1127970a18..89a651c662 100644
 --- a/man/timesyncd.conf.xml
 +++ b/man/timesyncd.conf.xml
 @@ -63,8 +63,7 @@
@@ -202,7 +202,7 @@ index 1127970a1..89a651c66 100644
    <refsect1>
      <title>Options</title>
 diff --git a/src/bootchart/bootchart.conf b/src/bootchart/bootchart.conf
-index 2d7cb6121..4f5e50936 100644
+index 2d7cb61217..4f5e50936e 100644
 --- a/src/bootchart/bootchart.conf
 +++ b/src/bootchart/bootchart.conf
 @@ -5,10 +5,11 @@
@@ -221,7 +221,7 @@ index 2d7cb6121..4f5e50936 100644
  [Bootchart]
  #Samples=500
 diff --git a/src/core/system.conf b/src/core/system.conf
-index a3727200d..231609033 100644
+index a3727200df..231609033b 100644
 --- a/src/core/system.conf
 +++ b/src/core/system.conf
 @@ -5,10 +5,11 @@
@@ -240,7 +240,7 @@ index a3727200d..231609033 100644
  [Manager]
  #LogLevel=info
 diff --git a/src/journal/coredump.conf b/src/journal/coredump.conf
-index 0fe9fe801..c2f0643e0 100644
+index 0fe9fe801a..c2f0643e03 100644
 --- a/src/journal/coredump.conf
 +++ b/src/journal/coredump.conf
 @@ -5,10 +5,11 @@
@@ -259,7 +259,7 @@ index 0fe9fe801..c2f0643e0 100644
  [Coredump]
  #Storage=external
 diff --git a/src/journal/journald.conf b/src/journal/journald.conf
-index 29bdf8f18..47eefe91c 100644
+index 29bdf8f183..47eefe91c1 100644
 --- a/src/journal/journald.conf
 +++ b/src/journal/journald.conf
 @@ -5,10 +5,11 @@
@@ -278,7 +278,7 @@ index 29bdf8f18..47eefe91c 100644
  [Journal]
  #Storage=auto
 diff --git a/src/login/logind.conf b/src/login/logind.conf
-index 6b1943a2d..834c4c2eb 100644
+index 6b1943a2d1..834c4c2ebf 100644
 --- a/src/login/logind.conf
 +++ b/src/login/logind.conf
 @@ -5,10 +5,11 @@
@@ -297,7 +297,7 @@ index 6b1943a2d..834c4c2eb 100644
  [Login]
  #NAutoVTs=6
 diff --git a/src/resolve/resolved.conf.in b/src/resolve/resolved.conf.in
-index e5a19ee47..3eb19e42b 100644
+index e5a19ee474..3eb19e42b7 100644
 --- a/src/resolve/resolved.conf.in
 +++ b/src/resolve/resolved.conf.in
 @@ -5,8 +5,9 @@
@@ -313,7 +313,7 @@ index e5a19ee47..3eb19e42b 100644
  # See resolved.conf(5) for details
  
 diff --git a/src/timesync/timesyncd.conf.in b/src/timesync/timesyncd.conf.in
-index fc3c6c49c..b6a2ada27 100644
+index fc3c6c49cf..b6a2ada273 100644
 --- a/src/timesync/timesyncd.conf.in
 +++ b/src/timesync/timesyncd.conf.in
 @@ -5,10 +5,11 @@

SOURCES/0068-hwdb-add-pnpid-for-the-T450s-touchpad.patch

@@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89411
  1 file changed, 2 insertions(+)
 
 diff --git a/hwdb/70-touchpad.hwdb b/hwdb/70-touchpad.hwdb
-index bbf44db77..9fcb5fdb9 100644
+index bbf44db778..9fcb5fdb9b 100644
 --- a/hwdb/70-touchpad.hwdb
 +++ b/hwdb/70-touchpad.hwdb
 @@ -36,4 +36,6 @@

SOURCES/0069-networkd-netdev-inform-when-we-take-over-an-existing.patch

@@ -16,7 +16,7 @@ be to simply make the kernel stop creating these devices as they are pretty usel
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
-index 8119205dd..7d193d088 100644
+index 8119205dde..7d193d088e 100644
 --- a/src/network/networkd-netdev.c
 +++ b/src/network/networkd-netdev.c
 @@ -261,7 +261,7 @@ static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userda

SOURCES/0070-man-replace-obsolete-wiki-link-with-man-page.patch

@@ -18,7 +18,7 @@ Subject: [PATCH] man: replace obsolete wiki link with man page
  10 files changed, 18 insertions(+), 34 deletions(-)
 
 diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml
-index 0e48e7934..1974cd7a2 100644
+index 0e48e79346..1974cd7a2d 100644
 --- a/man/systemd-cryptsetup-generator.xml
 +++ b/man/systemd-cryptsetup-generator.xml
 @@ -59,10 +59,8 @@
@@ -35,7 +35,7 @@ index 0e48e7934..1974cd7a2 100644
  
    <refsect1>
 diff --git a/man/systemd-debug-generator.xml b/man/systemd-debug-generator.xml
-index 74c3b2620..5c5e9fc4a 100644
+index 74c3b2620e..5c5e9fc4a1 100644
 --- a/man/systemd-debug-generator.xml
 +++ b/man/systemd-debug-generator.xml
 @@ -79,10 +79,8 @@
@@ -52,7 +52,7 @@ index 74c3b2620..5c5e9fc4a 100644
  
    <refsect1>
 diff --git a/man/systemd-efi-boot-generator.xml b/man/systemd-efi-boot-generator.xml
-index b2d8d65e3..fd7ba7983 100644
+index b2d8d65e3d..fd7ba79837 100644
 --- a/man/systemd-efi-boot-generator.xml
 +++ b/man/systemd-efi-boot-generator.xml
 @@ -68,9 +68,7 @@
@@ -67,7 +67,7 @@ index b2d8d65e3..fd7ba7983 100644
  
    <refsect1>
 diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml
-index 8f82e3330..022efb413 100644
+index 8f82e33304..022efb4130 100644
 --- a/man/systemd-fstab-generator.xml
 +++ b/man/systemd-fstab-generator.xml
 @@ -71,10 +71,8 @@
@@ -84,7 +84,7 @@ index 8f82e3330..022efb413 100644
  
    <refsect1>
 diff --git a/man/systemd-getty-generator.xml b/man/systemd-getty-generator.xml
-index 0b5b2f2a7..338925964 100644
+index 0b5b2f2a71..338925964d 100644
 --- a/man/systemd-getty-generator.xml
 +++ b/man/systemd-getty-generator.xml
 @@ -75,9 +75,8 @@
@@ -100,7 +100,7 @@ index 0b5b2f2a7..338925964 100644
      <para>Further information about configuration of gettys you may
      find in
 diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml
-index 9c706df24..8d2eaca4f 100644
+index 9c706df246..8d2eaca4f6 100644
 --- a/man/systemd-gpt-auto-generator.xml
 +++ b/man/systemd-gpt-auto-generator.xml
 @@ -157,9 +157,7 @@
@@ -115,7 +115,7 @@ index 9c706df24..8d2eaca4f 100644
  
    <refsect1>
 diff --git a/man/systemd-system-update-generator.xml b/man/systemd-system-update-generator.xml
-index 3eec1d7b9..e7fc95c74 100644
+index 3eec1d7b93..e7fc95c742 100644
 --- a/man/systemd-system-update-generator.xml
 +++ b/man/systemd-system-update-generator.xml
 @@ -61,10 +61,8 @@
@@ -132,7 +132,7 @@ index 3eec1d7b9..e7fc95c74 100644
  
    <refsect1>
 diff --git a/man/systemd-sysv-generator.xml b/man/systemd-sysv-generator.xml
-index e619b1bc2..f2d56cbcd 100644
+index e619b1bc2e..f2d56cbcd2 100644
 --- a/man/systemd-sysv-generator.xml
 +++ b/man/systemd-sysv-generator.xml
 @@ -81,10 +81,8 @@
@@ -149,7 +149,7 @@ index e619b1bc2..f2d56cbcd 100644
  
    <refsect1>
 diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
-index 09e11b471..a452f87ba 100644
+index 09e11b4711..a452f87baf 100644
 --- a/man/systemd.unit.xml
 +++ b/man/systemd.unit.xml
 @@ -357,8 +357,8 @@
@@ -164,7 +164,7 @@ index 09e11b471..a452f87ba 100644
    </refsect1>
  
 diff --git a/man/systemd.xml b/man/systemd.xml
-index 80591dc73..9b92140e6 100644
+index 80591dc732..9b92140e6b 100644
 --- a/man/systemd.xml
 +++ b/man/systemd.xml
 @@ -415,9 +415,8 @@

SOURCES/0071-Use-correct-uname-identifiers-in-arch_map-for-SuperH.patch

@@ -11,7 +11,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89421
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/src/shared/architecture.c b/src/shared/architecture.c
-index 34c5a53fa..884abdd3e 100644
+index 34c5a53fa9..884abdd3ea 100644
 --- a/src/shared/architecture.c
 +++ b/src/shared/architecture.c
 @@ -108,8 +108,12 @@ int uname_architecture(void) {

SOURCES/0072-hwdb-fix-Dell-XPS12-9Q33-key-name.patch

@@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=84437
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
-index 2cb976923..88906655e 100644
+index 2cb976923d..88906655ef 100644
 --- a/hwdb/60-keyboard.hwdb
 +++ b/hwdb/60-keyboard.hwdb
 @@ -259,7 +259,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnXPS*:pvr*

SOURCES/0073-Remove-the-cap-on-epoll-events.patch

@@ -14,7 +14,7 @@ avoiding this issue.
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
-index 25089a033..c6350be9f 100644
+index 25089a0335..c6350be9f4 100644
 --- a/src/libsystemd/sd-event/sd-event.c
 +++ b/src/libsystemd/sd-event/sd-event.c
 @@ -37,7 +37,6 @@

SOURCES/0074-Allow-up-to-4096-simultaneous-connections.patch

@@ -16,7 +16,7 @@ This patch raises the limit to 4096.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/core/dbus.c b/src/core/dbus.c
-index 260775cd8..85b517486 100644
+index 260775cd85..85b5174868 100644
 --- a/src/core/dbus.c
 +++ b/src/core/dbus.c
 @@ -44,7 +44,7 @@

SOURCES/0075-hwdb-add-Logitech-G5-Laser-Mouse.patch

@@ -9,7 +9,7 @@ Subject: [PATCH] hwdb: add Logitech G5 Laser Mouse
  1 file changed, 2 insertions(+)
 
 diff --git a/hwdb/70-mouse.hwdb b/hwdb/70-mouse.hwdb
-index a62ebc497..93ee4d9fa 100644
+index a62ebc497d..93ee4d9fa6 100644
 --- a/hwdb/70-mouse.hwdb
 +++ b/hwdb/70-mouse.hwdb
 @@ -196,6 +196,8 @@ mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:4008:

SOURCES/0076-tmpfiles-Fix-handling-of-duplicate-lines.patch

@@ -14,7 +14,7 @@ https://launchpad.net/bugs/1428540
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index 187997e1f..1e1096816 100644
+index 187997e1f4..1e10968164 100644
 --- a/src/tmpfiles/tmpfiles.c
 +++ b/src/tmpfiles/tmpfiles.c
 @@ -1750,9 +1750,11 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {

SOURCES/0077-hwdb-add-Lenovo-W451-to-TOUCHPAD_HAS_TRACKPOINT_BUTT.patch

@@ -9,7 +9,7 @@ Subject: [PATCH] hwdb: add Lenovo W451 to TOUCHPAD_HAS_TRACKPOINT_BUTTONS list
  1 file changed, 2 insertions(+)
 
 diff --git a/hwdb/70-touchpad.hwdb b/hwdb/70-touchpad.hwdb
-index 9fcb5fdb9..8a324466b 100644
+index 9fcb5fdb9b..8a324466b3 100644
 --- a/hwdb/70-touchpad.hwdb
 +++ b/hwdb/70-touchpad.hwdb
 @@ -36,6 +36,8 @@

SOURCES/0078-vconsole-match-on-vtcon-events-not-fbcon-ones.patch

@@ -23,7 +23,7 @@ into existence. (The font table is a per-vtcon property.)
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/src/vconsole/90-vconsole.rules.in b/src/vconsole/90-vconsole.rules.in
-index 062009640..35b9ad515 100644
+index 062009640c..35b9ad5151 100644
 --- a/src/vconsole/90-vconsole.rules.in
 +++ b/src/vconsole/90-vconsole.rules.in
 @@ -5,7 +5,6 @@

SOURCES/0079-core-do-not-spawn-jobs-or-touch-other-units-during-c.patch

@@ -36,7 +36,7 @@ Fixes https://bugs.freedesktop.org/show_bug.cgi?id=88401
  16 files changed, 89 insertions(+), 33 deletions(-)
 
 diff --git a/src/core/automount.c b/src/core/automount.c
-index 9f6bd84b2..e4c79415d 100644
+index 9f6bd84b21..e4c79415d1 100644
 --- a/src/core/automount.c
 +++ b/src/core/automount.c
 @@ -235,7 +235,7 @@ static void automount_set_state(Automount *a, AutomountState state) {
@@ -49,7 +49,7 @@ index 9f6bd84b2..e4c79415d 100644
          int r;
  
 diff --git a/src/core/busname.c b/src/core/busname.c
-index 1d77292f9..43d7607a3 100644
+index 1d77292f9b..43d7607a30 100644
 --- a/src/core/busname.c
 +++ b/src/core/busname.c
 @@ -335,7 +335,7 @@ static void busname_set_state(BusName *n, BusNameState state) {
@@ -62,7 +62,7 @@ index 1d77292f9..43d7607a3 100644
          int r;
  
 diff --git a/src/core/device.c b/src/core/device.c
-index 1cc103c29..4ff882721 100644
+index 1cc103c290..4ff8827219 100644
 --- a/src/core/device.c
 +++ b/src/core/device.c
 @@ -142,7 +142,7 @@ static void device_set_state(Device *d, DeviceState state) {
@@ -75,7 +75,7 @@ index 1cc103c29..4ff882721 100644
  
          assert(d);
 diff --git a/src/core/manager.c b/src/core/manager.c
-index bc9b7ec62..203a6a0a1 100644
+index bc9b7ec620..203a6a0a1a 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
 @@ -983,7 +983,28 @@ static int manager_coldplug(Manager *m) {
@@ -128,7 +128,7 @@ index bc9b7ec62..203a6a0a1 100644
                          r = q;
          }
 diff --git a/src/core/mount.c b/src/core/mount.c
-index c971330af..3ae0eb462 100644
+index c971330af2..3ae0eb4621 100644
 --- a/src/core/mount.c
 +++ b/src/core/mount.c
 @@ -617,7 +617,7 @@ static void mount_set_state(Mount *m, MountState state) {
@@ -141,7 +141,7 @@ index c971330af..3ae0eb462 100644
          MountState new_state = MOUNT_DEAD;
          int r;
 diff --git a/src/core/path.c b/src/core/path.c
-index e5ea79fec..51e36fa8b 100644
+index e5ea79fec7..51e36fa8be 100644
 --- a/src/core/path.c
 +++ b/src/core/path.c
 @@ -440,7 +440,12 @@ static void path_set_state(Path *p, PathState state) {
@@ -173,7 +173,7 @@ index e5ea79fec..51e36fa8b 100644
          }
  
 diff --git a/src/core/scope.c b/src/core/scope.c
-index b41db7872..ae6614fbf 100644
+index b41db7872c..ae6614fbf0 100644
 --- a/src/core/scope.c
 +++ b/src/core/scope.c
 @@ -173,7 +173,7 @@ static int scope_load(Unit *u) {
@@ -186,7 +186,7 @@ index b41db7872..ae6614fbf 100644
          int r;
  
 diff --git a/src/core/service.c b/src/core/service.c
-index 15e29be14..7781b4e62 100644
+index 15e29be149..7781b4e626 100644
 --- a/src/core/service.c
 +++ b/src/core/service.c
 @@ -879,7 +879,7 @@ static void service_set_state(Service *s, ServiceState state) {
@@ -199,7 +199,7 @@ index 15e29be14..7781b4e62 100644
          int r;
  
 diff --git a/src/core/slice.c b/src/core/slice.c
-index ae9819d01..61ff9d331 100644
+index ae9819d015..61ff9d3314 100644
 --- a/src/core/slice.c
 +++ b/src/core/slice.c
 @@ -153,7 +153,7 @@ static int slice_load(Unit *u) {
@@ -212,7 +212,7 @@ index ae9819d01..61ff9d331 100644
  
          assert(t);
 diff --git a/src/core/snapshot.c b/src/core/snapshot.c
-index b70c3beb6..b1d844877 100644
+index b70c3beb60..b1d8448771 100644
 --- a/src/core/snapshot.c
 +++ b/src/core/snapshot.c
 @@ -75,7 +75,7 @@ static int snapshot_load(Unit *u) {
@@ -225,7 +225,7 @@ index b70c3beb6..b1d844877 100644
  
          assert(s);
 diff --git a/src/core/socket.c b/src/core/socket.c
-index 88aae4815..760de0203 100644
+index 88aae4815b..760de0203d 100644
 --- a/src/core/socket.c
 +++ b/src/core/socket.c
 @@ -1326,7 +1326,7 @@ static void socket_set_state(Socket *s, SocketState state) {
@@ -238,7 +238,7 @@ index 88aae4815..760de0203 100644
          int r;
  
 diff --git a/src/core/swap.c b/src/core/swap.c
-index 5c19af5d9..369abf0f5 100644
+index 5c19af5d91..369abf0f53 100644
 --- a/src/core/swap.c
 +++ b/src/core/swap.c
 @@ -513,7 +513,7 @@ static void swap_set_state(Swap *s, SwapState state) {
@@ -251,7 +251,7 @@ index 5c19af5d9..369abf0f5 100644
          SwapState new_state = SWAP_DEAD;
          int r;
 diff --git a/src/core/target.c b/src/core/target.c
-index 33fb66bc3..2411a8e75 100644
+index 33fb66bc3f..2411a8e758 100644
 --- a/src/core/target.c
 +++ b/src/core/target.c
 @@ -107,7 +107,7 @@ static int target_load(Unit *u) {
@@ -264,7 +264,7 @@ index 33fb66bc3..2411a8e75 100644
  
          assert(t);
 diff --git a/src/core/timer.c b/src/core/timer.c
-index 45744c7de..48cf9c16a 100644
+index 45744c7de5..48cf9c16a8 100644
 --- a/src/core/timer.c
 +++ b/src/core/timer.c
 @@ -268,7 +268,12 @@ static void timer_set_state(Timer *t, TimerState state) {
@@ -296,7 +296,7 @@ index 45744c7de..48cf9c16a 100644
          }
  
 diff --git a/src/core/unit.c b/src/core/unit.c
-index a6558ee23..565455bd6 100644
+index a6558ee23b..565455bd63 100644
 --- a/src/core/unit.c
 +++ b/src/core/unit.c
 @@ -2859,27 +2859,34 @@ int unit_add_node_link(Unit *u, const char *what, bool wants) {
@@ -344,7 +344,7 @@ index a6558ee23..565455bd6 100644
          return 0;
  }
 diff --git a/src/core/unit.h b/src/core/unit.h
-index 291bc77a7..7ebc489c8 100644
+index 291bc77a76..7ebc489c80 100644
 --- a/src/core/unit.h
 +++ b/src/core/unit.h
 @@ -307,8 +307,14 @@ struct UnitVTable {

SOURCES/0080-firstboot-set-all-spwd-fields-to-1-for-consistency-w.patch

@@ -10,7 +10,7 @@ Subject: [PATCH] firstboot: set all spwd fields to -1 for consistency with
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
-index a765d6d21..a37ca170f 100644
+index a765d6d219..a37ca170fb 100644
 --- a/src/firstboot/firstboot.c
 +++ b/src/firstboot/firstboot.c
 @@ -525,9 +525,9 @@ static int process_root_password(void) {

SOURCES/0081-sysusers-do-not-reject-users-with-already-present-et.patch

@@ -14,7 +14,7 @@ It's better to relax checks here than to duplicate functionality in firstboot.
  1 file changed, 9 insertions(+), 14 deletions(-)
 
 diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
-index e47bcb4dc..76b5962c5 100644
+index e47bcb4dca..76b5962c51 100644
 --- a/src/sysusers/sysusers.c
 +++ b/src/sysusers/sysusers.c
 @@ -605,6 +605,8 @@ static int write_files(void) {

SOURCES/0082-nspawn-fix-use-after-free-and-leak-in-error-paths.patch

@@ -11,7 +11,7 @@ CID #1257765.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 7724df96b..78bd58483 100644
+index 7724df96bd..78bd584834 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
 @@ -3627,7 +3627,7 @@ int main(int argc, char *argv[]) {

SOURCES/0083-login-fix-copy-pasto-in-error-path.patch

@@ -11,7 +11,7 @@ CID #1256583.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/login/inhibit.c b/src/login/inhibit.c
-index 44bda34af..88af23e35 100644
+index 44bda34aff..88af23e35c 100644
 --- a/src/login/inhibit.c
 +++ b/src/login/inhibit.c
 @@ -260,7 +260,7 @@ int main(int argc, char *argv[]) {

SOURCES/0084-journalctl-update-hint-now-that-we-set-ACL-everywher.patch

@@ -9,7 +9,7 @@ Subject: [PATCH] journalctl: update hint now that we set ACL everywhere
  1 file changed, 11 insertions(+), 14 deletions(-)
 
 diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
-index 55c778633..12c869f5a 100644
+index 55c7786331..12c869f5af 100644
 --- a/src/journal/journalctl.c
 +++ b/src/journal/journalctl.c
 @@ -1542,10 +1542,17 @@ static int access_check_var_log_journal(sd_journal *j) {

SOURCES/0085-sd-journal-return-error-when-we-cannot-open-a-file.patch

@@ -12,7 +12,7 @@ properly when the user lacks permissions.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
-index 9b57e5945..9b9e8ac85 100644
+index 9b57e5945d..9b9e8ac859 100644
 --- a/src/journal/sd-journal.c
 +++ b/src/journal/sd-journal.c
 @@ -1248,7 +1248,7 @@ static int add_file(sd_journal *j, const char *prefix, const char *filename) {

SOURCES/0086-missing.h-add-NDA_.patch

@@ -13,7 +13,7 @@ introduced in v3.9 and NDA_PORT, NDA_VNI and NDA_IFINDEX in v3.10
  2 files changed, 19 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 3201428c4..081ed0f6e 100644
+index 3201428c44..081ed0f6eb 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -334,7 +334,8 @@ AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE,
@@ -35,7 +35,7 @@ index 3201428c4..081ed0f6e 100644
  
  # This makes sure pkg.m4 is available.
 diff --git a/src/shared/missing.h b/src/shared/missing.h
-index 8cb0b2c96..6ef4dbdf4 100644
+index 8cb0b2c96e..6ef4dbdf43 100644
 --- a/src/shared/missing.h
 +++ b/src/shared/missing.h
 @@ -35,6 +35,7 @@

SOURCES/0087-udevd-close-race-in-udev-settle.patch

@@ -33,7 +33,7 @@ Reported-by: Daniel Drake <drake@endlessm.com>
  1 file changed, 17 insertions(+), 9 deletions(-)
 
 diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 99d4c8983..e98c1fd6d 100644
+index 99d4c8983a..e98c1fd6da 100644
 --- a/src/udev/udevd.c
 +++ b/src/udev/udevd.c
 @@ -909,6 +909,17 @@ static void handle_signal(struct udev *udev, int signo) {

SOURCES/0088-man-document-that-ExecStartPre-is-not-the-place-to-s.patch

@@ -10,7 +10,7 @@ Subject: [PATCH] man: document that ExecStartPre= is not the place to start
  1 file changed, 5 insertions(+)
 
 diff --git a/man/systemd.service.xml b/man/systemd.service.xml
-index c03b4e8a5..f59870563 100644
+index c03b4e8a54..f598705633 100644
 --- a/man/systemd.service.xml
 +++ b/man/systemd.service.xml
 @@ -334,6 +334,11 @@

SOURCES/0089-journal-fix-return-code.patch

@@ -14,7 +14,7 @@ recurse this deep.
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 24c49b916..f500568fe 100644
+index 24c49b916a..f500568fec 100644
 --- a/src/journal/journal-file.c
 +++ b/src/journal/journal-file.c
 @@ -2652,10 +2652,8 @@ int journal_file_open(

SOURCES/0090-console-fix-error-code-inversion.patch

@@ -13,7 +13,7 @@ instead of <0, which will not be detected as error by sysview-core.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/console/consoled-manager.c b/src/console/consoled-manager.c
-index 9dd62f04a..25de0a218 100644
+index 9dd62f04a0..25de0a218f 100644
 --- a/src/console/consoled-manager.c
 +++ b/src/console/consoled-manager.c
 @@ -228,7 +228,7 @@ static int manager_sysview_session_control(Manager *m, sysview_event *event) {

SOURCES/0091-bus-proxy-complain-only-once-about-queue-overflows.patch

@@ -29,7 +29,7 @@ dbus-daemon does).
  2 files changed, 13 insertions(+), 4 deletions(-)
 
 diff --git a/src/bus-proxyd/proxy.c b/src/bus-proxyd/proxy.c
-index 3dea908f5..e13cf5e2e 100644
+index 3dea908f5b..e13cf5e2ea 100644
 --- a/src/bus-proxyd/proxy.c
 +++ b/src/bus-proxyd/proxy.c
 @@ -729,13 +729,21 @@ static int proxy_process_destination_to_local(Proxy *p) {
@@ -59,7 +59,7 @@ index 3dea908f5..e13cf5e2e 100644
  }
  
 diff --git a/src/bus-proxyd/proxy.h b/src/bus-proxyd/proxy.h
-index 913d47071..782c4e60b 100644
+index 913d47071b..782c4e60b3 100644
 --- a/src/bus-proxyd/proxy.h
 +++ b/src/bus-proxyd/proxy.h
 @@ -40,6 +40,7 @@ struct Proxy {

SOURCES/0092-cgtop-fix-assert-when-not-on-tty.patch

@@ -17,7 +17,7 @@ Aborted (core dumped)
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
-index 3c7ad4060..f951c37cb 100644
+index 3c7ad40605..f951c37cbc 100644
 --- a/src/cgtop/cgtop.c
 +++ b/src/cgtop/cgtop.c
 @@ -447,7 +447,7 @@ static int display(Hashmap *a) {

SOURCES/0093-man-split-paragraph.patch

@@ -12,7 +12,7 @@ paragraph to make it much easier to find.
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
-index 11b160e58..fdb157864 100644
+index 11b160e58f..fdb1578641 100644
 --- a/man/systemd.exec.xml
 +++ b/man/systemd.exec.xml
 @@ -283,7 +283,9 @@

SOURCES/0094-hwdb-update.patch

@@ -5,14 +5,14 @@ Subject: [PATCH] hwdb: update
 
 (cherry picked from commit b83cbcb7d95482baa588706227f01bbbe44b9d12)
 ---
- hwdb/20-OUI.hwdb               | 247 ++++++++++-
- hwdb/20-pci-vendor-model.hwdb  | 936 +++++++++++++++++++++++++++--------------
+ hwdb/20-OUI.hwdb               | 247 ++++++++-
+ hwdb/20-pci-vendor-model.hwdb  | 936 ++++++++++++++++++++++-----------
  hwdb/20-sdio-vendor-model.hwdb |  30 ++
- hwdb/20-usb-vendor-model.hwdb  | 181 +++++++-
+ hwdb/20-usb-vendor-model.hwdb  | 181 ++++++-
  4 files changed, 1060 insertions(+), 334 deletions(-)
 
 diff --git a/hwdb/20-OUI.hwdb b/hwdb/20-OUI.hwdb
-index 6976bdf64..deb323d34 100644
+index 6976bdf649..deb323d34c 100644
 --- a/hwdb/20-OUI.hwdb
 +++ b/hwdb/20-OUI.hwdb
 @@ -28829,7 +28829,7 @@ OUI:0013EB*
@@ -844,7 +844,7 @@ index 6976bdf64..deb323d34 100644
   ID_OUI_FROM_DATABASE=HBC-radiomatic
  
 diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb/20-pci-vendor-model.hwdb
-index 6c2208887..3b35b26e5 100644
+index 6c22088873..3b35b26e59 100644
 --- a/hwdb/20-pci-vendor-model.hwdb
 +++ b/hwdb/20-pci-vendor-model.hwdb
 @@ -4361,6 +4361,9 @@ pci:v00001002d0000665Csv00001787sd00002329*
@@ -2631,7 +2631,7 @@ index 6c2208887..3b35b26e5 100644
   ID_VENDOR_FROM_DATABASE=JusonTech Corporation
  
 diff --git a/hwdb/20-sdio-vendor-model.hwdb b/hwdb/20-sdio-vendor-model.hwdb
-index 626d673c4..9cf34b2a3 100644
+index 626d673c4d..9cf34b2a39 100644
 --- a/hwdb/20-sdio-vendor-model.hwdb
 +++ b/hwdb/20-sdio-vendor-model.hwdb
 @@ -80,6 +80,36 @@ sdio:c*v02D0*
@@ -2672,7 +2672,7 @@ index 626d673c4..9cf34b2a3 100644
   ID_VENDOR_FROM_DATABASE=SyChip Inc.
  
 diff --git a/hwdb/20-usb-vendor-model.hwdb b/hwdb/20-usb-vendor-model.hwdb
-index 94e0269ce..8867531a3 100644
+index 94e0269ce7..8867531a31 100644
 --- a/hwdb/20-usb-vendor-model.hwdb
 +++ b/hwdb/20-usb-vendor-model.hwdb
 @@ -503,6 +503,9 @@ usb:v03F0p0217*

SOURCES/0095-networkd-Begin-with-serial-number-1-for-netlink-requ.patch

@@ -28,7 +28,7 @@ will fail with -EBUSY.
  1 file changed, 5 insertions(+)
 
 diff --git a/src/libsystemd/sd-rtnl/sd-rtnl.c b/src/libsystemd/sd-rtnl/sd-rtnl.c
-index ae49c77e0..7cdcc5d96 100644
+index ae49c77e01..7cdcc5d96a 100644
 --- a/src/libsystemd/sd-rtnl/sd-rtnl.c
 +++ b/src/libsystemd/sd-rtnl/sd-rtnl.c
 @@ -61,6 +61,11 @@ static int sd_rtnl_new(sd_rtnl **ret) {

SOURCES/0096-journal-remote-downgrade-routine-messages-to-debug.patch

@@ -8,12 +8,12 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89486
 ---
  src/journal-remote/journal-remote-parse.c |  2 +-
  src/journal-remote/journal-remote-write.c |  2 +-
- src/journal-remote/journal-remote.c       | 36 +++++++++++++++----------------
- src/journal-remote/microhttpd-util.c      |  4 ++--
+ src/journal-remote/journal-remote.c       | 36 +++++++++++------------
+ src/journal-remote/microhttpd-util.c      |  4 +--
  4 files changed, 22 insertions(+), 22 deletions(-)
 
 diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c
-index afded7e38..6c096de03 100644
+index afded7e380..6c096de03a 100644
 --- a/src/journal-remote/journal-remote-parse.c
 +++ b/src/journal-remote/journal-remote-parse.c
 @@ -443,7 +443,7 @@ int process_source(RemoteSource *source, bool compress, bool seal) {
@@ -26,7 +26,7 @@ index afded7e38..6c096de03 100644
  
          if (!source->iovw.count) {
 diff --git a/src/journal-remote/journal-remote-write.c b/src/journal-remote/journal-remote-write.c
-index df3004939..99820fa7b 100644
+index df30049397..99820fa7b8 100644
 --- a/src/journal-remote/journal-remote-write.c
 +++ b/src/journal-remote/journal-remote-write.c
 @@ -156,7 +156,7 @@ int writer_write(Writer *w,
@@ -39,7 +39,7 @@ index df3004939..99820fa7b 100644
          log_debug("Retrying write.");
          r = journal_file_append_entry(w->journal, ts, iovw->iovec, iovw->count,
 diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
-index 8f32a9a98..d1486e7cd 100644
+index 8f32a9a988..d1486e7cda 100644
 --- a/src/journal-remote/journal-remote.c
 +++ b/src/journal-remote/journal-remote.c
 @@ -207,7 +207,7 @@ static int open_output(Writer *w, const char* host) {
@@ -156,7 +156,7 @@ index 8f32a9a98..d1486e7cd 100644
                  *hostname = b;
  
 diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
-index a95fff18f..b45c38d68 100644
+index a95fff18f3..b45c38d682 100644
 --- a/src/journal-remote/microhttpd-util.c
 +++ b/src/journal-remote/microhttpd-util.c
 @@ -178,7 +178,7 @@ static int verify_cert_authorized(gnutls_session_t session) {

SOURCES/0097-journal-remote-process-events-without-delay.patch

@@ -22,11 +22,11 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89516
 ---
  src/journal-remote/journal-remote-parse.c |  1 +
  src/journal-remote/journal-remote-parse.h |  1 +
- src/journal-remote/journal-remote.c       | 65 +++++++++++++++++++++++++++----
+ src/journal-remote/journal-remote.c       | 65 ++++++++++++++++++++---
  3 files changed, 59 insertions(+), 8 deletions(-)
 
 diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c
-index 6c096de03..7e6295435 100644
+index 6c096de03a..7e62954351 100644
 --- a/src/journal-remote/journal-remote-parse.c
 +++ b/src/journal-remote/journal-remote-parse.c
 @@ -41,6 +41,7 @@ void source_free(RemoteSource *source) {
@@ -38,7 +38,7 @@ index 6c096de03..7e6295435 100644
          free(source);
  }
 diff --git a/src/journal-remote/journal-remote-parse.h b/src/journal-remote/journal-remote-parse.h
-index 22db55091..06a50296a 100644
+index 22db550913..06a50296a1 100644
 --- a/src/journal-remote/journal-remote-parse.h
 +++ b/src/journal-remote/journal-remote-parse.h
 @@ -54,6 +54,7 @@ typedef struct RemoteSource {
@@ -50,7 +50,7 @@ index 22db55091..06a50296a 100644
  
  RemoteSource* source_new(int fd, bool passive_fd, char *name, Writer *writer);
 diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
-index d1486e7cd..b7cc6d717 100644
+index d1486e7cda..b7cc6d7172 100644
 --- a/src/journal-remote/journal-remote.c
 +++ b/src/journal-remote/journal-remote.c
 @@ -289,6 +289,8 @@ static int dispatch_raw_source_event(sd_event_source *event,

SOURCES/0098-man-update-example-2-in-systemd.network-5.patch

@@ -12,7 +12,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89221
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/man/systemd.network.xml b/man/systemd.network.xml
-index 485876b6a..24f8416ef 100644
+index 485876b6ac..24f8416ef9 100644
 --- a/man/systemd.network.xml
 +++ b/man/systemd.network.xml
 @@ -643,7 +643,7 @@ Gateway=192.168.0.1</programlisting>

SOURCES/0099-gpt-auto-generator-fix-detection-of-srv.patch

@@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89226
  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 7d5a6c650..cceeeb845 100644
+index 7d5a6c6508..cceeeb845c 100644
 --- a/src/gpt-auto-generator/gpt-auto-generator.c
 +++ b/src/gpt-auto-generator/gpt-auto-generator.c
 @@ -549,7 +549,7 @@ static int enumerate_partitions(dev_t devnum) {

SOURCES/0100-sd-rtnl-never-set-serial-to-0.patch

@@ -14,7 +14,7 @@ Suggested by Richard Maw.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/libsystemd/sd-rtnl/sd-rtnl.c b/src/libsystemd/sd-rtnl/sd-rtnl.c
-index 7cdcc5d96..5df39e117 100644
+index 7cdcc5d96a..5df39e1177 100644
 --- a/src/libsystemd/sd-rtnl/sd-rtnl.c
 +++ b/src/libsystemd/sd-rtnl/sd-rtnl.c
 @@ -262,7 +262,7 @@ static void rtnl_seal_message(sd_rtnl *rtnl, sd_rtnl_message *m) {