The patch titled drivers/scsi/arcmsr/: cleanups has been removed from the -mm tree. Its filename is drivers-scsi-arcmsr-cleanups.patch This patch was dropped because it was folded into areca-raid-linux-scsi-driver.patch ------------------------------------------------------ Subject: drivers/scsi/arcmsr/: cleanups From: Adrian Bunk <bunk@xxxxxxxxx> - arcmsr_attr.c: #if 0 the unused arcmsr_free_sysfs_attr() - arcmsr_hba.c: make the needlessly global arcmsr_iop_reset() static Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> Cc: Erich Chen <erich@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/scsi/arcmsr/arcmsr_attr.c | 2 ++ drivers/scsi/arcmsr/arcmsr_hba.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff -puN drivers/scsi/arcmsr/arcmsr_attr.c~drivers-scsi-arcmsr-cleanups drivers/scsi/arcmsr/arcmsr_attr.c --- a/drivers/scsi/arcmsr/arcmsr_attr.c~drivers-scsi-arcmsr-cleanups +++ a/drivers/scsi/arcmsr/arcmsr_attr.c @@ -171,12 +171,14 @@ arcmsr_alloc_sysfs_attr(struct AdapterCo &arcmsr_sysfs_message_transfer_attr); } +#if 0 void arcmsr_free_sysfs_attr(struct AdapterControlBlock *acb) { struct Scsi_Host *host = acb->host; sysfs_remove_bin_file(&host->shost_gendev.kobj, &arcmsr_sysfs_message_transfer_attr); } +#endif /* 0 */ static ssize_t arcmsr_attr_host_driver_version(struct class_device *cdev, char *buf) { diff -puN drivers/scsi/arcmsr/arcmsr_hba.c~drivers-scsi-arcmsr-cleanups drivers/scsi/arcmsr/arcmsr_hba.c --- a/drivers/scsi/arcmsr/arcmsr_hba.c~drivers-scsi-arcmsr-cleanups +++ a/drivers/scsi/arcmsr/arcmsr_hba.c @@ -1357,7 +1357,7 @@ static void arcmsr_iop_init(struct Adapt acb->acb_flags |= ACB_F_IOP_INITED; } -void arcmsr_iop_reset(struct AdapterControlBlock *acb) +static void arcmsr_iop_reset(struct AdapterControlBlock *acb) { struct MessageUnit __iomem *reg = acb->pmu; struct CommandControlBlock *ccb; _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch git-alsa.patch make-sound-isa-gus-gusextremecdevices-static.patch arch-arm-kernel-bios32c-no-need-to-set-isa_bridge.patch git-cpufreq.patch git-gfs2.patch if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch make-variables-static-after-klibc-merge.patch git-libata-all.patch git-mtd.patch drivers-net-e1000-possible-cleanups.patch fs-nfs-make-2-functions-static.patch fs-nfs-make-code-static.patch git-pcmcia.patch include-scsi-libsash-should-include-linux-scatterlisth.patch gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch git-scsi-rc-fixes.patch drivers-scsi-aic7xxx-possible-cleanups.patch drivers-scsi-small-cleanups.patch drivers-scsi-qla2xxx-make-some-functions-static.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch drivers-scsi-aic7xxx-possible-cleanups-2.patch drivers-scsi-advansysc-cleanups.patch make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch megaraid-fix-warnings-when-config_proc_fs=n.patch areca-raid-linux-scsi-driver.patch drivers-scsi-arcmsr-cleanups.patch areca-raid-linux-scsi-driver-update7-fix-2.patch mm-make-functions-static.patch acx1xx-wireless-driver.patch drivers-edac-make-code-static.patch inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix.patch reiserfs-warn-about-the-useless-nolargeio-option.patch x86-microcode-add-sysfs-and-hotplug-support-fix-fix-2.patch null-terminate-over-long-proc-kallsyms-symbols-fix.patch remove-kernel-kthreadckthread_stop_sem.patch drivers-block-cpqarrayc-remove-an-unused-variable.patch unexport-open_softirq.patch task-watchers-register-semundo-task-watcher.patch fs-ecryptfs-possible-cleanups.patch ecryptfs-add-a-maintainers-entry.patch make-kernel-sysctlc_proc_do_string-static.patch namespaces-utsname-sysctl-hack-fix.patch namespaces-utsname-implement-clone_newuts-flag.patch fs-reiser4-possible-cleanups.patch drivers-ide-cleanups.patch srcu-3-add-srcu-operations-to-rcutorture-fix.patch the-scheduled-removal-of-some-oss-drivers.patch the-scheduled-removal-of-some-oss-drivers-fix.patch the-scheduled-removal-of-some-oss-drivers-fix-fix.patch kill-sound-oss-_symsc.patch slab-cache-shrinker-statistics.patch i386-enable-4k-stacks-by-default.patch mutex-subsystem-synchro-test-module.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