The patch titled aic7*: cleanup MODULE_PARM_DESC strings has been removed from the -mm tree. Its filename is aic7-cleanup-module_parm_desc-strings.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: aic7*: cleanup MODULE_PARM_DESC strings From: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Modify beginning string to be more readable. Remove one trailing newline. Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/scsi/aic7xxx/aic79xx_osm.c | 4 ++-- drivers/scsi/aic7xxx/aic7xxx_osm.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/scsi/aic7xxx/aic79xx_osm.c~aic7-cleanup-module_parm_desc-strings drivers/scsi/aic7xxx/aic79xx_osm.c --- a/drivers/scsi/aic7xxx/aic79xx_osm.c~aic7-cleanup-module_parm_desc-strings +++ a/drivers/scsi/aic7xxx/aic79xx_osm.c @@ -321,7 +321,7 @@ MODULE_LICENSE("Dual BSD/GPL"); MODULE_VERSION(AIC79XX_DRIVER_VERSION); module_param(aic79xx, charp, 0444); MODULE_PARM_DESC(aic79xx, -"period delimited, options string.\n" +"period-delimited options string:\n" " verbose Enable verbose/diagnostic logging\n" " allow_memio Allow device registers to be memory mapped\n" " debug Bitmask of debug values to enable\n" @@ -346,7 +346,7 @@ MODULE_PARM_DESC(aic79xx, " Shorten the selection timeout to 128ms\n" "\n" " options aic79xx 'aic79xx=verbose.tag_info:{{}.{}.{..10}}.seltime:1'\n" -"\n"); +); static void ahd_linux_handle_scsi_status(struct ahd_softc *, struct scsi_device *, diff -puN drivers/scsi/aic7xxx/aic7xxx_osm.c~aic7-cleanup-module_parm_desc-strings drivers/scsi/aic7xxx/aic7xxx_osm.c --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c~aic7-cleanup-module_parm_desc-strings +++ a/drivers/scsi/aic7xxx/aic7xxx_osm.c @@ -341,7 +341,7 @@ MODULE_LICENSE("Dual BSD/GPL"); MODULE_VERSION(AIC7XXX_DRIVER_VERSION); module_param(aic7xxx, charp, 0444); MODULE_PARM_DESC(aic7xxx, -"period delimited, options string.\n" +"period-delimited options string:\n" " verbose Enable verbose/diagnostic logging\n" " allow_memio Allow device registers to be memory mapped\n" " debug Bitmask of debug values to enable\n" _ Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are origin.patch git-acpi.patch acpi-fix-printk-format-warnings.patch drivers-base-check-errors.patch sysfs-add-proper-sysfs_init-prototype.patch git-lxdialog.patch mtd-printk-format-warning.patch pcmcia-ds-must_check-fixes.patch libsas-externs-not-needed.patch pcie-check-and-return-bus_register-errors-fix.patch git-scsi-misc.patch dc395x-fix-printk-format-warning.patch scsi-target-printk-format-warnings.patch add-kerneldocs-for-some-functions-in-mm-memoryc.patch tiacx-sparse-cleanups.patch consistently-use-max_errno-in-__syscall_return.patch consistently-use-max_errno-in-__syscall_return-fix.patch eisa-bus-modalias-attributes-support-1.patch kernel-params-must_check-fixes.patch blockdevc-check-errors.patch block-handle-subsystem_register-init-errors.patch fs-namespace-handle-init-registration-errors.patch kernel-doc-for-relay-interface.patch kernel-doc-move-filesystems-together.patch include-documentation-for-functions-in-drivers-base-classc.patch fix-parameter-names-in-drivers-base-classc.patch fix-kerneldoc-comments-in-kernel-timerc-fix.patch cdev-documentation-was-drop-second-arg-of-unregister_chrdev.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-printk-format-warning.patch ecryptfs-fix-printk-format-warnings.patch ide-core-must_check-fixes.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