diff options
| author | John Audia <therealgraysky@proton.me> | 2022-05-25 13:09:23 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-06-07 22:28:59 +0200 |
| commit | 49f8a75031c8fb2efc4824166da75f1473cdab6b (patch) | |
| tree | 8735a6f849807516e7c1cc015616d5c584491a3c /target/linux/generic/hack-5.10 | |
| parent | 3ce3de934c34b8d36012cb687b38e5bcff62f95d (diff) | |
| download | upstream-49f8a75031c8fb2efc4824166da75f1473cdab6b.tar.gz upstream-49f8a75031c8fb2efc4824166da75f1473cdab6b.tar.bz2 upstream-49f8a75031c8fb2efc4824166da75f1473cdab6b.zip | |
kernel: bump 5.10 to 5.10.118
Removed upstreamed:
generic-backport/774-v5.15-1-igc-remove-_I_PHY_ID-checking.patch
generic-backport/774-v5.15-2-igc-remove-phy-type-checking.patch
All patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit b789a588b1c55fe1df7e2d6ae1c4f84b96a03a95)
Diffstat (limited to 'target/linux/generic/hack-5.10')
| -rw-r--r-- | target/linux/generic/hack-5.10/204-module_strip.patch | 4 | ||||
| -rw-r--r-- | target/linux/generic/hack-5.10/600-bridge_offload.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/hack-5.10/204-module_strip.patch b/target/linux/generic/hack-5.10/204-module_strip.patch index 645074821f..4c6b4454c6 100644 --- a/target/linux/generic/hack-5.10/204-module_strip.patch +++ b/target/linux/generic/hack-5.10/204-module_strip.patch @@ -120,7 +120,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #ifdef CONFIG_MODVERSIONS -@@ -3247,9 +3249,11 @@ static int setup_load_info(struct load_i +@@ -3251,9 +3253,11 @@ static int setup_load_info(struct load_i static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -133,7 +133,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -3270,6 +3274,7 @@ static int check_modinfo(struct module * +@@ -3274,6 +3278,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } diff --git a/target/linux/generic/hack-5.10/600-bridge_offload.patch b/target/linux/generic/hack-5.10/600-bridge_offload.patch index 7e1b852bf3..b704c98dc8 100644 --- a/target/linux/generic/hack-5.10/600-bridge_offload.patch +++ b/target/linux/generic/hack-5.10/600-bridge_offload.patch @@ -154,7 +154,7 @@ static int br_netif_receive_skb(struct net *net, struct sock *sk, struct sk_buff *skb) -@@ -162,6 +163,7 @@ int br_handle_frame_finish(struct net *n +@@ -169,6 +170,7 @@ int br_handle_frame_finish(struct net *n dst->used = now; br_forward(dst->dst, skb, local_rcv, false); } else { @@ -162,7 +162,7 @@ if (!mcast_hit) br_flood(br, skb, pkt_type, local_rcv, false); else -@@ -280,6 +282,9 @@ static rx_handler_result_t br_handle_fra +@@ -287,6 +289,9 @@ static rx_handler_result_t br_handle_fra memset(skb->cb, 0, sizeof(struct br_input_skb_cb)); p = br_port_get_rcu(skb->dev); |