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

The BTF conflicts were simple overlapping changes.

The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/block/nbd.c
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
index a80767d,bb28c70..0b5a2c3
--- 1/drivers/net/dsa/mv88e6xxx/chip.c
--- 2/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@@ -3346,9 -3335,9 +3345,10 @@@ static const struct mv88e6xxx_ops mv88e
        .reset = mv88e6352_g1_reset,
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+       .serdes_power = mv88e6341_serdes_power,
        .gpio_ops = &mv88e6352_gpio_ops,
        .avb_ops = &mv88e6390_avb_ops,
 +      .ptp_ops = &mv88e6352_ptp_ops,
  };
  
  static const struct mv88e6xxx_ops mv88e6350_ops = {

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/usb/lan78xx.c
Simple merge

diff --cc drivers/net/xen-netfront.c
Simple merge

diff --cc ipc/sem.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/filter.c
Simple merge

diff --cc net/core/xdp.c
Simple merge

diff --cc net/dsa/slave.c
Simple merge

diff --cc net/ipv4/igmp.c
Simple merge

diff --cc net/ipv4/inet_fragment.c
Simple merge

diff --cc net/ipv4/tcp_bbr.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

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

diff --cc net/rds/ib_mr.h
index f440ace,655f01d..5da12c2
--- 1/net/rds/ib_mr.h
--- 2/net/rds/ib_mr.h
+++ b/net/rds/ib_mr.h
@@@ -113,11 -113,10 +113,12 @@@ struct rds_ib_mr_pool *rds_ib_create_mr
                                             int npages);
  void rds_ib_get_mr_info(struct rds_ib_device *rds_ibdev,
                        struct rds_info_rdma_connection *iinfo);
 +void rds6_ib_get_mr_info(struct rds_ib_device *rds_ibdev,
 +                       struct rds6_info_rdma_connection *iinfo6);
  void rds_ib_destroy_mr_pool(struct rds_ib_mr_pool *);
  void *rds_ib_get_mr(struct scatterlist *sg, unsigned long nents,
-                   struct rds_sock *rs, u32 *key_ret);
+                   struct rds_sock *rs, u32 *key_ret,
+                   struct rds_connection *conn);
  void rds_ib_sync_mr(void *trans_private, int dir);
  void rds_ib_free_mr(void *trans_private, int invalidate);
  void rds_ib_flush_mrs(void);

diff --cc net/rds/ib_rdma.c
index 99ccafb,2e49a40..63c8d10
--- 1/net/rds/ib_rdma.c
--- 2/net/rds/ib_rdma.c
+++ b/net/rds/ib_rdma.c
@@@ -553,10 -542,10 +554,10 @@@ void *rds_ib_get_mr(struct scatterlist 
  {
        struct rds_ib_device *rds_ibdev;
        struct rds_ib_mr *ibmr = NULL;
-       struct rds_ib_connection *ic = rs->rs_conn->c_transport_data;
+       struct rds_ib_connection *ic = NULL;
        int ret;
  
 -      rds_ibdev = rds_ib_get_device(rs->rs_bound_addr);
 +      rds_ibdev = rds_ib_get_device(rs->rs_bound_addr.s6_addr32[3]);
        if (!rds_ibdev) {
                ret = -ENODEV;
                goto out;

diff --cc net/rds/rdma.c
Simple merge

diff --cc net/rds/rds.h
Simple merge

diff --cc net/rds/send.c
Simple merge

diff --cc net/socket.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge

diff --cc net/xfrm/xfrm_user.c
Simple merge

diff --cc tools/lib/bpf/btf.c
index 03161be,2d270c5..1622a30
--- 1/tools/lib/bpf/btf.c
--- 2/tools/lib/bpf/btf.c
+++ b/tools/lib/bpf/btf.c
@@@ -259,29 -269,9 +274,29 @@@ __s64 btf__resolve_size(const struct bt
        return nelems * size;
  }
  
- int32_t btf__find_by_name(const struct btf *btf, const char *type_name)
 +int btf__resolve_type(const struct btf *btf, __u32 type_id)
 +{
 +      const struct btf_type *t;
 +      int depth = 0;
 +
 +      t = btf__type_by_id(btf, type_id);
 +      while (depth < MAX_RESOLVE_DEPTH &&
 +             !btf_type_is_void_or_null(t) &&
 +             IS_MODIFIER(BTF_INFO_KIND(t->info))) {
 +              type_id = t->type;
 +              t = btf__type_by_id(btf, type_id);
 +              depth++;
 +      }
 +
 +      if (depth == MAX_RESOLVE_DEPTH || btf_type_is_void_or_null(t))
 +              return -EINVAL;
 +
 +      return type_id;
 +}
 +
+ __s32 btf__find_by_name(const struct btf *btf, const char *type_name)
  {
-       uint32_t i;
+       __u32 i;
  
        if (!strcmp(type_name, "void"))
                return 0;

diff --cc tools/lib/bpf/btf.h
index 24f361d,e2a09a1..dd8a86e
--- 1/tools/lib/bpf/btf.h
--- 2/tools/lib/bpf/btf.h
+++ b/tools/lib/bpf/btf.h
@@@ -14,12 -15,10 +15,13 @@@ typedef int (*btf_print_fn_t)(const cha
        __attribute__((format(printf, 1, 2)));
  
  void btf__free(struct btf *btf);
- struct btf *btf__new(uint8_t *data, uint32_t size, btf_print_fn_t err_log);
- int32_t btf__find_by_name(const struct btf *btf, const char *type_name);
- int64_t btf__resolve_size(const struct btf *btf, uint32_t type_id);
+ struct btf *btf__new(__u8 *data, __u32 size, btf_print_fn_t err_log);
+ __s32 btf__find_by_name(const struct btf *btf, const char *type_name);
+ const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 id);
+ __s64 btf__resolve_size(const struct btf *btf, __u32 type_id);
 +int btf__resolve_type(const struct btf *btf, __u32 type_id);
  int btf__fd(const struct btf *btf);
 +const char *btf__name_by_offset(const struct btf *btf, __u32 offset);
 +const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 type_id);
  
  #endif

diff --cc tools/lib/bpf/libbpf.c
Simple merge

diff --cc tools/lib/bpf/libbpf.h
Simple merge