Re: linux-next: manual merge of the pinctrl tree with the mmc tree

[Ulf Hansson]

On Fri, 10 Apr 2026 at 15:31, Mark Brown <broonie@xxxxxxxxxx> wrote:
>
> On Fri, Apr 10, 2026 at 02:27:48PM +0100, Mark Brown wrote:
> > Hi all,
> >
> > Today's linux-next merge of the pinctrl tree got extensive and
> > concerning conflicts in:
>
> Replacing Linus' address.
>
> >
> >   include/linux/mux/consumer.h
> >   drivers/mux/core.c
> >
> > between commit:
> >
> >   993bcaf32c4940 ("mux: Add helper functions for getting optional and selected mux-state")
> >
> > from the mmc tree and commit:
> >
> >   bb23f1b8c28be9 ("mux: add devm_mux_control_get_from_np() to get mux from child node")
> >
> > from the pinctrl tree, I'm not convinced that the latter commit is ready
> > as devm_get_mux_control_from_np() appears to ignore the np parameter.
> >
> > I fixed it up (see below) 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.
> >
> > This fixup is very quick and hacky, I don't have huge confidence in it.
> > Indeed since making it I see more failures due to devm_mux_control_get()
> > not being exported, I have a hard time seeing how exactly
> > devm_get_mux_control_from_np() is intended to work given that it ignores
> > the np parameter and is just a straight rename/reprototype of that
> > function.

Linus, if possible, I suggest you drop the patch from your pinctrl tree.

If it's urgent to get this into v7.1 for pinctrl, you may pull my
immutable mux branch from my mmc tree and let the author of the patch
base the mux change on that.

[...]

Kind regards
Uffe