Messages in this thread | | | From | Jason Gunthorpe <> | Subject | Re: linux-next: manual merge of the cel tree with the rdma tree | Date | Tue, 5 Nov 2019 13:03:53 +0000 |
| |
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
| |