From: huang ying <huang.ying.caritas@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
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: Re: linux-next: manual merge of the pci tree with Linus' tree
Date: Mon, 25 Jun 2012 14:32:54 +0800 [thread overview]
Message-ID: <CAC=cRTOPWSQmuxWtkpGDxiEeqoG=CEr985-qCLP+HAg6BPk7nA@mail.gmail.com> (raw)
In-Reply-To: <20120625123108.06ef7f883a323df5221edc98@canb.auug.org.au>
Hi, Stephen,
On Mon, Jun 25, 2012 at 10:31 AM, Stephen Rothwell <sfr@canb.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@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);
I found this conflict during development too. I think the fixing is
correct. Thanks.
Best Regards,
Huang Ying
next prev parent reply other threads:[~2012-06-25 6:32 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-25 2:31 linux-next: manual merge of the pci tree with Linus' tree Stephen Rothwell
2012-06-25 6:32 ` huang ying [this message]
2012-06-25 14:14 ` Alan Stern
-- strict thread matches above, loose matches on Subject: below --
2022-01-13 23:45 Stephen Rothwell
2022-01-14 5:48 ` Sergio Paracuellos
2022-01-14 6:53 ` Stephen Rothwell
2022-01-14 6:57 ` Sergio Paracuellos
2021-08-25 0:57 Stephen Rothwell
2021-02-23 0:19 Stephen Rothwell
2020-05-14 1:02 Stephen Rothwell
2020-03-30 23:49 Stephen Rothwell
2020-03-31 8:37 ` Geert Uytterhoeven
2020-03-24 23:58 Stephen Rothwell
2019-09-19 12:33 Mark Brown
2018-07-20 1:03 Stephen Rothwell
2018-07-20 9:15 ` Lorenzo Pieralisi
2018-07-20 10:49 ` Thomas Petazzoni
2018-04-03 2:29 Stephen Rothwell
2018-03-26 1:23 Stephen Rothwell
2018-03-27 16:19 ` Rob Herring
2017-06-26 0:51 Stephen Rothwell
2017-07-03 2:58 ` Stephen Rothwell
2016-12-08 23:44 Stephen Rothwell
2016-06-23 1:44 Stephen Rothwell
2016-06-23 16:43 ` Bjorn Helgaas
2016-01-20 23:33 Stephen Rothwell
2013-06-17 1:42 Stephen Rothwell
2013-06-04 1:49 Stephen Rothwell
2013-06-04 2:11 ` Bjorn Helgaas
2012-09-04 2:04 Stephen Rothwell
2012-09-04 1:59 Stephen Rothwell
2012-09-04 6:57 ` Yuval Mintz
2012-06-19 1:15 Stephen Rothwell
2010-12-20 2:08 Stephen Rothwell
2009-12-07 0:25 Stephen Rothwell
2009-12-07 0:25 Stephen Rothwell
2009-10-14 0:05 Stephen Rothwell
2009-10-14 0:38 ` Jesse Barnes
2009-10-14 2:10 ` Stephen Rothwell
2009-10-14 7:41 ` David Woodhouse
2009-06-30 1:56 Stephen Rothwell
2009-06-30 2:01 ` Jesse Barnes
2009-06-30 2:16 ` Matthew Wilcox
2009-06-30 16:00 ` Jesse Barnes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAC=cRTOPWSQmuxWtkpGDxiEeqoG=CEr985-qCLP+HAg6BPk7nA@mail.gmail.com' \
--to=huang.ying.caritas@gmail.com \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=stern@rowland.harvard.edu \
--cc=ying.huang@intel.com \
--cc=zheng.z.yan@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).