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@xxxxxxxxxx/
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
};
