lkml.org 
[lkml]   [2019]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH v2 25/79] docs: convert docs to ReST and rename to *.rst
Em Mon, 22 Apr 2019 08:48:10 -0500
Bjorn Helgaas <bhelgaas@google.com> escreveu:

> [+cc Changbin, -cc many others]
>
> On Mon, Apr 22, 2019 at 8:28 AM Mauro Carvalho Chehab
> <mchehab+samsung@kernel.org> wrote:
> >
> > Convert the PM documents to ReST, in order to allow them to
> > build with Sphinx.
> >
> > The conversion is actually:
> > - add blank lines and identation in order to identify paragraphs;
>
> s/identation/indentation/
>
> > - fix tables markups;
> > - add some lists markups;
> > - mark literal blocks;
> > - adjust title markups.
> >
> > At its new index.rst, let's add a :orphan: while this is not linked to
> > the main index.rst file, in order to avoid build warnings.
> >
> > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
>
> The PCI part of this is fine with me but may conflict with Changbin's work:
>
> https://lore.kernel.org/lkml/20190409155626.6049-1-changbin.du@gmail.com

Yes it could generate a conflict, but it is a trivial change:

--- a/Documentation/PCI/pci.txt
+++ b/Documentation/PCI/pci.txt
@@ -110,7 +110,7 @@ initialization with a pointer to a structure describing the driver
resume_early Wake device from low power state.
resume Wake device from low power state.

- (Please see Documentation/power/pci.txt for descriptions
+ (Please see Documentation/power/pci.rst for descriptions
of PCI Power Management and the related functions.)

shutdown Hook into reboot_notifier_list (kernel/sys.c).
Looking at Changbin's patch 02/12 v3:

https://lore.kernel.org/lkml/20190409155626.6049-3-changbin.du@gmail.com/

It doesn't touch the above line, nor the context lines, and it doesn't
change more than 50% of the file. So, even if this patch gets merged
after the PCI changeset, git will very likely recognize it as a
rename and will apply it anyway.

> Since this doesn't look like it's targeting merge via the PCI tree,
> I'll let you two work out any conflicts.
>
> Acked-by: Bjorn Helgaas <bhelgaas@google.com>

Thanks!
Mauro

\
 
 \ /
  Last update: 2019-04-22 16:08    [W:1.236 / U:1.780 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site