All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the pci tree with Linus' tree
Date: Fri, 14 Jan 2022 17:53:03 +1100	[thread overview]
Message-ID: <20220114175303.07569259@canb.auug.org.au> (raw)
In-Reply-To: <CAMhs-H_u42MSPpkwFEQCVghHWVjMqdJ1aKXXhbhxKWrejZLqRA@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 998 bytes --]

Hi Sergio,

On Fri, 14 Jan 2022 06:48:08 +0100 Sergio Paracuellos <sergio.paracuellos@gmail.com> wrote:
>
> On Fri, Jan 14, 2022 at 12:45 AM Stephen Rothwell <sfr@canb.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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  reply	other threads:[~2022-01-14  6:53 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-13 23:45 linux-next: manual merge of the pci tree with Linus' tree Stephen Rothwell
2022-01-14  5:48 ` Sergio Paracuellos
2022-01-14  6:53   ` Stephen Rothwell [this message]
2022-01-14  6:57     ` Sergio Paracuellos
  -- strict thread matches above, loose matches on Subject: below --
2021-08-25  0:57 Stephen Rothwell
2021-02-23  0:19 Stephen Rothwell
2020-05-14  1:02 Stephen Rothwell
2020-03-30 23:49 Stephen Rothwell
2020-03-31  8:37 ` Geert Uytterhoeven
2020-03-24 23:58 Stephen Rothwell
2019-09-19 12:33 Mark Brown
2018-07-20  1:03 Stephen Rothwell
2018-07-20  9:15 ` Lorenzo Pieralisi
2018-07-20 10:49   ` Thomas Petazzoni
2018-04-03  2:29 Stephen Rothwell
2018-03-26  1:23 Stephen Rothwell
2018-03-27 16:19 ` Rob Herring
2017-06-26  0:51 Stephen Rothwell
2017-07-03  2:58 ` Stephen Rothwell
2016-12-08 23:44 Stephen Rothwell
2016-06-23  1:44 Stephen Rothwell
2016-06-23 16:43 ` Bjorn Helgaas
2016-01-20 23:33 Stephen Rothwell
2013-06-17  1:42 Stephen Rothwell
2013-06-04  1:49 Stephen Rothwell
2013-06-04  2:11 ` Bjorn Helgaas
2012-09-04  2:04 Stephen Rothwell
2012-09-04  1:59 Stephen Rothwell
2012-09-04  6:57 ` Yuval Mintz
2012-06-25  2:31 Stephen Rothwell
2012-06-25  6:32 ` huang ying
2012-06-25 14:14 ` Alan Stern
2012-06-25 14:14   ` Alan Stern
2012-06-19  1:15 Stephen Rothwell
2010-12-20  2:08 Stephen Rothwell
2009-12-07  0:25 Stephen Rothwell
2009-12-07  0:25 Stephen Rothwell
2009-10-14  0:05 Stephen Rothwell
2009-10-14  0:38 ` Jesse Barnes
2009-10-14  2:10   ` Stephen Rothwell
2009-10-14  7:41 ` David Woodhouse
2009-06-30  1:56 Stephen Rothwell
2009-06-30  2:01 ` Jesse Barnes
2009-06-30  2:16   ` Matthew Wilcox
2009-06-30 16:00     ` Jesse Barnes

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220114175303.07569259@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=bhelgaas@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sergio.paracuellos@gmail.com \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.