linux-kernel - Re: linux-next: manual merge of the cel tree with the rdma 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: <20191105130347.GO22766@mellanox.com>
Date:   Tue, 5 Nov 2019 13:03:53 +0000
From:   Jason Gunthorpe <jgg@...lanox.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
CC:     Chuck Lever <chuck.lever@...cle.com>,
        Doug Ledford <dledford@...hat.com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Michal Kalderon <michal.kalderon@...vell.com>,
        Ariel Elior <ariel.elior@...vell.com>
Subject: Re: linux-next: manual merge of the cel tree with the rdma tree

On Tue, Nov 05, 2019 at 07:21:44PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the cel tree got a conflict in:
> 
>   drivers/infiniband/core/Makefile
> 
> between commit:
> 
>   771b46a8d15a ("RDMA/core: Move core content from ib_uverbs to ib_core")
> 
> from the rdma tree and commit:
> 
>   b0a70ca7e39e ("IB/core: Trace points for diagnosing completion queue issues")
> 
> from the cel tree.

What is a 'cel' tree and why is it taking RDMA patches?

Jason