| Message ID | 20231211110328.76c925af@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the net tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --cc drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c index c4e19d627da2,4b8cb120362b..000000000000 --- a/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c between commit: 3d7a3f2612d7 ("net/mlx5: Nack sync reset request when HotPlug is enabled") from the net tree and commit: cecf44ea1a1f ("net/mlx5: Allow sync reset flow when BF MGT interface device is present") from the net-next 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.