Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.cz>2012-10-08 10:43:36 +0200
committerJiri Kosina <jkosina@suse.cz>2012-10-09 13:58:45 +0200
commita8dc443952907740fd22fa66a29bcaa104b5a09c (patch)
tree7fc625d35443bb941d09f2dba142a18bc9cd1015
parentf266e647f79a52d34083d2b09dd6c8b83af6ad30 (diff)
- patches.drivers/megaraid-sas-boot-hangs-while-LD-is-offline.patch:rpm-3.0.42-0.7
Typo fix.
-rw-r--r--kernel-source.changes6
-rw-r--r--patches.drivers/megaraid-sas-boot-hangs-while-LD-is-offline.patch20
2 files changed, 16 insertions, 10 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 157352eb11..fc3f4c9090 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Oct 8 10:43:22 CEST 2012 - mhocko@suse.cz
+
+- patches.drivers/megaraid-sas-boot-hangs-while-LD-is-offline.patch:
+ Typo fix.
+
+-------------------------------------------------------------------
Mon Sep 24 23:21:54 CEST 2012 - jkosina@suse.cz
- rpm/kernel-binary.spec.in: Temporarily disable icecream builds
diff --git a/patches.drivers/megaraid-sas-boot-hangs-while-LD-is-offline.patch b/patches.drivers/megaraid-sas-boot-hangs-while-LD-is-offline.patch
index ebb7665a3d..7042fd2852 100644
--- a/patches.drivers/megaraid-sas-boot-hangs-while-LD-is-offline.patch
+++ b/patches.drivers/megaraid-sas-boot-hangs-while-LD-is-offline.patch
@@ -12,8 +12,12 @@ Signed-off-by: Sumit Saxena <Sumit.Saxena@lsi.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Acked-by: Hannes Reinecke <hare@suse.de>
-diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
-index 7370c08..a8f772f 100644
+---
+ drivers/scsi/megaraid/megaraid_sas.h | 9 +++++++++
+ drivers/scsi/megaraid/megaraid_sas_base.c | 28 ++++++++++++++++++----------
+ drivers/scsi/megaraid/megaraid_sas_fp.c | 2 +-
+ 3 files changed, 28 insertions(+), 11 deletions(-)
+
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -332,6 +332,15 @@ enum MR_PD_STATE {
@@ -32,11 +36,9 @@ index 7370c08..a8f772f 100644
/*
* defines the physical drive address structure
-diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
-index fcaddfd..ad2cb20 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
-@@ -1522,6 +1522,7 @@ static struct megasas_instance *megasas_lookup_instance(u16 host_no)
+@@ -1522,6 +1522,7 @@ static struct megasas_instance *megasas_
static int megasas_slave_configure(struct scsi_device *sdev)
{
u16 pd_index = 0;
@@ -44,7 +46,7 @@ index fcaddfd..ad2cb20 100644
struct megasas_instance *instance ;
instance = megasas_lookup_instance(sdev->host->host_no);
-@@ -1533,16 +1534,23 @@ static int megasas_slave_configure(struct scsi_device *sdev)
+@@ -1533,16 +1534,23 @@ static int megasas_slave_configure(struc
* That will be fixed once LSI engineers have audited the
* firmware for possible issues.
*/
@@ -58,7 +60,7 @@ index fcaddfd..ad2cb20 100644
- MEGASAS_DEFAULT_CMD_TIMEOUT * HZ);
- return 0;
- }
-+ pd_index = (sdev->channel * MEGASAS_MAX_DEV_PER_CHANNEL) + sdev_id;
++ pd_index = (sdev->channel * MEGASAS_MAX_DEV_PER_CHANNEL) + sdev->id;
+
+ /* Skip for LD offline and PD which are not configured as
+ * system pd.
@@ -71,15 +73,13 @@ index fcaddfd..ad2cb20 100644
+ }
+
+ ld_index = ((sdev->channel - 2) * MEGASAS_MAX_DEV_PER_CHANNEL)
-+ + sdev_id;
++ + sdev->id;
+ /* Need to find out best value to detect LD */
+ if ((sdev->channel >= MEGASAS_MAX_LD_CHANNELS) &&
+ (instance->ld_ids[ld_index] == 0xFF)) {
return -ENXIO;
}
-diff --git a/drivers/scsi/megaraid/megaraid_sas_fp.c b/drivers/scsi/megaraid/megaraid_sas_fp.c
-index 8fe3a45..e4aa580 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fp.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fp.c
@@ -52,10 +52,10 @@