Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753729AbdFSJAd (ORCPT ); Mon, 19 Jun 2017 05:00:33 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:36858 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753492AbdFSJAb (ORCPT ); Mon, 19 Jun 2017 05:00:31 -0400 Date: Mon, 19 Jun 2017 11:00:23 +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: 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: 17061909-0020-0000-0000-0000038B254F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17061909-0021-0000-0000-0000420B607F Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-06-19_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-1706190153 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1500 Lines: 43 On Thu, 15 Jun 2017, Sebastian Ott wrote: > 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! Ok, we should also adjust the return code to fix this: drivers/s390/block/scm_blk.c:426:2: warning: initialization from incompatible pointer type [enabled by default] .queue_rq = scm_blk_request, ^ diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c index 2cd6123c8f18..4279685901bf 100644 --- a/drivers/s390/block/scm_blk.c +++ b/drivers/s390/block/scm_blk.c @@ -278,8 +278,8 @@ struct scm_queue { spinlock_t lock; }; -static int scm_blk_request(struct blk_mq_hw_ctx *hctx, - const struct blk_mq_queue_data *qd) +static blk_status_t scm_blk_request(struct blk_mq_hw_ctx *hctx, + const struct blk_mq_queue_data *qd) { struct scm_device *scmdev = hctx->queue->queuedata; struct scm_blk_dev *bdev = dev_get_drvdata(&scmdev->dev);