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

[huang ying]

Hi, Stephen,

On Mon, Jun 25, 2012 at 10:31 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 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@xxxxxxxxxxxxxxxx
>
> 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);

I found this conflict during development too.  I think the fixing is
correct.  Thanks.

Best Regards,
Huang Ying
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/