From: bhelgaas@google.com (Bjorn Helgaas)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 1/4] PCI: iproc: enable arm64 support for iProc PCIe
Date: Wed, 22 Jul 2015 16:40:00 -0500 [thread overview]
Message-ID: <20150722214000.GP21967@google.com> (raw)
In-Reply-To: <55B00684.7070502@broadcom.com>
On Wed, Jul 22, 2015 at 02:09:24PM -0700, Ray Jui wrote:
> I'm fine with the entire change. Both of us understand it's temporary
> and will be removed as soon as struct pci_sys_data is removed from ARM32.
>
> Note I don't know how the code merge should work here. The iProc PCIe
> driver is enabled when CONFIG_ARCH_BCM_IPROC is enabled. Note patch #3
> of this series enables CONFIG_ARCH_BCM_IPROC for arm64. Without this
> patch, arm64 build will be broken because of struct pci_sys_data.
>
> I know you are taking PCI changes and I assume Catalin will be merging
> arm64 related changes. But patches in this patch series need to go
> together to keep things intact.
The easiest thing to do would be to merge them all through one tree.
Catalin could ack the arm64 config changes and I could merge everything via
PCI, or I could ack the PCI changes and he could merge them.
I propose the former since the PCI changes are more substantive, but if the
latter works better, feel free to add my:
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
to the revised first patch and the second one.
Bjorn
next prev parent reply other threads:[~2015-07-22 21:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-22 1:29 [PATCH v4 0/4] Add Broadcom North Star 2 support Ray Jui
2015-07-22 1:29 ` [PATCH v4 1/4] PCI: iproc: enable arm64 support for iProc PCIe Ray Jui
2015-07-22 20:53 ` Bjorn Helgaas
2015-07-22 21:09 ` Ray Jui
2015-07-22 21:40 ` Bjorn Helgaas [this message]
2015-07-22 1:29 ` [PATCH v4 2/4] PCI: iproc: Fix ARM64 dependency in Kconfig Ray Jui
2015-07-22 1:29 ` [PATCH v4 3/4] arm64: Add Broadcom iProc family support Ray Jui
2015-07-24 8:51 ` Will Deacon
2015-07-24 15:42 ` Ray Jui
2015-07-27 18:35 ` Olof Johansson
2015-07-27 18:44 ` Ray Jui
2015-07-22 1:29 ` [PATCH v4 4/4] arm64: dts: Add Broadcom North Star 2 support Ray Jui
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=20150722214000.GP21967@google.com \
--to=bhelgaas@google.com \
--cc=linux-arm-kernel@lists.infradead.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 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).