From: Christoph Hellwig <hch@lst.de>
To: Chuck Lever <chuck.lever@oracle.com>
Cc: "J. Bruce Fields" <bfields@fieldses.org>,
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 13:15:29 +0100 [thread overview]
Message-ID: <20160106121529.GA21780@lst.de> (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.
>
> 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?
I'm not Doug, but all the recent for 4.5 work is in Dougs tree
at
https://github.com/dledford/linux rdma/k.o/for-4.5
Bruce, can you ACK me local_dma_lkey patch as well which needs
the same treatment as Chuck's patches? I have some RDMA work
in that area planned for the nxt merge window, so it would be
really helpful to get it in for 4.5.
next prev parent reply other threads:[~2016-01-06 12:15 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 [this message]
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
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=20160106121529.GA21780@lst.de \
--to=hch@lst.de \
--cc=bfields@fieldses.org \
--cc=chuck.lever@oracle.com \
--cc=dledford@redhat.com \
--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.