On Wed, 25 Mar 2026, Werner Sembach wrote:

> Hi,
> 
> Am 25.03.26 um 14:06 schrieb Ilpo Järvinen:
> > On Wed, 25 Mar 2026, Werner Sembach wrote:
> > 
> > > Hi,
> > > 
> > > Am 25.03.26 um 13:40 schrieb Ilpo Järvinen:
> > > > On Tue, 24 Mar 2026, Werner Sembach wrote:
> > > > 
> > > > > v2: Incorporate Armins feedback.
> > > > > v3: Incorporate more of Armins feedback.
> > > > >       Rework USB-C power prio functions
> > > > > v4: Readd system vendor SchenkerTechnologiesGmbH for XMG FUSION (L19)
> > > > >       Replace for loops with if statements for USB-C power priority
> > > > > functions
> > > > >       Add missing mutex in usb_c_power_priority_restore
> > > > > v5: Restructure patch around new entry for XMG Fusion
> > > > >       Add missing Reviewed-by and Tested-by
> > > > >       Spelling fixes in documentation
> > > > > v6: Fix small format error in docs
> > > > >       Fix Reviewed-by line
> > > > > v7: Variable rename to lowercase
> > > > > v8: Move USB-C power priority init to after probe call
> > > > >       Clarify documentation
> > > > Hi,
> > > > 
> > > > Does this conflict with something that went through the fixes branch? I
> > > > tried applying this through for-next and get fails so I guess I'll have
> > > > to merge fixes to for-next before I can apply this.
> > > > 
> > > > It would be nice to mention any known conflicts in the coverletter.
> > > sorry, I thought the base-commit line was enough
> > > 
> > > it applies cleanly to v7.0-rc3 and v7.0-rc4
> > > 
> > > earlier rc versions of 7.0 are missing a required patch
> > Okay, so there's a dependency for some commit that went through 'fixes'?
> > 
> > > maybe for-next is not yet rebased on the latest rc?
> > 'fixes' and 'for-next' are sort of independent normally. Both are based at
> > -rc1.
> 
> Ah sorry didn't know that, thought for-next moves along the different rc
> releases and so I only checked if it applies to torvalds/master.
> 
> Quick checked the missing patchset is this one:
> https://lore.kernel.org/all/20260218005101.73680-1-W_Armin@gmx.de/ it came in
> between rc2 and rc3.

Thanks, for taking a look. I assumed it that series might be the cause.

I'll pull fixes into for-next once Linus has pulled in the PR I just sent 
(so I know the commit IDs remain cast into the stone), and then apply your 
on top into for-next (a tentative plan).

> > I don't rebase 'for-next' from -rc1. If there's a conflict or some 'fixes'
> > commit needed for a work to be done in 'for-next', I'll resolve those by
> > merging 'fixes' changes back into 'for-next.
> > 
> > > I will have a look

-- 
 i.