From: Jonathan Corbet <corbet@lwn.net>
To: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Cc: Linux Doc Mailing List <linux-doc@vger.kernel.org>,
Mauro Carvalho Chehab <mchehab@infradead.org>,
linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org,
linux-fbdev@vger.kernel.org, linux-s390@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-watchdog@vger.kernel.org, xdp-newbies@vger.kernel.org,
linux-samsung-soc@vger.kernel.org, linux-acpi@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com, bpf@vger.kernel.org,
linux-ide@vger.kernel.org, linux-pm@vger.kernel.org,
dri-devel@lists.freedesktop.org, linux-scsi@vger.kernel.org,
linux-gpio@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
x86@kernel.org, dm-devel@redhat.com,
target-devel@vger.kernel.org, netdev@vger.kernel.org,
kexec@lists.infradead.org, linux-fpga@vger.kernel.org,
linux-rdma@vger.ke
Subject: Re: Avoiding merge conflicts while adding new docs - Was: Re: [PATCH 00/57] Convert files to ReST
Date: Fri, 19 Apr 2019 16:10:58 -0600 [thread overview]
Message-ID: <20190419161058.3628a29b@lwn.net> (raw)
In-Reply-To: <20190418091526.00e074d1@coco.lan>
On Thu, 18 Apr 2019 09:42:23 -0300
Mauro Carvalho Chehab <mchehab+samsung@kernel.org> wrote:
> After thinking a little bit and doing some tests, I think a good solution
> would be to add ":orphan:" markup to the new .rst files that were not
> added yet into the main body (e. g. something like the enclosed example).
Interesting...I didn't know about that. Yes, I think it makes sense to
put that in...
jon
prev parent reply other threads:[~2019-04-19 22:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-16 2:55 [PATCH 00/57] Convert files to ReST Mauro Carvalho Chehab
2019-04-16 2:55 ` [PATCH 15/57] docs: gpio: convert it " Mauro Carvalho Chehab
2019-04-23 10:52 ` Linus Walleij
2019-04-23 12:38 ` Mauro Carvalho Chehab
2019-04-18 12:42 ` Avoiding merge conflicts while adding new docs - Was: Re: [PATCH 00/57] Convert files " Mauro Carvalho Chehab
2019-04-19 22:10 ` Jonathan Corbet [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=20190419161058.3628a29b@lwn.net \
--to=corbet@lwn.net \
--cc=bpf@vger.kernel.org \
--cc=dm-devel@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=kexec@lists.infradead.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-rdma@vger.ke \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux-watchdog@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mchehab+samsung@kernel.org \
--cc=mchehab@infradead.org \
--cc=netdev@vger.kernel.org \
--cc=target-devel@vger.kernel.org \
--cc=x86@kernel.org \
--cc=xdp-newbies@vger.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).