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=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 18595C48BDF for ; Fri, 18 Jun 2021 17:25:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E8E9561159 for ; Fri, 18 Jun 2021 17:25:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234064AbhFRR1z (ORCPT ); Fri, 18 Jun 2021 13:27:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233617AbhFRR1z (ORCPT ); Fri, 18 Jun 2021 13:27:55 -0400 Received: from ms.lwn.net (ms.lwn.net [IPv6:2600:3c01:e000:3a1::42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB221C061574; Fri, 18 Jun 2021 10:25:45 -0700 (PDT) Received: from localhost (unknown [IPv6:2601:281:8300:104d::5f6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ms.lwn.net (Postfix) with ESMTPSA id D7E7D9A2; Fri, 18 Jun 2021 17:25:44 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 ms.lwn.net D7E7D9A2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lwn.net; s=20201203; t=1624037145; bh=VWmAA0YzzpNvxcoFBtGHf43nmNUWhu3CK8g3vdxbsRE=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=b01VgQRUzhEO5ndT69988RRG7Ev9fbKU5L28nWrpKNKt5OdisyW4eyn2ulpFyGIOv gXXfDjDvkvsOt9eDIWtOXhJQKLUGsiKa05hhZPMYF44dVJxwT4IvUHh6Kynh+kkHDU D9UUQ4ALmlVEJGt0Dq2t12XkhF0slNOjEUejb8ZjPAWObLs6SYTtHJOQ9qENWcPNji KxLmlcO17k83mlWjiWRFP8DtbWCoW8ZoGib0arLJ09yxiXArzwyd4AOyzb+yc8xvBQ 9iCRsurkJwvXKAR+ENbp0XeIhB1uFMrMSJ0DavligyWb2Wpm4S3jgddzduwIyLLjWU mdenQMhW1oK0Q== From: Jonathan Corbet To: Stephen Rothwell , David Miller , Networking Cc: Linux Kernel Mailing List , Linux Next Mailing List , Mauro Carvalho Chehab , Oleksandr Mazur Subject: Re: linux-next: manual merge of the net-next tree with the jc_docs tree In-Reply-To: <20210618115533.0b48bf39@canb.auug.org.au> References: <20210618115533.0b48bf39@canb.auug.org.au> Date: Fri, 18 Jun 2021 11:25:44 -0600 Message-ID: <871r8zrso7.fsf@meer.lwn.net> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > Documentation/networking/devlink/devlink-trap.rst > > between commit: > > 8d4a0adc9cab ("docs: networking: devlink: avoid using ReST :doc:`foo` markup") > > from the jc_docs tree and commit: > > 01f1b6ed2b84 ("documentation: networking: devlink: fix prestera.rst formatting that causes build warnings") > > from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > -- > Cheers, > Stephen Rothwell > > diff --cc Documentation/networking/devlink/devlink-trap.rst > index efa5f7f42c88,ef8928c355df..000000000000 > --- a/Documentation/networking/devlink/devlink-trap.rst > +++ b/Documentation/networking/devlink/devlink-trap.rst > @@@ -495,8 -495,9 +495,9 @@@ help debug packet drops caused by thes > links to the description of driver-specific traps registered by various device > drivers: > > - * :doc:`netdevsim` > - * :doc:`mlxsw` > - * :doc:`prestera` > + * Documentation/networking/devlink/netdevsim.rst > + * Documentation/networking/devlink/mlxsw.rst > ++ * Documentation/networking/devlink/prestera.rst This is the right fix, thanks. I got that :doc: directive taken out even if everybody chose to ignore my request to that end...:) jon