From: Jason Gunthorpe <jgg@mellanox.com>
To: Doug Ledford <dledford@redhat.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Mark Bloch <markb@mellanox.com>,
Leon Romanovsky <leonro@mellanox.com>
Subject: Re: linux-next: manual merge of the net-next tree with the rdma-fixes tree
Date: Thu, 15 Mar 2018 20:05:28 -0600 [thread overview]
Message-ID: <20180316020528.GA27212@mellanox.com> (raw)
In-Reply-To: <1521163082.18703.191.camel@redhat.com>
On Thu, Mar 15, 2018 at 09:18:02PM -0400, Doug Ledford wrote:
> Here's the commit (from the rdma git repo) with the proper merge fix
> (although it also has other minor merge stuff that needs to be ignored):
>
> 2d873449a202 (Merge branch 'k.o/wip/dl-for-rc' into k.o/wip/dl-for-next)
Stephen,
If you merge the branches in the order:
rdma for-next, rdma for-rc, then net-next
you should not see a merge conflict as rdma for-next already has the
correct resolution.
Jason
next prev parent reply other threads:[~2018-03-16 2:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-16 0:56 linux-next: manual merge of the net-next tree with the rdma-fixes tree Stephen Rothwell
2018-03-16 1:18 ` Doug Ledford
2018-03-16 2:05 ` Jason Gunthorpe [this message]
2018-03-16 6:54 ` Saeed Mahameed
2018-03-23 4:19 ` David Miller
2018-03-23 4:33 ` Jason Gunthorpe
2018-03-23 14:22 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2023-06-13 1:43 Stephen Rothwell
2023-06-13 12:39 ` Leon Romanovsky
2025-05-13 3:06 Stephen Rothwell
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=20180316020528.GA27212@mellanox.com \
--to=jgg@mellanox.com \
--cc=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=leonro@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=markb@mellanox.com \
--cc=netdev@vger.kernel.org \
--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