On Wed, 12 Jun 2019 14:52:55 -0300 Mauro Carvalho Chehab <mchehab+samsung@xxxxxxxxxx> wrote: > Convert docs to ReST and add them to the arch-specific > book. > > The conversion here was trivial, as almost every file there > was already using an elegant format close to ReST standard. > > The changes were mostly to mark literal blocks and add a few > missing section title identifiers. > > One note with regards to "--": on Sphinx, this can't be used > to identify a list, as it will format it badly. This can be > used, however, to identify a long hyphen - and "---" is an > even longer one. > > 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> > Acked-by: Andrew Donnellan <andrew.donnellan@xxxxxxxxxxx> # cxl This one fails to apply because ... [...] > diff --git a/Documentation/PCI/pci-error-recovery.rst b/Documentation/PCI/pci-error-recovery.rst > index 83db42092935..acc21ecca322 100644 > --- a/Documentation/PCI/pci-error-recovery.rst > +++ b/Documentation/PCI/pci-error-recovery.rst > @@ -403,7 +403,7 @@ That is, the recovery API only requires that: > .. note:: > > Implementation details for the powerpc platform are discussed in > - the file Documentation/powerpc/eeh-pci-error-recovery.txt > + the file Documentation/powerpc/eeh-pci-error-recovery.rst > > As of this writing, there is a growing list of device drivers with > patches implementing error recovery. Not all of these patches are in > @@ -422,3 +422,24 @@ That is, the recovery API only requires that: > - drivers/net/cxgb3 > - drivers/net/s2io.c > - drivers/net/qlge > + > +>>> As of this writing, there is a growing list of device drivers with > +>>> patches implementing error recovery. Not all of these patches are in > +>>> mainline yet. These may be used as "examples": > +>>> > +>>> drivers/scsi/ipr > +>>> drivers/scsi/sym53c8xx_2 > +>>> drivers/scsi/qla2xxx > +>>> drivers/scsi/lpfc > +>>> drivers/next/bnx2.c > +>>> drivers/next/e100.c > +>>> drivers/net/e1000 > +>>> drivers/net/e1000e > +>>> drivers/net/ixgb > +>>> drivers/net/ixgbe > +>>> drivers/net/cxgb3 > +>>> drivers/net/s2io.c > +>>> drivers/net/qlge ...of this, which has the look of a set of conflict markers that managed to get committed...? jon
