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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20160106121529.GA21780@lst.de>
Date:	Wed, 6 Jan 2016 13:15:29 +0100
From:	Christoph Hellwig <hch@....de>
To:	Chuck Lever <chuck.lever@...cle.com>
Cc:	"J. Bruce Fields" <bfields@...ldses.org>,
	Doug Ledford <dledford@...hat.com>,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org,
	LKML Kernel <linux-kernel@...r.kernel.org>,
	Christoph Hellwig <hch@....de>,
	Ira Weiny <ira.weiny@...el.com>,
	Or Gerlitz <ogerlitz@...lanox.com>
Subject: Re: linux-next: manual merge of the rdma tree with the nfsd tree

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/