fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: bump to 4.9.258, 4.14.222, 4.19.177

Browse Source 
Refreshed all patches.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2021-03-03 00:39:33 +08:00
parent ae22f0455e
commit 05131fd251
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
19 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/kernel-version.mk
View File

@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif
LINUX_VERSION-4.9 = .257
LINUX_VERSION-4.14 = .221
LINUX_VERSION-4.19 = .176
LINUX_VERSION-4.9 = .258
LINUX_VERSION-4.14 = .222
LINUX_VERSION-4.19 = .177
LINUX_KERNEL_HASH-4.9.257 = 95e780fffc81de8217a31a3e6e212b69643f5344e9ba0dabaa6e426126f6d64f
LINUX_KERNEL_HASH-4.14.221 = ce2254075ff4846f13380c1cf4bec1e351e5996a7dd109c200e222e49fd2c7e9
LINUX_KERNEL_HASH-4.19.176 = e1c3b8d21ba31bd5c50bb3b2a741f62958eb2a116bf13fa0e14f1656c4826073
LINUX_KERNEL_HASH-4.9.258 = d478f8e069f6d8b86b0a69f99252ea9e7cd7070bf6bdd0e9b3773ee418e5c8cd
LINUX_KERNEL_HASH-4.14.222 = 734082b03d9f8e43b123b0061f08045b70c34e3a4b09f8a8da6a287686dac744
LINUX_KERNEL_HASH-4.19.177 = ac0eb3794e01eac66bea3ab39b8776dadf15c418ddc534ccfd95a0270302357d
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

2
target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
View File

@ -757,7 +757,7 @@
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3881,14 +3881,16 @@ static bool tcp_parse_aligned_timestamp(
@@ -3901,14 +3901,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);

2
target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch
View File

@ -737,7 +737,7 @@
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3881,14 +3881,16 @@ static bool tcp_parse_aligned_timestamp(
@@ -3901,14 +3901,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);

6
target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch
View File

