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

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

[Thierry Reding]

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.

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.

diff --cc arch/arm64/configs/defconfig
index dd1ac01ee29b,dde8b61338e3..f4dfd0cc853c
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -652,54 -651,7 +652,8 @@@ CONFIG_PINCTRL_IMX8ULP=
  CONFIG_PINCTRL_IMX91=y
  CONFIG_PINCTRL_IMX93=y
  CONFIG_PINCTRL_IMX_SCMI=y
- CONFIG_PINCTRL_MSM=y
- CONFIG_PINCTRL_ELIZA=y
- CONFIG_PINCTRL_GLYMUR=y
- CONFIG_PINCTRL_IPQ5018=y
- CONFIG_PINCTRL_IPQ5210=y
- CONFIG_PINCTRL_IPQ5332=y
- CONFIG_PINCTRL_IPQ5424=y
- CONFIG_PINCTRL_IPQ8074=y
- CONFIG_PINCTRL_IPQ6018=y
- CONFIG_PINCTRL_IPQ9574=y
- CONFIG_PINCTRL_KAANAPALI=y
- CONFIG_PINCTRL_MSM8916=y
- CONFIG_PINCTRL_MSM8953=y
- CONFIG_PINCTRL_MSM8976=y
- CONFIG_PINCTRL_MSM8994=y
- CONFIG_PINCTRL_MSM8996=y
- CONFIG_PINCTRL_MSM8998=y
- CONFIG_PINCTRL_QCM2290=y
- CONFIG_PINCTRL_QCS404=y
- CONFIG_PINCTRL_QCS615=y
- CONFIG_PINCTRL_QCS8300=y
- CONFIG_PINCTRL_QDF2XXX=y
- CONFIG_PINCTRL_QDU1000=y
  CONFIG_PINCTRL_RP1=m
- CONFIG_PINCTRL_SA8775P=y
- CONFIG_PINCTRL_SC7180=y
- CONFIG_PINCTRL_SC7280=y
- CONFIG_PINCTRL_SC8180X=y
- CONFIG_PINCTRL_SC8280XP=y
- CONFIG_PINCTRL_SDM660=y
- CONFIG_PINCTRL_SDM670=y
- CONFIG_PINCTRL_SDM845=y
- CONFIG_PINCTRL_SDX75=y
 +CONFIG_PINCTRL_SKY1=y
- CONFIG_PINCTRL_SM4450=y
- CONFIG_PINCTRL_SM6115=y
- CONFIG_PINCTRL_SM6125=y
- CONFIG_PINCTRL_SM6350=y
- CONFIG_PINCTRL_SM6375=y
- CONFIG_PINCTRL_MILOS=y
- CONFIG_PINCTRL_SM8150=y
- CONFIG_PINCTRL_SM8250=y
- CONFIG_PINCTRL_SM8350=y
- CONFIG_PINCTRL_SM8450=y
- CONFIG_PINCTRL_SM8550=y
- CONFIG_PINCTRL_SM8650=y
- CONFIG_PINCTRL_SM8750=y
- CONFIG_PINCTRL_X1E80100=y
  CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
  CONFIG_PINCTRL_LPASS_LPI=m
  CONFIG_PINCTRL_MILOS_LPASS_LPI=m

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

[Thierry Reding]

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

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

[Linus Walleij]

On Wed, May 6, 2026 at 3:51 PM Thierry Reding <thierry.reding@gmail.com> wrote:
> 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.

Hm. I'll put this on an immutable branch instead so we can pull the
same changes into the offending branch in the SoC tree.

Maybe not the cleanest but it should do the trick.

Yours,
Linus Walleij