lkml.org 
[lkml]   [2009]   [Nov]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/2] hpsa: make device attrs static
Ah whoops --

* Alex Chiang <achiang@hp.com>:
>
> diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
> index e402155..aae5f5a 100644
> --- a/drivers/scsi/hpsa.c
> +++ b/drivers/scsi/hpsa.c
> @@ -146,11 +146,11 @@ static ssize_t lunid_show(struct device *dev,
> static ssize_t unique_id_show(struct device *dev,
> struct device_attribute *attr, char *buf);
>
> -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);
> +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);
>
> -struct device_attribute *hpsa_sdev_attrs[] = {
> +static struct device_attribute *hpsa_sdev_attrs[] = {
> &dev_attr_raid_level,
> &dev_attr_lunid,
> &dev_attr_unique_id,

This will conflict with the patch that Stephen sent earlier today

[PATCH 11/17] hpsa: Make hpsa_sdev_attrs static
Message-ID: <20091111165119.17754.81784.stgit@beardog.cce.hp.com>

My patch does more. ;)

I suggest whoever picks up Stephen's series drops his 11/17 patch
and takes mine instead.

On the other hand, Stephen, if you have to go through some
revisions and end up reposting your patch set, can you pick this
one up too?

Thanks,
/ac



\
 
 \ /
  Last update: 2009-11-12 02:35    [W:0.444 / U:0.080 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site