Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752762AbdFOOu6 (ORCPT ); Thu, 15 Jun 2017 10:50:58 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:53056 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752550AbdFOOu4 (ORCPT ); Thu, 15 Jun 2017 10:50:56 -0400 Date: Thu, 15 Jun 2017 16:50:48 +0200 (CEST) From: Sebastian Ott X-X-Sender: sebott@schleppi To: Stephen Rothwell cc: Jens Axboe , Martin Schwidefsky , Heiko Carstens , Linux-Next Mailing List , Linux Kernel Mailing List , Christoph Hellwig Subject: Re: linux-next: build failure after merge of the block tree In-Reply-To: <20170613205409.4b7e06f9@canb.auug.org.au> References: <20170613205409.4b7e06f9@canb.auug.org.au> User-Agent: Alpine 2.20 (LFD 67 2015-01-07) Organization: =?ISO-8859-15?Q?=22IBM_Deutschland_Research_&_Development_GmbH_=2F_Vorsitzende_des_Aufsichtsrats=3A_Martina_Koederitz_Gesch=E4ftsf=FChrung=3A_Dirk_Wittkopp_Sitz_der_Gesellschaft=3A_B=F6blingen_=2F_Registergericht?= =?ISO-8859-15?Q?=3A_Amtsgericht_Stuttgart=2C_HRB_243294=22?= MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-TM-AS-GCONF: 00 x-cbid: 17061514-0016-0000-0000-000004BE472F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17061514-0017-0000-0000-000027EF9E11 Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-06-15_07:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1706150257 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 659 Lines: 23 On Tue, 13 Jun 2017, Stephen Rothwell wrote: > After merging the block tree, today's linux-next build (s390x > s390-defconfig) failed like this: > > drivers/s390/block/scm_blk.c:293:10: error: 'BLK_MQ_RQ_QUEUE_BUSY' undeclared (first use in this function) > drivers/s390/block/scm_blk.c:327:9: error: 'BLK_MQ_RQ_QUEUE_OK' undeclared (first use in this function) > > Caused by commit > > fc17b6534eb8 ("blk-mq: switch ->queue_rq return value to blk_status_t") > > interacting with commit > > 12d907626539 ("s390/scm: convert to blk-mq") > > from the s390 tree. > > Is the following the correct merge fixup? Yes, that looks good! Thanks, Sebastian