From: David Ahern <dsahern@gmail.com>
Date: Sat, 23 Feb 2019 02:50:39 +0000 (-0800)
Subject: Merge branch 'iproute2-master' into next
X-Git-Tag: v5.1.0~27^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f78e995a841fe233f9a5d321573cb79396709c5;p=thirdparty%2Fiproute2.git

Merge branch 'iproute2-master' into next

Conflicts:
	misc/ss.c

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

9f78e995a841fe233f9a5d321573cb79396709c5
diff --cc misc/ss.c
index 8e5cc16b6,e9033503d..9cb3ee19e
--- a/misc/ss.c
+++ b/misc/ss.c
@@@ -4918,9 -4806,8 +4959,11 @@@ static int scan_state(const char *state
  #define OPT_TIPCSOCK 257
  #define OPT_TIPCINFO 258
  
+ #define OPT_TOS 259
+ 
 +/* Values of 'x' are already used so a non-character is used */
- #define OPT_XDPSOCK 259
++#define OPT_XDPSOCK 260
 +
  static const struct option long_opts[] = {
  	{ "numeric", 0, 0, 'n' },
  	{ "resolve", 0, 0, 'r' },
@@@ -4956,9 -4843,9 +4999,10 @@@
  	{ "contexts", 0, 0, 'z' },
  	{ "net", 1, 0, 'N' },
  	{ "tipcinfo", 0, 0, OPT_TIPCINFO},
+ 	{ "tos", 0, 0, OPT_TOS },
  	{ "kill", 0, 0, 'K' },
  	{ "no-header", 0, 0, 'H' },
 +	{ "xdp", 0, 0, OPT_XDPSOCK},
  	{ 0 }
  
  };