Hi all,
On Thu, 22 Feb 2024 14:20:41 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the edac tree got a conflict in:
>
> Documentation/index.rst
>
> between commit:
>
> 9ee367809c67 ("docs: Include simplified link titles in main index")
>
> from the jc_docs tree and commits:
>
> 1289c431641f ("Documentation: RAS: Add index and address translation section")
> 0e4fd816b08e ("Documentation: Move RAS section to admin-guide")
>
> from the edac 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.
>
>
> diff --cc Documentation/index.rst
> index 429a407470c8,9dfdc826618c..000000000000
> --- a/Documentation/index.rst
> +++ b/Documentation/index.rst
> @@@ -112,8 -112,7 +112,7 @@@ to ReStructured Text format, or are sim
> .. toctree::
> :maxdepth: 1
>
> - staging/index
> + Unsorted documentation <staging/index>
> - RAS/ras
>
>
> Translations
This is now a conflict between the jc_docs tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpGzXK0Ue9yM.pgp
Description: OpenPGP digital signature
