From: Jakub Kicinski <kuba@kernel.org>
To: Leon Romanovsky <leon@kernel.org>
Cc: Jason Gunthorpe <jgg@nvidia.com>,
Edward Srouji <edwards@nvidia.com>,
linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org,
netdev@vger.kernel.org, Saeed Mahameed <saeedm@nvidia.com>,
Tariq Toukan <tariqt@nvidia.com>,
Yishai Hadas <yishaih@nvidia.com>
Subject: Re: [PATCH rdma-next 0/2] Introduce mlx5 data direct placement (DDP)
Date: Mon, 4 Nov 2024 18:53:03 -0800 [thread overview]
Message-ID: <20241104185303.1b83bf8a@kernel.org> (raw)
In-Reply-To: <20241104082710.GB99170@unreal>
On Mon, 4 Nov 2024 10:27:10 +0200 Leon Romanovsky wrote:
> Jakub,
>
> We applied this series to RDMA and first patch generates merge conflicts
> in include/linux/mlx5/mlx5_ifc.h between netdev and RDMA trees.
>
> Can you please pull shared mlx5-next branch to avoid it?
Sorry I don't have the context, the thread looks 2 months old.
If you'd like us to pull something please sense a pull request
targeting net-next...
next prev parent reply other threads:[~2024-11-05 2:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-03 11:37 [PATCH rdma-next 0/2] Introduce mlx5 data direct placement (DDP) Leon Romanovsky
2024-09-03 11:37 ` [PATCH mlx5-next 1/2] net/mlx5: Introduce data placement ordering bits Leon Romanovsky
2024-09-03 11:37 ` [PATCH rdma-next 2/2] RDMA/mlx5: Support OOO RX WQE consumption Leon Romanovsky
2024-09-04 6:02 ` [PATCH rdma-next 0/2] Introduce mlx5 data direct placement (DDP) Zhu Yanjun
2024-09-04 8:27 ` Edward Srouji
2024-09-04 11:53 ` Zhu Yanjun
2024-09-05 12:23 ` Edward Srouji
2024-09-06 5:02 ` Zhu Yanjun
2024-09-06 12:17 ` Edward Srouji
2024-09-06 15:17 ` Zhu Yanjun
2024-09-08 8:47 ` Edward Srouji
2024-09-06 13:02 ` Bernard Metzler
2024-11-04 8:20 ` (subset) " Leon Romanovsky
2024-11-04 8:27 ` Leon Romanovsky
2024-11-05 2:53 ` Jakub Kicinski [this message]
2024-11-05 6:26 ` Leon Romanovsky
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=20241104185303.1b83bf8a@kernel.org \
--to=kuba@kernel.org \
--cc=edwards@nvidia.com \
--cc=jgg@nvidia.com \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=saeedm@nvidia.com \
--cc=tariqt@nvidia.com \
--cc=yishaih@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).