diff options
| author | John Audia <therealgraysky@proton.me> | 2022-10-05 07:58:32 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-10-18 20:13:41 +0200 |
| commit | fb11c635118385184fb088227123783463e7900a (patch) | |
| tree | 4edd61fb41fbb99fb3daeac0a68a37187c6dc7b0 /target/linux/oxnas | |
| parent | 8fefd5c26caac6a30e39892a69b43526ce1e8c07 (diff) | |
| download | upstream-fb11c635118385184fb088227123783463e7900a.tar.gz upstream-fb11c635118385184fb088227123783463e7900a.tar.bz2 upstream-fb11c635118385184fb088227123783463e7900a.zip | |
kernel: bump 5.10 to 5.10.147
Removed upstreamed:
bcm53xx/patches-5.10/083-v6.0-clk-iproc-Do-not-rely-on-node-name-for-correct-PLL-s.patch[1]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.147&id=a8e6cde5062fb2aff81f86cc0770591714bee545
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit e2da6a0a59a81a4fc0fdffde31abf22ee121e9f5)
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 5af87b4a86..461a1b87f4 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); -@@ -4558,6 +4566,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4562,6 +4570,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); -@@ -4603,6 +4614,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -4607,6 +4618,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); |