From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753839AbcKSAWW (ORCPT ); Fri, 18 Nov 2016 19:22:22 -0500 Received: from mga04.intel.com ([192.55.52.120]:15163 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752686AbcKSAWU (ORCPT ); Fri, 18 Nov 2016 19:22:20 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,660,1473145200"; d="scan'208";a="193204053" Date: Fri, 18 Nov 2016 16:22:18 -0800 From: Jarkko Sakkinen To: Jonathan Corbet Cc: Takashi Iwai , Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, SeongJae Park Subject: Re: linux-next: manual merge of the sound tree with the jc_docs tree Message-ID: <20161119002218.6k5snf7srxhds4ah@intel.com> References: <20161114111553.533d5615@canb.auug.org.au> <20161113175628.7906efa8@lwn.net> <20161118163312.46505e6f@lwn.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161118163312.46505e6f@lwn.net> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.6.2-neo (2016-08-21) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 world, I'd like to see this stuff moved there, preferably > > > with the patches going though the docs tree. > > > > If there needs any other changes, feel free to merge my > > topic/restize-docs branch into yours and keep working there: > > git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/resize-docs > > OK, I've done that, so this series will show up in docs-next; hopefully > the merge conflicts will be resolved in the process. > > I had said that I really wanted to move it all under driver-api and put > it into that manual, but, looking at what's there, it's not that simple. > The driver API parts of that manual belong there, but some of the > information is user-oriented. A long-term goal is to separate out those > two types of information so that interested readers can more easily find > the information relevant to them. But that won't happen for 4.10..:) So > I'll leave things as they are for now. > > (Note also that the driver API manual already has a section on sound > devices: > > http://static.lwn.net/kerneldoc/driver-api/sound.html > > This came from the driver DocBook conversion a while back. At some point > we should really pull all that stuff together into a single document). > > Thanks again for doing this conversion, > > jon 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? Thanks for fixing the issues! /Jarkko