* linux-next: manual merge of the net-next tree with the mlx5-next tree
@ 2024-09-12 2:06 Stephen Rothwell
2024-09-17 1:53 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2024-09-12 2:06 UTC (permalink / raw)
To: David Miller, Jakub Kicinski, Paolo Abeni, Leon Romanovsky
Cc: Networking, Linux Kernel Mailing List, Linux Next Mailing List,
Saeed Mahameed, Yevgeny Kliteynik, Yishai Hadas
[-- Attachment #1: Type: text/plain, Size: 1265 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/linux/mlx5/mlx5_ifc.h
between commit:
c772a2c69018 ("net/mlx5: Add IFC related stuff for data direct")
from the mlx5-next tree and commit:
34c626c3004a ("net/mlx5: Added missing mlx5_ifc definition for HW Steering")
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.
--
Cheers,
Stephen Rothwell
diff --cc include/linux/mlx5/mlx5_ifc.h
index 65bbf535b365,b6f8e3834bd3..000000000000
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@@ -313,7 -315,7 +315,8 @@@ enum
MLX5_CMD_OP_MODIFY_VHCA_STATE = 0xb0e,
MLX5_CMD_OP_SYNC_CRYPTO = 0xb12,
MLX5_CMD_OP_ALLOW_OTHER_VHCA_ACCESS = 0xb16,
+ MLX5_CMD_OPCODE_QUERY_VUID = 0xb22,
+ MLX5_CMD_OP_GENERATE_WQE = 0xb17,
MLX5_CMD_OP_MAX
};
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the net-next tree with the mlx5-next tree
2024-09-12 2:06 linux-next: manual merge of the net-next tree with the mlx5-next tree Stephen Rothwell
@ 2024-09-17 1:53 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2024-09-17 1:53 UTC (permalink / raw)
To: Doug Ledford, Jason Gunthorpe
Cc: David Miller, Jakub Kicinski, Paolo Abeni, Leon Romanovsky,
Networking, Linux Kernel Mailing List, Linux Next Mailing List,
Saeed Mahameed, Yevgeny Kliteynik, Yishai Hadas
[-- Attachment #1: Type: text/plain, Size: 1526 bytes --]
Hi all,
On Thu, 12 Sep 2024 12:06:19 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> include/linux/mlx5/mlx5_ifc.h
>
> between commit:
>
> c772a2c69018 ("net/mlx5: Add IFC related stuff for data direct")
>
> from the mlx5-next tree and commit:
>
> 34c626c3004a ("net/mlx5: Added missing mlx5_ifc definition for HW Steering")
>
> 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc include/linux/mlx5/mlx5_ifc.h
> index 65bbf535b365,b6f8e3834bd3..000000000000
> --- a/include/linux/mlx5/mlx5_ifc.h
> +++ b/include/linux/mlx5/mlx5_ifc.h
> @@@ -313,7 -315,7 +315,8 @@@ enum
> MLX5_CMD_OP_MODIFY_VHCA_STATE = 0xb0e,
> MLX5_CMD_OP_SYNC_CRYPTO = 0xb12,
> MLX5_CMD_OP_ALLOW_OTHER_VHCA_ACCESS = 0xb16,
> + MLX5_CMD_OPCODE_QUERY_VUID = 0xb22,
> + MLX5_CMD_OP_GENERATE_WQE = 0xb17,
> MLX5_CMD_OP_MAX
> };
>
This is now a conflict between the rdma tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-09-17 1:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-12 2:06 linux-next: manual merge of the net-next tree with the mlx5-next tree Stephen Rothwell
2024-09-17 1:53 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox