From dbc6a2467efb1c3a6f9c40899219346fa37523c8 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 23 Nov 2015 15:12:40 +0100
Subject: fixup! Merge branch 'systemd' into bg/systemd-update

---
 src/systemd/src/basic/fs-util.c                      | 1 +
 src/systemd/src/basic/path-util.c                    | 1 -
 src/systemd/src/libsystemd-network/sd-dhcp6-client.c | 1 -
 src/systemd/src/systemd/sd-lldp.h                    | 4 ++--
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/systemd/src/basic/fs-util.c b/src/systemd/src/basic/fs-util.c
index 5c78b2df64..e9a4f7e39e 100644
--- a/src/systemd/src/basic/fs-util.c
+++ b/src/systemd/src/basic/fs-util.c
@@ -99,6 +99,7 @@ int rmdir_parents(const char *path, const char *stop) {
         return 0;
 }
 
+
 int rename_noreplace(int olddirfd, const char *oldpath, int newdirfd, const char *newpath) {
         struct stat buf;
         int ret;
diff --git a/src/systemd/src/basic/path-util.c b/src/systemd/src/basic/path-util.c
index 9bfaafa5ca..9809eee2e2 100644
--- a/src/systemd/src/basic/path-util.c
+++ b/src/systemd/src/basic/path-util.c
@@ -56,7 +56,6 @@
 #include "util.h"
 
 #if 0 /* NM_IGNORED */
-
 bool path_is_absolute(const char *p) {
         return p[0] == '/';
 }
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
index a3cbf0928a..f4706cd8a9 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
@@ -1302,4 +1302,3 @@ int sd_dhcp6_client_new(sd_dhcp6_client **ret) {
 
         return 0;
 }
-
diff --git a/src/systemd/src/systemd/sd-lldp.h b/src/systemd/src/systemd/sd-lldp.h
index 06058ef6f8..747e23b170 100644
--- a/src/systemd/src/systemd/sd-lldp.h
+++ b/src/systemd/src/systemd/sd-lldp.h
@@ -23,11 +23,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <inttypes.h>
 #include <net/ethernet.h>
 
-#include "nm-sd-adapt.h"
-
 #include "sd-event.h"
 
 #include "_sd-common.h"
-- 
cgit v1.2.1