systemd: merge branch 'systemd' into master

diff --cc src/systemd/src/basic/alloc-util.c
Simple merge

diff --cc src/systemd/src/basic/alloc-util.h
Simple merge

diff --cc src/systemd/src/basic/async.h
Simple merge

diff --cc src/systemd/src/basic/escape.c
Simple merge

diff --cc src/systemd/src/basic/escape.h
index fd1b118,1b28bd1..6ca36a7
--- 1/src/systemd/src/basic/escape.h
--- 2/src/systemd/src/basic/escape.h
+++ b/src/systemd/src/basic/escape.h
@@@ -27,8 -23,10 +25,12 @@@
  #include <stddef.h>
  #include <stdint.h>
  #include <sys/types.h>
+ #include <uchar.h>
  
  #include "string-util.h"
++#if 0 /* NM_IGNORED */
+ #include "missing.h"
++#endif /* NM_IGNORED */
  
  /* What characters are special in the shell? */
  /* must be escaped outside and inside double-quotes */

diff --cc src/systemd/src/basic/fd-util.c
Simple merge

diff --cc src/systemd/src/basic/fd-util.h
Simple merge

diff --cc src/systemd/src/basic/fileio.c
Simple merge

diff --cc src/systemd/src/basic/fileio.h
Simple merge

diff --cc src/systemd/src/basic/fs-util.c
Simple merge

diff --cc src/systemd/src/basic/fs-util.h
Simple merge

diff --cc src/systemd/src/basic/hash-funcs.c
Simple merge

diff --cc src/systemd/src/basic/hash-funcs.h
Simple merge

diff --cc src/systemd/src/basic/hashmap.c
Simple merge

diff --cc src/systemd/src/basic/hashmap.h
Simple merge

diff --cc src/systemd/src/basic/hexdecoct.c
Simple merge

diff --cc src/systemd/src/basic/hexdecoct.h
Simple merge

diff --cc src/systemd/src/basic/hostname-util.c
Simple merge

diff --cc src/systemd/src/basic/hostname-util.h
Simple merge

diff --cc src/systemd/src/basic/in-addr-util.c
Simple merge

diff --cc src/systemd/src/basic/in-addr-util.h
Simple merge

diff --cc src/systemd/src/basic/io-util.c
Simple merge

diff --cc src/systemd/src/basic/io-util.h
Simple merge

diff --cc src/systemd/src/basic/list.h
Simple merge

diff --cc src/systemd/src/basic/log.h
Simple merge

diff --cc src/systemd/src/basic/macro.h
Simple merge

diff --cc src/systemd/src/basic/mempool.c
Simple merge

diff --cc src/systemd/src/basic/mempool.h
Simple merge

diff --cc src/systemd/src/basic/parse-util.c
Simple merge

diff --cc src/systemd/src/basic/parse-util.h
Simple merge

diff --cc src/systemd/src/basic/path-util.c
Simple merge

diff --cc src/systemd/src/basic/path-util.h
Simple merge

diff --cc src/systemd/src/basic/prioq.c
Simple merge

diff --cc src/systemd/src/basic/prioq.h
Simple merge

diff --cc src/systemd/src/basic/random-util.c
Simple merge

diff --cc src/systemd/src/basic/refcnt.h
Simple merge

diff --cc src/systemd/src/basic/set.h
Simple merge

diff --cc src/systemd/src/basic/socket-util.h
Simple merge

diff --cc src/systemd/src/basic/stdio-util.h
Simple merge

diff --cc src/systemd/src/basic/string-table.c
Simple merge

diff --cc src/systemd/src/basic/string-table.h
Simple merge

diff --cc src/systemd/src/basic/string-util.c
Simple merge

diff --cc src/systemd/src/basic/string-util.h
Simple merge

diff --cc src/systemd/src/basic/strv.c
index 3862490,b5d4d81..c003091
--- 1/src/systemd/src/basic/strv.c
--- 2/src/systemd/src/basic/strv.c
+++ b/src/systemd/src/basic/strv.c
@@@ -30,9 -26,8 +28,10 @@@
  
  #include "alloc-util.h"
  #include "escape.h"
 +#if 0 /* NM_IGNORED */
  #include "extract-word.h"
 +#endif /* NM_IGNORED */
+ #include "fileio.h"
  #include "string-util.h"
  #include "strv.h"
  #include "util.h"

diff --cc src/systemd/src/basic/strv.h
Simple merge

diff --cc src/systemd/src/basic/time-util.c
Simple merge

diff --cc src/systemd/src/basic/time-util.h
Simple merge

diff --cc src/systemd/src/basic/umask-util.h
Simple merge

diff --cc src/systemd/src/basic/unaligned.h
Simple merge

diff --cc src/systemd/src/basic/utf8.c
Simple merge

diff --cc src/systemd/src/basic/utf8.h
index 32172c3,12c272d..0a7858c
--- 1/src/systemd/src/basic/utf8.h
--- 2/src/systemd/src/basic/utf8.h
+++ b/src/systemd/src/basic/utf8.h
@@@ -26,8 -22,10 +24,12 @@@
  #include <stdbool.h>
  #include <stddef.h>
  #include <stdint.h>
+ #include <uchar.h>
  
  #include "macro.h"
++#if 0 /* NM_IGNORED */
+ #include "missing.h"
++#endif /* NM_IGNORED */
  
  #define UTF8_REPLACEMENT_CHARACTER "\xef\xbf\xbd"
  

diff --cc src/systemd/src/basic/util.c
Simple merge

diff --cc src/systemd/src/basic/util.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/arp-util.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp-identifier.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp-identifier.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp-internal.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp-lease-internal.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp-option.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp-protocol.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp6-internal.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp6-lease-internal.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp6-option.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/dhcp6-protocol.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/lldp-internal.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/lldp-internal.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/lldp-network.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/lldp-network.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/lldp-port.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/lldp-port.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/lldp-tlv.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/lldp-tlv.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/lldp.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/network-internal.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/network-internal.h
Simple merge

diff --cc src/systemd/src/libsystemd-network/sd-dhcp-client.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/sd-dhcp-lease.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/sd-dhcp6-client.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
Simple merge

diff --cc src/systemd/src/libsystemd-network/sd-lldp.c
Simple merge

diff --cc src/systemd/src/libsystemd/sd-id128/sd-id128.c
Simple merge

diff --cc src/systemd/src/shared/dns-domain.c
Simple merge

diff --cc src/systemd/src/shared/dns-domain.h
Simple merge

diff --cc src/systemd/src/systemd/_sd-common.h
Simple merge

diff --cc src/systemd/src/systemd/sd-dhcp-client.h
Simple merge

diff --cc src/systemd/src/systemd/sd-dhcp-lease.h
Simple merge

diff --cc src/systemd/src/systemd/sd-dhcp6-client.h
Simple merge

diff --cc src/systemd/src/systemd/sd-dhcp6-lease.h
Simple merge

diff --cc src/systemd/src/systemd/sd-event.h
Simple merge

diff --cc src/systemd/src/systemd/sd-id128.h
Simple merge

diff --cc src/systemd/src/systemd/sd-ipv4acd.h
Simple merge

diff --cc src/systemd/src/systemd/sd-ipv4ll.h
Simple merge

diff --cc src/systemd/src/systemd/sd-lldp.h
Simple merge

diff --cc src/systemd/src/systemd/sd-ndisc.h
Simple merge