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.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=unavailable 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 BE378C31E4B for ; Fri, 14 Jun 2019 21:30:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9094921473 for ; Fri, 14 Jun 2019 21:30:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="qFpSeq8k"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="D/zHigl6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9094921473 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=KX0DoaqibKsz6jmKREOnGHqAHEAiWXmOPyJ0iCM+Y4M=; b=qFpSeq8klV1g3u jvDXSqXObwxZe+akXj31Y+hXMyy86IPKPOB4xxRxoEsCkw3gdWlfWHRxZs0omCAetGUoy5KeeIV+C vyVCRE3gjsDw2Y7su9+/V9U1ZX6mCDDquekYRGFXawHzkl7u49/aM6s2nL8ARoUCMQEwff2aeJon8 BUQiqG2BeHYsIPXeKzAe3CxYQdohERrDTupq8EUcptO/uubUv2Kz8hZfwrj61EyCLbTEUEUQv/9r7 PAChZ1rgvn7zHUXdhWBXnJ5JHkhbmiYolnQQPx0IJZd3Byk2ANjT/pAtCOfRxGf6QQlB7kPkzlxHN qBbbFFGnie1ogExDvycQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hbtmQ-0006qb-48; Fri, 14 Jun 2019 21:30:38 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hbtmN-0006pu-4x for linux-arm-kernel@lists.infradead.org; Fri, 14 Jun 2019 21:30:36 +0000 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 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-Disposition: inline In-Reply-To: <20190614143635.3aff154d@lwn.net> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190614_143035_217928_26F24294 X-CRM114-Status: GOOD ( 18.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux Doc Mailing List , Benjamin Herrenschmidt , linux-pci@vger.kernel.org, Oliver O'Halloran , Russell Currey , Mauro Carvalho Chehab , Qiang Zhao , linux-scsi@vger.kernel.org, Michael Ellerman , Jiri Slaby , Linas Vepstas , Andrew Donnellan , Mauro Carvalho Chehab , "Manoj N. Kumar" , linux-arm-kernel@lists.infradead.org, "Matthew R. Ochs" , Uma Krishnan , Sam Bobroff , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Li Yang , Andrew Donnellan , Frederic Barrat , Paul Mackerras , linuxppc-dev@lists.ozlabs.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel