Merge branch 'systemd' into bg/ipv4ll-bgo747463

In addition, update src/Makefile.am with new paths and move

  src/{dhcp-manager/systemd-dhcp => systemd}/nm-sd-adapt.[ch]

as well.

54 files changed, 70 insertions, 70 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 8cafb4886e..0008351de3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,79 +48,79 @@ AM_CPPFLAGS += $(foreach d,$(sort $(dir $(libNetworkManager_la_SOURCES))),-I$(to
 noinst_LTLIBRARIES = \
 	libNetworkManager.la \
 	libnm-iface-helper.la \
-	libsystemd-dhcp.la
+	libsystemd-nm.la
 
 ######################
-# libsystemd-dhcp
+# libsystemd-nm
 ######################
 
-SYSTEMD_DHCP_CFLAGS = \
-	-I$(top_srcdir)/src/dhcp-manager/systemd-dhcp/src/systemd \
-	-I$(top_srcdir)/src/dhcp-manager/systemd-dhcp/src/libsystemd-network \
-	-I$(top_srcdir)/src/dhcp-manager/systemd-dhcp/src/shared \
-	-I$(top_srcdir)/src/dhcp-manager/systemd-dhcp
-
-libsystemd_dhcp_la_SOURCES = \
-	dhcp-manager/systemd-dhcp/src/libsystemd/sd-id128/sd-id128.c \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-identifier.c \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-identifier.h \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-internal.h \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-lease-internal.h \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-option.c \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-option.c \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.h \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-lease.c \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-protocol.h \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-internal.h \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-protocol.h \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-lease-internal.h \
-	dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c \
-	dhcp-manager/systemd-dhcp/src/shared/async.h \
-	dhcp-manager/systemd-dhcp/src/shared/time-util.h \
-	dhcp-manager/systemd-dhcp/src/shared/siphash24.h \
-	dhcp-manager/systemd-dhcp/src/shared/time-util.c \
-	dhcp-manager/systemd-dhcp/src/shared/socket-util.h \
-	dhcp-manager/systemd-dhcp/src/shared/sparse-endian.h \
-	dhcp-manager/systemd-dhcp/src/shared/macro.h \
-	dhcp-manager/systemd-dhcp/src/shared/refcnt.h \
-	dhcp-manager/systemd-dhcp/src/shared/util.c \
-	dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c \
-	dhcp-manager/systemd-dhcp/src/shared/siphash24.c \
-	dhcp-manager/systemd-dhcp/src/shared/util.h \
-	dhcp-manager/systemd-dhcp/src/shared/in-addr-util.h \
-	dhcp-manager/systemd-dhcp/src/shared/list.h \
-	dhcp-manager/systemd-dhcp/src/shared/log.h \
-	dhcp-manager/systemd-dhcp/src/shared/fileio.h \
-	dhcp-manager/systemd-dhcp/src/shared/fileio.c \
-	dhcp-manager/systemd-dhcp/src/shared/path-util.c \
-	dhcp-manager/systemd-dhcp/src/shared/path-util.h \
-	dhcp-manager/systemd-dhcp/src/shared/strv.h \
-	dhcp-manager/systemd-dhcp/src/shared/strv.c \
-	dhcp-manager/systemd-dhcp/src/shared/unaligned.h \
-	dhcp-manager/systemd-dhcp/src/shared/utf8.h \
-	dhcp-manager/systemd-dhcp/src/shared/utf8.c \
-	dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h \
-	dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h \
-	dhcp-manager/systemd-dhcp/src/systemd/sd-id128.h \
-	dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-lease.h \
-	dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h \
-	dhcp-manager/systemd-dhcp/src/systemd/sd-event.h \
-	dhcp-manager/systemd-dhcp/src/systemd/_sd-common.h \
-	dhcp-manager/systemd-dhcp/nm-sd-adapt.h \
-	dhcp-manager/systemd-dhcp/nm-sd-adapt.c
-
-libsystemd_dhcp_la_CPPFLAGS = \
+SYSTEMD_NM_CFLAGS = \
+	-I$(top_srcdir)/src/systemd/src/systemd \
+	-I$(top_srcdir)/src/systemd/src/libsystemd-network \
+	-I$(top_srcdir)/src/systemd/src/shared \
+	-I$(top_srcdir)/src/systemd
+
+libsystemd_nm_la_SOURCES = \
+	systemd/src/libsystemd/sd-id128/sd-id128.c \
+	systemd/src/libsystemd-network/dhcp-identifier.c \
+	systemd/src/libsystemd-network/dhcp-identifier.h \
+	systemd/src/libsystemd-network/dhcp-network.c \
+	systemd/src/libsystemd-network/dhcp-packet.c \
+	systemd/src/libsystemd-network/dhcp-internal.h \
+	systemd/src/libsystemd-network/dhcp6-network.c \
+	systemd/src/libsystemd-network/dhcp6-lease-internal.h \
+	systemd/src/libsystemd-network/dhcp6-option.c \
+	systemd/src/libsystemd-network/network-internal.c \
+	systemd/src/libsystemd-network/sd-dhcp-lease.c \
+	systemd/src/libsystemd-network/sd-dhcp-client.c \
+	systemd/src/libsystemd-network/dhcp-option.c \
+	systemd/src/libsystemd-network/network-internal.h \
+	systemd/src/libsystemd-network/sd-dhcp6-lease.c \
+	systemd/src/libsystemd-network/dhcp-protocol.h \
+	systemd/src/libsystemd-network/dhcp6-internal.h \
+	systemd/src/libsystemd-network/dhcp6-protocol.h \
+	systemd/src/libsystemd-network/dhcp-lease-internal.h \
+	systemd/src/libsystemd-network/sd-dhcp6-client.c \
+	systemd/src/shared/async.h \
+	systemd/src/shared/time-util.h \
+	systemd/src/shared/siphash24.h \
+	systemd/src/shared/time-util.c \
+	systemd/src/shared/socket-util.h \
+	systemd/src/shared/sparse-endian.h \
+	systemd/src/shared/macro.h \
+	systemd/src/shared/refcnt.h \
+	systemd/src/shared/util.c \
+	systemd/src/shared/in-addr-util.c \
+	systemd/src/shared/siphash24.c \
+	systemd/src/shared/util.h \
+	systemd/src/shared/in-addr-util.h \
+	systemd/src/shared/list.h \
+	systemd/src/shared/log.h \
+	systemd/src/shared/fileio.h \
+	systemd/src/shared/fileio.c \
+	systemd/src/shared/path-util.c \
+	systemd/src/shared/path-util.h \
+	systemd/src/shared/strv.h \
+	systemd/src/shared/strv.c \
+	systemd/src/shared/unaligned.h \
+	systemd/src/shared/utf8.h \
+	systemd/src/shared/utf8.c \
+	systemd/src/systemd/sd-dhcp-lease.h \
+	systemd/src/systemd/sd-dhcp-client.h \
+	systemd/src/systemd/sd-id128.h \
+	systemd/src/systemd/sd-dhcp6-lease.h \
+	systemd/src/systemd/sd-dhcp6-client.h \
+	systemd/src/systemd/sd-event.h \
+	systemd/src/systemd/_sd-common.h \
+	systemd/nm-sd-adapt.h \
+	systemd/nm-sd-adapt.c
+
+libsystemd_nm_la_CPPFLAGS = \
 	-I$(top_srcdir)/include \
-	$(SYSTEMD_DHCP_CFLAGS) \
+	$(SYSTEMD_NM_CFLAGS) \
 	$(GLIB_CFLAGS)
 
-libsystemd_dhcp_la_LIBADD = \
+libsystemd_nm_la_LIBADD = \
 	$(GLIB_LIBS)
 
 ###########################################
@@ -399,7 +399,7 @@ AM_CPPFLAGS += \
 	$(LIBNDP_CFLAGS) \
 	$(LIBSOUP_CFLAGS) \
 	$(SYSTEMD_LOGIN_CFLAGS) \
-	$(SYSTEMD_DHCP_CFLAGS) \
+	$(SYSTEMD_NM_CFLAGS) \
 	\
 	-DBINDIR=\"$(bindir)\" \
 	-DDATADIR=\"$(datadir)\" \
@@ -427,7 +427,7 @@ libNetworkManager_la_SOURCES = \
 
 libNetworkManager_la_LIBADD = \
 	$(top_builddir)/libnm-core/libnm-core.la \
-	libsystemd-dhcp.la \
+	libsystemd-nm.la \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
 	$(GUDEV_LIBS) \
@@ -493,7 +493,7 @@ endif
 
 libnm_iface_helper_la_LIBADD = \
 	$(top_builddir)/libnm-core/libnm-core.la \
-	libsystemd-dhcp.la \
+	libsystemd-nm.la \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
 	$(GUDEV_LIBS) \
@@ -513,7 +513,7 @@ nm_iface_helper_SOURCES = \
 
 nm_iface_helper_LDADD = \
 	$(top_builddir)/libnm-core/libnm-core.la \
-	libsystemd-dhcp.la \
+	libsystemd-nm.la \
 	libnm-iface-helper.la \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
diff --git a/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.c b/src/systemd/nm-sd-adapt.c
index a6d817278e..a6d817278e 100644
--- a/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.c
+++ b/src/systemd/nm-sd-adapt.c
diff --git a/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h b/src/systemd/nm-sd-adapt.h
index 845f7fba86..845f7fba86 100644
--- a/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h
+++ b/src/systemd/nm-sd-adapt.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-identifier.c b/src/systemd/src/libsystemd-network/dhcp-identifier.c
index c33761bc13..c33761bc13 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-identifier.c
+++ b/src/systemd/src/libsystemd-network/dhcp-identifier.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-identifier.h b/src/systemd/src/libsystemd-network/dhcp-identifier.h
index 5d4da21cb0..5d4da21cb0 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-identifier.h
+++ b/src/systemd/src/libsystemd-network/dhcp-identifier.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-internal.h b/src/systemd/src/libsystemd-network/dhcp-internal.h
index b94c43f3b8..b94c43f3b8 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-internal.h
+++ b/src/systemd/src/libsystemd-network/dhcp-internal.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-lease-internal.h b/src/systemd/src/libsystemd-network/dhcp-lease-internal.h
index 2d7bf03bab..2d7bf03bab 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-lease-internal.h
+++ b/src/systemd/src/libsystemd-network/dhcp-lease-internal.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c b/src/systemd/src/libsystemd-network/dhcp-network.c
index 0b63028b46..0b63028b46 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c
+++ b/src/systemd/src/libsystemd-network/dhcp-network.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-option.c b/src/systemd/src/libsystemd-network/dhcp-option.c
index 50ecf87383..50ecf87383 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-option.c
+++ b/src/systemd/src/libsystemd-network/dhcp-option.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c b/src/systemd/src/libsystemd-network/dhcp-packet.c
index bb9bd90491..bb9bd90491 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c
+++ b/src/systemd/src/libsystemd-network/dhcp-packet.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-protocol.h b/src/systemd/src/libsystemd-network/dhcp-protocol.h
index da483feadf..da483feadf 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-protocol.h
+++ b/src/systemd/src/libsystemd-network/dhcp-protocol.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-internal.h b/src/systemd/src/libsystemd-network/dhcp6-internal.h
index ee4014faab..ee4014faab 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-internal.h
+++ b/src/systemd/src/libsystemd-network/dhcp6-internal.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-lease-internal.h b/src/systemd/src/libsystemd-network/dhcp6-lease-internal.h
index 9f7826c466..9f7826c466 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-lease-internal.h
+++ b/src/systemd/src/libsystemd-network/dhcp6-lease-internal.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c b/src/systemd/src/libsystemd-network/dhcp6-network.c
index 626a4d6a7f..626a4d6a7f 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c
+++ b/src/systemd/src/libsystemd-network/dhcp6-network.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-option.c b/src/systemd/src/libsystemd-network/dhcp6-option.c
index 10872a3159..10872a3159 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-option.c
+++ b/src/systemd/src/libsystemd-network/dhcp6-option.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-protocol.h b/src/systemd/src/libsystemd-network/dhcp6-protocol.h
index 6598d86074..6598d86074 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-protocol.h
+++ b/src/systemd/src/libsystemd-network/dhcp6-protocol.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c b/src/systemd/src/libsystemd-network/network-internal.c
index bc691abf26..bc691abf26 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c
+++ b/src/systemd/src/libsystemd-network/network-internal.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.h b/src/systemd/src/libsystemd-network/network-internal.h
index f94099f57a..f94099f57a 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.h
+++ b/src/systemd/src/libsystemd-network/network-internal.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c b/src/systemd/src/libsystemd-network/sd-dhcp-client.c
index 5d63866cf7..5d63866cf7 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/systemd/src/libsystemd-network/sd-dhcp-client.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c b/src/systemd/src/libsystemd-network/sd-dhcp-lease.c
index ee6d72dffc..ee6d72dffc 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/systemd/src/libsystemd-network/sd-dhcp-lease.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
index 8b29898b14..8b29898b14 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-lease.c b/src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
index 8ac18a7566..8ac18a7566 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-lease.c
+++ b/src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd/sd-id128/sd-id128.c b/src/systemd/src/libsystemd/sd-id128/sd-id128.c
index 909467d696..909467d696 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd/sd-id128/sd-id128.c
+++ b/src/systemd/src/libsystemd/sd-id128/sd-id128.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/async.h b/src/systemd/src/shared/async.h
index 44b886a661..44b886a661 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/async.h
+++ b/src/systemd/src/shared/async.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/fileio.c b/src/systemd/src/shared/fileio.c
index d167c18cce..d167c18cce 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/fileio.c
+++ b/src/systemd/src/shared/fileio.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/fileio.h b/src/systemd/src/shared/fileio.h
index fccea7725a..fccea7725a 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/fileio.h
+++ b/src/systemd/src/shared/fileio.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c b/src/systemd/src/shared/in-addr-util.c
index 488f6d1ebd..488f6d1ebd 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c
+++ b/src/systemd/src/shared/in-addr-util.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.h b/src/systemd/src/shared/in-addr-util.h
index 715ded330f..715ded330f 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.h
+++ b/src/systemd/src/shared/in-addr-util.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/list.h b/src/systemd/src/shared/list.h
index af121d7009..af121d7009 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/list.h
+++ b/src/systemd/src/shared/list.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/log.h b/src/systemd/src/shared/log.h
index e9cfe1a287..e9cfe1a287 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/log.h
+++ b/src/systemd/src/shared/log.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/macro.h b/src/systemd/src/shared/macro.h
index d5cb240b3b..d5cb240b3b 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/macro.h
+++ b/src/systemd/src/shared/macro.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/path-util.c b/src/systemd/src/shared/path-util.c
index d6efc1c403..d6efc1c403 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/path-util.c
+++ b/src/systemd/src/shared/path-util.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/path-util.h b/src/systemd/src/shared/path-util.h
index 209881e7dd..209881e7dd 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/path-util.h
+++ b/src/systemd/src/shared/path-util.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/refcnt.h b/src/systemd/src/shared/refcnt.h
index e6e9a6bd6e..e6e9a6bd6e 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/refcnt.h
+++ b/src/systemd/src/shared/refcnt.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c b/src/systemd/src/shared/siphash24.c
index a26f8e28ca..a26f8e28ca 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c
+++ b/src/systemd/src/shared/siphash24.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.h b/src/systemd/src/shared/siphash24.h
index 3450d754fe..3450d754fe 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.h
+++ b/src/systemd/src/shared/siphash24.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/socket-util.h b/src/systemd/src/shared/socket-util.h
index 3cbaf0f982..3cbaf0f982 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/socket-util.h
+++ b/src/systemd/src/shared/socket-util.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/sparse-endian.h b/src/systemd/src/shared/sparse-endian.h
index 02de0feca8..02de0feca8 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/sparse-endian.h
+++ b/src/systemd/src/shared/sparse-endian.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/strv.c b/src/systemd/src/shared/strv.c
index a983f279e6..a983f279e6 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/strv.c
+++ b/src/systemd/src/shared/strv.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/strv.h b/src/systemd/src/shared/strv.h
index 18e4d257e7..18e4d257e7 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/strv.h
+++ b/src/systemd/src/shared/strv.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/time-util.c b/src/systemd/src/shared/time-util.c
index f1e56b6e47..f1e56b6e47 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/time-util.c
+++ b/src/systemd/src/shared/time-util.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/time-util.h b/src/systemd/src/shared/time-util.h
index 5d5aa10db4..5d5aa10db4 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/time-util.h
+++ b/src/systemd/src/shared/time-util.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/unaligned.h b/src/systemd/src/shared/unaligned.h
index 3b73a9c682..3b73a9c682 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/unaligned.h
+++ b/src/systemd/src/shared/unaligned.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/utf8.c b/src/systemd/src/shared/utf8.c
index 7433f9b059..7433f9b059 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/utf8.c
+++ b/src/systemd/src/shared/utf8.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/utf8.h b/src/systemd/src/shared/utf8.h
index 1fb132041e..1fb132041e 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/utf8.h
+++ b/src/systemd/src/shared/utf8.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/util.c b/src/systemd/src/shared/util.c
index 03dcfa7779..03dcfa7779 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/util.c
+++ b/src/systemd/src/shared/util.c
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/util.h b/src/systemd/src/shared/util.h
index faa91f9288..faa91f9288 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/util.h
+++ b/src/systemd/src/shared/util.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/_sd-common.h b/src/systemd/src/systemd/_sd-common.h
index abcd57dbe4..abcd57dbe4 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/_sd-common.h
+++ b/src/systemd/src/systemd/_sd-common.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h b/src/systemd/src/systemd/sd-dhcp-client.h
index 527c4239d1..527c4239d1 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h
+++ b/src/systemd/src/systemd/sd-dhcp-client.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h b/src/systemd/src/systemd/sd-dhcp-lease.h
index 80d32134b1..80d32134b1 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h
+++ b/src/systemd/src/systemd/sd-dhcp-lease.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h b/src/systemd/src/systemd/sd-dhcp6-client.h
index e2646cbbc4..e2646cbbc4 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h
+++ b/src/systemd/src/systemd/sd-dhcp6-client.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-lease.h b/src/systemd/src/systemd/sd-dhcp6-lease.h
index 84008cf590..84008cf590 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-lease.h
+++ b/src/systemd/src/systemd/sd-dhcp6-lease.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-event.h b/src/systemd/src/systemd/sd-event.h
index aa71baaaa7..aa71baaaa7 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-event.h
+++ b/src/systemd/src/systemd/sd-event.h
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-id128.h b/src/systemd/src/systemd/sd-id128.h
index da1bb2fa24..da1bb2fa24 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-id128.h
+++ b/src/systemd/src/systemd/sd-id128.h