Re: linux-next: manual merge of the pci tree with Linus' tree

[Sergio Paracuellos]

Hi Stephen,

On Fri, Jan 14, 2022 at 12:45 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the pci tree got a conflict in:
>
>   drivers/pci/controller/Kconfig
>
> between commit:
>
>   aa50faff4416 ("PCI: mt7621: Convert driver into 'bool'")

This was a temporary fix for v5.16 since driver was not ready to be
compiled as a module yet and some MIPS architecture dependent code was
remaining.

>
> from Linus' tree and commit:
>
>   44ddb791f8f4 ("PCI: mt7621: Allow COMPILE_TEST for all arches")

The changes in Kconfig here are the good ones removing MIPS dependency
and allowing the driver to be compiled as a module.

>
> from the pci 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/pci/controller/Kconfig
> index aec8c9a3488b,f7e44d9c6965..000000000000
> --- a/drivers/pci/controller/Kconfig
> +++ b/drivers/pci/controller/Kconfig
> @@@ -332,8 -332,8 +332,8 @@@ config PCIE_APPL
>           If unsure, say Y if you have an Apple Silicon system.
>
>   config PCIE_MT7621
>  -      tristate "MediaTek MT7621 PCIe Controller"
>  +      bool "MediaTek MT7621 PCIe Controller"

This should be tristate.

> -       depends on SOC_MT7621 || (MIPS && COMPILE_TEST)
> +       depends on SOC_MT7621 || COMPILE_TEST

This is correct,

>         select PHY_MT7621_PCI
>         default SOC_MT7621
>         help

Best regards,
    Sergio Paracuellos