Re: linux-next: manual merge of the rdma tree with the nfsd tree

From	Christoph Hellwig <hch@lst.de>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the rdma tree with the nfsd tree
Date	2016-01-06 13:20 +0100
Message-ID	<qNVei-YK-17@gated-at.bofh.it> (permalink)
References	<qLBjH-6Ik-5@gated-at.bofh.it> <qN2rw-4WC-7@gated-at.bofh.it> <qN3xf-5yZ-9@gated-at.bofh.it> <qNj90-7LW-13@gated-at.bofh.it> <qNV4C-Vs-13@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Thread

Re: linux-next: manual merge of the rdma tree with the nfsd tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-04 02:50 +0100
  Re: linux-next: manual merge of the rdma tree with the nfsd tree Doug Ledford <dledford@redhat.com> - 2016-01-04 04:00 +0100
    Re: linux-next: manual merge of the rdma tree with the nfsd tree "J. Bruce Fields" <bfields@fieldses.org> - 2016-01-04 20:40 +0100
      Re: linux-next: manual merge of the rdma tree with the nfsd tree Chuck Lever <chuck.lever@oracle.com> - 2016-01-06 13:10 +0100
        Re: linux-next: manual merge of the rdma tree with the nfsd tree Christoph Hellwig <hch@lst.de> - 2016-01-06 13:20 +0100
          Re: linux-next: manual merge of the rdma tree with the nfsd tree Christoph Hellwig <hch@lst.de> - 2016-01-06 13:30 +0100
            Re: linux-next: manual merge of the rdma tree with the nfsd tree Doug Ledford <dledford@redhat.com> - 2016-01-06 19:00 +0100
          Re: linux-next: manual merge of the rdma tree with the nfsd tree Chuck Lever <chuck.lever@oracle.com> - 2016-01-06 15:30 +0100
            Re: linux-next: manual merge of the rdma tree with the nfsd tree Chuck Lever <chuck.lever@oracle.com> - 2016-01-06 16:30 +0100
              Re: linux-next: manual merge of the rdma tree with the nfsd tree Chuck Lever <chuck.lever@oracle.com> - 2016-01-06 17:40 +0100
                Re: linux-next: manual merge of the rdma tree with the nfsd tree Anna Schumaker <Anna.Schumaker@netapp.com> - 2016-01-06 17:50 +0100
        Re: linux-next: manual merge of the rdma tree with the nfsd tree Chuck Lever <chuck.lever@oracle.com> - 2016-01-06 13:30 +0100
        Re: linux-next: manual merge of the rdma tree with the nfsd tree "J. Bruce Fields" <bfields@fieldses.org> - 2016-01-06 17:30 +0100

csiph-web