Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <5b659baa-8451-b4a1-2ad4-0423faac4642@acm.org>
Date:   Mon, 22 Aug 2022 09:06:11 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.1.2
Subject: Re: linux-next: build failure after merge of the block tree
Content-Language: en-US
To:     Jens Axboe <axboe@kernel.dk>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20220822144613.6e6ce950@canb.auug.org.au>
 <911717ae-3955-08dd-ad53-a6488ef8127b@kernel.dk>
 <3848cd00-b4e8-17f6-32d6-011170f293da@acm.org>
 <4a9d2d6f-2b07-7331-6507-e19cd8e4f2ff@kernel.dk>
From:   Bart Van Assche <bvanassche@acm.org>
In-Reply-To: <4a9d2d6f-2b07-7331-6507-e19cd8e4f2ff@kernel.dk>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

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. */