[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20091112135628.GC18312@beardog.cce.hp.com>
Date: Thu, 12 Nov 2009 07:56:28 -0600
From: scameron@...rdog.cce.hp.com
To: Alex Chiang <achiang@...com>
Cc: akpm@...ux-foundation.org, jens.axboe@...cle.com,
James Bottomley <James.Bottomley@...senPartnership.com>,
Mike Miller <mikem@...rdog.cce.hp.com>,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH 2/2] hpsa: make device attrs static
On Wed, Nov 11, 2009 at 06:12:45PM -0700, Alex Chiang wrote:
> Ah whoops --
>
> * Alex Chiang <achiang@...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@...rdog.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?
Sounds good. Thanks.
-- steve
>
> Thanks,
> /ac
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists