Linux-Next Archive on
 help / color / Atom feed
From: Jason Gunthorpe <>
To: Stephen Rothwell <>
Cc: Chuck Lever <>,
	Doug Ledford <>,
	Linux Next Mailing List <>,
	Linux Kernel Mailing List <>,
	Michal Kalderon <>,
	Ariel Elior <>
Subject: Re: linux-next: manual merge of the cel tree with the rdma tree
Date: Tue, 5 Nov 2019 13:03:53 +0000
Message-ID: <> (raw)
In-Reply-To: <>

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?


      reply index

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-05  8:21 Stephen Rothwell
2019-11-05 13:03 ` Jason Gunthorpe [this message]

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on

Archives are clonable:
	git clone --mirror linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ \
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:

AGPL code for this site: git clone