linux-kernel - Re: linux-next: duplicate patches in the asm-generic 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] [thread-next>] [day] [month] [year] [list]

Message-Id: <1b757588-66cc-4946-a9fb-a2a88c5c54cf@app.fastmail.com>
Date:   Thu, 25 May 2023 18:41:03 +0200
From:   "Arnd Bergmann" <arnd@...db.de>
To:     "Linus Walleij" <linus.walleij@...aro.org>,
        "Stephen Rothwell" <sfr@...b.auug.org.au>
Cc:     "Will Deacon" <will@...nel.org>,
        "Linux Kernel Mailing List" <linux-kernel@...r.kernel.org>,
        linux-next <linux-next@...r.kernel.org>
Subject: Re: linux-next: duplicate patches in the asm-generic tree

On Thu, May 25, 2023, at 15:41, Linus Walleij wrote:
> On Thu, May 25, 2023 at 1:22 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
>> The following commits are also in Linus Torvalds' tree as different
>> commits (but the same patches):
>>
>>   b1e7601203a8 ("arm64: vdso: Pass (void *) to virt_to_page()")
>>
>> This is commit
>>
>>   b0abde80620f ("arm64: vdso: Pass (void *) to virt_to_page()")
>>
>> in Linus' tree.
>
> Aha Catalin ACKed it and Will picked it up, perhaps Arnd can drop it from
> his tree, albeit it is not a disaster, I am surprised this was the
> biggest fallout
> we've seen of those patches.

I can't easily drop it without undoing the merge from your branch.

Maybe you can just rebase your branch on top of -rc2 and send
a new pull request. That should automatically drop the duplicate
patch.

    Arnd