Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/hw/bnxt_re/ib_verbs.c
Simple merge

diff --cc drivers/infiniband/hw/bnxt_re/main.c
Simple merge

diff --cc drivers/infiniband/hw/bnxt_re/qplib_fp.h
Simple merge

diff --cc drivers/infiniband/hw/bnxt_re/qplib_res.h
Simple merge

diff --cc drivers/infiniband/hw/bnxt_re/qplib_sp.c
Simple merge

diff --cc drivers/infiniband/hw/hns/hns_roce_hw_v2.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/main.c
Simple merge

diff --cc drivers/infiniband/sw/rxe/rxe_net.c
index 8cc64ceeb3569b906faac7131fe9358163eb509b,d400aaab0e70003da71c999bfdb3e5c88daa1010..132a87e52d5c7e9a63ea7eddc10d410eb15c83a4
--- 1/drivers/infiniband/sw/rxe/rxe_net.c
--- 2/drivers/infiniband/sw/rxe/rxe_net.c
+++ b/drivers/infiniband/sw/rxe/rxe_net.c
@@@ -595,13 -577,7 +585,13 @@@ void rxe_port_down(struct rxe_dev *rxe
  
  void rxe_set_port_state(struct rxe_dev *rxe)
  {
 -      if (ib_get_curr_port_state(rxe->ndev) == IB_PORT_ACTIVE)
 +      struct net_device *ndev;
 +
 +      ndev = rxe_ib_device_get_netdev(&rxe->ib_dev);
 +      if (!ndev)
 +              return;
 +
-       if (netif_running(ndev) && netif_carrier_ok(ndev))
++      if (ib_get_curr_port_state(ndev) == IB_PORT_ACTIVE)
                rxe_port_up(rxe);
        else
                rxe_port_down(rxe);

diff --cc drivers/infiniband/sw/rxe/rxe_verbs.c
index 8a5fc20fd186927ab00ae13a77a53222a90c3239,dad3cacb904880644cd8c62abd869e32ba7102f5..6152a0fdfc8caa0026bc0b888edb8dbfb8cfdf50
--- 1/drivers/infiniband/sw/rxe/rxe_verbs.c
--- 2/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@@ -62,9 -55,10 +62,10 @@@ static int rxe_query_port(struct ib_dev
        ret = ib_get_eth_speed(ibdev, port_num, &attr->active_speed,
                               &attr->active_width);
  
 -      attr->state = ib_get_curr_port_state(rxe->ndev);
++      attr->state = ib_get_curr_port_state(ndev);
        if (attr->state == IB_PORT_ACTIVE)
                attr->phys_state = IB_PORT_PHYS_STATE_LINK_UP;
 -      else if (dev_get_flags(rxe->ndev) & IFF_UP)
 +      else if (dev_get_flags(ndev) & IFF_UP)
                attr->phys_state = IB_PORT_PHYS_STATE_POLLING;
        else
                attr->phys_state = IB_PORT_PHYS_STATE_DISABLED;

diff --cc drivers/infiniband/sw/siw/siw_main.c
Simple merge

diff --cc drivers/infiniband/sw/siw/siw_verbs.c
index 7ca0297d68a4a70fcccb1ec5df12f6ecd3296c9d,592a015cc4c6a09c684cb0862da8d14e2987dab0..5ac8bd450d240724d55de641fd0aef2f07a7b68d
--- 1/drivers/infiniband/sw/siw/siw_verbs.c
--- 2/drivers/infiniband/sw/siw/siw_verbs.c
+++ b/drivers/infiniband/sw/siw/siw_verbs.c
@@@ -178,21 -178,13 +178,20 @@@ int siw_query_port(struct ib_device *ba
  
        rv = ib_get_eth_speed(base_dev, port, &attr->active_speed,
                         &attr->active_width);
 +      if (rv)
 +              return rv;
 +
 +      ndev = ib_device_get_netdev(base_dev, SIW_PORT);
 +      if (!ndev)
 +              return -ENODEV;
 +
        attr->gid_tbl_len = 1;
        attr->max_msg_sz = -1;
 -      attr->max_mtu = ib_mtu_int_to_enum(sdev->netdev->mtu);
 -      attr->active_mtu = ib_mtu_int_to_enum(sdev->netdev->mtu);
 -      attr->state = ib_get_curr_port_state(sdev->netdev);
 +      attr->max_mtu = ib_mtu_int_to_enum(ndev->max_mtu);
 +      attr->active_mtu = ib_mtu_int_to_enum(READ_ONCE(ndev->mtu));
-       attr->phys_state = (netif_running(ndev) && netif_carrier_ok(ndev)) ?
++      attr->state = ib_get_curr_port_state(ndev);
+       attr->phys_state = attr->state == IB_PORT_ACTIVE ?
                IB_PORT_PHYS_STATE_LINK_UP : IB_PORT_PHYS_STATE_DISABLED;
-       attr->state = attr->phys_state == IB_PORT_PHYS_STATE_LINK_UP ?
-               IB_PORT_ACTIVE : IB_PORT_DOWN;
        attr->port_cap_flags = IB_PORT_CM_SUP | IB_PORT_DEVICE_MGMT_SUP;
        /*
         * All zero

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c
Simple merge