lkml.org 
[lkml]   [2019]   [Nov]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the cel tree with the rdma tree
Date
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

\
 
 \ /
  Last update: 2019-11-05 14:05    [W:0.031 / U:1.484 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site