Merge branch 'master' into next

Conflicts:
	devlink/devlink.c

Fixed the conflict by updating the numbering for all new attributes
after the ones in master branch.

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

diff --git a/devlink/devlink.c b/devlink/devlink.c
index fd3f79017f714bb366da15d089aadca8e2862169..5e762e37540cace4080b97cdcaa5348de35e2e3f 100644 (file)
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -255,11 +255,11 @@ static void ifname_map_free(struct ifname_map *ifname_map)
 #define DL_OPT_FLASH_FILE_NAME BIT(25)
 #define DL_OPT_FLASH_COMPONENT BIT(26)
 #define DL_OPT_HEALTH_REPORTER_NAME    BIT(27)
-#define DL_OPT_HEALTH_REPORTER_GRACEFUL_PERIOD BIT(27)
-#define DL_OPT_HEALTH_REPORTER_AUTO_RECOVER    BIT(28)
-#define DL_OPT_TRAP_NAME               BIT(29)
-#define DL_OPT_TRAP_ACTION             BIT(30)
-#define DL_OPT_TRAP_GROUP_NAME         BIT(31)
+#define DL_OPT_HEALTH_REPORTER_GRACEFUL_PERIOD BIT(28)
+#define DL_OPT_HEALTH_REPORTER_AUTO_RECOVER    BIT(29)
+#define DL_OPT_TRAP_NAME               BIT(30)
+#define DL_OPT_TRAP_ACTION             BIT(31)
+#define DL_OPT_TRAP_GROUP_NAME         BIT(32)
 
 struct dl_opts {
        uint64_t present; /* flags of present items */

diff --git a/ip/ipnexthop.c b/ip/ipnexthop.c
index bc8ab4311337da6466d19c3bdc52889571e1b6e6..9f860c8cea251693955ab149259f6b85a55367ea 100644 (file)
--- a/ip/ipnexthop.c
+++ b/ip/ipnexthop.c
@@ -249,7 +249,7 @@ int print_nexthop(struct nlmsghdr *n, void *arg)
        }
 
        if (tb[NHA_BLACKHOLE])
-               print_null(PRINT_ANY, "blackhole", "blackhole", NULL);
+               print_null(PRINT_ANY, "blackhole", "blackhole ", NULL);
 
        if (nhm->nh_protocol != RTPROT_UNSPEC || show_details > 0) {
                print_string(PRINT_ANY, "protocol", "proto %s ",

diff --git a/ip/link_xfrm.c b/ip/link_xfrm.c
index 7a3285b420456130e14d4705bab1a05e29281211..a28f308d56104e9af6f21494629f93122a16e4c1 100644 (file)
--- a/ip/link_xfrm.c
+++ b/ip/link_xfrm.c
@@ -17,7 +17,7 @@ static void xfrm_print_help(struct link_util *lu, int argc, char **argv,
                            FILE *f)
 {
        fprintf(f,
-               "Usage: ... %-4s dev PHYS_DEV [ if_id IF-ID ]\n"
+               "Usage: ... %-4s dev [ PHYS_DEV ] [ if_id IF-ID ]\n"
                "\n"
                "Where: IF-ID := { 0x0..0xffffffff }\n",
                lu->id);
@@ -46,12 +46,8 @@ static int xfrm_parse_opt(struct link_util *lu, int argc, char **argv,
                argc--; argv++;
        }
 
-       if (link) {
+       if (link)
                addattr32(n, 1024, IFLA_XFRM_LINK, link);
-       } else {
-               fprintf(stderr, "must specify physical device\n");
-               return -1;
-       }
 
        return 0;
 }

diff --git a/man/man8/ss.8 b/man/man8/ss.8
index f428e60cc19496c7b98052bc81d67cc53e9b97e8..023d771b17878091d036159d6b796e931f44a233 100644 (file)
--- a/man/man8/ss.8
+++ b/man/man8/ss.8
@@ -99,13 +99,13 @@ skmem:(r<rmem_alloc>,rb<rcv_buf>,t<wmem_alloc>,tb<snd_buf>,
 .br
 .RS
 .RS
-f<fwd_alloc>,w<wmem_queued>,
+f<fwd_alloc>,w<wmem_queued>,o<opt_mem>,
 .RE
 .RE
 .br
 .RS
 .RS
-o<opt_mem>,bl<back_log>)
+bl<back_log>,d<sock_drop>)
 .RE
 .RE
 .P
@@ -146,6 +146,10 @@ The memory used for the sk backlog queue. On a process context, if the
 process is receiving packet, and a new packet is received, it will be
 put into the sk backlog queue, so it can be received by the process
 immediately
+.P
+.TP
+.B <sock_drop>
+the number of packets dropped before they are de-multiplexed into the socket
 .RE
 .TP
 .B \-p, \-\-processes

diff --git a/rdma/res.c b/rdma/res.c
index 97a7b9640185e23505a93fbd695921e20f0ce9cb..6003006e98aa43ca32a481240d541f84bbf9c809 100644 (file)
--- a/rdma/res.c
+++ b/rdma/res.c
@@ -161,6 +161,9 @@ void print_comm(struct rd *rd, const char *str, struct nlattr **nla_line)
 {
        char tmp[18];
 
+       if (!str)
+               return;
+
        if (rd->json_output) {
                /* Don't beatify output in JSON format */
                jsonw_string_field(rd->jw, "comm", str);