Em Mon, 22 Apr 2019 08:48:10 -0500 Bjorn Helgaas <bhelgaas@xxxxxxxxxx> escreveu: > [+cc Changbin, -cc many others] > > On Mon, Apr 22, 2019 at 8:28 AM Mauro Carvalho Chehab > <mchehab+samsung@xxxxxxxxxx> 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@xxxxxxxxxx> > > 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@xxxxxxxxx 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@xxxxxxxxx/ 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@xxxxxxxxxx> Thanks! Mauro
