- sata_nv-handle-serror-status-indication.patch removed from -mm tree

- sata_nv-handle-serror-status-indication.patch removed from -mm tree

[akpm]

The patch titled
     sata_nv: handle SError status indication
has been removed from the -mm tree.  Its filename was
     sata_nv-handle-serror-status-indication.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: sata_nv: handle SError status indication
From: Robert Hancock <hancockr@shaw.ca>

ADMA-capable controllers provide a bit in the status register that appears
to indicate that the controller detected an SError condition.  Update
sata_nv to detect this and trigger error handling in order to handle the
fault.

Signed-off-by: Robert Hancock <hancockr@shaw.ca>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Tejun Heo <htejun@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/ata/sata_nv.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff -puN drivers/ata/sata_nv.c~sata_nv-handle-serror-status-indication drivers/ata/sata_nv.c
--- a/drivers/ata/sata_nv.c~sata_nv-handle-serror-status-indication
+++ a/drivers/ata/sata_nv.c
@@ -827,7 +827,8 @@ static irqreturn_t nv_adma_interrupt(int
 			/* freeze if hotplugged or controller error */
 			if (unlikely(status & (NV_ADMA_STAT_HOTPLUG |
 					       NV_ADMA_STAT_HOTUNPLUG |
-					       NV_ADMA_STAT_TIMEOUT))) {
+					       NV_ADMA_STAT_TIMEOUT |
+					       NV_ADMA_STAT_SERROR))) {
 				struct ata_eh_info *ehi = &ap->eh_info;
 
 				ata_ehi_clear_desc(ehi);
@@ -841,6 +842,9 @@ static irqreturn_t nv_adma_interrupt(int
 				} else if (status & NV_ADMA_STAT_HOTUNPLUG) {
 					ata_ehi_hotplugged(ehi);
 					ata_ehi_push_desc(ehi, ": hot unplug");
+				} else if (status & NV_ADMA_STAT_SERROR) {
+					/* let libata analyze SError and figure out the cause */
+					ata_ehi_push_desc(ehi, ": SError");
 				}
 				ata_port_freeze(ap);
 				continue;
_

Patches currently in -mm which might be from hancockr@shaw.ca are

origin.patch
sata_nv-add-back-some-verbosity-into-adma-error_handler.patch
sata_nv-add-back-some-verbosity-into-adma-error_handler-tidy.patch