From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: [PATCH 10/13] sound: fix the comments that refers to kernel-doc Date: Tue, 16 May 2017 12:50:55 +0200 Message-ID: References: <3514c2b81341c160bf6753cb47fa2346f3b5a0e7.1494775891.git.mchehab@s-opensource.com> <20170516074653.187d499f@vento.lan> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id B8800266EFE for ; Tue, 16 May 2017 12:50:56 +0200 (CEST) In-Reply-To: <20170516074653.187d499f@vento.lan> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Mauro Carvalho Chehab Cc: alsa-devel@alsa-project.org, Jonathan Corbet , Linux Doc Mailing List , linux-kernel@vger.kernel.org, Mauro Carvalho Chehab List-Id: alsa-devel@alsa-project.org On Tue, 16 May 2017 12:46:53 +0200, Mauro Carvalho Chehab wrote: > > Em Mon, 15 May 2017 11:04:26 +0200 > Takashi Iwai escreveu: > > > On Sun, 14 May 2017 17:38:44 +0200, > > Mauro Carvalho Chehab wrote: > > > > > > The markup inside the #if 0 comment actually refers to a > > > kernel-doc markup. As we're getting rid of DocBook update it. > > > > > > Signed-off-by: Mauro Carvalho Chehab > > > > I guess you prefer taking it from your tree? Feel free to take my > > ack: > > Reviewed-by: Takashi Iwai > > In the specific case of this patch, it doesn't matter much from what > tree it would be merged, as no other patch depends on it ;) > > So, if you prefer, you can merge it directly on your tree. Otherwise, > I'll keep it on my pile of patches to be send to docs -next. OK, since the PCM stuff is being changed for 4.13, may be it's safer that I take this patch in sound git tree. thanks, Takashi > > > > > > > > thanks, > > > > Takashi > > > > > --- > > > include/sound/pcm.h | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/include/sound/pcm.h b/include/sound/pcm.h > > > index 361749e60799..bbf97d4c4c17 100644 > > > --- a/include/sound/pcm.h > > > +++ b/include/sound/pcm.h > > > @@ -1054,7 +1054,7 @@ int snd_pcm_format_unsigned(snd_pcm_format_t format); > > > int snd_pcm_format_linear(snd_pcm_format_t format); > > > int snd_pcm_format_little_endian(snd_pcm_format_t format); > > > int snd_pcm_format_big_endian(snd_pcm_format_t format); > > > -#if 0 /* just for DocBook */ > > > +#if 0 /* just for kernel-doc */ > > > /** > > > * snd_pcm_format_cpu_endian - Check the PCM format is CPU-endian > > > * @format: the format to check > > > -- > > > 2.9.3 > > > > > > > > > > Thanks, > Mauro > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751913AbdEPKvA (ORCPT ); Tue, 16 May 2017 06:51:00 -0400 Received: from mx2.suse.de ([195.135.220.15]:34315 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751146AbdEPKu5 (ORCPT ); Tue, 16 May 2017 06:50:57 -0400 Date: Tue, 16 May 2017 12:50:55 +0200 Message-ID: From: Takashi Iwai To: Mauro Carvalho Chehab Cc: "Linux Doc Mailing List" , , "Mauro Carvalho Chehab" , "Jonathan Corbet" , "Jaroslav Kysela" , Subject: Re: [PATCH 10/13] sound: fix the comments that refers to kernel-doc In-Reply-To: <20170516074653.187d499f@vento.lan> References: <3514c2b81341c160bf6753cb47fa2346f3b5a0e7.1494775891.git.mchehab@s-opensource.com> <20170516074653.187d499f@vento.lan> 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/25.2 (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: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 16 May 2017 12:46:53 +0200, Mauro Carvalho Chehab wrote: > > Em Mon, 15 May 2017 11:04:26 +0200 > Takashi Iwai escreveu: > > > On Sun, 14 May 2017 17:38:44 +0200, > > Mauro Carvalho Chehab wrote: > > > > > > The markup inside the #if 0 comment actually refers to a > > > kernel-doc markup. As we're getting rid of DocBook update it. > > > > > > Signed-off-by: Mauro Carvalho Chehab > > > > I guess you prefer taking it from your tree? Feel free to take my > > ack: > > Reviewed-by: Takashi Iwai > > In the specific case of this patch, it doesn't matter much from what > tree it would be merged, as no other patch depends on it ;) > > So, if you prefer, you can merge it directly on your tree. Otherwise, > I'll keep it on my pile of patches to be send to docs -next. OK, since the PCM stuff is being changed for 4.13, may be it's safer that I take this patch in sound git tree. thanks, Takashi > > > > > > > > thanks, > > > > Takashi > > > > > --- > > > include/sound/pcm.h | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/include/sound/pcm.h b/include/sound/pcm.h > > > index 361749e60799..bbf97d4c4c17 100644 > > > --- a/include/sound/pcm.h > > > +++ b/include/sound/pcm.h > > > @@ -1054,7 +1054,7 @@ int snd_pcm_format_unsigned(snd_pcm_format_t format); > > > int snd_pcm_format_linear(snd_pcm_format_t format); > > > int snd_pcm_format_little_endian(snd_pcm_format_t format); > > > int snd_pcm_format_big_endian(snd_pcm_format_t format); > > > -#if 0 /* just for DocBook */ > > > +#if 0 /* just for kernel-doc */ > > > /** > > > * snd_pcm_format_cpu_endian - Check the PCM format is CPU-endian > > > * @format: the format to check > > > -- > > > 2.9.3 > > > > > > > > > > Thanks, > Mauro >