Merge tag 'v5.9-rc3' into rdma.git for-next

Required due to dependencies in following patches.

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --cc drivers/infiniband/core/cm.c
index 8fe141727bea540b716d275a61f6c0f83570eebb,fbc28f1a8b9291f69e7372b1ef576e72eae71325..5740d1ba3568700759290d907560f27148e9dc21
--- 1/drivers/infiniband/core/cm.c
--- 2/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@@ -3057,9 -3058,11 +3057,9 @@@ static int cm_rej_handler(struct cm_wor
                        cm_enter_timewait(cm_id_priv);
                        break;
                }
-               /* fall through */
+               fallthrough;
        default:
 -              pr_debug("%s: local_id %d, cm_id_priv->id.state: %d\n",
 -                       __func__, be32_to_cpu(cm_id_priv->id.local_id),
 -                       cm_id_priv->id.state);
 +              trace_icm_rej_unknown_err(&cm_id_priv->id);
                spin_unlock_irq(&cm_id_priv->lock);
                goto out;
        }
@@@ -3113,9 -3116,11 +3113,9 @@@ int ib_send_cm_mra(struct ib_cm_id *cm_
                        msg_response = CM_MSG_RESPONSE_OTHER;
                        break;
                }
-               /* fall through */
+               fallthrough;
        default:
 -              pr_debug("%s: local_id %d, cm_id_priv->id.state: %d\n",
 -                       __func__, be32_to_cpu(cm_id_priv->id.local_id),
 -                       cm_id_priv->id.state);
 +              trace_icm_send_mra_unknown_err(&cm_id_priv->id);
                ret = -EINVAL;
                goto error1;
        }
@@@ -3223,9 -3227,11 +3223,9 @@@ static int cm_mra_handler(struct cm_wor
        case IB_CM_MRA_REP_RCVD:
                atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
                                counter[CM_MRA_COUNTER]);
-               /* fall through */
+               fallthrough;
        default:
 -              pr_debug("%s local_id %d, cm_id_priv->id.state: %d\n",
 -                       __func__, be32_to_cpu(cm_id_priv->id.local_id),
 -                       cm_id_priv->id.state);
 +              trace_icm_mra_unknown_err(&cm_id_priv->id);
                goto out;
        }
  

diff --cc drivers/infiniband/core/cma.c
Simple merge

diff --cc drivers/infiniband/core/ucma.c
Simple merge

diff --cc drivers/infiniband/hw/hns/hns_roce_device.h
Simple merge

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

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

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

diff --cc drivers/infiniband/hw/usnic/usnic_ib_main.c
Simple merge

diff --cc drivers/infiniband/sw/rxe/rxe_comp.c
Simple merge

diff --cc drivers/infiniband/sw/rxe/rxe_task.c
Simple merge

diff --cc drivers/infiniband/sw/rxe/rxe_verbs.c
Simple merge

diff --cc drivers/infiniband/ulp/isert/ib_isert.c
Simple merge