From: Catalin Marinas <catalin.marinas@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jonathan Corbet <corbet@lwn.net>, Will Deacon <will@kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Randy Dunlap <rdunlap@infradead.org>,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Subject: Re: linux-next: manual merge of the jc_docs tree with the arm64-fixes tree
Date: Fri, 24 Apr 2020 09:40:12 +0100 [thread overview]
Message-ID: <20200424084011.GA3881@gaia> (raw)
In-Reply-To: <20200424121513.0750e300@canb.auug.org.au>
Thanks Stephen,
On Fri, Apr 24, 2020 at 12:15:13PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the jc_docs tree got a conflict in:
>
> Documentation/arm64/amu.rst
>
> between commit:
>
> 59bff30ad6ce ("Documentation: arm64: fix amu.rst doc warnings")
>
> from the arm64-fixes tree and commit:
>
> d91589556b6a ("docs: amu: supress some Sphinx warnings")
>
> from the jc_docs tree.
I should have checked whether there is a fix already.
> I fixed it up (I used the former version sonce that seems to be a superset
> of the latter)
I think Randy's version is indeed better, at least the bullet points are
now consistently aligned to the first column throughout the document.
--
Catalin
prev parent reply other threads:[~2020-04-24 8:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-24 2:15 linux-next: manual merge of the jc_docs tree with the arm64-fixes tree Stephen Rothwell
2020-04-24 8:40 ` Catalin Marinas [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=20200424084011.GA3881@gaia \
--to=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab+huawei@kernel.org \
--cc=rdunlap@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=will@kernel.org \
/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).