* [pull-request][net-next] Merge mlx5-next into net-next
@ 2021-10-28 5:21 Saeed Mahameed
2021-10-28 15:22 ` Jakub Kicinski
0 siblings, 1 reply; 3+ messages in thread
From: Saeed Mahameed @ 2021-10-28 5:21 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski
Cc: netdev, Jason Gunthorpe, Leon Romanovsky, Saeed Mahameed
From: Saeed Mahameed <saeedm@nvidia.com>
Hi Dave, Jakub,
This pull request provides a single merge commit of mlx5-next into net-next
which handles a non-trivial conflict.
The commits from mlx5-next provide MR (Memory Region) Memory Key
management cleanup in mlx5 IB driver and mlx5 core driver [1].
Please pull and let me know if there's any problem.
[1] https://patchwork.kernel.org/project/netdevbpf/cover/cover.1634033956.git.leonro@nvidia.com/
Thanks,
Saeed.
--
The following changes since commit f25c0515c521375154c62c72447869f40218c861:
net: sched: gred: dynamically allocate tc_gred_qopt_offload (2021-10-27 12:06:52 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git tags/mlx5-net-next-5.15-rc7
for you to fetch changes up to 573bce9e675b0654e18a338ca9a64187fc19806f:
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux into net-next (2021-10-27 21:33:28 -0700)
----------------------------------------------------------------
Merge mlx5-next into net-next
----------------------------------------------------------------
Aharon Landau (8):
net/mlx5: Add ifc bits to support optional counters
net/mlx5: Add priorities for counters in RDMA namespaces
RDMA/mlx5: Remove iova from struct mlx5_core_mkey
RDMA/mlx5: Remove size from struct mlx5_core_mkey
RDMA/mlx5: Remove pd from struct mlx5_core_mkey
RDMA/mlx5: Replace struct mlx5_core_mkey by u32 key
RDMA/mlx5: Move struct mlx5_core_mkey to mlx5_ib
RDMA/mlx5: Attach ndescs to mlx5_ib_mkey
Leon Romanovsky (1):
Merge brank 'mlx5_mkey' into rdma.git for-next
Meir Lichtinger (2):
net/mlx5: Add uid field to UAR allocation structures
IB/mlx5: Enable UAR to have DevX UID
Saeed Mahameed (1):
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux into net-next
drivers/infiniband/hw/mlx5/cmd.c | 26 +++++++
drivers/infiniband/hw/mlx5/cmd.h | 2 +
drivers/infiniband/hw/mlx5/devx.c | 13 ++--
drivers/infiniband/hw/mlx5/devx.h | 2 +-
drivers/infiniband/hw/mlx5/main.c | 55 +++++++-------
drivers/infiniband/hw/mlx5/mlx5_ib.h | 31 ++++----
drivers/infiniband/hw/mlx5/mr.c | 83 +++++++++++-----------
drivers/infiniband/hw/mlx5/odp.c | 38 +++-------
drivers/infiniband/hw/mlx5/wr.c | 10 +--
.../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 6 +-
.../ethernet/mellanox/mlx5/core/diag/fw_tracer.h | 2 +-
.../ethernet/mellanox/mlx5/core/diag/rsc_dump.c | 10 +--
drivers/net/ethernet/mellanox/mlx5/core/en.h | 4 +-
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 2 +-
.../net/ethernet/mellanox/mlx5/core/en_common.c | 6 +-
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 23 +++---
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 2 +-
.../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 10 +--
.../net/ethernet/mellanox/mlx5/core/fpga/core.h | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 54 +++++++++++---
drivers/net/ethernet/mellanox/mlx5/core/mr.c | 27 +++----
.../mellanox/mlx5/core/steering/dr_icm_pool.c | 10 +--
.../ethernet/mellanox/mlx5/core/steering/dr_send.c | 11 ++-
.../mellanox/mlx5/core/steering/dr_types.h | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/uar.c | 14 ++--
drivers/vdpa/mlx5/core/mlx5_vdpa.h | 8 +--
drivers/vdpa/mlx5/core/mr.c | 8 +--
drivers/vdpa/mlx5/core/resources.c | 13 ++--
drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 +-
include/linux/mlx5/device.h | 2 +
include/linux/mlx5/driver.h | 32 ++-------
include/linux/mlx5/fs.h | 2 +
include/linux/mlx5/mlx5_ifc.h | 26 +++++--
34 files changed, 292 insertions(+), 248 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [pull-request][net-next] Merge mlx5-next into net-next
2021-10-28 5:21 [pull-request][net-next] Merge mlx5-next into net-next Saeed Mahameed
@ 2021-10-28 15:22 ` Jakub Kicinski
2021-10-28 19:32 ` Saeed Mahameed
0 siblings, 1 reply; 3+ messages in thread
From: Jakub Kicinski @ 2021-10-28 15:22 UTC (permalink / raw)
To: Saeed Mahameed
Cc: David S. Miller, netdev, Jason Gunthorpe, Leon Romanovsky,
Saeed Mahameed
On Wed, 27 Oct 2021 22:21:04 -0700 Saeed Mahameed wrote:
> From: Saeed Mahameed <saeedm@nvidia.com>
>
> Hi Dave, Jakub,
>
> This pull request provides a single merge commit of mlx5-next into net-next
> which handles a non-trivial conflict.
>
> The commits from mlx5-next provide MR (Memory Region) Memory Key
> management cleanup in mlx5 IB driver and mlx5 core driver [1].
>
> Please pull and let me know if there's any problem.
>
> [1] https://patchwork.kernel.org/project/netdevbpf/cover/cover.1634033956.git.leonro@nvidia.com/
>
> Thanks,
> Saeed.
>
> --
FWIW the PR is fumbled a little bit and the actual contents are in the
footer. But Dave has pulled so all good. Just noting this for the
future cause I think that's why we missed the pw bot's auto-response.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [pull-request][net-next] Merge mlx5-next into net-next
2021-10-28 15:22 ` Jakub Kicinski
@ 2021-10-28 19:32 ` Saeed Mahameed
0 siblings, 0 replies; 3+ messages in thread
From: Saeed Mahameed @ 2021-10-28 19:32 UTC (permalink / raw)
To: kuba; +Cc: Leon Romanovsky, Jason Gunthorpe, davem, netdev
On Thu, 2021-10-28 at 08:22 -0700, Jakub Kicinski wrote:
> On Wed, 27 Oct 2021 22:21:04 -0700 Saeed Mahameed wrote:
> > From: Saeed Mahameed <saeedm@nvidia.com>
> >
> > Hi Dave, Jakub,
> >
> > This pull request provides a single merge commit of mlx5-next into
> > net-next
> > which handles a non-trivial conflict.
> >
> > The commits from mlx5-next provide MR (Memory Region) Memory Key
> > management cleanup in mlx5 IB driver and mlx5 core driver [1].
> >
> > Please pull and let me know if there's any problem.
> >
> > [1]
> > https://patchwork.kernel.org/project/netdevbpf/cover/cover.1634033956.git.leonro@nvidia.com/
> >
> > Thanks,
> > Saeed.
> >
> > --
>
> FWIW the PR is fumbled a little bit and the actual contents are in
> the
> footer. But Dave has pulled so all good. Just noting this for the
> future cause I think that's why we missed the pw bot's auto-response.
Got it, Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-28 19:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-28 5:21 [pull-request][net-next] Merge mlx5-next into net-next Saeed Mahameed
2021-10-28 15:22 ` Jakub Kicinski
2021-10-28 19:32 ` Saeed Mahameed
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).