Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1666773

Re: linux-next: build failure after merge of the block tree

From Sebastian Ott <sebott@linux.vnet.ibm.com>
Newsgroups linux.kernel
Subject Re: linux-next: build failure after merge of the block tree
Date 2017-06-15 17:00 +0200
Message-ID <tSEpz-3Kz-7@gated-at.bofh.it> (permalink)
References <tRRIf-6VX-25@gated-at.bofh.it>
Organization "IBM Deutschland Research & Development GmbH / Vorsitzende des Aufsichtsrats: Martina Koederitz Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294"

Show all headers | View raw


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

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

linux-next: build failure after merge of the block tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-13 13:00 +0200
  Re: linux-next: build failure after merge of the block tree Sebastian Ott <sebott@linux.vnet.ibm.com> - 2017-06-15 17:00 +0200
    Re: linux-next: build failure after merge of the block tree Sebastian Ott <sebott@linux.vnet.ibm.com> - 2017-06-19 11:10 +0200

csiph-web