Merge tag 'v5.15-rc4' into rdma.get for-next

Merged due to dependencies in following patches.

Conflict in drivers/infiniband/hw/hfi1/ipoib_tx.c resolved by hand to take
the %p change and txq stats rename together.

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

diff --cc drivers/infiniband/hw/hfi1/ipoib_tx.c
index d1c2cf5,15b0cb0..f401089
--- 1/drivers/infiniband/hw/hfi1/ipoib_tx.c
--- 2/drivers/infiniband/hw/hfi1/ipoib_tx.c
+++ b/drivers/infiniband/hw/hfi1/ipoib_tx.c
@@@ -826,15 -874,16 +826,15 @@@ void hfi1_ipoib_tx_timeout(struct net_d
  {
        struct hfi1_ipoib_dev_priv *priv = hfi1_ipoib_priv(dev);
        struct hfi1_ipoib_txq *txq = &priv->txqs[q];
 -      u64 completed = atomic64_read(&txq->complete_txreqs);
  
-       dd_dev_info(priv->dd, "timeout txq %llx q %u stopped %u stops %d no_desc %d ring_full %d\n",
-                   (unsigned long long)txq, q,
+       dd_dev_info(priv->dd, "timeout txq %p q %u stopped %u stops %d no_desc %d ring_full %d\n",
+                   txq, q,
                    __netif_subqueue_stopped(dev, txq->q_idx),
 -                  atomic_read(&txq->stops),
 -                  atomic_read(&txq->no_desc),
 -                  atomic_read(&txq->ring_full));
 +                  atomic_read(&txq->tx_ring.stops),
 +                  atomic_read(&txq->tx_ring.no_desc),
 +                  atomic_read(&txq->tx_ring.ring_full));
-       dd_dev_info(priv->dd, "sde %llx engine %u\n",
-                   (unsigned long long)txq->sde,
+       dd_dev_info(priv->dd, "sde %p engine %u\n",
+                   txq->sde,
                    txq->sde ? txq->sde->this_idx : 0);
        dd_dev_info(priv->dd, "flow %x\n", txq->flow.as_int);
        dd_dev_info(priv->dd, "sent %llu completed %llu used %llu\n",