From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christophe Leroy <christophe.leroy@csgroup•eu>,
Arnd Bergmann <arnd@arndb•de>
Cc: ARM <linux-arm-kernel@lists•infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: duplicate patch in the fsl tree
Date: Tue, 12 Aug 2025 11:03:43 +1000 [thread overview]
Message-ID: <20250812110343.6dd82e9f@canb.auug.org.au> (raw)
In-Reply-To: <20250723094558.5bcfca69@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 661 bytes --]
Hi Christophe,
On Wed, 23 Jul 2025 09:45:58 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> The following commit is also in the arm-soc tree as a different commit
> (but the same patch):
>
> 8b3da0519ae6 ("soc: fsl: qe: convert set_multiple() to returning an integer")
>
> This is commit
>
> 12702f0c3834 ("soc: fsl: qe: convert set_multiple() to returning an integer")
>
> in the arm-soc tree.
Since 8b3da0519ae6 is the only commit in the fsl tree and the
duplication is now causing a conflict due to another commit touching
the same file, you could just reset the fsl tree to v6.17-rc1.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2025-08-12 1:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-22 23:45 linux-next: duplicate patch in the fsl tree Stephen Rothwell
2025-07-30 13:41 ` Christophe Leroy
2025-07-30 13:55 ` Arnd Bergmann
2025-07-30 14:23 ` Christophe Leroy
2025-07-30 14:37 ` Bartosz Golaszewski
2025-07-30 18:45 ` Arnd Bergmann
2025-08-12 1:03 ` Stephen Rothwell [this message]
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=20250812110343.6dd82e9f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=christophe.leroy@csgroup$(echo .)eu \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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