aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-04-10 09:12:08 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2021-04-17 21:50:08 +0200
commit33f419bf2acec1baa490cb93624acda7c3456a72 (patch)
treefc6cbfc7573a319994d0a2e6ff7a08039f6ca1cf
parent57e32650efa4d0c067cdd15c36d0403700df8526 (diff)
downloadupstream-33f419bf2acec1baa490cb93624acda7c3456a72.tar.gz
upstream-33f419bf2acec1baa490cb93624acda7c3456a72.tar.bz2
upstream-33f419bf2acec1baa490cb93624acda7c3456a72.zip
kernel: bump 5.4 to 5.4.111
Refreshed with update_kernel.sh. No manual tweaks needed. 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>
-rw-r--r--include/kernel-version.mk4
-rw-r--r--target/linux/generic/hack-5.4/204-module_strip.patch2
-rw-r--r--target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch2
-rw-r--r--target/linux/generic/pending-5.4/920-mangle_bootargs.patch2
4 files changed, 5 insertions, 5 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index de67289c66..746f75d212 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif
-LINUX_VERSION-5.4 = .110
+LINUX_VERSION-5.4 = .111
LINUX_VERSION-5.10 = .31
-LINUX_KERNEL_HASH-5.4.110 = d0f6978440e8a4b266cb1847405a764bca83667541b9e4cdbbc161fb0dd9b228
+LINUX_KERNEL_HASH-5.4.111 = 21626132658dc34cb41b7aa7b80ecf83751890a71ac1a63d77aea9d488271a03
LINUX_KERNEL_HASH-5.10.31 = 54eef1a4d29a2582281375e028ac73c2c5d90dfa21500fa8c3b00e529a2b510d
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
diff --git a/target/linux/generic/hack-5.4/204-module_strip.patch b/target/linux/generic/hack-5.4/204-module_strip.patch
index 96e124b21a..a207a11ee5 100644
--- a/target/linux/generic/hack-5.4/204-module_strip.patch
+++ b/target/linux/generic/hack-5.4/204-module_strip.patch
@@ -96,7 +96,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -2196,6 +2196,13 @@ config TRIM_UNUSED_KSYMS
+@@ -2195,6 +2195,13 @@ config TRIM_UNUSED_KSYMS
If unsure, or if you need to build out-of-tree modules, say N.
diff --git a/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch
index 1f0c017680..c4c13b9695 100644
--- a/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch
+++ b/target/linux/generic/pending-5.4/203-kallsyms_uncompressed.patch
@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1278,6 +1278,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
+@@ -1277,6 +1277,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
the unaligned access emulation.
see arch/parisc/kernel/unaligned.c for reference
diff --git a/target/linux/generic/pending-5.4/920-mangle_bootargs.patch b/target/linux/generic/pending-5.4/920-mangle_bootargs.patch
index 45eabbd10a..7523b396ba 100644
--- a/target/linux/generic/pending-5.4/920-mangle_bootargs.patch
+++ b/target/linux/generic/pending-5.4/920-mangle_bootargs.patch
@@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1663,6 +1663,15 @@ config EMBEDDED
+@@ -1662,6 +1662,15 @@ config EMBEDDED
an embedded system so certain expert options are available
for configuration.