The patch titled hpsa: make device attrs static has been removed from the -mm tree. Its filename was hpsa-make-device-attrs-static.patch This patch was dropped because it was folded into scsi-add-hpsa-driver-for-hp-smart-array-controllers.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: hpsa: make device attrs static From: Alex Chiang <achiang@xxxxxx> No need to export those device attributes. In fact, without this patch, we can trip over a build error if hpsa is a built-in and another driver also declares and exports attributes with the same name. You'll see errors like: drivers/scsi/built-in.o: multiple definition of `dev_attr_lunid' drivers/block/built-in.o: first defined here Signed-off-by: Alex Chiang <achiang@xxxxxx> Cc: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx> Cc: Mike Miller <mikem@xxxxxxxxxxxxxxxxxx> Cc: Jens Axboe <jens.axboe@xxxxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/scsi/hpsa.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/scsi/hpsa.c~hpsa-make-device-attrs-static drivers/scsi/hpsa.c --- a/drivers/scsi/hpsa.c~hpsa-make-device-attrs-static +++ a/drivers/scsi/hpsa.c @@ -151,10 +151,10 @@ static int check_for_unit_attention(stru static void check_ioctl_unit_attention(struct ctlr_info *h, struct CommandList *c); -DEVICE_ATTR(raid_level, S_IRUGO, raid_level_show, NULL); -DEVICE_ATTR(lunid, S_IRUGO, lunid_show, NULL); -DEVICE_ATTR(unique_id, S_IRUGO, unique_id_show, NULL); -DEVICE_ATTR(rescan, S_IWUSR, NULL, host_store_rescan); +static DEVICE_ATTR(raid_level, S_IRUGO, raid_level_show, NULL); +static DEVICE_ATTR(lunid, S_IRUGO, lunid_show, NULL); +static DEVICE_ATTR(unique_id, S_IRUGO, unique_id_show, NULL); +static DEVICE_ATTR(rescan, S_IWUSR, NULL, host_store_rescan); static struct device_attribute *hpsa_sdev_attrs[] = { &dev_attr_raid_level, _ Patches currently in -mm which might be from achiang@xxxxxx are linux-next.patch scsi-add-hpsa-driver-for-hp-smart-array-controllers.patch hpsa-make-device-attrs-static.patch page-types-learn-to-describe-flags-directly-from-command-line.patch page-types-whitespace-alignment.patch page-types-exit-early-when-invoked-with-d-describe.patch mm-add-numa-node-symlink-for-memory-section-in-sysfs.patch mm-refactor-register_cpu_under_node.patch mm-refactor-unregister_cpu_under_node.patch mm-add-numa-node-symlink-for-cpu-devices-in-sysfs.patch documentation-abi-sys-devices-system-cpu-cpu-node.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