aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas/patches-5.4/999-libata-hacks.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-10-02 15:28:55 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-10-02 16:45:56 +0200
commit50f456b46cbae27ed13badfe7b2976cd01b67a57 (patch)
tree9911069e0538585942fe2c16685e7ed3afbff674 /target/linux/oxnas/patches-5.4/999-libata-hacks.patch
parent78cf3e53b1f4ea6428925302d78f743a693d5fb1 (diff)
downloadupstream-50f456b46cbae27ed13badfe7b2976cd01b67a57.tar.gz
upstream-50f456b46cbae27ed13badfe7b2976cd01b67a57.tar.bz2
upstream-50f456b46cbae27ed13badfe7b2976cd01b67a57.zip
kernel: bump 5.4 to 5.4.150
Manually rebased: generic/pending-5.4/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch Removed upstreamed: layerscape/patches-5.4/819-uart-0004-MLK-18137-fsl_lpuart-Fix-loopback-mode.patch All others updated automatically. Compile-tested on: lantiq/xrx200, armvirt/64 Runtime-tested on: lantiq/xrx200, armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/oxnas/patches-5.4/999-libata-hacks.patch')
-rw-r--r--target/linux/oxnas/patches-5.4/999-libata-hacks.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/oxnas/patches-5.4/999-libata-hacks.patch b/target/linux/oxnas/patches-5.4/999-libata-hacks.patch
index 5d93ce39f7..d91f2d6724 100644
--- a/target/linux/oxnas/patches-5.4/999-libata-hacks.patch
+++ b/target/linux/oxnas/patches-5.4/999-libata-hacks.patch
@@ -15,7 +15,7 @@
/* initialize internal qc */
qc = __ata_qc_from_tag(ap, ATA_TAG_INTERNAL);
-@@ -5124,6 +5132,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -5128,6 +5136,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (unlikely(ap->pflags & ATA_PFLAG_FROZEN))
return NULL;
@@ -25,7 +25,7 @@
/* libsas case */
if (ap->flags & ATA_FLAG_SAS_HOST) {
tag = ata_sas_allocate_tag(ap);
-@@ -5169,6 +5180,8 @@ void ata_qc_free(struct ata_queued_cmd *
+@@ -5173,6 +5184,8 @@ void ata_qc_free(struct ata_queued_cmd *
qc->tag = ATA_TAG_POISON;
if (ap->flags & ATA_FLAG_SAS_HOST)
ata_sas_free_tag(tag, ap);