The patch titled kernel-doc: prevent duplicate description: output has been added to the -mm tree. Its filename is kernel-doc-prevent-duplicate-description-output.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: kernel-doc: prevent duplicate description: output From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Prevent duplicate output of a Description: section when there is a "blank" ("*") line between the initial function name/description line and the "Description:" header. Test case: drivers/scsi/scsi_devinfo.c::scsi_init_devinfo(). Rob Landley hit this while he was producing SCSI kernel-doc. Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/kernel-doc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN scripts/kernel-doc~kernel-doc-prevent-duplicate-description-output scripts/kernel-doc --- a/scripts/kernel-doc~kernel-doc-prevent-duplicate-description-output +++ a/scripts/kernel-doc @@ -1907,7 +1907,7 @@ sub process_file($) { $newsection = $1; $newcontents = $2; - if ($contents ne "") { + if (($contents ne "") && ($contents ne "\n")) { if (!$in_doc_sect && $verbose) { print STDERR "Warning(${file}:$.): contents before sections\n"; ++$warnings; _ Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are origin.patch git-alsa.patch docbook-fix-drivers-base-class-warning.patch git-kbuild.patch hamradio-fix-dmascc-section-mismatch.patch e1000e-make-e1000e-default-to-the-same-kconfig-setting-as-e1000.patch pcmcia-include-bad-cis-filename-in-error-message.patch git-unionfs.patch git-ipwireless_cs.patch git-x86.patch register_cpu-__devinit-or-__cpuinit.patch cciss-use-upper_32_bits-macro-to-eliminate-warnings.patch dio-fix-kernel-doc-notation.patch tpm-infineon-section-mismatch.patch tdfxfb-fix-section-mismatch-warnings.patch uvesafb-small-cleanups.patch documentation-move-dnotifytxt-to-filesystems.patch documentation-move-sharedsubtreestxt-to-filesystems.patch documentation-create-new-scheduler-subdirectory.patch reporting-bugs-cc-the-mailing-list-too.patch kernel-doc-prevent-duplicate-description-output.patch kernel-doc-warn-on-badly-formatted-short-description.patch fs-menu-small-reorg.patch the-scheduled-time-option-removal.patch profile-likely-unlikely-macros.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html