The patch titled scripts/kernel-doc: fix fatal error on function prototype has been added to the -mm tree. Its filename is scripts-kernel-doc-fix-fatal-error-on-function-prototype.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://userweb.kernel.org/~akpm/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: scripts/kernel-doc: fix fatal error on function prototype From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Fix a fatal error in scripts/kernel-doc when a function signature uses __init_or_module (just ignore that string): Error(drivers/base/platform.c:568): cannot understand prototype: 'struct platform_device * __init_or_module platform_create_bundle(struct platform_driver *driver, int (*probe)(struct platform_device *), struct resource *res, unsigned int n_res, const void *data, size_t size) ' Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/kernel-doc | 1 + 1 file changed, 1 insertion(+) diff -puN scripts/kernel-doc~scripts-kernel-doc-fix-fatal-error-on-function-prototype scripts/kernel-doc --- a/scripts/kernel-doc~scripts-kernel-doc-fix-fatal-error-on-function-prototype +++ a/scripts/kernel-doc @@ -1730,6 +1730,7 @@ sub dump_function($$) { $prototype =~ s/^noinline +//; $prototype =~ s/__devinit +//; $prototype =~ s/__init +//; + $prototype =~ s/__init_or_module +//; $prototype =~ s/^#\s*define\s+//; #ak added $prototype =~ s/__attribute__\s*\(\([a-z,]*\)\)//; _ Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are scripts-kernel-doc-handle-struct-member-__aligned.patch documentation-rename-pci-pci-dma-mappingtxt-to-dma-api-howtotxt.patch scripts-kernel-doc-fix-fatal-error-on-function-prototype.patch linux-next.patch vmwgfx-depends-on-fb-to-fix-build-errors.patch dib3000mc-reduce-large-stack-usage.patch dib7000p-reduce-large-stack-usage.patch led-driver-for-the-soekris-net5501-board-fix-2.patch scsi-fix-convert-scsi_scanc-kernel-doc.patch scsi-update-drivers-tools-url-references.patch reiser4-export-remove_from_page_cache-fix.patch mutex-subsystem-synchro-test-module-add-missing-header-file.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