From 2bb8d8d9b248208dc8c11c7b7089acb70cd988b5 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 17 Jul 2018 03:06:33 +0900
Subject: [PATCH 1/3] process-util: do not hide global variable

Suggested by LGTM.
---
 src/basic/process-util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 0a4f917cbd..0a5280eb24 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -1153,7 +1153,7 @@ void reset_cached_pid(void) {
 /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
  * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
  * libpthread, as it is part of glibc anyway. */
-extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void * __dso_handle);
+extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
 extern void* __dso_handle __attribute__ ((__weak__));
 
 pid_t getpid_cached(void) {

From 948f7ce4fbbb393e3c6a12ab3fbc7023b4124e43 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 17 Jul 2018 03:10:29 +0900
Subject: [PATCH 2/3] login: fix typo in log message

Reported in #9590.
---
 src/login/logind-user.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 99358360ab..e18a6f0efe 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -753,7 +753,7 @@ int config_parse_compat_user_tasks_max(
         log_syntax(unit, LOG_NOTICE, filename, line, 0,
                    "Support for option %s= has been removed.",
                    lvalue);
-        log_info("Hint: try creating /etc/systemd/system/user-.slice/50-limits.conf with:\n"
+        log_info("Hint: try creating /etc/systemd/system/user-.slice.d/50-limits.conf with:\n"
                  "        [Slice]\n"
                  "        TasksMax=%s",
                  rvalue);

From bd277f53e84c0765d6bdc118002e5e258e1cd9dd Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 17 Jul 2018 03:12:19 +0900
Subject: [PATCH 3/3] man: fix group name for systemd-networkd

---
 man/systemd.netdev.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 7faa38d502..d950eb578b 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -1006,7 +1006,7 @@
             (see <citerefentry project="wireguard"><refentrytitle>wg</refentrytitle><manvolnum>8</manvolnum></citerefentry>).
             This option is mandatory to use WireGuard.
             Note that because this information is secret, you may want to set
-            the permissions of the .netdev file to be owned by <literal>root:systemd-networkd</literal>
+            the permissions of the .netdev file to be owned by <literal>root:systemd-network</literal>
             with a <literal>0640</literal> file mode.</para>
         </listitem>
       </varlistentry>