Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752407AbdLGVKX (ORCPT ); Thu, 7 Dec 2017 16:10:23 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:36932 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750862AbdLGVKW (ORCPT ); Thu, 7 Dec 2017 16:10:22 -0500 Date: Thu, 7 Dec 2017 13:10:17 -0800 From: "Paul E. McKenney" To: Stephen Rothwell Cc: Bart Van Assche , "josh@joshtriplett.org" , "linux-kernel@vger.kernel.org" , "linux-scsi@vger.kernel.org" , "linux-next@vger.kernel.org" , "martin.petersen@oracle.com" , "ptikhomirov@virtuozzo.com" Subject: Re: linux-next: build failure after merge of the scsi-mkp tree Reply-To: paulmck@linux.vnet.ibm.com References: <20171207145728.57cd9ac4@canb.auug.org.au> <1512619169.3298.3.camel@wdc.com> <20171207152521.0036b131@canb.auug.org.au> <20171207044222.GK7829@linux.vnet.ibm.com> <1512667802.2624.20.camel@wdc.com> <20171207174038.GQ7829@linux.vnet.ibm.com> <20171208073439.1593936d@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171208073439.1593936d@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-GCONF: 00 x-cbid: 17120721-0024-0000-0000-000002FE7AC9 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008167; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000244; SDB=6.00956897; UDB=6.00483752; IPR=6.00736927; BA=6.00005729; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00018411; XFM=3.00000015; UTC=2017-12-07 21:10:20 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17120721-0025-0000-0000-000046409FEF Message-Id: <20171207211017.GU7829@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-12-07_09:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1712070309 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1160 Lines: 26 On Fri, Dec 08, 2017 at 07:34:39AM +1100, Stephen Rothwell wrote: > Hi all, > > On Thu, 7 Dec 2017 09:40:38 -0800 "Paul E. McKenney" wrote: > > > > On Thu, Dec 07, 2017 at 05:30:03PM +0000, Bart Van Assche wrote: > > > However, what's not clear to me is through which tree this patch should be > > > sent to Linus? Should the above patch be sent as a v4.15-rc fix or should > > > Martin perhaps queue it in his tree for v4.16-rc1? > > > > I have to defer to you guys on that one. Left to myself, I will just > > push it into the next merge window (as opposed to using my normal process, > > which at this point would get it into the one following). > > > > So please let me know how you would like to proceed. > > Clearly, it needs to go via Martin's tree as otherwise his tree will > not build in some circumstances ... or if it going to cause problems > for Paul, then it should be in a separate non-rebasing branch (probably > of Paul's tree) that is merged into Pauls main branch and Marin's tree. It is unlikely to cause problems, so please let it go up where convenient. Just please let me know. Thanx, Paul