linux-kernel - linux-next: manual merge of the net-next tree with the jc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20210618115533.0b48bf39@canb.auug.org.au>
Date:   Fri, 18 Jun 2021 11:55:33 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Jonathan Corbet <corbet@....net>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Mauro Carvalho Chehab <mchehab+huawei@...nel.org>,
        Oleksandr Mazur <oleksandr.mazur@...ision.eu>
Subject: linux-next: manual merge of the net-next tree with the jc_docs tree

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
  
  .. _Generic-Packet-Trap-Groups:
  

Content of type "application/pgp-signature" skipped