linux-next: manual merge of the pci tree with the ia64 tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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;
  }
  
  /*

Attachment: pgp00000.pgp
Description: PGP signature