linux-kernel - 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-next>] [day] [month] [year] [list]

Message-Id: <20131031192354.32945644fbdca2e0d6ca5455@canb.auug.org.au>
Date:	Thu, 31 Oct 2013 19:23:54 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Grant Likely <grant.likely@...aro.org>,
	Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>,
	Jason Cooper <jason@...edaemon.net>
Subject: 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 arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

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);
  }

Content of type "application/pgp-signature" skipped