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,
	Alan Stern <stern@rowland.harvard.edu>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Huang Ying <ying.huang@intel.com>,
	Zheng Yan <zheng.z.yan@intel.com>
Subject: linux-next: manual merge of the pci tree with Linus' tree
Date: Mon, 25 Jun 2012 12:31:08 +1000	[thread overview]
Message-ID: <20120625123108.06ef7f883a323df5221edc98@canb.auug.org.au> (raw)

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

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in
drivers/pci/pci.c between commit c2fb8a3fa255 ("USB: add
NO_D3_DURING_SLEEP flag and revert 151b61284776be2") from Linus' tree and
commit 448bd857d48e ("PCI/PM: add PCIe runtime D3cold support") from the
pci tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/pci/pci.c
index 77cb54a,3f8b74f..0000000

--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@@ -1744,11 -1803,10 +1803,15 @@@ int pci_prepare_to_sleep(struct pci_de
  	if (target_state == PCI_POWER_ERROR)
  		return -EIO;
  
+ 	/* D3cold during system suspend/hibernate is not supported */
+ 	if (target_state > PCI_D3hot)
+ 		target_state = PCI_D3hot;
+ 
 +	/* Some devices mustn't be in D3 during system sleep */
 +	if (target_state == PCI_D3hot &&
 +			(dev->dev_flags & PCI_DEV_FLAGS_NO_D3_DURING_SLEEP))
 +		return 0;
 +
  	pci_enable_wake(dev, target_state, device_may_wakeup(&dev->dev));
  
  	error = pci_set_power_state(dev, target_state);

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