Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752468AbdLGVQU (ORCPT <rfc822;w@1wt.eu>);
        Thu, 7 Dec 2017 16:16:20 -0500
Received: from userp2120.oracle.com ([156.151.31.85]:34728 "EHLO
        userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752377AbdLGVQS (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 7 Dec 2017 16:16:18 -0500
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
        Bart Van Assche <Bart.VanAssche@wdc.com>,
        "josh\@joshtriplett.org" <josh@joshtriplett.org>,
        "linux-kernel\@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linux-scsi\@vger.kernel.org" <linux-scsi@vger.kernel.org>,
        "linux-next\@vger.kernel.org" <linux-next@vger.kernel.org>,
        "martin.petersen\@oracle.com" <martin.petersen@oracle.com>,
        "ptikhomirov\@virtuozzo.com" <ptikhomirov@virtuozzo.com>
Subject: Re: linux-next: build failure after merge of the scsi-mkp tree
From: "Martin K. Petersen" <martin.petersen@oracle.com>
Organization: Oracle Corporation
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>
Date: Thu, 07 Dec 2017 16:11:03 -0500
In-Reply-To: <20171208073439.1593936d@canb.auug.org.au> (Stephen Rothwell's
        message of "Fri, 8 Dec 2017 07:34:39 +1100")
Message-ID: <yq1wp1yw8ew.fsf@oracle.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8738 signatures=668644
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0
 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999
 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.0.1-1711220000 definitions=main-1712070310
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 719
Lines: 19


Stephen,

>> 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.

I'm perfectly OK with taking it through the SCSI tree. Probably the path
of least resistance.

-- 
Martin K. Petersen	Oracle Linux Engineering