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:   Mon, 18 Feb 2019 10:48:54 +0000
From:   Leon Romanovsky <>
To:     Stephen Rothwell <>
CC:     David Miller <>,
        Networking <>,
        Doug Ledford <>,
        Jason Gunthorpe <>,
        Linux Next Mailing List <>,
        Linux Kernel Mailing List <>,
        Mark Bloch <>,
        Bodong Wang <>,
        Saeed Mahameed <>
Subject: Re: linux-next: manual merge of the net-next tree with the rdma tree

On Mon, Feb 18, 2019 at 11:05:49AM +1100, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the net-next tree got a conflict in:
>   drivers/infiniband/hw/mlx5/ib_rep.c
> between commits:
>   459cc69fa4c1 ("RDMA: Provide safe ib_alloc_device() function")
>   fc9e4477f924 ("RDMA/mlx5: Fix memory leak in case we fail to add an IB device")
> from the rdma tree and commit:
>   f0666f1f22b5 ("IB/mlx5: Use unified register/load function for uplink and VF vports")
> 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.

Thanks a lot for your resolution.

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

Powered by blists - more mailing lists