Re: [patch -mmotm] docbook: duplicate kernel-locking doc merge

From: Andrew Morton
Date: Wed May 28 2008 - 01:14:45 EST


On Tue, 27 May 2008 22:13:27 -0700 Randy Dunlap <randy.dunlap@xxxxxxxxxx> wrote:

>
> From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
>
> Removed duplicated patch lines.
>
> I was checking mmotm (2008-0527) kernel docs and got this error:
>
> xmlto: input does not validate (status 3)
> /local/linsrc/mmotm-2008-0527-0032/Documentation/DocBook/kernel-locking.xml:722: element chapter: validity error : ID trylock-functions already defined
> <chapter id="trylock-functions">
> ^
> /local/linsrc/mmotm-2008-0527-0032/Documentation/DocBook/kernel-locking.xml:722: element chapter: validity error : ID trylock-functions already defined
> Document /local/linsrc/mmotm-2008-0527-0032/Documentation/DocBook/kernel-locking.xml does not validate
> make[1]: *** [Documentation/DocBook/kernel-locking.html] Error 3
> make[1]: *** Waiting for unfinished jobs....
> make: *** [htmldocs] Error 2
>
> Looks like Rusty's doc additions were duplicated.

ah, thanks, that's me trying to pick up patches which aren't in linux-next
yet. I normally don't bother doing that unless there's a lot of material
involved.

I'll zap the erroneously-included
rusty-misc-doc_add_a_chapter_about_trylock_functions_bug_9011.patch
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/