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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20131031125713.GK26784@titan.lakedaemon.net>
Date:	Thu, 31 Oct 2013 08:57:13 -0400
From:	Jason Cooper <jason@...edaemon.net>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>
Cc:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	linux-arm-kernel@...ts.infradead.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Grant Likely <grant.likely@...aro.org>,
	Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>
Subject: 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 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 arm-soc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

This looks fine by me.

thx,

Jason.

> diff --cc drivers/pci/host/pci-mvebu.c
> index 07ddb3a13c6e,80b2250ea19a..000000000000
> --- a/drivers/pci/host/pci-mvebu.c
> +++ b/drivers/pci/host/pci-mvebu.c
> @@@ -693,9 -732,10 +719,10 @@@ static void mvebu_pcie_enable(struct mv
>   	hw.private_data   = (void **)&pcie;
>   	hw.setup          = mvebu_pcie_setup;
>   	hw.scan           = mvebu_pcie_scan_bus;
>  -	hw.map_irq        = mvebu_pcie_map_irq;
>  +	hw.map_irq        = of_irq_parse_and_map_pci;
>   	hw.ops            = &mvebu_pcie_ops;
>   	hw.align_resource = mvebu_pcie_align_resource;
> + 	hw.add_bus        = mvebu_pcie_add_bus;
>   
>   	pci_common_init(&hw);
>   }


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/