diff options
author | John Audia <graysky@archlinux.us> | 2021-05-02 07:28:04 -0400 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2021-05-07 07:05:16 +0200 |
commit | daa586082740842e86c72c5c0e58320897a7d277 (patch) | |
tree | c0ebc86b85433768fca206824e028e13baa7f22d | |
parent | 75ca641f1b84e15110146f16b643b0f5f1c41090 (diff) | |
download | upstream-daa586082740842e86c72c5c0e58320897a7d277.tar.gz upstream-daa586082740842e86c72c5c0e58320897a7d277.tar.bz2 upstream-daa586082740842e86c72c5c0e58320897a7d277.zip |
kernel: bump 5.4 to 5.4.116
All patches automatically rebased.
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.mk | 4 | ||||
-rw-r--r-- | target/linux/realtek/patches-5.4/300-mips-add-rtl838x-platform.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 65e31e81e3..5b003e31a0 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 = .115 +LINUX_VERSION-5.4 = .116 LINUX_VERSION-5.10 = .33 -LINUX_KERNEL_HASH-5.4.115 = 5b4724748527a622a886232b5da1471619eb3aa3bb38a11851275eba09989dd2 +LINUX_KERNEL_HASH-5.4.116 = fa8bce778c23a2c5be36e5b5b5005bcfd4ac3df8a90999e9e64189634bbbc9aa LINUX_KERNEL_HASH-5.10.33 = 933fdbc36371c0f830b7a6a957a559fca2dad1cc0eaa852ef42fb168185b4315 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/realtek/patches-5.4/300-mips-add-rtl838x-platform.patch b/target/linux/realtek/patches-5.4/300-mips-add-rtl838x-platform.patch index e946a5b1a0..ecc77b2a73 100644 --- a/target/linux/realtek/patches-5.4/300-mips-add-rtl838x-platform.patch +++ b/target/linux/realtek/patches-5.4/300-mips-add-rtl838x-platform.patch @@ -10,7 +10,7 @@ platforms += sgi-ip27 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -630,6 +630,26 @@ config RALINK +@@ -631,6 +631,26 @@ config RALINK select ARCH_HAS_RESET_CONTROLLER select RESET_CONTROLLER |