linux-kernel - Re: linux-next: manual merge of the rdma tree with Linus' 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: <20191028193032.GA22766@mellanox.com>
Date:   Mon, 28 Oct 2019 19:30:41 +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>,
        Erez Alfasi <ereza@...lanox.com>
Subject: Re: linux-next: manual merge of the rdma tree with Linus' tree

On Thu, Oct 24, 2019 at 11:01:15AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the rdma tree got a conflict in:
> 
>   drivers/infiniband/hw/mlx5/odp.c
> 
> between commit:
> 
>   9dc775e7f550 ("RDMA/odp: Lift umem_mutex out of ib_umem_odp_unmap_dma_pages()")
> 
> from Linus' tree and commit:
> 
>   a3de94e3d61e ("IB/mlx5: Introduce ODP diagnostic counters")
> 
> from the rdma tree.
> 
> I fixed it up (see below - but maybe the mlx5_update_odp_stats()
> also needs to move after the moved mutex_unlock()?) 

nope, this resolution is right, thanks

Jason