Merge branch 'iproute2-master' into next

Conflicts:
	misc/ss.c

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

diff --cc devlink/devlink.c
Simple merge

diff --cc lib/bpf.c
Simple merge

diff --cc man/man8/ss.8
Simple merge

diff --cc misc/ss.c
index 8e5cc16b6f52365ce7dd8c1bf514f483dd39e27e,e9033503ddbb3ec87c2e831908918bc6f3443458..9cb3ee19e5422b6c799d1ad1661621696cdefbd0
--- 1/misc/ss.c
--- 2/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_XDPSOCK 259
+ #define OPT_TOS 259
+ 
 +/* Values of 'x' are already used so a non-character is used */
++#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 }
  
  };

diff --cc tc/tc_util.c
Simple merge