aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2021-05-26 12:58:06 +0100
committerKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2021-05-27 18:32:10 +0100
commit53b9cc442f9ba33c66f78ee0a1fda4bb71ddd679 (patch)
tree1f58f2fd144076bc60b8facceaf13d3d7ac0249d
parent962d530dea44bb7df79f088643ac35f7275c7ac7 (diff)
downloadupstream-53b9cc442f9ba33c66f78ee0a1fda4bb71ddd679.tar.gz
upstream-53b9cc442f9ba33c66f78ee0a1fda4bb71ddd679.tar.bz2
upstream-53b9cc442f9ba33c66f78ee0a1fda4bb71ddd679.zip
kernel: bump 5.10 to 5.10.40
Automatically refreshed: generic/hack-5.10/902-debloat_proc.patch generic/pending-5.10/110-perf-jevents-fix-getting-maximum-number-of-fds.patch Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
-rw-r--r--include/kernel-version.mk4
-rw-r--r--target/linux/generic/hack-5.10/902-debloat_proc.patch2
-rw-r--r--target/linux/generic/pending-5.10/110-perf-jevents-fix-getting-maximum-number-of-fds.patch2
3 files changed, 4 insertions, 4 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 0007a4574d..96dfb1b2f0 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
endif
LINUX_VERSION-5.4 = .121
-LINUX_VERSION-5.10 = .39
+LINUX_VERSION-5.10 = .40
LINUX_KERNEL_HASH-5.4.121 = 9d9327fca397e114bcc59d69fa5ae1ac8bac76b170ed811d1b1645df7456375f
-LINUX_KERNEL_HASH-5.10.39 = 5738a515ca97853481767360c568eae46c8d777d98a69e018a3299baa6b3f614
+LINUX_KERNEL_HASH-5.10.40 = 7480803acd7152b1e8248954e219ca9d8d95afa73ec2d8973170939ac44b2f24
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
diff --git a/target/linux/generic/hack-5.10/902-debloat_proc.patch b/target/linux/generic/hack-5.10/902-debloat_proc.patch
index b426851bcc..31ed45b19e 100644
--- a/target/linux/generic/hack-5.10/902-debloat_proc.patch
+++ b/target/linux/generic/hack-5.10/902-debloat_proc.patch
@@ -135,7 +135,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
do { \
--- a/ipc/msg.c
+++ b/ipc/msg.c
-@@ -1348,6 +1348,9 @@ void __init msg_init(void)
+@@ -1350,6 +1350,9 @@ void __init msg_init(void)
{
msg_init_ns(&init_ipc_ns);
diff --git a/target/linux/generic/pending-5.10/110-perf-jevents-fix-getting-maximum-number-of-fds.patch b/target/linux/generic/pending-5.10/110-perf-jevents-fix-getting-maximum-number-of-fds.patch
index ab6b250953..d221b05625 100644
--- a/target/linux/generic/pending-5.10/110-perf-jevents-fix-getting-maximum-number-of-fds.patch
+++ b/target/linux/generic/pending-5.10/110-perf-jevents-fix-getting-maximum-number-of-fds.patch
@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c
-@@ -897,7 +897,7 @@ static int get_maxfds(void)
+@@ -894,7 +894,7 @@ static int get_maxfds(void)
struct rlimit rlim;
if (getrlimit(RLIMIT_NOFILE, &rlim) == 0)