The patch titled aic7*: cleanup MODULE_PARM_DESC strings has been added to the -mm tree. Its filename is aic7-cleanup-module_parm_desc-strings.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this 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 --- 25/drivers/scsi/aic7xxx/aic79xx_osm.c~aic7-cleanup-module_parm_desc-strings Mon May 8 12:01:36 2006 +++ 25-akpm/drivers/scsi/aic7xxx/aic79xx_osm.c Mon May 8 12:01:36 2006 @@ -340,7 +340,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" @@ -366,7 +366,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 --- 25/drivers/scsi/aic7xxx/aic7xxx_osm.c~aic7-cleanup-module_parm_desc-strings Mon May 8 12:01:36 2006 +++ 25-akpm/drivers/scsi/aic7xxx/aic7xxx_osm.c Mon May 8 12:01:36 2006 @@ -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 git-kbuild.patch config-exit-if-no-beginning-filename.patch git-mtd.patch git-net.patch lpfc-sparse-null-warnings.patch aic7-cleanup-module_parm_desc-strings.patch areca-raid-linux-scsi-driver.patch git-watchdog.patch add-poisonh-and-patch-primary-users.patch update-2-drivers-for-poisonh.patch add-doc-submitchecklist.patch doc-add-audit-acct-to-docbook.patch ip2-fix-sections.patch codingstyle-add-typedefs-chapter.patch acpi-identify-which-device-is-not-power-manageable.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