On Monday, November 25, 2019 12:13:45 AM CET Stephen Rothwell wrote:
> Hi all,
>
> 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.
Thanks, the fix looks good to me.
Cheers,
Rafael
