From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S934963AbcKNIBR (ORCPT <rfc822;w@1wt.eu>);
        Mon, 14 Nov 2016 03:01:17 -0500
Received: from mx2.suse.de ([195.135.220.15]:46385 "EHLO mx2.suse.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1753598AbcKNIBQ (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 14 Nov 2016 03:01:16 -0500
Date: Mon, 14 Nov 2016 09:01:13 +0100
Message-ID: <s5ha8d2ebhy.wl-tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Jonathan Corbet <corbet@lwn.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, 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
In-Reply-To: <20161113175628.7906efa8@lwn.net>
References: <20161114111553.533d5615@canb.auug.org.au>
        <20161113175628.7906efa8@lwn.net>
User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.5
 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, 14 Nov 2016 01:56:28 +0100,
Jonathan Corbet wrote:
> 
> 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...

Sorry, will put you guys in Cc at the next time (although all
conversions have been done in the sound tree).

> 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

It's based on vanilla 4.9-rc4, so it must be clean to be merged.  A
few misc fixes will come up in for-next branch, but they should be
harmless to your changes -- at least the api-related changes won't be
touched.


thanks,

Takashi

> 
> (Thanks, Stephen, for fixing it up).
> 
> jon
>