From: Jason Gunthorpe <jgg@mellanox.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Chuck Lever <chuck.lever@oracle.com>,
Doug Ledford <dledford@redhat.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Michal Kalderon <michal.kalderon@marvell.com>,
Ariel Elior <ariel.elior@marvell.com>
Subject: Re: linux-next: manual merge of the cel tree with the rdma tree
Date: Tue, 5 Nov 2019 13:03:53 +0000 [thread overview]
Message-ID: <20191105130347.GO22766@mellanox.com> (raw)
In-Reply-To: <20191105192144.7af9704b@canb.auug.org.au>
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
prev parent reply other threads:[~2019-11-05 13:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-05 8:21 linux-next: manual merge of the cel tree with the rdma tree Stephen Rothwell
2019-11-05 13:03 ` Jason Gunthorpe [this message]
Reply instructions:
You may reply publicly 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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191105130347.GO22766@mellanox.com \
--to=jgg@mellanox.com \
--cc=ariel.elior@marvell.com \
--cc=chuck.lever@oracle.com \
--cc=dledford@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=michal.kalderon@marvell.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox