Re: [PATCH next] DocBook: More properly fix media/v4l/compat.xml mis-merge

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



At Tue, 21 Oct 2014 14:07:14 -0200,
Mauro Carvalho Chehab wrote:
> 
> Em Tue, 21 Oct 2014 17:41:25 +0200
> Takashi Iwai <tiwai@xxxxxxx> escreveu:
> 
> > The "V4L2 in Linux 3.18" should be rather in a new section, as the
> > original commit was intended.
> 
> Hi Takashi,
> 
> Thanks for the patch, but I just merged one that did exactly that
> (and also added the missing /orderedlist):
> 	http://git.linuxtv.org/cgit.cgi/media_tree.git/commit/?h=fixes&id=b832e749f0c750b06deece320489e8a9e6ae9e80

Oh this conflicts with Randy's fix that has been already on
linux-next...  My fix was on top of Randy's commit.


Takashi

> 
> Regards,
> Mauro
> 
> > 
> > Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
> > ---
> >  Documentation/DocBook/media/v4l/compat.xml | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml
> > index a7a15fc65b7b..0a2debfa68f6 100644
> > --- a/Documentation/DocBook/media/v4l/compat.xml
> > +++ b/Documentation/DocBook/media/v4l/compat.xml
> > @@ -2567,6 +2567,9 @@ fields changed from _s32 to _u32.
> >  	  </para>
> >          </listitem>
> >        </orderedlist>
> > +    </section>
> > +
> > +    <section>
> >        <title>V4L2 in Linux 3.18</title>
> >        <orderedlist>
> >  	<listitem>
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-doc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Kernel Newbies]     [Security]     [Netfilter]     [Bugtraq]     [Linux FS]     [Yosemite Forum]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Video 4 Linux]     [Device Mapper]     [Linux Resources]

  Powered by Linux