From: "Arnd Bergmann" <arnd@arndb.de>
To: "Linus Walleij" <linus.walleij@linaro.org>,
"Stephen Rothwell" <sfr@canb.auug.org.au>
Cc: "Will Deacon" <will@kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
linux-next <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patches in the asm-generic tree
Date: Thu, 25 May 2023 18:41:03 +0200 [thread overview]
Message-ID: <1b757588-66cc-4946-a9fb-a2a88c5c54cf@app.fastmail.com> (raw)
In-Reply-To: <CACRpkdYUPmaBWDwH_ARHp-bFtpML3aShd_mKBBq+ndQATGEJjQ@mail.gmail.com>
On Thu, May 25, 2023, at 15:41, Linus Walleij wrote:
> On Thu, May 25, 2023 at 1:22 AM Stephen Rothwell <sfr@canb.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
next prev parent reply other threads:[~2023-05-25 16:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-24 23:22 Stephen Rothwell
2023-05-25 13:41 ` Linus Walleij
2023-05-25 16:41 ` Arnd Bergmann [this message]
2023-05-29 11:36 ` Linus Walleij
2023-06-01 8:48 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1b757588-66cc-4946-a9fb-a2a88c5c54cf@app.fastmail.com \
--to=arnd@arndb.de \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®