aboutsummaryrefslogtreecommitdiffstats
path: root/include/kernel-version.mk
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-04-27 18:18:36 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2021-04-30 23:48:37 +0200
commit0d2873df15a9dad7a4a3012870836bb51216324c (patch)
tree8c6da1c6129a9e3ada6cd9b947aefa4603f3ab4d /include/kernel-version.mk
parent14a95b36b1ecd038fffc279878c5a4c51043d709 (diff)
downloadupstream-0d2873df15a9dad7a4a3012870836bb51216324c.tar.gz
upstream-0d2873df15a9dad7a4a3012870836bb51216324c.tar.bz2
upstream-0d2873df15a9dad7a4a3012870836bb51216324c.zip
kernel: bump 5.4 to 5.4.114
Manually rebased* generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch Added new backport* generic/backport-5.4/050-gro-fix-napi_gro_frags-Fast-GRO-breakage-due-to-IP-a.patch All others updated automatically. The new backport was included based on this[1] upstream commit that will be mainlined soon. This change is needed because Eric Dumazet's check for NET_IP_ALIGN (landed in 5.4.114) causes huge slowdowns on drivers which use napi_gro_frags(). Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional *Credit to Alexander Lobakin 1. https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=7ad18ff6449cbd6beb26b53128ddf56d2685aa93 Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'include/kernel-version.mk')
-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 6063d055fc..5c12a42cf7 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 = .113
+LINUX_VERSION-5.4 = .114
LINUX_VERSION-5.10 = .33
-LINUX_KERNEL_HASH-5.4.113 = 30cde92463c474b75f9eb197654570dd6dbb32ec20695544c5469f292662da47
+LINUX_KERNEL_HASH-5.4.114 = be98f087cb58f23bc5edb8ee80a4794a569d48049d75b1a8eaef9f80fede9557
LINUX_KERNEL_HASH-5.10.33 = 933fdbc36371c0f830b7a6a957a559fca2dad1cc0eaa852ef42fb168185b4315
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))