From: "J. Bruce Fields" <bfields@fieldses.org>
To: Chuck Lever <chuck.lever@oracle.com>
Cc: Doug Ledford <dledford@redhat.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org,
LKML Kernel <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: Wed, 6 Jan 2016 11:25:17 -0500 [thread overview]
Message-ID: <20160106162517.GA13070@fieldses.org> (raw)
In-Reply-To: <24AC8112-95A2-4D7B-8048-3D7D50A78B90@oracle.com>
On Wed, Jan 06, 2016 at 07:01:14AM -0500, Chuck Lever wrote:
> 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.
The order makes no difference.
The problem is that we had conflicting patches: I still had Christoph's
patch, but Doug's tree did something different.
(The only reason to care about merge order is that if I sent my pull
request to Linus first, it would look like "here's the nfsd changes for
4.5. Oh, plus a bunch of rdma changes from Doug which he can explain
later...". So it'd be best if the rdma changes were already in before I
sent a pull request based on them.)
> 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?
Sure, I'm fine with doing it either way. Feel free to add my Acked-by:
to the patches you sent me before if that would simplify things.
--b.
prev parent reply other threads:[~2016-01-06 16:25 UTC|newest]
Thread overview: 24+ 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
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:14 ` Or Gerlitz
2016-01-06 12:15 ` Christoph Hellwig
2016-01-06 12:22 ` Or Gerlitz
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 14:46 ` Or Gerlitz
2016-01-06 15:20 ` Chuck Lever
2016-01-06 15:52 ` Or Gerlitz
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 16:48 ` Anna Schumaker
2016-01-06 12:27 ` Chuck Lever
2016-01-06 16:25 ` J. Bruce Fields [this message]
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=20160106162517.GA13070@fieldses.org \
--to=bfields@fieldses.org \
--cc=chuck.lever@oracle.com \
--cc=dledford@redhat.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.