Re: linux-next: manual merge of the net-next tree with the jc_docs tree

[Jonathan Corbet <corbet@lwn.net>]

Stephen Rothwell <sfr@canb.auug.org.au> 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