linux-kernel - Re: linux-next: manual merge of the rdma tree with the rdma-fixes tree

lists.openwall.net		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 linux-cve-announce 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]

Message-ID: <20190823150237.GL12847@mellanox.com>
Date:   Fri, 23 Aug 2019 15:02:42 +0000
From:   Jason Gunthorpe <jgg@...lanox.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
CC:     Doug Ledford <dledford@...hat.com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Moni Shoua <monis@...lanox.com>,
        Parav Pandit <parav@...lanox.com>,
        Leon Romanovsky <leonro@...lanox.com>
Subject: Re: linux-next: manual merge of the rdma tree with the rdma-fixes
 tree

On Fri, Aug 23, 2019 at 12:22:27PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the rdma tree got a conflict in:
> 
>   drivers/infiniband/hw/mlx5/mlx5_ib.h
> 
> between commit:
> 
>   0e6613b41edd ("IB/mlx5: Consolidate use_umr checks into single function")
> 
> from the rdma-fixes tree and commit:
> 
>   3e1f000ff746 ("IB/mlx5: Support per device q counters in switchdev mode")
> 
> from the rdma 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.

Looks OK to me, thanks

Jason