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

From: Thierry Reding <[email-masked]>
Date: Wed, 6 May 2026 15:51:06 +0200

On Wed, May 06, 2026 at 12:02:09PM +0200, Thierry Reding wrote:
> Hi all,
> 
> Today's linux-next merge of the pinctrl tree got a conflict in:
> 
>   arch/arm64/configs/defconfig
> 
> between commit:
> 
>   2fd3902c91c8 ("pinctrl: qcom: Make important drivers default")
> 
> from the pinctrl tree and commit:
> 
>   517d8fc52f3c ("arm64: defconfig: Enable CIX Sky1 pinctrl, PCIe host, and Cadence GPIO")
> 
> from the pinctrl tree.

Sorry, looks like I messed up the invocation here. The conflict is
between the pinctrl and the cix tree, obviously.

Thierry