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>

diff --cc ip/iplink.c
Simple merge

diff --cc ip/iproute.c
Simple merge

diff --cc ip/tunnel.c
Simple merge

diff --cc lib/utils.c
Simple merge

diff --cc man/man8/rdma.8
index fba77693e3196d8b8668f94e58d9cb4115e6b932,69134f45a6c3e65a655c8c321e163f2c2234395b..6f88f37778396cd059f2b008ca2ded5f7d1ec0ec
--- 1/man/man8/rdma.8
--- 2/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 misc/nstat.c
Simple merge

diff --cc misc/ss.c
Simple merge

diff --cc tc/m_ematch.c
Simple merge

diff --cc tc/m_nat.c
Simple merge

diff --cc tc/m_pedit.c
Simple merge

diff --cc tc/tc.c
index 68475c156057a9f0dba0c2e9987ac80e2e9b47ad,892655624bd908490a298d8f6562173781dad660..0d223281ba25ec2fa978648bc05ced586a1ee76a
--- 1/tc/tc.c
--- 2/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++;

diff --cc tc/tc_class.c
Simple merge