Subject: Re: linux-next: duplicate patch in the fsl tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 12 Aug 2025 11:03:43 +1000

Hi Christophe,

On Wed, 23 Jul 2025 09:45:58 +1000 Stephen Rothwell <[email-masked]> 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