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

Message-ID: <CAC=cRTOPWSQmuxWtkpGDxiEeqoG=CEr985-qCLP+HAg6BPk7nA@mail.gmail.com>
Date:	Mon, 25 Jun 2012 14:32:54 +0800
From:	huang ying <huang.ying.caritas@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Bjorn Helgaas <bhelgaas@...gle.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Alan Stern <stern@...land.harvard.edu>,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Huang Ying <ying.huang@...el.com>,
	Zheng Yan <zheng.z.yan@...el.com>
Subject: Re: linux-next: manual merge of the pci tree with Linus' tree

Hi, Stephen,

On Mon, Jun 25, 2012 at 10:31 AM, Stephen Rothwell <sfr@...b.auug.org.au> 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@...b.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);

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/