From: Jason Gunthorpe <jgg@mellanox.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Doug Ledford <dledford@redhat.com>, Jens Axboe <axboe@kernel.dk>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Bart Van Assche <bart.vanassche@wdc.com>,
Max Gurtovoy <maxg@mellanox.com>, Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: manual merge of the block tree with the rdma tree
Date: Wed, 15 Aug 2018 13:26:01 -0600 [thread overview]
Message-ID: <20180815192601.GI2341@mellanox.com> (raw)
In-Reply-To: <20180815114539.34e066e1@canb.auug.org.au>
On Wed, Aug 15, 2018 at 11:45:39AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 26 Jul 2018 13:58:04 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the block tree got a conflict in:
> >
> > drivers/nvme/target/rdma.c
> >
> > between commit:
> >
> > 23f96d1f15a7 ("nvmet-rdma: Simplify ib_post_(send|recv|srq_recv)() calls")
> > 202093848cac ("nvmet-rdma: add an error flow for post_recv failures")
> >
> > from the rdma tree and commits:
> >
> > 2fc464e2162c ("nvmet-rdma: add unlikely check in the fast path")
> >
> > 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.
> >
>
> This is now a conflict between Linus' tree and the rdma tree.
Yes, I expect this.. good thing we had linux-next as several of these
needed non-obvious changes.
I keep track of your postings and build a conflict resolution for
Linus to refer to. netdev is the last conflicting tree I expect, and
it hasn't been sent yet..
Thanks,
Jason
next prev parent reply other threads:[~2018-08-15 19:26 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-26 3:58 linux-next: manual merge of the block tree with the rdma tree Stephen Rothwell
2018-08-15 1:45 ` Stephen Rothwell
2018-08-15 19:26 ` Jason Gunthorpe [this message]
2020-06-02 2:48 Stephen Rothwell
2020-06-02 2:56 Stephen Rothwell
2020-06-02 8:37 ` Max Gurtovoy
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
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=20180815192601.GI2341@mellanox.com \
--to=jgg@mellanox.com \
--cc=axboe@kernel.dk \
--cc=bart.vanassche@wdc.com \
--cc=dledford@redhat.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maxg@mellanox.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;
as well as URLs for NNTP newsgroup(s).