The patch titled ide-floppy: fix debug-only syntax error has been added to the -mm tree. Its filename is ide-floppy-fix-debug-only-syntax-error.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: ide-floppy: fix debug-only syntax error From: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Fix debug-only printk syntax error. Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/ide/ide-floppy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/ide/ide-floppy.c~ide-floppy-fix-debug-only-syntax-error drivers/ide/ide-floppy.c --- a/drivers/ide/ide-floppy.c~ide-floppy-fix-debug-only-syntax-error +++ a/drivers/ide/ide-floppy.c @@ -1284,7 +1284,7 @@ static ide_startstop_t idefloppy_do_requ debug_log(KERN_INFO "rq_status: %d, dev: %s, flags: %lx, errors: %d\n", rq->rq_status, - rq->rq_disk ? rq->rq_disk->disk_name ? "?", + rq->rq_disk ? rq->rq_disk->disk_name : "?", rq->flags, rq->errors); debug_log(KERN_INFO "sector: %ld, nr_sectors: %ld, " "current_nr_sectors: %d\n", (long)rq->sector, _ Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are git-alsa.patch git-dvb.patch git-infiniband.patch git-kbuild.patch git-mtd.patch git-netdev-all.patch git-pcmcia.patch lpfc-sparse-null-warnings.patch aic7-cleanup-module_parm_desc-strings.patch qla1280-fix-section-mismatch-warnings.patch areca-raid-linux-scsi-driver.patch git-watchdog.patch slab-kmalloc-kzalloc-comments-cleanup-and-fix.patch kernel-doc-for-mm-filemapc.patch add-poisonh-and-patch-primary-users.patch update-2-drivers-for-poisonh.patch poison-add-use-more-constants.patch add-doc-submitchecklist.patch doc-add-audit-acct-to-docbook.patch codingstyle-add-typedefs-chapter.patch fix-listh-kernel-doc.patch listh-doc-change-counter-to-control.patch kernel-doc-drop-leading-space-in-sections.patch kernel-doc-script-cleanups.patch wd7000-fix-section-mismatch-warnings.patch megaraid_mbox-fix-section-mismatch-warnings.patch kernel-doc-mm-readhead-fixup.patch checkstack-pirnt-module-names.patch wan-sdla-section-fixes.patch trident-fb-section-fixes.patch cdrom-mcdx-section-fixes.patch char-ip2-more-section-fixes-replacement.patch advansys-section-fixes.patch kernel-doc-warn-on-malformed-function-docs.patch ide-floppy-fix-debug-only-syntax-error.patch pi-futex-rt-mutex-docs-update.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