Hi Stephen,
On Tue, Feb 14, 2023 at 2:47 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Today's linux-next merge of the usb tree got a conflict in:
>
> arch/arm64/configs/defconfig
>
> between commit:
>
> 85d81e15862a ("arm64: defconfig: Enable DisplayPort on SC8280XP laptops")
>
> from the qcom tree and commit:
>
> 1f6d59f7f82d ("arm64: defconfig: Enable UCSI support")
>
> from the usb 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 for your resolution!
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@@ -960,7 -946,8 +961,9 @@@ CONFIG_TYPEC_TCPCI=
> CONFIG_TYPEC_FUSB302=m
> CONFIG_TYPEC_TPS6598X=m
> CONFIG_TYPEC_HD3SS3220=m
> +CONFIG_TYPEC_MUX_GPIO_SBU=m
> + CONFIG_TYPEC_UCSI=m
> + CONFIG_UCSI_CCG=m
CONFIG_TYPEC_MUX_GPIO_SBU=m should be last, cfr.
drivers/usb/typec/Kconfig:source "drivers/usb/typec/ucsi/Kconfig"
drivers/usb/typec/Kconfig:source "drivers/usb/typec/mux/Kconfig"
> CONFIG_MMC=y
> CONFIG_MMC_BLOCK_MINORS=32
> CONFIG_MMC_ARMMMCI=y
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
