From: David Ahern <dsahern@gmail.com>
Date: Mon, 2 Apr 2018 17:47:34 +0000 (-0700)
Subject: Merge branch 'iproute2-master' into iproute2-next
X-Git-Tag: v4.17.0~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c62a64d60959e96f364a289df61308655abc99f;p=thirdparty%2Fiproute2.git

Merge branch 'iproute2-master' into iproute2-next

Conflicts:
	bridge/mdb.c
	misc/ss.c
	tc/tc.c

Signed-off-by: David Ahern <dsahern@gmail.com>
---

2c62a64d60959e96f364a289df61308655abc99f
diff --cc man/man8/rdma.8
index fba77693e,69134f45a..6f88f3777
--- a/man/man8/rdma.8
+++ b/man/man8/rdma.8
@@@ -37,19 -31,9 +37,19 @@@ Print the version of th
  .B rdma
  tool and exit.
  
 +.TP
 +.BR "\-b", " \-batch " <FILENAME>
 +Read commands from provided file or standard input and invoke them.
 +First failure will cause termination of rdma.
 +
 +.TP
 +.BR "\-force"
 +Don't terminate rdma on errors in batch mode.
 +If there were any errors during execution of the commands, the application return code will be non zero.
 +
  .TP
  .BR "\-d" , " --details"
- Otuput detailed information.
+ Output detailed information.
  
  .TP
  .BR "\-p" , " --pretty"
diff --cc tc/tc.c
index 68475c156,892655624..0d223281b
--- a/tc/tc.c
+++ b/tc/tc.c
@@@ -188,12 -192,14 +194,14 @@@ noexist
  
  static void usage(void)
  {
- 	fprintf(stderr, "Usage: tc [ OPTIONS ] OBJECT { COMMAND | help }\n"
+ 	fprintf(stderr,
+ 		"Usage: tc [ OPTIONS ] OBJECT { COMMAND | help }\n"
  		"       tc [-force] -batch filename\n"
  		"where  OBJECT := { qdisc | class | filter | action | monitor | exec }\n"
- 		"       OPTIONS := { -s[tatistics] | -d[etails] | -r[aw] | -b[atch] [filename] | -n[etns] name |\n"
- 		"                    -nm | -nam[es] | { -cf | -conf } path } |\n"
- 		"                    -o[neline] -j[son] -p[retty] -c[olor]\n");
+ 		"       OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[aw] |\n"
 -		"                    -j[son] | -p[retty] |\n"
++		"                    -o[neline] | -j[son] | -p[retty] | -c[olor]\n"
+ 		"                    -b[atch] [filename] | -n[etns] name |\n"
+ 		"                    -nm | -nam[es] | { -cf | -conf } path }\n");
  }
  
  static int do_cmd(int argc, char **argv, void *buf, size_t buflen)
@@@ -489,10 -494,10 +498,12 @@@ int main(int argc, char **argv
  			++timestamp_short;
  		} else if (matches(argv[1], "-json") == 0) {
  			++json;
 +		} else if (matches(argv[1], "-oneline") == 0) {
 +			++oneline;
  		} else {
- 			fprintf(stderr, "Option \"%s\" is unknown, try \"tc -help\".\n", argv[1]);
+ 			fprintf(stderr,
+ 				"Option \"%s\" is unknown, try \"tc -help\".\n",
+ 				argv[1]);
  			return -1;
  		}
  		argc--;	argv++;