From: Jonathan Corbet <corbet@lwn.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Takashi Iwai <tiwai@suse.de>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
SeongJae Park <sj38.park@gmail.com>
Subject: Re: linux-next: manual merge of the sound tree with the jc_docs tree
Date: Sun, 13 Nov 2016 17:56:28 -0700 [thread overview]
Message-ID: <20161113175628.7906efa8@lwn.net> (raw)
In-Reply-To: <20161114111553.533d5615@canb.auug.org.au>
On Mon, 14 Nov 2016 11:15:53 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the sound tree got a conflict in:
>
> Documentation/index.rst
>
> between commits:
>
> 799a545bb938 ("tpm: move documentation under Documentation/security")
> ba42c574fc8b ("Documentation: Add HOWTO Korean translation into rst based build system")
>
> from the jc_docs tree and commit:
>
> 8551914a5e19 ("ALSA: doc: ReSTize alsa-driver-api document")
>
> from the sound tree.
Sigh. I'm glad this work is being done, but if we're going to create
some coordinated documentation it might be good to involve the docs
maintainer when doing it...
In this case, I would have liked the chance to comment. This
documentation belongs in the driver-api document, not the top-level one.
So, in an ideal world, I'd like to see this stuff moved there, preferably
with the patches going though the docs tree.
(Thanks, Stephen, for fixing it up).
jon
next prev parent reply other threads:[~2016-11-14 0:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-14 0:15 linux-next: manual merge of the sound tree with the jc_docs tree Stephen Rothwell
2016-11-14 0:56 ` Jonathan Corbet [this message]
2016-11-14 8:01 ` Takashi Iwai
2016-11-14 16:11 ` Jonathan Corbet
2016-11-14 16:23 ` Takashi Iwai
2016-11-18 23:33 ` Jonathan Corbet
2016-11-19 0:22 ` Jarkko Sakkinen
2016-11-19 0:39 ` Jonathan Corbet
-- strict thread matches above, loose matches on Subject: below --
2016-11-14 0:18 Stephen Rothwell
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=20161113175628.7906efa8@lwn.net \
--to=corbet@lwn.net \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=sj38.park@gmail.com \
--cc=tiwai@suse.de \
/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).