Messages in this thread Patch in this message | | | Date | Mon, 22 Aug 2022 09:06:11 -0700 | Subject | Re: linux-next: build failure after merge of the block tree | From | Bart Van Assche <> |
| |
On 8/22/22 08:40, Jens Axboe wrote: > Done - please check the end result, both yours and Stephen's had to be > manually applied.
Hi Jens,
There is a difference between the qlogicpti source code in your tree and in the master branch. Is this change intentional?
Thanks,
Bart.
$ PAGER= git diff origin/master..axboe-block/for-next drivers/scsi/qlogicpti* diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c index 57f2f4135a06..87b60bf9ad3b 100644 --- a/drivers/scsi/qlogicpti.c +++ b/drivers/scsi/qlogicpti.c @@ -1339,7 +1339,7 @@ static int qpti_sbus_probe(struct platform_device *op) /* Clear out scsi_cmnd array. */ memset(qpti->cmd_slots, 0, sizeof(qpti->cmd_slots));
- if (qpti_map_queues(qpti) < 0) + if (qpti_map_queues(qpti)) goto fail_free_irq;
/* Load the firmware. */
| |