| Message ID | 1463594869-6335-1-git-send-email-eric.desrochers@canonical.com |
|---|---|
| State | New |
| Headers | show |
Clean cherry-pick, positive test results
Positive testing
Applied to Wily, but note: On Wed, May 18, 2016 at 02:07:49PM -0400, Eric Desrochers wrote: > From: Eric Desrochers <slashd@ubuntu.com> > That extra "From: Eric ..." line at the start of the message body is not correct (it would replace the author of the patch when applied). I have removed that, leaving the proper in-body From line instead: > From: Tomas Henzl <thenzl@redhat.com> > -Kamal > BugLink: https://bugs.launchpad.net/bugs/1581169 > > This patch fixes a 'general protection fault' issue by > moving the attribute to where it was likely meant. > > Signed-off-by: Tomas Henzl <thenzl@redhat.com> > Signed-off-by: Don Brace <don.brace@pmcs.com> > Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> > (cherry picked from commit fb53c439d84387621c53808a3957ffd9876e5094) > Signed-off-by: Eric Desrochers <slashd@ubuntu.com> > --- > drivers/scsi/hpsa.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c > index cab4e98..c8d00ce 100644 > --- a/drivers/scsi/hpsa.c > +++ b/drivers/scsi/hpsa.c > @@ -744,7 +744,6 @@ static struct device_attribute *hpsa_sdev_attrs[] = { > &dev_attr_lunid, > &dev_attr_unique_id, > &dev_attr_hp_ssd_smart_path_enabled, > - &dev_attr_lockup_detected, > NULL, > }; > > @@ -756,6 +755,7 @@ static struct device_attribute *hpsa_shost_attrs[] = { > &dev_attr_resettable, > &dev_attr_hp_ssd_smart_path_status, > &dev_attr_raid_offload_debug, > + &dev_attr_lockup_detected, > NULL, > }; > > -- > 1.9.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index cab4e98..c8d00ce 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -744,7 +744,6 @@ static struct device_attribute *hpsa_sdev_attrs[] = { &dev_attr_lunid, &dev_attr_unique_id, &dev_attr_hp_ssd_smart_path_enabled, - &dev_attr_lockup_detected, NULL, }; @@ -756,6 +755,7 @@ static struct device_attribute *hpsa_shost_attrs[] = { &dev_attr_resettable, &dev_attr_hp_ssd_smart_path_status, &dev_attr_raid_offload_debug, + &dev_attr_lockup_detected, NULL, };