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

[Sergio Paracuellos]

On Fri, Jan 14, 2022 at 7:53 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi Sergio,
>
> On Fri, 14 Jan 2022 06:48:08 +0100 Sergio Paracuellos <sergio.paracuellos@xxxxxxxxx> wrote:
> >
> > On Fri, Jan 14, 2022 at 12:45 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> > >
> > > 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
>
> Thanks, I have fixed up my merge resolution for Monday.

Thanks for letting me know, Stephen.

Best regards,
    Sergio Paracuellos
>
> --
> Cheers,
> Stephen Rothwell