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: <20211001135212.GR964074@nvidia.com>
Date:   Fri, 1 Oct 2021 10:52:12 -0300
From:   Jason Gunthorpe <jgg@...dia.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Doug Ledford <dledford@...hat.com>,
        Dennis Dalessandro <dennis.dalessandro@...nelisnetworks.com>,
        Guo Zhi <qtxuning1999@...u.edu.cn>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Mike Marciniszyn <mike.marciniszyn@...nelisnetworks.com>
Subject: Re: linux-next: manual merge of the rdma tree with the rdma-fixes
 tree

On Thu, Sep 30, 2021 at 11:35:18AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the rdma tree got a conflict in:
> 
>   drivers/infiniband/hw/hfi1/ipoib_tx.c
> 
> between commit:
> 
>   7d5cfafe8b40 ("RDMA/hfi1: Fix kernel pointer leak")
> 
> from the rdma-fixes tree and commit:
> 
>   f5dc70a0e142 ("IB/hfi1: Tune netdev xmit cachelines")
> 
> 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.

It looks OK, thanks

Jason