From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jonathan Corbet <corbet@lwn.net>
Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
Borislav Petkov <bp@alien8.de>, Tony Luck <tony.luck@intel.com>,
Carlos Bilbao <carlos.bilbao@amd.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Yazen Ghannam <yazen.ghannam@amd.com>
Subject: Re: linux-next: manual merge of the edac tree with the jc_docs tree
Date: Wed, 13 Mar 2024 10:15:16 +1100 [thread overview]
Message-ID: <20240313101516.25300dcf@canb.auug.org.au> (raw)
In-Reply-To: <20240222142041.34342553@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1405 bytes --]
Hi all,
On Thu, 22 Feb 2024 14:20:41 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2024-03-12 23:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-22 3:20 linux-next: manual merge of the edac tree with the jc_docs tree Stephen Rothwell
2024-03-12 23:15 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240313101516.25300dcf@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bp@alien8.de \
--cc=carlos.bilbao@amd.com \
--cc=corbet@lwn.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab+samsung@kernel.org \
--cc=tony.luck@intel.com \
--cc=yazen.ghannam@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).