From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70911C31E4B for ; Fri, 14 Jun 2019 21:30:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3C7E12183E for ; Fri, 14 Jun 2019 21:30:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560547837; bh=ZxDW8K6J+radmhN5Vs7dffyGWwY56OXzv8PYXR/lauo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=nZcOISdQ6lbpPS8vwsQ4vOdgp7XKPO5/wZ05Ug1GI02Xz3Rr3FexTw9LqOb9MS8+o LjqBfPu74Xy/wotIvSYRgt/DSOpztwOw4r46X1MVIYbOSwqE3e39tvj9VHJoF8BUh2 +ZHKNBqASMak0NqCgzeQgshslEj6jBXHH0F3K+1U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726445AbfFNVag (ORCPT ); Fri, 14 Jun 2019 17:30:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:36850 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725809AbfFNVaf (ORCPT ); Fri, 14 Jun 2019 17:30:35 -0400 Received: from localhost (unknown [69.71.4.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7E908206BB; Fri, 14 Jun 2019 21:30:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560547834; bh=ZxDW8K6J+radmhN5Vs7dffyGWwY56OXzv8PYXR/lauo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=D/zHigl6AEHgfKDfYaQUw48nJ0lJIJi63bv2MJ+d8wmz+4j43FfzZUkMaIGPzY7VV n+W7xyxXoFe8ifSY15/YHLd5tqvHKjYOYq243asXrG4VkaF+IKjYq4SNTJiVqGGVD3 isDi+ABOK/k1Q25bBsPQ+LT1tqvlis8g776GBz60= Date: Fri, 14 Jun 2019 16:30:33 -0500 From: Bjorn Helgaas To: Jonathan Corbet Cc: Mauro Carvalho Chehab , Linux Doc Mailing List , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, Linas Vepstas , Russell Currey , Sam Bobroff , Oliver O'Halloran , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Frederic Barrat , Andrew Donnellan , "Manoj N. Kumar" , "Matthew R. Ochs" , Uma Krishnan , Qiang Zhao , Li Yang , Greg Kroah-Hartman , Jiri Slaby , linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-scsi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Andrew Donnellan Subject: Re: [PATCH v4 19/28] docs: powerpc: convert docs to ReST and rename to *.rst Message-ID: <20190614213033.GV13533@google.com> References: <63560c1ee7174952e148a353840a17969fe0be2d.1560361364.git.mchehab+samsung@kernel.org> <20190614143635.3aff154d@lwn.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190614143635.3aff154d@lwn.net> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 14, 2019 at 02:36:35PM -0600, Jonathan Corbet wrote: > On Wed, 12 Jun 2019 14:52:55 -0300 > Mauro Carvalho Chehab 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 > > Acked-by: Andrew Donnellan # 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...? I don't see these conflict markers in my local branch or in linux-next (next-20190614). Let me know if I need to do something. Bjorn