linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bjorn Helgaas <bhelgaas@google.com>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Hauke Mehrtens <hauke@hauke-m.de>, Ray Jui <rjui@broadcom.com>
Subject: linux-next: manual merge of the pci tree with the arm-soc tree
Date: Mon, 17 Aug 2015 11:08:55 +1000	[thread overview]
Message-ID: <20150817110855.4fcf9a66@canb.auug.org.au> (raw)

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/pci/host/Kconfig

between commit:

  70d334ca71b0 ("PCI: iproc: Fix BCMA dependency in Kconfig")

from the arm-soc tree and commit:

  05aa7d6a72c1 ("PCI: iproc: Allow BCMA bus driver to be built as module")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/pci/host/Kconfig
index 48b5b3058d9d,e339a8c42f76..000000000000
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@ -135,8 -135,8 +135,8 @@@ config PCIE_IPROC_PLATFOR
  	  through the generic platform bus interface
  
  config PCIE_IPROC_BCMA
- 	bool "Broadcom iProc PCIe BCMA bus driver"
+ 	tristate "Broadcom iProc PCIe BCMA bus driver"
 -	depends on ARCH_BCM_IPROC || (ARM && COMPILE_TEST)
 +	depends on ARM && (ARCH_BCM_IPROC || COMPILE_TEST)
  	select PCIE_IPROC
  	select BCMA
  	select PCI_DOMAINS

             reply	other threads:[~2015-08-17  1:08 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-17  1:08 Stephen Rothwell [this message]
2018-04-03  2:00 linux-next: manual merge of the pci tree with the arm-soc tree Stephen Rothwell
2019-11-06 22:45 Stephen Rothwell
2019-11-07 18:27 ` Olof Johansson
2019-11-07 21:18   ` Bjorn Helgaas
2019-11-08 11:07     ` Lorenzo Pieralisi
2019-11-08 20:18       ` Bjorn Helgaas
2019-11-08 22:29       ` Olof Johansson
2022-12-04 22:57 Stephen Rothwell
2022-12-13 16:21 ` Bjorn Helgaas
2022-12-13 16:48   ` Thierry Reding
2022-12-13 19:03     ` Serge Semin
2022-12-13 19:53       ` Bjorn Helgaas
2022-12-13 20:07         ` Bjorn Helgaas
2022-12-13 23:36           ` Serge Semin
2022-12-14 14:37             ` Thierry Reding
2022-12-14 22:07               ` Serge Semin
2022-12-15 12:06                 ` Thierry Reding
2022-12-15 23:56                   ` Serge Semin

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=20150817110855.4fcf9a66@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnd@arndb.de \
    --cc=bhelgaas@google.com \
    --cc=hauke@hauke-m.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=rjui@broadcom.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).