diff options
| author | John Audia <graysky@archlinux.us> | 2021-02-17 05:58:14 -0500 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-02-19 07:15:59 +0100 |
| commit | 76d1168d0d4b9d76e2ad78c0fc6b255561deb284 (patch) | |
| tree | 60fd91fe322d516bfd5147bf33019c03c8ad32e8 /target/linux/generic/backport-5.4 | |
| parent | cbe4beb442e10f9ad8fc71202e87c15a0859c44c (diff) | |
| download | upstream-76d1168d0d4b9d76e2ad78c0fc6b255561deb284.tar.gz upstream-76d1168d0d4b9d76e2ad78c0fc6b255561deb284.tar.bz2 upstream-76d1168d0d4b9d76e2ad78c0fc6b255561deb284.zip | |
kernel: bump 5.4 to 5.4.99
Ran update_kernel.sh in a fresh clone without any existing toolchains.
No manual changes needed.
Build system: x86_64
Build-tested: bcm27xx/bcm2711
Signed-off-by: John Audia <graysky@archlinux.us>
(cherry-picked from commit 5d3a6fd970)
Diffstat (limited to 'target/linux/generic/backport-5.4')
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch b/target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch index 4edcbe1691..9bcb33b737 100644 --- a/target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch +++ b/target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch @@ -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 -@@ -1206,18 +1206,6 @@ static bool gc_worker_can_early_drop(con +@@ -1207,18 +1207,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); -@@ -1254,10 +1242,8 @@ static void gc_worker(struct work_struct +@@ -1255,10 +1243,8 @@ static void gc_worker(struct work_struct tmp = nf_ct_tuplehash_to_ctrack(h); scanned++; diff --git a/target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch b/target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch index f864a7899c..a79c860187 100644 --- a/target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch +++ b/target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch @@ -66,7 +66,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -5403,8 +5403,7 @@ static void skb_gro_reset_offset(struct +@@ -5404,8 +5404,7 @@ static void skb_gro_reset_offset(struct NAPI_GRO_CB(skb)->frag0 = NULL; NAPI_GRO_CB(skb)->frag0_len = 0; |