From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jason Cooper <jason@lakedaemon•net>,
andrew@lunn•ch, gregory.clement@free-electrons•com,
linux-arm-kernel@lists•infradead.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Thomas Petazzoni <thomas.petazzoni@free-electrons•com>,
Bjorn Helgaas <bhelgaas@google•com>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail•com>
Subject: linux-next: manual merge of the mvebu tree with the pci tree
Date: Wed, 14 Aug 2013 16:18:40 +1000 [thread overview]
Message-ID: <20130814161840.dcee2b1354579cce7ff81730@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 864 bytes --]
Hi all,
Today's linux-next merge of the mvebu tree got a conflict in
drivers/pci/host/Kconfig between commit 5477a33b51b7 ("PCI: mvebu: Make
Marvell PCIe driver depend on OF") from the pci tree and commit
31d896ade95d ("PCI: mvebu: add support for Marvell Dove SoCs") from the
mvebu 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 e5ba4eb,492eec9..0000000
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@ -3,8 -3,7 +3,8 @@@ menu "PCI host controller drivers
config PCI_MVEBU
bool "Marvell EBU PCIe controller"
- depends on ARCH_MVEBU || ARCH_KIRKWOOD
+ depends on ARCH_MVEBU || ARCH_DOVE || ARCH_KIRKWOOD
+ depends on OF
config PCIE_DW
bool
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-08-14 6:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-14 6:18 Stephen Rothwell [this message]
2013-08-15 13:31 ` linux-next: manual merge of the mvebu tree with the pci tree Thomas Petazzoni
-- strict thread matches above, loose matches on Subject: below --
2013-08-14 6:22 Stephen Rothwell
2013-08-14 13:05 ` Jason Cooper
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=20130814161840.dcee2b1354579cce7ff81730@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andrew@lunn$(echo .)ch \
--cc=bhelgaas@google$(echo .)com \
--cc=gregory.clement@free-electrons$(echo .)com \
--cc=jason@lakedaemon$(echo .)net \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sebastian.hesselbarth@gmail$(echo .)com \
--cc=thomas.petazzoni@free-electrons$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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