aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-03-07 07:26:24 -0500
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-03-13 17:06:35 +0100
commite7fa97b326e596f64c4b9965c6f6c3773944c2c6 (patch)
treed861c215b45b4c1f0db7db61d02ff5c1b1260f4a /target/linux/generic/pending-5.4
parent1a7ef2c3cf12262ebd1d445a525b9778657d824f (diff)
downloadupstream-e7fa97b326e596f64c4b9965c6f6c3773944c2c6.tar.gz
upstream-e7fa97b326e596f64c4b9965c6f6c3773944c2c6.tar.bz2
upstream-e7fa97b326e596f64c4b9965c6f6c3773944c2c6.zip
kernel: bump 5.4 to 5.4.105
Ran update_kernel.sh in a fresh clone without any existing toolchains. Removed upstreamed generic-backports: 830-v5.12-0001-net-usb-qmi_wwan-support-ZTE-P685M-modem.patch 831-v5.9-usbip-tools-fix-build-error-for-multiple-definition.patch 755-v5.8-net-dsa-add-GRO-support-via-gro_cells.patch Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> Tested-by: Curtis Deptuck <curtdept@me.com> [x86/64] [squash patches] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/generic/pending-5.4')
-rw-r--r--target/linux/generic/pending-5.4/306-mips_mem_functions_performance.patch2
-rw-r--r--target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.4/306-mips_mem_functions_performance.patch b/target/linux/generic/pending-5.4/306-mips_mem_functions_performance.patch
index 4e6b7b5cd3..611aa0314f 100644
--- a/target/linux/generic/pending-5.4/306-mips_mem_functions_performance.patch
+++ b/target/linux/generic/pending-5.4/306-mips_mem_functions_performance.patch
@@ -25,7 +25,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
-DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) \
--- a/arch/mips/include/asm/string.h
+++ b/arch/mips/include/asm/string.h
-@@ -140,4 +140,42 @@ extern void *memcpy(void *__to, __const_
+@@ -19,4 +19,42 @@ extern void *memcpy(void *__to, __const_
#define __HAVE_ARCH_MEMMOVE
extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
diff --git a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
index a90bb2c285..6392b9d756 100644
--- a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
+++ b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
@@ -280,7 +280,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* Some drivers may have called napi_schedule
* prior to exhausting their budget.
-@@ -10271,6 +10332,10 @@ static int __init net_dev_init(void)
+@@ -10313,6 +10374,10 @@ static int __init net_dev_init(void)
sd->backlog.weight = weight_p;
}