linux-kernel - linux-next: manual merge of the tip tree with the pci 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]

Date:	Mon, 24 Nov 2014 16:18:42 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Bjorn Helgaas <bhelgaas@...gle.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jingoo Han <jg1.han@...sung.com>,
	Yijing Wang <wangyijing@...wei.com>
Subject: linux-next: manual merge of the tip tree with the pci tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
drivers/pci/host/pcie-rcar.c between commit 3c70637f7569 ("PCI: rcar:
Make rcar_pci static") from the pci tree and commit 7c35c8cc32f3 ("PCI:
rcar: Save MSI controller in pci_sys_data") from the tip 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/pcie-rcar.c
index 0df9b2941221,c1177cd55ce3..000000000000
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@@ -380,16 -380,7 +380,7 @@@ static int rcar_pcie_setup(int nr, stru
  	return 1;
  }
  
- static void rcar_pcie_add_bus(struct pci_bus *bus)
- {
- 	if (IS_ENABLED(CONFIG_PCI_MSI)) {
- 		struct rcar_pcie *pcie = sys_to_pcie(bus->sysdata);
- 
- 		bus->msi = &pcie->msi.chip;
- 	}
- }
- 
 -struct hw_pci rcar_pci = {
 +static struct hw_pci rcar_pci = {
  	.setup          = rcar_pcie_setup,
  	.map_irq        = of_irq_parse_and_map_pci,
  	.ops            = &rcar_pcie_ops,

Content of type "application/pgp-signature" skipped