The patch titled 3w-xxxx: fix "ATA UDMA upgrade" message number has been removed from the -mm tree. Its filename is 3w-xxxx-fix-ata-udma-upgrade-message-number.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: 3w-xxxx: fix "ATA UDMA upgrade" message number From: Alexey Dobriyan <adobriyan@xxxxxxxxx> sparse "defined twice" warning Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/scsi/3w-xxxx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/scsi/3w-xxxx.h~3w-xxxx-fix-ata-udma-upgrade-message-number drivers/scsi/3w-xxxx.h --- a/drivers/scsi/3w-xxxx.h~3w-xxxx-fix-ata-udma-upgrade-message-number +++ a/drivers/scsi/3w-xxxx.h @@ -74,7 +74,7 @@ static char *tw_aen_string[] = { [0x00D] = "ERROR: Logical unit deleted: Unit #", [0x00F] = "WARNING: SMART threshold exceeded: Port #", [0x021] = "WARNING: ATA UDMA downgrade: Port #", - [0x021] = "WARNING: ATA UDMA upgrade: Port #", + [0x022] = "WARNING: ATA UDMA upgrade: Port #", [0x023] = "WARNING: Sector repair occurred: Port #", [0x024] = "ERROR: SBUF integrity check failure", [0x025] = "ERROR: Lost cached write: Port #", _ Patches currently in -mm which might be from adobriyan@xxxxxxxxx are origin.patch jbd-use-build_bug_on-in-journal-init.patch really-ignore-kmem_cache_destroy-return-value.patch make-kmem_cache_destroy-return-void.patch asus_acpi-fix-proc-files-parsing.patch asus_acpi-dont-printk-on-writing-garbage-to-proc-files.patch git-dvb.patch git-ieee1394.patch config_pm=n-slim-drivers-pcmcia.patch i82092-wire-up-errors-from-pci_register_driver.patch config_pm=n-slim-drivers-serial-8250_pcic.patch git-scsi-misc.patch megaraid-fix-warnings-when-config_proc_fs=n.patch task_struct-ifdef-missedem-v-ipc.patch ifdef-blktrace-debugging-fields.patch tty_ioc-keep-davej-sane.patch ifdef-quota_read-quota_write.patch reiserfs-ifdef-xattr_sem.patch reiserfs-ifdef-acl-stuff-from-inode.patch fsh-ifdef-security-fields.patch config_pm=n-slim-drivers-parport-parport_serialc.patch config_pm=n-slim-sound-oss-tridentc.patch config_pm=n-slim-sound-oss-cs46xxc.patch windfarm_smu_satc-simplify-around-i2c_add_driver.patch cramfs-rewrite-init_cramfs_fs.patch freevxfs-fix-leak-on-error-path.patch cramfs-make-cramfs_uncompress_exit-return-void.patch 9p-fix-leak-on-error-path.patch ban-register_filesystemnull.patch documentation-submittingdrivers-minor-update.patch kmemdup-introduce.patch kmemdup-some-users.patch create-fs-utimesc.patch proper-flags-type-of-spin_lock_irqsave.patch remove-null-check-in-register_nls.patch make-kmem_cache_destroy-return-void-ecryptfs.patch config_pm=n-slim-drivers-ide-pci-sc1200c.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