> On Jan 4, 2016, at 2:36 PM, J. Bruce Fields <bfields@xxxxxxxxxxxx> wrote:
>
> On Sun, Jan 03, 2016 at 09:53:20PM -0500, Doug Ledford wrote:
>> On 01/03/2016 08:44 PM, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> On Thu, 31 Dec 2015 13:30:22 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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.
>
> OK. I'm assuming Chuck will want to do any necessary rebasing and
> retesting himself, so for now I've just dropped those patches, and
> expect to pick up new versions when Chuck gets back from the holidays.
Part of the plan was that Doug's tree would be merged before
Bruce's. But the above problem description looks like the
maintainer trees were merged into linux-next in the other order.
I'd like to make this simpler for everyone. Bruce, may I send
my for-4.5 NFS/RDMA server patches to Doug with your Acked-by?
That way, merge order won't matter.
Doug, what is the URL for the branch I should rebase on?
--
Chuck Lever
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
