Re: linux-next: manual merge of the pinctrl-intel tree with the origin tree
From: Andy Shevchenko
Date: Thu Nov 19 2026 - 12:49:01 EST
On Thu, Nov 19, 2026 at 05:29:46PM +0000, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the pinctrl-intel tree got a conflict in:
>
> drivers/pinctrl/intel/pinctrl-intel.c
>
> between commit:
>
> 4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")
>
> from the origin tree and commit:
>
> 34925b925793b ("pinctrl: intel: define iterator variables inside for-loop")
>
> from the pinctrl-intel tree.
>
> 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.
Thanks, it is correct resolution.
--
With Best Regards,
Andy Shevchenko