From: Max Gurtovoy <maxg@mellanox.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Jens Axboe <axboe@kernel.dk>, Doug Ledford <dledford@redhat.com>,
Jason Gunthorpe <jgg@mellanox.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Yamin Friedman <yaminf@mellanox.com>,
Israel Rukshin <israelr@mellanox.com>,
Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: manual merge of the block tree with the rdma tree
Date: Tue, 2 Jun 2020 11:37:26 +0300 [thread overview]
Message-ID: <3717aca8-9d75-33f1-ea8c-044af767ab5c@mellanox.com> (raw)
In-Reply-To: <20200602125647.5f5ed151@canb.auug.org.au>
On 6/2/2020 5:56 AM, Stephen Rothwell wrote:
> Hi all,
Hi,
This looks good to me.
Can you share a pointer to the tree so we'll test it in our labs ?
need to re-test:
1. srq per core
2. srq per core + T10-PI
And both will run with shared CQ.
>
> Today's linux-next merge of the block tree got a conflict in:
>
> drivers/nvme/target/rdma.c
>
> between commit:
>
> 5733111dcd97 ("nvmet-rdma: use new shared CQ mechanism")
>
> from the rdma tree and commits:
>
> b0012dd39715 ("nvmet-rdma: use SRQ per completion vector")
> b09160c3996c ("nvmet-rdma: add metadata/T10-PI support")
>
> from the block tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
next prev parent reply other threads:[~2020-06-02 8:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-02 2:56 linux-next: manual merge of the block tree with the rdma tree Stephen Rothwell
2020-06-02 8:37 ` Max Gurtovoy [this message]
2020-06-02 10:43 ` Stephen Rothwell
2020-06-02 19:01 ` Jason Gunthorpe
2020-06-02 19:02 ` Jens Axboe
2020-06-02 19:09 ` Jason Gunthorpe
2020-06-02 21:37 ` Jens Axboe
2020-06-02 22:40 ` Max Gurtovoy
2020-06-02 23:32 ` Jason Gunthorpe
2020-06-03 10:56 ` Max Gurtovoy
-- strict thread matches above, loose matches on Subject: below --
2020-06-02 2:48 Stephen Rothwell
2018-07-26 3:58 Stephen Rothwell
2018-08-15 1:45 ` Stephen Rothwell
2018-08-15 19:26 ` Jason Gunthorpe
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=3717aca8-9d75-33f1-ea8c-044af767ab5c@mellanox.com \
--to=maxg@mellanox.com \
--cc=axboe@kernel.dk \
--cc=dledford@redhat.com \
--cc=hch@lst.de \
--cc=israelr@mellanox.com \
--cc=jgg@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=yaminf@mellanox.com \
/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;
as well as URLs for NNTP newsgroup(s).