linux-kernel - Re: linux-next: Fixes tag needs some work in the block tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <7e4aa4d3-2d65-41b0-9ae7-a79432ca6175@kernel.dk>
Date:   Tue, 15 Aug 2023 10:59:34 -0600
From:   Jens Axboe <axboe@...nel.dk>
To:     Song Liu <song@...nel.org>
Cc:     Yu Kuai <yukuai1@...weicloud.com>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        "yukuai (C)" <yukuai3@...wei.com>
Subject: Re: linux-next: Fixes tag needs some work in the block tree

On 8/15/23 10:51 AM, Song Liu wrote:
> On Wed, Aug 16, 2023 at 12:31?AM Jens Axboe <axboe@...nel.dk> wrote:
>>
>> On 8/15/23 10:26 AM, Song Liu wrote:
>>> On Wed, Aug 16, 2023 at 12:20?AM Jens Axboe <axboe@...nel.dk> wrote:
>>>>
>>>> On 8/15/23 10:17 AM, Song Liu wrote:
>>>>> On Wed, Aug 16, 2023 at 12:07?AM Jens Axboe <axboe@...nel.dk> wrote:
>>>>>>
>>>>>> On 8/15/23 9:58 AM, Song Liu wrote:
>>>>>>> On Tue, Aug 15, 2023 at 11:08?PM Jens Axboe <axboe@...nel.dk> wrote:
>>>>>>>>
>>>>>>>> On 8/14/23 9:21 PM, Yu Kuai wrote:
>>>>>>>>> Hi,
>>>>>>>>>
>>>>>>>>> ? 2023/08/15 7:19, Stephen Rothwell ??:
>>>>>>>>>> Hi all,
>>>>>>>>>>
>>>>>>>>>> In commit
>>>>>>>>>>
>>>>>>>>>>    71070e7bd25d ("md/raid10: fix a 'conf->barrier' leakage in raid10_takeover()")
>>>>>>>>>>
>>>>>>>>>> Fixes tag
>>>>>>>>>>
>>>>>>>>>>    Fixes: 4d27e927344a ("md: don't quiesce in mddev_suspend()")
>>>>>>>>>>
>>>>>>>>>> has these problem(s):
>>>>>>>>>>
>>>>>>>>>>    - Target SHA1 does not exist
>>>>>>>>>
>>>>>>>>> Sorry about this, the commit was picked from previous md-next branch,
>>>>>>>>> and I didn't know that it will change...
>>>>>>>>
>>>>>>>> It's most likely not your fault, I'm guessing Song rebased that branch
>>>>>>>> and this is why the sha changed. Song?
>>>>>>>
>>>>>>> Yeah, it is my fault. I am really sorry for this issue.
>>>>>>>
>>>>>>>>
>>>>>>>>> Is there any way that I can fix this ?
>>>>>>>>
>>>>>>>> Only way to fix this is if I rewind my branch and Song updates his
>>>>>>>> branch to not have this issue, and then sends a new pull request.
>>>>>>>
>>>>>>> Yes please. Let's fix this.
>>>>>>
>>>>>> Please send a new one, I've dropped the old one.
>>>>>
>>>>> Is this the for-6.6/block branch? I haven't seen the change yet. The top
>>>>> commit on the branch (as I see) is
>>>>>
>>>>> 306d74055754 ("ublk: Switch to memdup_user_nul() helper")
>>>>
>>>> Where are you looking? It's at:
>>>
>>> I am looking at
>>>
>>> https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
>>>
>>> It appears to be some lag from git server?
>>
>> That's just a backup, I always pull and push from git.kernel.dk. The
>> korg one will lag about an hour, depending on when things are pushed.
>> I've never used the korg one as the canonical location.
> 
> Got it. I will update my git config.
> 
> Here is the updated PR:
> 
> 
> The following changes since commit 66a6a5d0ec852eaced589da066376e69397cd71e:
> 
>   ublk: Switch to memdup_user_nul() helper (2023-08-15 10:06:54 -0600)
> 
> are available in the Git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/song/md.git
> tags/md-next-20230814-resend

Pulled.

-- 
Jens Axboe