From: Jason Gunthorpe <jgg@nvidia.com>
Date: Mon, 31 Aug 2020 15:28:12 +0000 (-0300)
Subject: Merge tag 'v5.9-rc3' into rdma.git for-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6989aa62d342d79d447a9af12477b907d211bebe;p=linux.git

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>
---

6989aa62d342d79d447a9af12477b907d211bebe
diff --cc drivers/infiniband/core/cm.c
index 8fe141727bea5,fbc28f1a8b929..5740d1ba35687
--- a/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;
  	}