Re: linux-next: manual merge of the tip tree with the ti tree

[Nishanth Menon]

On 15:33-20260923, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   arch/arm64/configs/defconfig
> 
> between commit:
> 
>   e557da9b756db ("arm64: configs: defconfig: Convert TISCI to modules")
> 
> from the ti tree and commit:
> 
>   bd94bea7165be ("arm64: defconfig: Drop redundant Qualcomm irqchip entries")
> 
> from the tip 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.

Yep, thanks for handling this, i had expected this conflict and will let
the SoC maintainers know when I send the PR.

> 
> diff --cc arch/arm64/configs/defconfig
> index c41e5d5dbc81a,978e00891dca8..0000000000000
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@@ -1753,10 -1743,8 +1753,8 @@@ CONFIG_PWM_VISCONTI=
>   CONFIG_PWM_XILINX=m
>   CONFIG_SL28CPLD_INTC=y
>   CONFIG_XILINX_INTC=y
> - CONFIG_QCOM_PDC=y
> - CONFIG_QCOM_MPM=y
>  -CONFIG_TI_SCI_INTR_IRQCHIP=y
>  -CONFIG_TI_SCI_INTA_IRQCHIP=y
>  +CONFIG_TI_SCI_INTR_IRQCHIP=m
>  +CONFIG_TI_SCI_INTA_IRQCHIP=m
>   CONFIG_RESET_GPIO=m
>   CONFIG_RESET_IMX7=y
>   CONFIG_RESET_QCOM_AOSS=y



-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
https://ti.com/opensource