diff options
author | John Audia <graysky@archlinux.us> | 2022-02-23 06:58:46 -0500 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-03-01 21:38:36 +0100 |
commit | 0989b7ad3a38345bc09a535782884d78ec195c9d (patch) | |
tree | e973e013e2f06be560dd49098415a8c4b465589a /target/linux/oxnas | |
parent | a2d4b5711aa73d14ffbc4f90a7944473b80baecb (diff) | |
download | upstream-0989b7ad3a38345bc09a535782884d78ec195c9d.tar.gz upstream-0989b7ad3a38345bc09a535782884d78ec195c9d.tar.bz2 upstream-0989b7ad3a38345bc09a535782884d78ec195c9d.zip |
kernel: bump 5.10 to 5.10.102
Removed upstreamed:
bcm4908/patches-5.10/180-i2c-brcmstb-fix-support-for-DSL-and-CM-variants.patch[1]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.102&id=f333c1916fd6b55900029bf8f918cc00009e2111
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')
-rw-r--r-- | target/linux/oxnas/patches-5.10/999-libata-hacks.patch | 4 |
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 61c0c045a6..84d418887c 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); -@@ -4554,6 +4562,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4555,6 +4563,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); -@@ -4599,6 +4610,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -4600,6 +4611,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); |