Re: linux-next: manual merge of the arm-soc tree with the devicetree tree

Stephen, Glad to see you're back at it! Nice meeting you and your wife in Edinburgh. Adding Thomas Petazzoni to the Cc. On Thu, Oct 31, 2013 at 07:23:54PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > drivers/pci/host/pci-mvebu.c

linux-next: manual merge of the arm-soc tree with the devicetree tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/pci/host/pci-mvebu.c between commit 16b84e5a505c ("of/irq: Create of_irq_parse_and_map_pci() to consolidate arch code.") from the devicetree tree and commit e5615c30c1c9 ("PCI: mvebu: remove subsys_initcall") from the a

linux-next: manual merge of the arm-soc tree with the devicetree tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-integrator/pci_v3.c between commit 16b84e5a505c ("of/irq: Create of_irq_parse_and_map_pci() to consolidate arch code") from the devicetree tree and commit d7057e1de8d6 ("ARM: integrator: delete non-devicetree boot

linux-next: manual merge of the arm-soc tree with the devicetree tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-vexpress/v2m.c between commit 465aac6d496a ("Fix build when CONFIG_W1_MASTER_GPIO=m b exporting "allnodes"") from the devicetree tree and commit 0891642cf117 ("ARM: vexpress: Start using new Versatile Express infr