Re: linux-next: manual merge of the sound tree with the jc_docs tree

2016-11-18 Thread Jonathan Corbet
On Fri, 18 Nov 2016 16:22:18 -0800 Jarkko Sakkinen wrote: > Given that there is now a directory for TPM rst documentation do you > still want all changes to your tree or is it sufficient to just cc > linux-doc? For stuff in security/tpm? It makes my life easier if documentation patches come thr

Re: linux-next: manual merge of the sound tree with the jc_docs tree

2016-11-18 Thread Jarkko Sakkinen
On Fri, Nov 18, 2016 at 04:33:12PM -0700, Jonathan Corbet wrote: > On Mon, 14 Nov 2016 09:01:13 +0100 > Takashi Iwai wrote: > > > > 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 wo

Re: linux-next: manual merge of the sound tree with the jc_docs tree

2016-11-18 Thread Jonathan Corbet
On Mon, 14 Nov 2016 09:01:13 +0100 Takashi Iwai wrote: > > 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

Re: linux-next: manual merge of the sound tree with the jc_docs tree

2016-11-14 Thread Takashi Iwai
On Mon, 14 Nov 2016 17:11:59 +0100, Jonathan Corbet wrote: > > On Mon, 14 Nov 2016 09:01:13 +0100 > Takashi Iwai wrote: > > > > 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 do

Re: linux-next: manual merge of the sound tree with the jc_docs tree

2016-11-14 Thread Jonathan Corbet
On Mon, 14 Nov 2016 09:01:13 +0100 Takashi Iwai wrote: > > 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... > > Sorry, will put you guys in Cc at the next time (although

Re: linux-next: manual merge of the sound tree with the jc_docs tree

2016-11-14 Thread Takashi Iwai
On Mon, 14 Nov 2016 01:56:28 +0100, Jonathan Corbet wrote: > > On Mon, 14 Nov 2016 11:15:53 +1100 > Stephen Rothwell wrote: > > > Today's linux-next merge of the sound tree got a conflict in: > > > > Documentation/index.rst > > > > between commits: > > > > 799a545bb938 ("tpm: move documen

Re: linux-next: manual merge of the sound tree with the jc_docs tree

2016-11-13 Thread Jonathan Corbet
On Mon, 14 Nov 2016 11:15:53 +1100 Stephen Rothwell 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