2
0
forked from Ivasoft/openwrt

kernel: bump 5.4 to 5.4.48

Resolved merge conflict in the following patches:

 layerscape: 701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch
 ramips: 0013-owrt-hack-fix-mt7688-cache-issue.patch

Refreshed patches, removed upstreamed patch:

 bcm63xx: 020-v5.8-mtd-rawnand-brcmnand-fix-hamming-oob-layout.patch

Run tested: qemu-x86-64
Build tested: x86/64

Signed-off-by: Petr Štetiar <ynezz@true.cz>
This commit is contained in:
Petr Štetiar
2020-06-09 14:18:25 +02:00
parent ceeece9ffa
commit e44e60b290
28 changed files with 42 additions and 85 deletions

View File

@@ -341,7 +341,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -2844,11 +2844,13 @@ static const struct seq_operations fib_r
@@ -2847,11 +2847,13 @@ static const struct seq_operations fib_r
int __net_init fib_proc_init(struct net *net)
{
@@ -357,7 +357,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
fib_triestat_seq_show, NULL))
goto out2;
@@ -2859,17 +2861,21 @@ int __net_init fib_proc_init(struct net
@@ -2862,17 +2864,21 @@ int __net_init fib_proc_init(struct net
return 0;
out3: