From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Doug Ledford <dledford@redhat•com>, Jason Gunthorpe <jgg@mellanox•com>
Cc: Dennis Dalessandro <dennis.dalessandro@cornelisnetworks•com>,
Guo Zhi <qtxuning1999@sjtu•edu.cn>,
Jason Gunthorpe <jgg@nvidia•com>, Jason Gunthorpe <jgg@ziepe•ca>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mike Marciniszyn <mike.marciniszyn@cornelisnetworks•com>
Subject: linux-next: manual merge of the rdma tree with the rdma-fixes tree
Date: Thu, 30 Sep 2021 11:35:18 +1000 [thread overview]
Message-ID: <20210930113518.4b9f55e6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2034 bytes --]
Hi all,
Today's linux-next merge of the rdma tree got a conflict in:
drivers/infiniband/hw/hfi1/ipoib_tx.c
between commit:
7d5cfafe8b40 ("RDMA/hfi1: Fix kernel pointer leak")
from the rdma-fixes tree and commit:
f5dc70a0e142 ("IB/hfi1: Tune netdev xmit cachelines")
from the rdma tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/infiniband/hw/hfi1/ipoib_tx.c
index 15b0cb0f363f,d1c2cf52ba48..000000000000
--- a/drivers/infiniband/hw/hfi1/ipoib_tx.c
+++ b/drivers/infiniband/hw/hfi1/ipoib_tx.c
@@@ -874,16 -826,15 +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",
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-09-30 1:35 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-30 1:35 Stephen Rothwell [this message]
2021-10-01 13:52 ` linux-next: manual merge of the rdma tree with the rdma-fixes tree Jason Gunthorpe
-- strict thread matches above, loose matches on Subject: below --
2025-03-06 1:37 Stephen Rothwell
2025-03-06 10:24 ` Zhu Yanjun
2025-03-06 11:35 ` Zhu Yanjun
[not found] ` <4d66668a-ff8e-48f6-a5e3-98ada08c5037@linux.dev>
2025-03-06 20:33 ` Stephen Rothwell
2023-09-28 1:38 Stephen Rothwell
2023-09-28 9:59 ` Leon Romanovsky
2022-01-06 0:44 Stephen Rothwell
2019-08-23 2:22 Stephen Rothwell
2019-08-23 15:02 ` Jason Gunthorpe
2018-07-10 1:17 Stephen Rothwell
2018-07-10 5:19 ` Leon Romanovsky
2018-06-27 0:07 Stephen Rothwell
2018-06-27 5:50 ` Leon Romanovsky
2018-05-01 0:10 Stephen Rothwell
2018-05-01 0:55 ` Doug Ledford
2018-05-02 10:22 ` Leon Romanovsky
2018-05-02 14:00 ` Doug Ledford
2018-05-02 17:50 ` Jason Gunthorpe
2018-03-22 0:45 Stephen Rothwell
2018-01-17 1:51 Stephen Rothwell
2018-01-17 1:55 ` Stephen Rothwell
2018-01-17 3:03 ` Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210930113518.4b9f55e6@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dennis.dalessandro@cornelisnetworks$(echo .)com \
--cc=dledford@redhat$(echo .)com \
--cc=jgg@mellanox$(echo .)com \
--cc=jgg@nvidia$(echo .)com \
--cc=jgg@ziepe$(echo .)ca \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mike.marciniszyn@cornelisnetworks$(echo .)com \
--cc=qtxuning1999@sjtu$(echo .)edu.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox