Re: linux-next: duplicate patches in the asm-generic tree

[Arnd Bergmann]

On Thu, May 25, 2023, at 15:41, Linus Walleij wrote:
> On Thu, May 25, 2023 at 1:22 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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