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

[Lee Jones <lee@kernel.org>]

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:
> > 
> > > The mixing of managed and non-managed resources may lead to possible
> > > use-after-free bugs. In this driver the problematic part is the device
> > > functionality that may just have gone behind the functions back, e.g.,
> > > when interrupt is being served. Fix this by switching to managed resources
> > > for PCI.
> > > 
> > > 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, we can wait for the next merge window.

-- 
Lee Jones [李琼斯]