@ -47,7 +47,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
};
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -974,6 +974,9 @@ static unsigned int early_drop_list(stru
@@ -975,6 +975,9 @@ static unsigned int early_drop_list(stru
hlist_nulls_for_each_entry_rcu(h, n, head, hnnode) {
tmp = nf_ct_tuplehash_to_ctrack(h);
@ -57,7 +57,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
if (nf_ct_is_expired(tmp)) {
nf_ct_gc_expired(tmp);
continue;
@@ -1051,6 +1054,18 @@ static bool gc_worker_can_early_drop(con
@@ -1052,6 +1055,18 @@ static bool gc_worker_can_early_drop(con
return false;
}
@ -76,7 +76,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
static void gc_worker(struct work_struct *work)
{
unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u);
@@ -1087,6 +1102,11 @@ static void gc_worker(struct work_struct
@@ -1088,6 +1103,11 @@ static void gc_worker(struct work_struct
tmp = nf_ct_tuplehash_to_ctrack(h);
scanned++;

4
target/linux/generic/backport-4.14/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
View File

@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1054,18 +1054,6 @@ static bool gc_worker_can_early_drop(con
@@ -1055,18 +1055,6 @@ static bool gc_worker_can_early_drop(con
return false;
}
@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static void gc_worker(struct work_struct *work)
{
unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u);
@@ -1102,10 +1090,8 @@ static void gc_worker(struct work_struct
@@ -1103,10 +1091,8 @@ static void gc_worker(struct work_struct
tmp = nf_ct_tuplehash_to_ctrack(h);
scanned++;

0
target/linux/generic/backport-4.14/605-0002-tcp-avoid-min-R-bloat-by-skipping-R-from-delayed-K-in.patch → target/linux/generic/backport-4.14/605-0002-tcp-avoid-min-RTT-bloat-by-skipping-RTT-from-delayed-ACK-.patch
View File

0
target/linux/generic/backport-4.14/605-0008-tcp_bbr-in-restart-from-idle,-see-if-we-should-exit.patch → target/linux/generic/backport-4.14/605-0008-tcp_bbr-in-restart-from-idle-see-if-we-should-exit.patch
View File

0
target/linux/generic/backport-4.14/605-0009-tcp_bbr-apply-PROBE_RTT-cwnd-cap-even-if-acked==0.patch → target/linux/generic/backport-4.14/605-0009-tcp_bbr-apply-PROBE_RTT-cwnd-cap-even-if-acked-0.patch
View File

4
target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
View File

@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1178,18 +1178,6 @@ static bool gc_worker_can_early_drop(con
@@ -1179,18 +1179,6 @@ static bool gc_worker_can_early_drop(con
return false;
}
@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static void gc_worker(struct work_struct *work)
{
unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u);
@@ -1226,10 +1214,8 @@ static void gc_worker(struct work_struct
@@ -1227,10 +1215,8 @@ static void gc_worker(struct work_struct
tmp = nf_ct_tuplehash_to_ctrack(h);
scanned++;

4
target/linux/generic/hack-4.14/207-disable-modorder.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/Makefile
+++ b/Makefile
@@ -1254,7 +1254,6 @@ endif
@@ -1261,7 +1261,6 @@ endif
PHONY += modules
modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
@$(kecho) ' Building modules, stage 2.';
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
@@ -1283,7 +1282,6 @@ _modinst_:
@@ -1290,7 +1289,6 @@ _modinst_:
rm -f $(MODLIB)/build ; \
ln -s $(CURDIR) $(MODLIB)/build ; \
fi

2
target/linux/generic/hack-4.14/220-gc_sections.patch
View File

@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
# Read KERNELRELEASE from include/config/kernel.release (if it exists)
KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
@@ -779,11 +784,6 @@ ifdef CONFIG_DEBUG_SECTION_MISMATCH
@@ -786,11 +791,6 @@ ifdef CONFIG_DEBUG_SECTION_MISMATCH
KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once)
endif

2
target/linux/generic/hack-4.14/221-module_exports.patch
View File

@ -90,7 +90,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
__used \
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -432,7 +432,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(
@@ -435,7 +435,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(
# Linker scripts preprocessor (.lds.S -> .lds)
# ---------------------------------------------------------------------------
quiet_cmd_cpp_lds_S = LDS $@

4
target/linux/generic/hack-4.14/930-crashlog.patch
View File

@ -318,7 +318,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#include <asm/sections.h>
#include <linux/io.h>
@@ -483,6 +484,8 @@ static void __init_memblock memblock_ins
@@ -447,6 +448,8 @@ static void __init_memblock memblock_ins
memblock_set_region_node(rgn, nid);
type->cnt++;
type->total_size += size;
@ -327,7 +327,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}
/**
@@ -522,6 +525,8 @@ int __init_memblock memblock_add_range(s
@@ -486,6 +489,8 @@ int __init_memblock memblock_add_range(s
type->regions[0].flags = flags;
memblock_set_region_node(&type->regions[0], nid);
type->total_size = size;

2
target/linux/generic/hack-4.14/952-net-conntrack-events-support-multiple-registrant.patch
View File

@ -98,7 +98,7 @@
depends on NETFILTER_ADVANCED
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -2249,6 +2249,10 @@ int nf_conntrack_init_net(struct net *ne
@@ -2250,6 +2250,10 @@ int nf_conntrack_init_net(struct net *ne
ret = nf_conntrack_proto_pernet_init(net);
if (ret < 0)
goto err_proto;

2
target/linux/generic/hack-4.19/952-net-conntrack-events-support-multiple-registrant.patch
View File

@ -98,7 +98,7 @@
depends on NETFILTER_ADVANCED
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -2447,6 +2447,10 @@ int nf_conntrack_init_net(struct net *ne
@@ -2448,6 +2448,10 @@ int nf_conntrack_init_net(struct net *ne
ret = nf_conntrack_proto_pernet_init(net);
if (ret < 0)
goto err_proto;

4
target/linux/generic/hack-4.9/207-disable-modorder.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/Makefile
+++ b/Makefile
@@ -1242,7 +1242,6 @@ endif
@@ -1249,7 +1249,6 @@ endif
PHONY += modules
modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
@$(kecho) ' Building modules, stage 2.';
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild
@@ -1272,7 +1271,6 @@ _modinst_:
@@ -1279,7 +1278,6 @@ _modinst_:
rm -f $(MODLIB)/build ; \
ln -s $(CURDIR) $(MODLIB)/build ; \
fi

2
target/linux/generic/hack-4.9/221-module_exports.patch
View File

@ -90,7 +90,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
__used \
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -409,7 +409,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(
@@ -412,7 +412,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(
# Linker scripts preprocessor (.lds.S -> .lds)
# ---------------------------------------------------------------------------
quiet_cmd_cpp_lds_S = LDS $@

4
target/linux/generic/hack-4.9/930-crashlog.patch
View File

@ -318,7 +318,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#include <asm/sections.h>
#include <linux/io.h>
@@ -495,6 +496,8 @@ static void __init_memblock memblock_ins
@@ -459,6 +460,8 @@ static void __init_memblock memblock_ins
memblock_set_region_node(rgn, nid);
type->cnt++;
type->total_size += size;
@ -327,7 +327,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}
/**
@@ -534,6 +537,8 @@ int __init_memblock memblock_add_range(s
@@ -498,6 +501,8 @@ int __init_memblock memblock_add_range(s
type->regions[0].flags = flags;
memblock_set_region_node(&type->regions[0], nid);
type->total_size = size;

2
target/linux/generic/hack-4.9/952-net-conntrack-events-support-multiple-registrant.patch
View File

@ -115,7 +115,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
depends on NETFILTER_ADVANCED
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -2077,6 +2077,10 @@ int nf_conntrack_init_net(struct net *ne
@@ -2078,6 +2078,10 @@ int nf_conntrack_init_net(struct net *ne
ret = nf_conntrack_proto_pernet_init(net);
if (ret < 0)
goto err_proto;