aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-09-10 15:17:13 -0400
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-09-12 01:28:50 +0200
commitbee76f1bfa13a1dad8706090a5b6a1dd36f3d9c1 (patch)
treeba288a8a4922007a82ede6b45292c88154044914 /target/linux/oxnas
parentc4110a524e9a026cf570b6dadf325c037b7527d0 (diff)
downloadupstream-bee76f1bfa13a1dad8706090a5b6a1dd36f3d9c1.tar.gz
upstream-bee76f1bfa13a1dad8706090a5b6a1dd36f3d9c1.tar.bz2
upstream-bee76f1bfa13a1dad8706090a5b6a1dd36f3d9c1.zip
kernel: bump 5.4 to 5.4.64
Remove upstreamed patches: generic-backport 701-v5.5-net-core-use-listified-Rx-for-GRO_NORMAL-in-napi_gro.patch Manually merged: mediatek/patches-5.4 0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch All other modifications made by update_kernel.sh Build-tested: ipq806x, lantiq/xrx200, mvebu, x86/64 Run-tested: ipq806x (R7800), mvebu (mamba, rango), lantiq/xrx200 (Easybox 904 xDSL), x86/64 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [add community build/run tests to commit message] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/oxnas')
-rw-r--r--target/linux/oxnas/patches-5.4/999-libata-hacks.patch8
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 f846c3fee3..28d6f8b570 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);
-@@ -5122,6 +5130,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -5121,6 +5129,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);
-@@ -5167,6 +5178,8 @@ void ata_qc_free(struct ata_queued_cmd *
+@@ -5166,6 +5177,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
-@@ -908,6 +908,8 @@ struct ata_port_operations {
+@@ -909,6 +909,8 @@ struct ata_port_operations {
void (*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
-@@ -998,6 +1000,9 @@ struct ata_port_operations {
+@@ -999,6 +1001,9 @@ struct ata_port_operations {
void (*phy_reset)(struct ata_port *ap);
void (*eng_timeout)(struct ata_port *ap);