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

Jens Axboe
2022-08-22T15:40:47Z

On 8/22/22 9:34 AM, Bart Van Assche wrote:
> On 8/22/22 06:55, Jens Axboe wrote:
>> On 8/21/22 4:46 AM, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> After merging the block tree, today's linux-next build (sparc defconfig)
>>> failed like this:
>>>
>>> drivers/scsi/qlogicpti.c: In function 'qpti_map_queues':
>>> drivers/scsi/qlogicpti.c:828:24: error: 'return' with a value, in function returning void [-Werror=return-type]
>>> ?? 828 |???????????????? return -1;
>>> ?????? |??????????????????????? ^
>>> drivers/scsi/qlogicpti.c:817:13: note: declared here
>>> ?? 817 | static void qpti_map_queues(struct qlogicpti *qpti)
>>> ?????? |???????????? ^~~~~~~~~~~~~~~
>>> drivers/scsi/qlogicpti.c:839:24: error: 'return' with a value, in function returning void [-Werror=return-type]
>>> ?? 839 |???????????????? return -1;
>>> ?????? |??????????????????????? ^
>>> drivers/scsi/qlogicpti.c:817:13: note: declared here
>>> ?? 817 | static void qpti_map_queues(struct qlogicpti *qpti)
>>> ?????? |???????????? ^~~~~~~~~~~~~~~
>>> drivers/scsi/qlogicpti.c: In function 'qpti_sbus_probe':
>>> drivers/scsi/qlogicpti.c:1394:1: warning: label 'fail_free_irq' defined but not used [-Wunused-label]
>>> ? 1394 | fail_free_irq:
>>> ?????? | ^~~~~~~~~~~~~
>>> cc1: some warnings being treated as errors
>>>
>>> Caused by commit
>>>
>>> ?? f19f2c966b2f ("block: Change the return type of blk_mq_map_queues() into void")
>>>
>>> I have applied the following fix up patch for today.
>>
>> Folded in, thanks Stephen.
>
> Hi Jens,
>
> Please drop Stephen's patch and fold in this patch instead:

Done - please check the end result, both yours and Stephen's had to be
manually applied.

--
Jens Axboe