Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752348AbdGDVkW (ORCPT ); Tue, 4 Jul 2017 17:40:22 -0400 Received: from ozlabs.org ([103.22.144.67]:36471 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752248AbdGDVkV (ORCPT ); Tue, 4 Jul 2017 17:40:21 -0400 Date: Wed, 5 Jul 2017 07:40:18 +1000 From: Stephen Rothwell To: Guenter Roeck Cc: Jens Axboe , Martin Schwidefsky , Heiko Carstens , Linux-Next Mailing List , Linux Kernel Mailing List , Christoph Hellwig , Sebastian Ott Subject: Re: linux-next: build failure after merge of the block tree Message-ID: <20170705074018.5cfee177@canb.auug.org.au> In-Reply-To: <20170704151557.GA22088@roeck-us.net> References: <20170613205409.4b7e06f9@canb.auug.org.au> <20170704151557.GA22088@roeck-us.net> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1035 Lines: 34 Hi Guenter, On Tue, 4 Jul 2017 08:15:57 -0700 Guenter Roeck wrote: > > On Tue, Jun 13, 2017 at 08:54:09PM +1000, 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? > > > > The failure made int into Linus' tree, but the fix didn't. Is the fix pending > in some other queue or does it have to be (re-)submitted ? It will be my in fixes tree today and until it appears in Linus' or the s390 tree. -- Cheers, Stephen Rothwell