diff for duplicates of <7cd6ea234585450f972a5cdd73961e97@microsemi.com>
diff --git a/a/1.txt b/N1/1.txt
index 92f50df..cdda976 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -13,15 +13,14 @@
> <kashyap.desai@broadcom.com>; Peter Rivera <peter.rivera@broadcom.com>;
> Paolo Bonzini <pbonzini@redhat.com>; Laurence Oberman
> <loberman@redhat.com>; Ming Lei <ming.lei@redhat.com>
-> Subject: [PATCH V2 7/8] scsi: hpsa: call hpsa_hba_inquiry() after adding =
-host
->=20
+> Subject: [PATCH V2 7/8] scsi: hpsa: call hpsa_hba_inquiry() after adding host
+>
> EXTERNAL EMAIL
->=20
->=20
+>
+>
> So that we can decide the default reply queue by the map created
> during adding host.
->=20
+>
> Cc: Hannes Reinecke <hare@suse.de>
> Cc: Arun Easi <arun.easi@cavium.com>
> Cc: Omar Sandoval <osandov@fb.com>,
@@ -38,40 +37,35 @@ host
> ---
> drivers/scsi/hpsa.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
->=20
+>
> diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
> index 287e5eb0723f..443eabf63a9f 100644
> --- a/drivers/scsi/hpsa.c
> +++ b/drivers/scsi/hpsa.c
-> @@ -8691,12 +8691,9 @@ static int hpsa_init_one(struct pci_dev *pdev, con=
-st
+> @@ -8691,12 +8691,9 @@ static int hpsa_init_one(struct pci_dev *pdev, const
> struct pci_device_id *ent)
> /* Disable discovery polling.*/
-> h->discovery_polling =3D 0;
->=20
+> h->discovery_polling = 0;
+>
> -
> /* Turn the interrupts on so we can service requests */
> h->access.set_intr_mask(h, HPSA_INTR_ON);
->=20
+>
> - hpsa_hba_inquiry(h);
> -
-> h->lastlogicals =3D kzalloc(sizeof(*(h->lastlogicals)), GFP_KERNE=
-L);
+> h->lastlogicals = kzalloc(sizeof(*(h->lastlogicals)), GFP_KERNEL);
> if (!h->lastlogicals)
> dev_info(&h->pdev->dev,
-> @@ -8707,6 +8704,8 @@ static int hpsa_init_one(struct pci_dev *pdev, cons=
-t
+> @@ -8707,6 +8704,8 @@ static int hpsa_init_one(struct pci_dev *pdev, const
> struct pci_device_id *ent)
> if (rc)
-> goto clean7; /* perf, sg, cmd, irq, shost, pci, lu, aer/h=
- */
->=20
+> goto clean7; /* perf, sg, cmd, irq, shost, pci, lu, aer/h */
+>
> + hpsa_hba_inquiry(h);
> +
> /* Monitor the controller for firmware lockups */
-> h->heartbeat_sample_interval =3D HEARTBEAT_SAMPLE_INTERVAL;
-> INIT_DELAYED_WORK(&h->monitor_ctlr_work, hpsa_monitor_ctlr_worker=
-);
+> h->heartbeat_sample_interval = HEARTBEAT_SAMPLE_INTERVAL;
+> INIT_DELAYED_WORK(&h->monitor_ctlr_work, hpsa_monitor_ctlr_worker);
> --
> 2.9.5
diff --git a/a/content_digest b/N1/content_digest
index 7910055..fbc2818 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -55,15 +55,14 @@
"> <kashyap.desai\@broadcom.com>; Peter Rivera <peter.rivera\@broadcom.com>;\n",
"> Paolo Bonzini <pbonzini\@redhat.com>; Laurence Oberman\n",
"> <loberman\@redhat.com>; Ming Lei <ming.lei\@redhat.com>\n",
- "> Subject: [PATCH V2 7/8] scsi: hpsa: call hpsa_hba_inquiry() after adding =\n",
- "host\n",
- ">=20\n",
+ "> Subject: [PATCH V2 7/8] scsi: hpsa: call hpsa_hba_inquiry() after adding host\n",
+ "> \n",
"> EXTERNAL EMAIL\n",
- ">=20\n",
- ">=20\n",
+ "> \n",
+ "> \n",
"> So that we can decide the default reply queue by the map created\n",
"> during adding host.\n",
- ">=20\n",
+ "> \n",
"> Cc: Hannes Reinecke <hare\@suse.de>\n",
"> Cc: Arun Easi <arun.easi\@cavium.com>\n",
"> Cc: Omar Sandoval <osandov\@fb.com>,\n",
@@ -80,40 +79,35 @@
"> ---\n",
"> drivers/scsi/hpsa.c | 5 ++---\n",
"> 1 file changed, 2 insertions(+), 3 deletions(-)\n",
- ">=20\n",
+ "> \n",
"> diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c\n",
"> index 287e5eb0723f..443eabf63a9f 100644\n",
"> --- a/drivers/scsi/hpsa.c\n",
"> +++ b/drivers/scsi/hpsa.c\n",
- "> \@\@ -8691,12 +8691,9 \@\@ static int hpsa_init_one(struct pci_dev *pdev, con=\n",
- "st\n",
+ "> \@\@ -8691,12 +8691,9 \@\@ static int hpsa_init_one(struct pci_dev *pdev, const\n",
"> struct pci_device_id *ent)\n",
"> /* Disable discovery polling.*/\n",
- "> h->discovery_polling =3D 0;\n",
- ">=20\n",
+ "> h->discovery_polling = 0;\n",
+ "> \n",
"> -\n",
"> /* Turn the interrupts on so we can service requests */\n",
"> h->access.set_intr_mask(h, HPSA_INTR_ON);\n",
- ">=20\n",
+ "> \n",
"> - hpsa_hba_inquiry(h);\n",
"> -\n",
- "> h->lastlogicals =3D kzalloc(sizeof(*(h->lastlogicals)), GFP_KERNE=\n",
- "L);\n",
+ "> h->lastlogicals = kzalloc(sizeof(*(h->lastlogicals)), GFP_KERNEL);\n",
"> if (!h->lastlogicals)\n",
"> dev_info(&h->pdev->dev,\n",
- "> \@\@ -8707,6 +8704,8 \@\@ static int hpsa_init_one(struct pci_dev *pdev, cons=\n",
- "t\n",
+ "> \@\@ -8707,6 +8704,8 \@\@ static int hpsa_init_one(struct pci_dev *pdev, const\n",
"> struct pci_device_id *ent)\n",
"> if (rc)\n",
- "> goto clean7; /* perf, sg, cmd, irq, shost, pci, lu, aer/h=\n",
- " */\n",
- ">=20\n",
+ "> goto clean7; /* perf, sg, cmd, irq, shost, pci, lu, aer/h */\n",
+ "> \n",
"> + hpsa_hba_inquiry(h);\n",
"> +\n",
"> /* Monitor the controller for firmware lockups */\n",
- "> h->heartbeat_sample_interval =3D HEARTBEAT_SAMPLE_INTERVAL;\n",
- "> INIT_DELAYED_WORK(&h->monitor_ctlr_work, hpsa_monitor_ctlr_worker=\n",
- ");\n",
+ "> h->heartbeat_sample_interval = HEARTBEAT_SAMPLE_INTERVAL;\n",
+ "> INIT_DELAYED_WORK(&h->monitor_ctlr_work, hpsa_monitor_ctlr_worker);\n",
"> --\n",
"> 2.9.5\n",
"\n",
@@ -123,4 +117,4 @@
"Acked-by: Don Brace <don.brace\@microsemi.com>"
]
-b3e88ea09523056c6862be61bb74dc7dc1d202a2dc7dce6a7b370cc0fbb5b2c6
+f1d26225ec5bef2674a3cdcc140b1042897b16c06fce6c40751b3b118039c0f0
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.