aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2021-09-18 21:55:58 +0100
committerDaniel Golle <daniel@makrotopia.org>2021-09-30 22:29:33 +0100
commit6e7fadb0c7aa1a4cedc6cc72d640f94efb15c127 (patch)
tree4c15dfe794f8eccdf2091f2da11463d88ceae12e /target/linux/oxnas
parent870b10b2941f751027b445a2e9e7b923ebbe0f27 (diff)
downloadupstream-6e7fadb0c7aa1a4cedc6cc72d640f94efb15c127.tar.gz
upstream-6e7fadb0c7aa1a4cedc6cc72d640f94efb15c127.tar.bz2
upstream-6e7fadb0c7aa1a4cedc6cc72d640f94efb15c127.zip
kernel: bump 5.10 to 5.10.67
Deleted (upstreamed): bcm27xx/patches-5.10/950-0312-vc4_hdmi-Set-HD_CTL_WHOLSMP-and-HD_CTL_CHALIGN_SET.patch Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/oxnas')
-rw-r--r--target/linux/oxnas/patches-5.10/999-libata-hacks.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/oxnas/patches-5.10/999-libata-hacks.patch b/target/linux/oxnas/patches-5.10/999-libata-hacks.patch
index b02c506e9f..2751c9fe88 100644
--- a/target/linux/oxnas/patches-5.10/999-libata-hacks.patch
+++ b/target/linux/oxnas/patches-5.10/999-libata-hacks.patch
@@ -15,7 +15,7 @@
/* initialize internal qc */
qc = __ata_qc_from_tag(ap, ATA_TAG_INTERNAL);
-@@ -4520,6 +4528,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -4524,6 +4532,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);
-@@ -4565,6 +4576,8 @@ void ata_qc_free(struct ata_queued_cmd *
+@@ -4569,6 +4580,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);