diff options
| author | John Audia <graysky@archlinux.us> | 2021-12-14 06:15:08 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-12-17 15:10:22 +0100 |
| commit | 43c0a12665eb22e7fc0ebbde47173a990291a40e (patch) | |
| tree | b7710b73569370c809b8780a8812446cd8b2c68f /target/linux/oxnas | |
| parent | 187c8f9153bee5deb8a1163ba2abcbc7bc9e229c (diff) | |
| download | upstream-43c0a12665eb22e7fc0ebbde47173a990291a40e.tar.gz upstream-43c0a12665eb22e7fc0ebbde47173a990291a40e.tar.bz2 upstream-43c0a12665eb22e7fc0ebbde47173a990291a40e.zip | |
kernel: bump 5.10 to 5.10.85
Removed target for patch which does not exist:
bcm27xx/patches-5.10/950-0249-kbuild-Disable-gcc-plugins.patch
All patches automatically rebased.
Build system: x86_64
Build-tested: bcm2711/RPi4B, ipq806x/R7800*
Run-tested: bcm2711/RPi4B, ipq806x/R7800*
* Had to revert 7f1edbd41295dff9f2127b169fbc086c0fb2c14e in order to build
(binutils 2.37, https://bugs.openwrt.org/index.php?do=details&task_id=4149)
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 e34891cbb6..61c0c045a6 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); -@@ -4552,6 +4560,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4554,6 +4562,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); -@@ -4597,6 +4608,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -4599,6 +4610,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); |