From: Doug Ledford <dledford@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
"J. Bruce Fields" <bfields@fieldses.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@lst.de>, Ira Weiny <ira.weiny@intel.com>,
Or Gerlitz <ogerlitz@mellanox.com>
Subject: Re: linux-next: manual merge of the rdma tree with the nfsd tree
Date: Sun, 3 Jan 2016 21:53:20 -0500 [thread overview]
Message-ID: <5689DEA0.1020803@redhat.com> (raw)
In-Reply-To: <20160104124450.7ba21c87@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1437 bytes --]
On 01/03/2016 08:44 PM, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 31 Dec 2015 13:30:22 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Hi Doug,
>>
>> Today's linux-next merge of the rdma tree got conflicts in a quite a
>> few files between (mostly, I think) commit:
>>
>> 6c7b6d2d442c ("IB: merge struct ib_device_attr into struct ib_device")
>>
>> from the nfsd tree and various commits from the rdma tree.
>>
>> It would have taken me considerable time to fix the conflicts up, so I
>> have dropped teh rdma tree for today (just because it was merged second).
>> Please have a conversation and figure out how you are going to cooperate
>> and get these conflicts fixed e.g. set up a stable branch with Christoph's
>> commit (and any other conflicting commits) in it and merge that into
>> both trees.
>
> So, on further inspection, it appears that there is a series of commits
> in the rdma tree that does basically the same as that nfsd tree commit
> above. So I have dropped the rdma tree again today. Please have a
> conversation guys ...
>
The initial patchset was Christoph's. It was later replaced with a
different patchset from Or Gerlitz. Bruce picked up some changes from
Chuck Lever that were originally based on Christoph's work but now need
to be rebased off of the current RDMA tree.
--
Doug Ledford <dledford@redhat.com>
GPG KeyID: 0E572FDD
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]
next prev parent reply other threads:[~2016-01-04 2:53 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-31 2:30 linux-next: manual merge of the rdma tree with the nfsd tree Stephen Rothwell
2016-01-04 1:44 ` Stephen Rothwell
2016-01-04 2:53 ` Doug Ledford [this message]
2016-01-04 19:36 ` J. Bruce Fields
2016-01-06 12:01 ` Chuck Lever
2016-01-06 12:14 ` Or Gerlitz
2016-01-06 12:15 ` Christoph Hellwig
2016-01-06 12:22 ` Or Gerlitz
2016-01-06 12:28 ` Christoph Hellwig
2016-01-06 17:54 ` Doug Ledford
2016-01-06 14:24 ` Chuck Lever
2016-01-06 14:46 ` Or Gerlitz
2016-01-06 15:20 ` Chuck Lever
2016-01-06 15:52 ` Or Gerlitz
2016-01-06 16:33 ` Chuck Lever
2016-01-06 16:38 ` Or Gerlitz
2016-01-06 16:48 ` Anna Schumaker
2016-01-06 12:27 ` Chuck Lever
2016-01-06 16:25 ` J. Bruce Fields
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=5689DEA0.1020803@redhat.com \
--to=dledford@redhat.com \
--cc=bfields@fieldses.org \
--cc=hch@lst.de \
--cc=ira.weiny@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ogerlitz@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).