aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-05-11 11:50:27 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2021-05-23 15:09:06 +0200
commit3e1c92f9e1be108df2042ab211cc8d68938e6af9 (patch)
tree4c584e34aca05f31dec4141b7d446dc283f9c36c /include
parentf726b37b681866145701bd1324c9c654312fa779 (diff)
downloadupstream-3e1c92f9e1be108df2042ab211cc8d68938e6af9.tar.gz
upstream-3e1c92f9e1be108df2042ab211cc8d68938e6af9.tar.bz2
upstream-3e1c92f9e1be108df2042ab211cc8d68938e6af9.zip
kernel: bump 5.4 to 5.4.118
Manually rebased: ath79/patches-5.4/0033-spi-ath79-drop-pdata-support.patch Removed uneeded patch: ath79/patches-5.4/0050-spi-ath79-remove-spi-master-setup-and-cleanup-assign.patch All other 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>
Diffstat (limited to 'include')
-rw-r--r--include/kernel-version.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 1fc005f895..dcf884af24 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 = .117
+LINUX_VERSION-5.4 = .118
LINUX_VERSION-5.10 = .39
-LINUX_KERNEL_HASH-5.4.117 = 4e989b5775830092e5c76b5cca65ebff862ad0c87d0b58c3a20d415c3d4ec770
+LINUX_KERNEL_HASH-5.4.118 = d970509c274fd2f5a9257a63c56f7a8b3e50ec12015bd6864dc4b76b38dc821b
LINUX_KERNEL_HASH-5.10.39 = 5738a515ca97853481767360c568eae46c8d777d98a69e018a3299baa6b3f614
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))