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

Sebastian Ott
2017-06-15T14:50:58Z

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