linux-next: manual merge of the mfd tree with the mfd-fixes tree

linux-next: manual merge of the mfd tree with the mfd-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 738 bytes --]

Hi all,

Today's linux-next merge of the mfd tree got a conflict in:

  drivers/mfd/twl4030-irq.c

between commit:

  d9d79e4f7dc9 ("mfd: Fix building without CONFIG_OF")

from the mfd-fixes tree and commit:

  3d77b3cc7cc8 ("mfd: twl4030-irq: Remove redundant 'node' variable")

from the mfd tree.

I fixed it up (I just used the former) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the mfd tree with the mfd-fixes tree

[Lee Jones]

On Fri, 20 Jun 2025, Abinash wrote:

> Hi Stephen, Lee,
> 
> Thanks for the heads-up. I'm the author of the patch:
> 
>   "mfd: twl4030-irq: Remove redundant 'node' variable"
> 
> It looks like Arnd’s patch in `for-mfd-fixes` already removes the same
> variable and improves compatibility by switching to `dev_fwnode()`.
> 
> Given the overlap, my patch can be safely dropped from `for-mfd-next`
> during rebase if it's now redundant.

Done.

-- 
Lee Jones [李琼斯]