linux-next: manual merge of the pci tree with Linus' tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Yinghai Lu <yinghai@kernel.org>, Jiang Liu <jiang.liu@huawei.com>
Subject: linux-next: manual merge of the pci tree with Linus' tree
Date: Tue, 4 Jun 2013 11:49:55 +1000	[thread overview]
Message-ID: <20130604114955.753909b956c4f8e75ace86a0@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1117 bytes --]

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in
drivers/acpi/pci_root.c between commit 3f327e39b4b8 ("PCI: acpiphp:
Re-enumerate devices when host bridge receives Bus Check") from Linus'
tree and commit 6dc7d22c6738 ("PCI/ACPI: Use dev_printk(),
acpi_handle_print(), pr_xxx() when possible") from the pci tree.

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

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

diff --cc drivers/acpi/pci_root.c
index e427dc5,122b4dc..0000000

--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@@ -639,11 -620,9 +620,11 @@@ static void _handle_hotplug_event_root(
  	switch (type) {
  	case ACPI_NOTIFY_BUS_CHECK:
  		/* bus enumerate */
- 		printk(KERN_DEBUG "%s: Bus check notify on %s\n", __func__,
- 				 (char *)buffer.pointer);
+ 		acpi_handle_printk(KERN_DEBUG, handle,
+ 				   "Bus check notify on %s\n", __func__);
 -		if (!root)
 +		if (root)
 +			acpiphp_check_host_bridge(handle);
 +		else
  			handle_root_bridge_insertion(handle);
  
  		break;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
