diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-20 00:35:22 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-20 00:37:51 +0200 |
| commit | b4ed8a92751fdcb681117a2cb586054af106c69e (patch) | |
| tree | 5c8319b402ac1d1d9bc49b8497ef3cbdd35e8cf4 /target/linux/oxnas | |
| parent | 43a5bebda1745dbb037746ff39bf900863ab43f3 (diff) | |
| download | upstream-b4ed8a92751fdcb681117a2cb586054af106c69e.tar.gz upstream-b4ed8a92751fdcb681117a2cb586054af106c69e.tar.bz2 upstream-b4ed8a92751fdcb681117a2cb586054af106c69e.zip | |
kernel: bump 5.4 to 5.4.154
Removed upstreamed:
generic/backport-5.4/070-v5.5-MIPS-BPF-Restore-MIPS32-cBPF-JIT.patch
All others updated automatically.
Compile-tested on: lantiq/xrx200, armvirt/64
Runtime-tested on: lantiq/xrx200, armvirt/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/oxnas')
| -rw-r--r-- | target/linux/oxnas/patches-5.4/999-libata-hacks.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/oxnas/patches-5.4/999-libata-hacks.patch b/target/linux/oxnas/patches-5.4/999-libata-hacks.patch index d91f2d6724..e536a4c1bc 100644 --- a/target/linux/oxnas/patches-5.4/999-libata-hacks.patch +++ b/target/linux/oxnas/patches-5.4/999-libata-hacks.patch @@ -15,7 +15,7 @@ /* initialize internal qc */ qc = __ata_qc_from_tag(ap, ATA_TAG_INTERNAL); -@@ -5128,6 +5136,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -5156,6 +5164,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); -@@ -5173,6 +5184,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -5201,6 +5212,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); @@ -36,7 +36,7 @@ --- a/include/linux/libata.h +++ b/include/linux/libata.h -@@ -910,6 +910,8 @@ struct ata_port_operations { +@@ -911,6 +911,8 @@ struct ata_port_operations { enum ata_completion_errors (*qc_prep)(struct ata_queued_cmd *qc); unsigned int (*qc_issue)(struct ata_queued_cmd *qc); bool (*qc_fill_rtf)(struct ata_queued_cmd *qc); @@ -45,7 +45,7 @@ /* * Configuration and exception handling -@@ -1000,6 +1002,9 @@ struct ata_port_operations { +@@ -1001,6 +1003,9 @@ struct ata_port_operations { void (*phy_reset)(struct ata_port *ap); void (*eng_timeout)(struct ata_port *ap); |