Skip to content

Commit 10e32b9

Browse files
graysky2hauke
authored andcommitted
kernel: bump 6.18 to 6.18.21
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.18.21 All patches automatically rebased. Build system: x86/64 Build-tested: x86/64-glibc Run-tested: Intel N150 Signed-off-by: John Audia <therealgraysky@proton.me> Link: openwrt/openwrt#22741 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
1 parent 2fab6c9 commit 10e32b9

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

target/linux/generic/hack-6.18/204-module_strip.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
107107

108108
/* Parse tag=value strings from .modinfo section */
109109
char *module_next_tag_pair(char *string, unsigned long *secsize)
110-
@@ -2572,9 +2574,11 @@ static void module_augment_kernel_taints
110+
@@ -2579,9 +2581,11 @@ static void module_augment_kernel_taints
111111

112112
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
113113
{
@@ -120,7 +120,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
120120
if (flags & MODULE_INIT_IGNORE_VERMAGIC)
121121
modmagic = NULL;
122122

123-
@@ -2588,6 +2592,7 @@ static int check_modinfo(struct module *
123+
@@ -2595,6 +2599,7 @@ static int check_modinfo(struct module *
124124
info->name, modmagic, vermagic);
125125
return -ENOEXEC;
126126
}

target/linux/generic/hack-6.18/259-regmap_dynamic.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
139139
#include <linux/mutex.h>
140140
#include <linux/err.h>
141141
#include <linux/property.h>
142-
@@ -3525,3 +3526,5 @@ static int __init regmap_initcall(void)
142+
@@ -3547,3 +3548,5 @@ static int __init regmap_initcall(void)
143143
return 0;
144144
}
145145
postcore_initcall(regmap_initcall);

target/linux/generic/kernel-6.18

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-6.18 = .20
2-
LINUX_KERNEL_HASH-6.18.20 = 837a5abd98e46078a0ae1400e2daad89ece45cc3209037b09c2265dab2393553
1+
LINUX_VERSION-6.18 = .21
2+
LINUX_KERNEL_HASH-6.18.21 = 1c38214fb137bae85b82b82537b5987358621b915ab2a8e4f09e60697c19474f

target/linux/generic/pending-6.18/630-packet_socket_type.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
8787
if (!net_eq(dev_net(dev), sock_net(sk)))
8888
goto drop;
8989

90-
@@ -3375,6 +3377,7 @@ static int packet_create(struct net *net
90+
@@ -3376,6 +3378,7 @@ static int packet_create(struct net *net
9191
mutex_init(&po->pg_vec_lock);
9292
po->rollover = NULL;
9393
po->prot_hook.func = packet_rcv;
9494
+ po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
9595

9696
if (sock->type == SOCK_PACKET)
9797
po->prot_hook.func = packet_rcv_spkt;
98-
@@ -4043,6 +4046,16 @@ packet_setsockopt(struct socket *sock, i
98+
@@ -4044,6 +4047,16 @@ packet_setsockopt(struct socket *sock, i
9999
packet_sock_flag_set(po, PACKET_SOCK_QDISC_BYPASS, val);
100100
return 0;
101101
}
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
112112
default:
113113
return -ENOPROTOOPT;
114114
}
115-
@@ -4105,6 +4118,13 @@ static int packet_getsockopt(struct sock
115+
@@ -4106,6 +4119,13 @@ static int packet_getsockopt(struct sock
116116
case PACKET_COPY_THRESH:
117117
val = READ_ONCE(pkt_sk(sk)->copy_thresh);
118118
break;

target/linux/generic/pending-6.18/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
161161

162162
struct rtnl_link {
163163
rtnl_doit_func doit;
164-
@@ -5295,7 +5295,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
164+
@@ -5317,7 +5317,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
165165
brport_nla_put_flag(skb, flags, mask,
166166
IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
167167
brport_nla_put_flag(skb, flags, mask,

0 commit comments

Comments
 (0)