From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shards.monkeyblade.net ([184.105.139.130]:55090 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750828AbeCTOks (ORCPT ); Tue, 20 Mar 2018 10:40:48 -0400 Date: Tue, 20 Mar 2018 10:40:46 -0400 (EDT) Message-Id: <20180320.104046.957152577341740274.davem@davemloft.net> To: swise@opengridcomputing.com Cc: rajur@chelsio.com, dledford@redhat.com, linux-rdma@vger.kernel.org, jgg@ziepe.ca, netdev@vger.kernel.org, bharat@chelsio.com, ganeshgr@chelsio.com, rahul.lakkireddy@chelsio.com Subject: Re: interdependencies with cxgb4 and iw_cxgb4 From: David Miller In-Reply-To: <01a201d3c051$eebbded0$cc339c70$@opengridcomputing.com> References: <2cbb87bf-9020-2788-be75-1dd7f48f6c42@opengridcomputing.com> <20180319.193440.1570733225238398675.davem@davemloft.net> <01a201d3c051$eebbded0$cc339c70$@opengridcomputing.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset=iso-8859-1 Content-Transfer-Encoding: 8BIT Sender: netdev-owner@vger.kernel.org List-ID: From: "Steve Wise" Date: Tue, 20 Mar 2018 08:47:04 -0500 >> From: Steve Wise >> Date: Mon, 19 Mar 2018 14:50:57 -0500 >> >> > Let me ask a dumb question:� Why cannot one of the maintaners pull the >> > commit from the other mainainer's git repo directly?� IE why have this >> > third trusted/signed git repo that has to be on k.o, from which both >> > maintainers pull?� If one of you can pull it in via a patch series, >> > like you do for all other patches, and then notify the other >> > maintainer to pull it from the first maintainers' repo if the series >> > meets the requirements that it needs to be in both maintainers' >> > repositories?� This avoids adding more staging git repos on k.o.� But >> > probably I'm missing something... >> >> Tree A may not want all of tree B's changes, and vice versa. > > I was thinking the special commit would go into a branch that was based on, > say rc1 or rc2 of one of the maintainers. Then both maintainers pull that > into their -next branch. Would that work? That makes things more complicated. The simplest design is that "identical" commits end up in both the RDMA and the net-next tree. Then it absolutely doesn't matter whose tree goes into Linus's first. Also, we should not be merging "merge window" code after -rc1. "-rc1" means the merge window is closed.