linux-kernel - linux-next: manual merge of the pci tree with the ia64 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>] [day] [month] [year] [list]

Message-Id: <20130620113636.9658fab2af8a67231093a462@canb.auug.org.au>
Date:	Thu, 20 Jun 2013 11:36:36 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Bjorn Helgaas <bhelgaas@...gle.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jiang Liu <liuj97@...il.com>,
	Yijing Wang <wangyijing@...wei.com>,
	"Luck, Tony" <tony.luck@...el.com>
Subject: linux-next: manual merge of the pci tree with the ia64 tree

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in
arch/ia64/sn/kernel/io_init.c between commit 2ead66b54725 ("PCI/IA64: SN:
use normal resource instead of pci_window") from the ia64 tree and commit
a649dbfea36b ("ia64/PCI: Clean up pci_scan_root_bus() usage") from the
pci tree.

I fixed it up (see below - this could clearly be done better) and can
carry the fix as necessary (no action is required).

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

diff --cc arch/ia64/sn/kernel/io_init.c
index 2b00ade,e2c7733..0000000
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@@ -269,16 -326,7 +269,14 @@@ sn_pci_controller_fixup(int segment, in
  	bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, controller,
  				&resources);
   	if (bus == NULL)
 -		kfree(controller);
 + 		goto error_return; /* error, or bus already scanned */
 +
- 	bus->sysdata = controller;
- 
 +	return;
 +
 +error_return:
 +	kfree(res);
 +	kfree(controller);
 +	return;
  }
  
  /*

Content of type "application/pgp-signature" skipped