From: Saeed Mahameed <saeed@kernel.org>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Eric Dumazet <edumazet@google.com>,
Jason Gunthorpe <jgg@nvidia.com>
Cc: Saeed Mahameed <saeedm@nvidia.com>,
linux-rdma@vger.kernel.org, Leon Romanovsky <leonro@nvidia.com>,
netdev@vger.kernel.org
Subject: Re: pull-request: mlx5-next 2023-01-24 V2
Date: Fri, 3 Feb 2023 12:14:53 -0800 [thread overview]
Message-ID: <Y91rPQbwdlsCDW3I@x130> (raw)
In-Reply-To: <20230126230815.224239-1-saeed@kernel.org>
On 26 Jan 15:08, Saeed Mahameed wrote:
>Hi,
>
>This pulls mlx5-next branch which includes changes from [1]:
>
>1) From Jiri: fixe a deadlock in mlx5_ib's netdev notifier unregister.
>2) From Mark and Patrisious: add IPsec RoCEv2 support.
>
>[1] https://lore.kernel.org/netdev/20230105041756.677120-1-saeed@kernel.org/
>
>Please pull into net-next and rdma-next.
>
[...]
>
>The following changes since commit b7bfaa761d760e72a969d116517eaa12e404c262:
>
> Linux 6.2-rc3 (2023-01-08 11:49:43 -0600)
>
>are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next
>
Dave, Paolo, any chance you could pull this one?
The PR is already marked as accepted in patchwork but we don't see it in
net-next, Jason was planning to pull this into rdma-next but
since we got a small conflict with net-next, we would like to make
sure it's handled first.
The conflict is very trivial and just take the two conflicting lines below
diff --cc include/linux/mlx5/driver.h
index cd529e051b4d,cc48aa308269..000000000000
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@@ -674,7 -675,7 +675,11 @@@ struct mlx5e_resources
} hw_objs;
struct devlink_port dl_port;
struct net_device *uplink_netdev;
++<<<<<<< HEAD
+ struct mlx5_crypto_dek_priv *dek_priv;
++=======
+ struct mutex uplink_netdev_lock;
++>>>>>>> c4d508fbe54af3119e01672299514bfc83dfd59f
};
prev parent reply other threads:[~2023-02-03 20:15 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-26 23:08 pull-request: mlx5-next 2023-01-24 V2 Saeed Mahameed
2023-02-02 7:46 ` Leon Romanovsky
2023-02-02 17:13 ` Jakub Kicinski
2023-02-02 17:14 ` Jason Gunthorpe
2023-02-02 17:25 ` Jakub Kicinski
2023-02-02 17:44 ` Jason Gunthorpe
2023-02-02 17:54 ` Jakub Kicinski
2023-02-02 18:03 ` Leon Romanovsky
2023-02-02 18:15 ` Saeed Mahameed
2023-02-02 18:30 ` Jakub Kicinski
2023-02-03 20:05 ` Saeed Mahameed
2023-02-03 21:14 ` Jakub Kicinski
2023-02-04 0:18 ` Jason Gunthorpe
2023-02-04 1:45 ` Jakub Kicinski
2023-02-06 14:58 ` Jason Gunthorpe
2023-02-07 0:38 ` Jakub Kicinski
2023-02-07 19:52 ` Jason Gunthorpe
2023-02-07 22:03 ` Jakub Kicinski
2023-02-08 9:17 ` Leon Romanovsky
2023-02-08 16:13 ` Jason Gunthorpe
2023-02-08 23:19 ` Jakub Kicinski
2023-02-09 0:27 ` Jason Gunthorpe
2023-02-09 0:48 ` Jakub Kicinski
2023-02-09 0:59 ` Jason Gunthorpe
2023-02-09 1:16 ` Jakub Kicinski
2023-02-10 17:15 ` Jason Gunthorpe
2023-02-09 0:36 ` Saeed Mahameed
2023-02-09 0:52 ` Jakub Kicinski
2023-02-04 0:47 ` Saeed Mahameed
2023-02-04 1:57 ` Jakub Kicinski
2023-02-05 10:26 ` Leon Romanovsky
2023-02-02 18:07 ` Leon Romanovsky
2023-02-03 20:14 ` Saeed Mahameed [this message]
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=Y91rPQbwdlsCDW3I@x130 \
--to=saeed@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jgg@nvidia.com \
--cc=kuba@kernel.org \
--cc=leonro@nvidia.com \
--cc=linux-rdma@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=saeedm@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).