Re: [PATCH v2 1/2] mfd: ls2kbmc: Fully convert to use managed resources

[Andy Shevchenko <andriy.shevchenko@linux.intel.com>]

On Thu, Nov 20, 2025 at 08:54:02AM +0000, Lee Jones wrote:
> On Wed, 19 Nov 2025, Andy Shevchenko wrote:
> > On Wed, Nov 19, 2025 at 04:47:03PM +0000, Lee Jones wrote:
> > > On Thu, 13 Nov 2025, Andy Shevchenko wrote:

...

> > > > Fixes: 91a3e1f5453a ("mfd: ls2kbmc: Check for devm_mfd_add_devices() failure")
> > > > Fixes: d952bba3fbb5 ("mfd: ls2kbmc: Add Loongson-2K BMC reset function support")
> > > > Reviewed-by: Binbin Zhou <zhoubinbin@loongson.cn>
> > > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > > > ---
> > > >  drivers/mfd/ls2k-bmc-core.c | 28 +++++++---------------------
> > > >  1 file changed, 7 insertions(+), 21 deletions(-)
> > > 
> > > Still doesn't apply.  I'm getting lots of conflicts.
> > > 
> > > What base are you on?
> > 
> > Linux Next which includes your -fixes branch. You probably need to merge either
> > it or v6.18-rc6 to the -next. Then the v1 will be okay to apply.
> 
> Ah, yes, that explains it.
> 
> > The bottom line is that without doing that we will have conflicts either in
> > Linux Next followed by merging by Linus or in your branches locally before
> > going to the above mentioned.
> > 
> > Another possibility is cherry-pick patches from -fixes to -next.
> > 
> > And alternative is to wait for -rc1 and rebase this on top of and
> > apply then.

> Yes, if there is no urgency,

It's up to you and the author of the code, it's a fix, but I don't think it's
too critical, we can wait, yes.

> we can wait for the next merge window.

It's a fix, do you mean to apply after -rc1 for v6.19-rcX?

-- 
With Best Regards,
Andy Shevchenko