[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAMhs-H_XqtGPq5Zf4YzSc7BJM0f_7yzrdUgQNV+L1MZWLUe=sw@mail.gmail.com>
Date: Fri, 14 Jan 2022 07:57:51 +0100
From: Sergio Paracuellos <sergio.paracuellos@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Bjorn Helgaas <bhelgaas@...gle.com>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the pci tree with Linus' tree
On Fri, Jan 14, 2022 at 7:53 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi Sergio,
>
> On Fri, 14 Jan 2022 06:48:08 +0100 Sergio Paracuellos <sergio.paracuellos@...il.com> wrote:
> >
> > On Fri, Jan 14, 2022 at 12:45 AM Stephen Rothwell <sfr@...b.auug.org.au> 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
Powered by blists - more mailing lists