diff options
author | John Audia <graysky@archlinux.us> | 2021-09-04 19:54:35 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-09-13 17:08:17 +0200 |
commit | 51c7e1d25f6a4bc1f4906db508ab8a93a7bcaf4a (patch) | |
tree | 3f9a794b168378c834694ac44047462738c8807d /target/linux/generic/hack-5.4 | |
parent | 5fb4cb07e24655a45cc489d03f85ca813eb093a0 (diff) | |
download | upstream-51c7e1d25f6a4bc1f4906db508ab8a93a7bcaf4a.tar.gz upstream-51c7e1d25f6a4bc1f4906db508ab8a93a7bcaf4a.tar.bz2 upstream-51c7e1d25f6a4bc1f4906db508ab8a93a7bcaf4a.zip |
kernel: bump 5.4 to 5.4.144
Manually rebased:
backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic/hack-5.4')
-rw-r--r-- | target/linux/generic/hack-5.4/204-module_strip.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 2c3de812a3..d6e25f319b 100644 --- a/target/linux/generic/hack-5.4/204-module_strip.patch +++ b/target/linux/generic/hack-5.4/204-module_strip.patch @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> config MODULES_TREE_LOOKUP --- a/kernel/module.c +++ b/kernel/module.c -@@ -1285,6 +1285,7 @@ static struct module_attribute *modinfo_ +@@ -1281,6 +1281,7 @@ static struct module_attribute *modinfo_ static const char vermagic[] = VERMAGIC_STRING; @@ -120,7 +120,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static int try_to_force_load(struct module *mod, const char *reason) { #ifdef CONFIG_MODULE_FORCE_LOAD -@@ -1296,6 +1297,7 @@ static int try_to_force_load(struct modu +@@ -1292,6 +1293,7 @@ static int try_to_force_load(struct modu return -ENOEXEC; #endif } @@ -128,7 +128,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #ifdef CONFIG_MODVERSIONS -@@ -3256,9 +3256,11 @@ static int setup_load_info(struct load_i +@@ -3256,9 +3258,11 @@ static int setup_load_info(struct load_i static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -141,7 +141,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -3279,6 +3281,7 @@ static int check_modinfo(struct module * +@@ -3279,6 +3283,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } |