aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-12-27 20:59:44 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2021-12-28 19:09:17 +0100
commit32c74552b2310531af593ee0f859a3935a3a7cbd (patch)
treeaeb837d705ab8556336ca7cfe98a9e01f985d5d0 /target/linux/oxnas
parenta8ad881b830fe00bd2036c281693849d8f45c91a (diff)
downloadupstream-32c74552b2310531af593ee0f859a3935a3a7cbd.tar.gz
upstream-32c74552b2310531af593ee0f859a3935a3a7cbd.tar.bz2
upstream-32c74552b2310531af593ee0f859a3935a3a7cbd.zip
kernel: bump 5.4 to 5.4.168
All 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')
-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 e536a4c1bc..cac7f48f43 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);
-@@ -5156,6 +5164,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -5158,6 +5166,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);
-@@ -5201,6 +5212,8 @@ void ata_qc_free(struct ata_queued_cmd *
+@@ -5203,6 +5214,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);