From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linus <torvalds@linux-foundation.org>
Subject: Re: linux-next: manual merge of the pm tree with the pci tree
Date: Thu, 28 Nov 2019 10:58:48 +1100 [thread overview]
Message-ID: <20191128105848.0209e2d5@canb.auug.org.au> (raw)
In-Reply-To: <20191125101345.760293f3@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2884 bytes --]
Hi all,
On Mon, 25 Nov 2019 10:13:45 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> Documentation/power/pci.rst
>
> between commits:
>
> b64cf7a1711d ("PCI/PM: Wrap long lines in documentation")
> 89cdbc354635 ("PCI/PM: Remove unused pci_driver.resume_early() hook")
> 1a1daf097e21 ("PCI/PM: Remove unused pci_driver.suspend_late() hook")
>
> from the pci tree and commit:
>
> 1992b66d2f55 ("PM: Wrap documentation to fit in 80 columns")
>
> from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc Documentation/power/pci.rst
> index 0924d29636ad,51e0a493d284..000000000000
> --- a/Documentation/power/pci.rst
> +++ b/Documentation/power/pci.rst
> @@@ -692,11 -692,11 +692,11 @@@ controlling the runtime power managemen
> At the time of this writing there are two ways to define power management
> callbacks for a PCI device driver, the recommended one, based on using a
> dev_pm_ops structure described in Documentation/driver-api/pm/devices.rst, and
> - the "legacy" one, in which the .suspend() and .resume() callbacks from struct
> - pci_driver are used. The legacy approach, however, doesn't allow one to define
> - runtime power management callbacks and is not really suitable for any new
> - drivers. Therefore it is not covered by this document (refer to the source code
> - to learn more about it).
> -the "legacy" one, in which the .suspend(), .suspend_late(), .resume_early(), and
> -.resume() callbacks from struct pci_driver are used. The legacy approach,
> -however, doesn't allow one to define runtime power management callbacks and is
> -not really suitable for any new drivers. Therefore it is not covered by this
> -document (refer to the source code to learn more about it).
> ++the "legacy" one, in which the .suspend() and .resume() callbacks from
> ++struct pci_driver are used. The legacy approach, however, doesn't allow
> ++one to define runtime power management callbacks and is not really suitable
> ++for any new drivers. Therefore it is not covered by this document (refer
> ++to the source code to learn more about it).
>
> It is recommended that all PCI device drivers define a struct dev_pm_ops object
> containing pointers to power management (PM) callbacks that will be executed by
This is now a conflict between the pci tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-11-27 23:58 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-24 23:13 linux-next: manual merge of the pm tree with the pci tree Stephen Rothwell
2019-11-25 14:06 ` Rafael J. Wysocki
2019-11-27 23:58 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-07-01 3:24 Stephen Rothwell
2015-02-11 1:07 Stephen Rothwell
2015-02-11 1:41 ` Rafael J. Wysocki
2015-02-11 2:03 ` Rafael J. Wysocki
2015-02-11 2:05 ` Lorenzo Pieralisi
2013-06-27 3:02 Stephen Rothwell
2013-04-16 2:46 Stephen Rothwell
2013-04-16 17:53 ` Rafael J. Wysocki
2013-02-20 1:55 Stephen Rothwell
2013-02-20 12:57 ` Rafael J. Wysocki
2013-02-18 1:17 Stephen Rothwell
2013-02-18 12:28 ` Rafael J. Wysocki
2013-02-18 1:11 Stephen Rothwell
2013-02-18 12:30 ` Rafael J. Wysocki
2013-02-15 1:23 Stephen Rothwell
2013-02-15 12:51 ` Rafael J. Wysocki
2013-01-30 8:35 Stephen Rothwell
2013-01-30 12:48 ` Rafael J. Wysocki
2013-01-10 0:28 Stephen Rothwell
2013-01-10 13:12 ` Rafael J. Wysocki
2013-01-10 18:30 ` Bjorn Helgaas
2012-11-06 2:48 Stephen Rothwell
2012-11-06 16:52 ` Bjorn Helgaas
2012-11-16 10:17 ` Rafael J. Wysocki
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=20191128105848.0209e2d5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=torvalds@linux-foundation.org \
/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).