From mboxrd@z Thu Jan  1 00:00:00 1970
From: huang ying <huang.ying.caritas@gmail.com>
Subject: Re: linux-next: manual merge of the pci tree with Linus' tree
Date: Mon, 25 Jun 2012 14:32:54 +0800
Message-ID: <CAC=cRTOPWSQmuxWtkpGDxiEeqoG=CEr985-qCLP+HAg6BPk7nA@mail.gmail.com>
References: <20120625123108.06ef7f883a323df5221edc98@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-vc0-f174.google.com ([209.85.220.174]:44017 "EHLO
	mail-vc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751087Ab2FYGcz convert rfc822-to-8bit (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Mon, 25 Jun 2012 02:32:55 -0400
In-Reply-To: <20120625123108.06ef7f883a323df5221edc98@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
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>

Hi, Stephen,

On Mon, Jun 25, 2012 at 10:31 AM, Stephen Rothwell <sfr@canb.auug.org.a=
u> 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 necessar=
y.
> --
> Cheers,
> Stephen Rothwell =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0sfr@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 pc=
i_de
> =C2=A0 =C2=A0 =C2=A0 =C2=A0if (target_state =3D=3D PCI_POWER_ERROR)
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return -EIO;
>
> + =C2=A0 =C2=A0 =C2=A0 /* D3cold during system suspend/hibernate is n=
ot supported */
> + =C2=A0 =C2=A0 =C2=A0 if (target_state > PCI_D3hot)
> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 target_state =3D P=
CI_D3hot;
> +
> =C2=A0+ =C2=A0 =C2=A0 =C2=A0/* Some devices mustn't be in D3 during s=
ystem sleep */
> =C2=A0+ =C2=A0 =C2=A0 =C2=A0if (target_state =3D=3D PCI_D3hot &&
> =C2=A0+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
 =C2=A0 =C2=A0(dev->dev_flags & PCI_DEV_FLAGS_NO_D3_DURING_SLEEP))
> =C2=A0+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return 0;
> =C2=A0+
> =C2=A0 =C2=A0 =C2=A0 =C2=A0pci_enable_wake(dev, target_state, device_=
may_wakeup(&dev->dev));
>
> =C2=A0 =C2=A0 =C2=A0 =C2=A0error =3D 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