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
| ||
|
Date: Mon, 4 Jan 2016 12:44:50 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Doug Ledford <dledford@...hat.com>, "J. Bruce Fields" <bfields@...ldses.org> Cc: linux-next@...r.kernel.org, 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 Hi all, On Thu, 31 Dec 2015 13:30:22 +1100 Stephen Rothwell <sfr@...b.auug.org.au> 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 ... -- Cheers, Stephen Rothwell sfr@...b.auug.org.au -- 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/
Powered by blists - more mailing lists