|
 |
049c96 |
From f681ef8608cd2d4addf701d1773d5e01afcbde95 Mon Sep 17 00:00:00 2001
|
|
|
049c96 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
049c96 |
Date: Tue, 23 Feb 2016 18:27:28 +0100
|
|
|
049c96 |
Subject: [PATCH] ip: remove extra newlines at end-of-file
|
|
|
049c96 |
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1269528
|
|
|
049c96 |
Upstream Status: iproute2.git commit f7520a1998995
|
|
|
049c96 |
Conflicts: Dropped changes to ip/ipfou.c since RHEL7 does not support
|
|
|
049c96 |
that.
|
|
|
049c96 |
|
|
|
049c96 |
commit f7520a1998995f29730692212c1c87a39064e168
|
|
|
049c96 |
Author: Stephen Hemminger <shemming@brocade.com>
|
|
|
049c96 |
Date: Fri Oct 23 15:41:58 2015 -0700
|
|
|
049c96 |
|
|
|
049c96 |
ip: remove extra newlines at end-of-file
|
|
|
049c96 |
|
|
|
049c96 |
Shouldn't have extra blank lines.
|
|
|
049c96 |
---
|
|
|
049c96 |
ip/ipaddrlabel.c | 1 -
|
|
|
049c96 |
ip/iplink_bond_slave.c | 1 -
|
|
|
049c96 |
ip/ipprefix.c | 1 -
|
|
|
049c96 |
ip/iproute.c | 1 -
|
|
|
049c96 |
ip/tcp_metrics.c | 1 -
|
|
|
049c96 |
5 files changed, 5 deletions(-)
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/ip/ipaddrlabel.c b/ip/ipaddrlabel.c
|
|
|
049c96 |
index c5d69f4..1158b33 100644
|
|
|
049c96 |
--- a/ip/ipaddrlabel.c
|
|
|
049c96 |
+++ b/ip/ipaddrlabel.c
|
|
|
049c96 |
@@ -263,4 +263,3 @@ int do_ipaddrlabel(int argc, char **argv)
|
|
|
049c96 |
fprintf(stderr, "Command \"%s\" is unknown, try \"ip addrlabel help\".\n", *argv);
|
|
|
049c96 |
exit(-1);
|
|
|
049c96 |
}
|
|
|
049c96 |
-
|
|
|
049c96 |
diff --git a/ip/iplink_bond_slave.c b/ip/iplink_bond_slave.c
|
|
|
049c96 |
index 33bea91..9b569b1 100644
|
|
|
049c96 |
--- a/ip/iplink_bond_slave.c
|
|
|
049c96 |
+++ b/ip/iplink_bond_slave.c
|
|
|
049c96 |
@@ -113,4 +113,3 @@ struct link_util bond_slave_link_util = {
|
|
|
049c96 |
.parse_opt = bond_slave_parse_opt,
|
|
|
049c96 |
.slave = true,
|
|
|
049c96 |
};
|
|
|
049c96 |
-
|
|
|
049c96 |
diff --git a/ip/ipprefix.c b/ip/ipprefix.c
|
|
|
049c96 |
index 42f51e7..286c09b 100644
|
|
|
049c96 |
--- a/ip/ipprefix.c
|
|
|
049c96 |
+++ b/ip/ipprefix.c
|
|
|
049c96 |
@@ -108,4 +108,3 @@ int print_prefix(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
|
|
|
049c96 |
|
|
|
049c96 |
return 0;
|
|
|
049c96 |
}
|
|
|
049c96 |
-
|
|
|
049c96 |
diff --git a/ip/iproute.c b/ip/iproute.c
|
|
|
049c96 |
index 27e04a8..b7e0b15 100644
|
|
|
049c96 |
--- a/ip/iproute.c
|
|
|
049c96 |
+++ b/ip/iproute.c
|
|
|
049c96 |
@@ -1696,4 +1696,3 @@ int do_iproute(int argc, char **argv)
|
|
|
049c96 |
fprintf(stderr, "Command \"%s\" is unknown, try \"ip route help\".\n", *argv);
|
|
|
049c96 |
exit(-1);
|
|
|
049c96 |
}
|
|
|
049c96 |
-
|
|
|
049c96 |
diff --git a/ip/tcp_metrics.c b/ip/tcp_metrics.c
|
|
|
049c96 |
index 8fa4b26..7e7cf27 100644
|
|
|
049c96 |
--- a/ip/tcp_metrics.c
|
|
|
049c96 |
+++ b/ip/tcp_metrics.c
|
|
|
049c96 |
@@ -427,4 +427,3 @@ int do_tcp_metrics(int argc, char **argv)
|
|
|
049c96 |
"try \"ip tcp_metrics help\".\n", *argv);
|
|
|
049c96 |
exit(-1);
|
|
|
049c96 |
}
|
|
|
049c96 |
-
|
|
|
049c96 |
--
|
|
|
049c96 |
1.8.3.1
|
|
|
049c96 |
|