aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas/patches-5.10
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2022-04-20 06:44:30 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-04-23 20:46:25 +0200
commitcab20be008591f89dd89c4e444cdf022fa7f57eb (patch)
treef3d3a5dee30c7ad8903f596847d4f9f257ec0bc5 /target/linux/oxnas/patches-5.10
parentb8ed98b10004d5de25c1b4b2d2b59b15fc04f794 (diff)
downloadupstream-cab20be008591f89dd89c4e444cdf022fa7f57eb.tar.gz
upstream-cab20be008591f89dd89c4e444cdf022fa7f57eb.tar.bz2
upstream-cab20be008591f89dd89c4e444cdf022fa7f57eb.zip
kernel: bump 5.10 to 5.10.112
Manually rebased: ath79/patches-5.10/901-phy-mdio-bitbang-prevent-rescheduling-during-command.patch All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/oxnas/patches-5.10')
-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 84d418887c..5af87b4a86 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);
-@@ -4555,6 +4563,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -4558,6 +4566,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);
-@@ -4600,6 +4611,8 @@ void ata_qc_free(struct ata_queued_cmd *
+@@ -4603,6 +4614,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);