Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753133AbbGVVkO (ORCPT ); Wed, 22 Jul 2015 17:40:14 -0400 Received: from mail-ig0-f181.google.com ([209.85.213.181]:34182 "EHLO mail-ig0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753079AbbGVVkL (ORCPT ); Wed, 22 Jul 2015 17:40:11 -0400 Date: Wed, 22 Jul 2015 16:40:00 -0500 From: Bjorn Helgaas To: Ray Jui Cc: Catalin Marinas , Will Deacon , Arnd Bergmann , Mark Rutland , Hauke Mehrtens , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org Subject: Re: [PATCH v4 1/4] PCI: iproc: enable arm64 support for iProc PCIe Message-ID: <20150722214000.GP21967@google.com> References: <1437528583-855-1-git-send-email-rjui@broadcom.com> <1437528583-855-2-git-send-email-rjui@broadcom.com> <20150722205316.GO21967@google.com> <55B00684.7070502@broadcom.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <55B00684.7070502@broadcom.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1344 Lines: 30 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 to the revised first patch and the second one. Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/