public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Alex Chiang <achiang@hp.com>
To: akpm@linux-foundation.org, jens.axboe@oracle.com
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>,
	Mike Miller <mikem@beardog.cce.hp.com>,
	linux-kernel@vger.kernel.org,
	"Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Subject: Re: [PATCH 2/2] hpsa: make device attrs static
Date: Wed, 11 Nov 2009 18:12:45 -0700	[thread overview]
Message-ID: <20091112011245.GA3010@grease> (raw)
In-Reply-To: <20091112002517.5660.74298.stgit@bob.kio>

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


  reply	other threads:[~2009-11-12  1:33 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-12  0:25 [PATCH 0/2] Fix cciss/hpsa build errors Alex Chiang
2009-11-12  0:25 ` [PATCH 1/2] cciss: make device attrs static Alex Chiang
2009-11-12  0:25 ` [PATCH 2/2] hpsa: " Alex Chiang
2009-11-12  1:12   ` Alex Chiang [this message]
2009-11-12 13:56     ` scameron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20091112011245.GA3010@grease \
    --to=achiang@hp.com \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=akpm@linux-foundation.org \
    --cc=jens.axboe@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mikem@beardog.cce.hp.com \
    --cc=scameron@beardog.cce.hp.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox