Re: [PATCH v2] drm/i915: Improve kernel-doc for i915_audio_component struct

[Daniel Vetter <daniel@ffwll.ch>]

On Tue, Oct 13, 2015 at 05:39:18PM +0200, Daniel Vetter wrote:
> On Tue, Oct 13, 2015 at 11:40:23AM +0200, Takashi Iwai wrote:
> > On Mon, 12 Oct 2015 10:17:51 +0200,
> > David Henningsson wrote:
> > > 
> > > 
> > > 
> > > On 2015-10-12 10:07, David Henningsson wrote:
> > > > To make kernel-doc happy, the i915_audio_component_audio_ops struct
> > > > cannot be nested.
> > > >
> > > > Signed-off-by: David Henningsson <david.henningsson@canonical.com>
> > > > ---
> > > 
> > > Changes since v1:
> > > 
> > >   * Added a notice about when pin_eld_notify is called
> > > 
> > >   * Uses new inline struct member style
> > > 
> > > Verified with "make htmldocs", looks fine to me.
> > > 
> > > Also, applies to Takashi's tree (master branch), maybe we should take it 
> > > through Takashi's tree to avoid conflicts, especially as there might be 
> > > more stuff coming that way (dp mst support from Mengdong, and perhaps 
> > > info retrieval from me).
> > 
> > I'm fine to take it, just let me know (and give acks).
> 
> There's other doc patches floating around for this, and I've already
> pulled in your branch. Soproabbyl simpler if I pull this into
> drm-intel.git

Worse, it conflicts all over with the docbook I have already. But I like
yours better, so can you please rebase and merge with what we have?

Thanks, Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx