| Message ID | 20230815122807.7dddd4a3@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | linux-next: manual merge of the mlx5-next tree with the net-next tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
diff --cc include/linux/mlx5/driver.h index e1c7e502a4fc,728bcd6d184c..000000000000 --- a/include/linux/mlx5/driver.h
Hi all, Today's linux-next merge of the mlx5-next tree got a conflict in: include/linux/mlx5/driver.h between commits: c8e350e62fc5 ("net/mlx5e: Make TC and IPsec offloads mutually exclusive on a netdev") 1f507e80c700 ("net/mlx5: Expose NIC temperature via hardware monitoring kernel API") from the net-next tree and commits: e26051386a94 ("net/mlx5e: Move MACsec flow steering and statistics database from ethernet to core") 17c5c415b9cb ("net/mlx5: Add RoCE MACsec steering infrastructure in core") from the mlx5-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.