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

Stephen Rothwell
2017-07-04T21:40:22Z

Hi Guenter,

On Tue, 4 Jul 2017 08:15:57 -0700 Guenter Roeck <linux@roeck-us.net> 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