lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date:   Thu, 14 May 2020 08:54:53 +0300
From:   Leon Romanovsky <>
To:     Stephen Rothwell <>
Cc:     Doug Ledford <>,
        Jason Gunthorpe <>,
        Linux Next Mailing List <>,
        Linux Kernel Mailing List <>,
        Maor Gottlieb <>
Subject: Re: linux-next: manual merge of the mlx5-next tree with the rdma tree

On Thu, May 14, 2020 at 12:59:20PM +1000, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the mlx5-next tree got a conflict in:
>   drivers/infiniband/hw/mlx5/main.c
> between commit:
>   2be08c308f10 ("RDMA/mlx5: Delete create QP flags obfuscation")
> from the rdma tree and commit:
>   14c129e30152 ("{IB/net}/mlx5: Simplify don't trap code")
> from the mlx5-next tree.
> I fixed it up (the latter change included the former) 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.

Thanks Stephen,

The mlx5-next branch was merged to rdma-next tonight and this conflict
will disappear in next the linux-next.


> --
> Cheers,
> Stephen Rothwell

Download attachment "signature.asc" of type "application/pgp-signature" (229 bytes)

Powered by blists - more mailing lists