Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream

7 files changed, 5 insertions, 22 deletions

diff --git a/shared/systemd/sd-adapt-shared/btrfs-util.h b/shared/systemd/sd-adapt-shared/dhcp-server-internal.h
index 637892c2..637892c2 100644
--- a/shared/systemd/sd-adapt-shared/btrfs-util.h
+++ b/shared/systemd/sd-adapt-shared/dhcp-server-internal.h
diff --git a/shared/systemd/sd-adapt-shared/missing.h b/shared/systemd/sd-adapt-shared/missing.h
deleted file mode 100644
index d0b460a7..00000000
--- a/shared/systemd/sd-adapt-shared/missing.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-/* dummy header */
-
-#include "missing_fcntl.h"
-#include "missing_socket.h"
-#include "missing_stat.h"
-#include "missing_type.h"
diff --git a/shared/systemd/sd-adapt-shared/cgroup-util.h b/shared/systemd/sd-adapt-shared/missing_fs.h
index 637892c2..637892c2 100644
--- a/shared/systemd/sd-adapt-shared/cgroup-util.h
+++ b/shared/systemd/sd-adapt-shared/missing_fs.h
diff --git a/shared/systemd/sd-adapt-shared/device-nodes.h b/shared/systemd/sd-adapt-shared/missing_magic.h
index 637892c2..637892c2 100644
--- a/shared/systemd/sd-adapt-shared/device-nodes.h
+++ b/shared/systemd/sd-adapt-shared/missing_magic.h
diff --git a/shared/systemd/sd-adapt-shared/procfs-util.h b/shared/systemd/sd-adapt-shared/missing_network.h
index 637892c2..637892c2 100644
--- a/shared/systemd/sd-adapt-shared/procfs-util.h
+++ b/shared/systemd/sd-adapt-shared/missing_network.h
diff --git a/shared/systemd/sd-adapt-shared/missing_sched.h b/shared/systemd/sd-adapt-shared/missing_sched.h
new file mode 100644
index 00000000..637892c2
--- /dev/null
+++ b/shared/systemd/sd-adapt-shared/missing_sched.h
@@ -0,0 +1,3 @@
+#pragma once
+
+/* dummy header */
diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
index 8dd93341..490cae92 100644
--- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
+++ b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
@@ -1,17 +1,5 @@
-/* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+// SPDX-License-Identifier: GPL-2.0+
+/*
  * Copyright (C) 2014 - 2018 Red Hat, Inc.
  */