Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

Lots of overlapping changes, mostly trivial in nature.

The mlxsw conflict was resolving using the example
resolution at:

https://github.com/jpirko/linux_mlxsw/blob/combined_queue/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c
index a4669e79fdf90a82cc69853684600986bb936a1d,f6f6a568d66a5a55cac67176c4c9a5ee01c11a90..66ea256fe56090c31857ed843b8abf4e42eb4a41
--- 1/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c
--- 2/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c
@@@ -760,10 -730,8 +766,10 @@@ int mlxsw_afa_block_append_vlan_modify(
                                                  MLXSW_AFA_VLAN_CODE,
                                                  MLXSW_AFA_VLAN_SIZE);
  
-       if (!act) {
 -      if (IS_ERR(act))
++      if (IS_ERR(act)) {
 +              NL_SET_ERR_MSG_MOD(extack, "Cannot append vlan_modify action");
-               return -ENOBUFS;
+               return PTR_ERR(act);
 +      }
        mlxsw_afa_vlan_pack(act, MLXSW_AFA_VLAN_VLAN_TAG_CMD_NOP,
                            MLXSW_AFA_VLAN_CMD_SET_OUTER, vid,
                            MLXSW_AFA_VLAN_CMD_SET_OUTER, pcp,
@@@ -1043,9 -1003,8 +1050,9 @@@ int mlxsw_afa_block_append_fwd(struct m
  
        act = mlxsw_afa_block_append_action(block, MLXSW_AFA_FORWARD_CODE,
                                            MLXSW_AFA_FORWARD_SIZE);
-       if (!act) {
-               err = -ENOBUFS;
+       if (IS_ERR(act)) {
 +              NL_SET_ERR_MSG_MOD(extack, "Cannot append forward action");
+               err = PTR_ERR(act);
                goto err_append_action;
        }
        mlxsw_afa_forward_pack(act, MLXSW_AFA_FORWARD_TYPE_PBS,
@@@ -1176,10 -1130,8 +1183,10 @@@ int mlxsw_afa_block_append_fid_set(stru
        char *act = mlxsw_afa_block_append_action(block,
                                                  MLXSW_AFA_VIRFWD_CODE,
                                                  MLXSW_AFA_VIRFWD_SIZE);
-       if (!act) {
 -      if (IS_ERR(act))
++      if (IS_ERR(act)) {
 +              NL_SET_ERR_MSG_MOD(extack, "Cannot append fid_set action");
-               return -ENOBUFS;
+               return PTR_ERR(act);
 +      }
        mlxsw_afa_virfwd_pack(act, MLXSW_AFA_VIRFWD_FID_CMD_SET, fid);
        return 0;
  }

diff --cc drivers/net/wan/lmc/lmc_main.c
Simple merge

diff --cc ipc/shm.c
Simple merge

diff --cc net/l2tp/l2tp_ppp.c
Simple merge

diff --cc net/netlink/af_netlink.c
Simple merge

diff --cc net/smc/smc_cdc.c
Simple merge

diff --cc tools/bpf/bpftool/map.c
index 9c81918455850c411eea9306fdd189a55a89fa6e,f74a8bcbda874a8cfa0595257e1002e047f5559a..e860ca859b28419ea45776209d9eac755242749f
--- 1/tools/bpf/bpftool/map.c
--- 2/tools/bpf/bpftool/map.c
+++ b/tools/bpf/bpftool/map.c
@@@ -34,7 -34,9 +34,8 @@@
  #include <assert.h>
  #include <errno.h>
  #include <fcntl.h>
 +#include <linux/err.h>
+ #include <linux/kernel.h>
  #include <stdbool.h>
  #include <stdio.h>
  #include <stdlib.h>
@@@ -262,20 -162,11 +264,21 @@@ static void print_entry_json(struct bpf
                print_hex_data_json(key, info->key_size);
                jsonw_name(json_wtr, "value");
                print_hex_data_json(value, info->value_size);
 +              if (btf) {
 +                      struct btf_dumper d = {
 +                              .btf = btf,
 +                              .jw = json_wtr,
 +                              .is_plain_text = false,
 +                      };
 +
 +                      jsonw_name(json_wtr, "formatted");
 +                      do_dump_btf(&d, info, key, value);
 +              }
        } else {
-               unsigned int i, n;
+               unsigned int i, n, step;
  
                n = get_possible_cpus();
+               step = round_up(info->value_size, 8);
  
                jsonw_name(json_wtr, "key");
                print_hex_data_json(key, info->key_size);