Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755749AbbKDMqI (ORCPT ); Wed, 4 Nov 2015 07:46:08 -0500 Received: from www.linutronix.de ([62.245.132.108]:49334 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751197AbbKDMqH (ORCPT ); Wed, 4 Nov 2015 07:46:07 -0500 Date: Wed, 4 Nov 2015 13:45:23 +0100 (CET) From: Thomas Gleixner To: Arnd Bergmann cc: linux-pci@vger.kernel.org, Bjorn Helgaas , marc.zyngier@arm.com, linux-kernel@vger.kernel.org, Ley Foon Tan Subject: Re: [PATCH] PCI: altera: use fwnode API for pci_msi_create_irq_domain In-Reply-To: <4309044.Hy8Vx01ZVW@wuerfel> Message-ID: References: <4309044.Hy8Vx01ZVW@wuerfel> User-Agent: Alpine 2.11 (DEB 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001,URIBL_BLOCKED=0.001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1721 Lines: 35 On Wed, 4 Nov 2015, Arnd Bergmann wrote: > There is a new conflict between Thomas Gleixner's IRQ tree that contains > a patch from Marc Zyngier to change the prototype for > pci_msi_create_irq_domain, and Bjorn Helgaas' PCI tree that contains > a new driver for the Altera PCI MSI host, with the old interface, > as gcc now warns in linux-next: > > drivers/pci/host/pcie-altera-msi.c: In function 'altera_allocate_domains': > drivers/pci/host/pcie-altera-msi.c:191:46: warning: passing argument 1 of 'pci_msi_create_irq_domain' from incompatible pointer type [-Wincompatible-pointer-types] > msi->msi_domain = pci_msi_create_irq_domain(msi->pdev->dev.of_node, > include/linux/msi.h:286:20: note: expected 'struct fwnode_handle *' but argument is of type 'struct device_node *' > > This changes the new driver use the modified API. > > Signed-off-by: Arnd Bergmann > Fixes: af1169b48b17 ("PCI: altera: Add Altera PCIe MSI driver") > Fixes: be5436c83ac8 ("irqdomain/msi: Use fwnode instead of of_node") > --- > This conflict seems to be new in linux-next today. Any idea how to resolve it? > > I think either Bjorn merges the msi-map-4.4 of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms and uses this > as the resolution, or whichever pull request comes second should let Linus > know about the conflict so he can do it when merging both. The irq/core stuff which contains Marcs msi map stuff has hit Linus tree already. Thanks, tglx -- 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/