Skip to content

Commit d664d74

Browse files
graysky2PolynomialDivision
authored andcommitted
kernel: bump 6.6 to 6.6.79
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.79 Manually rebased: ramips/patches-6.6/810-uvc-add-iPassion-iP2970-support.patch All other patches automatically rebased. Build system: x86/64 Build-tested: bcm27xx/bcm2712, filogic/glinet_gl-mt6000, filogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64 Run-tested: bcm27xx/bcm2712, filogic/glinet_gl-mt6000, filogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3, x86/64 Signed-off-by: John Audia <therealgraysky@proton.me> Link: openwrt/openwrt#18066 Signed-off-by: Nick Hainke <vincent@systemli.org>
1 parent ce67f08 commit d664d74

15 files changed

+42
-42
lines changed

include/kernel-6.6

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-6.6 = .78
2-
LINUX_KERNEL_HASH-6.6.78 = 5aa39a9bd555133ad741058f9908a277e6b36bb928481e747d885b50aaaa93ed
1+
LINUX_VERSION-6.6 = .79
2+
LINUX_KERNEL_HASH-6.6.79 = 07a6f904470da1a099aa1683e3025a999dd82f2438f78b006b80c6ae2e9dfe8d

target/linux/airoha/patches-6.6/105-uart-add-en7523-support.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
};
123123

124124
/* Uart divisor latch read */
125-
@@ -2881,6 +2889,12 @@ serial8250_do_set_termios(struct uart_po
125+
@@ -2889,6 +2897,12 @@ serial8250_do_set_termios(struct uart_po
126126

127127
serial8250_set_divisor(port, baud, quot, frac);
128128

target/linux/bcm27xx/patches-6.6/950-0065-cgroup-Disable-cgroup-memory-by-default.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
1717

1818
--- a/kernel/cgroup/cgroup.c
1919
+++ b/kernel/cgroup/cgroup.c
20-
@@ -6063,6 +6063,9 @@ int __init cgroup_init_early(void)
20+
@@ -6059,6 +6059,9 @@ int __init cgroup_init_early(void)
2121
return 0;
2222
}
2323

@@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
2727
/**
2828
* cgroup_init - cgroup initialization
2929
*
30-
@@ -6096,6 +6099,12 @@ int __init cgroup_init(void)
30+
@@ -6092,6 +6095,12 @@ int __init cgroup_init(void)
3131

3232
cgroup_unlock();
3333

@@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
4040
for_each_subsys(ss, ssid) {
4141
if (ss->early_init) {
4242
struct cgroup_subsys_state *css =
43-
@@ -6736,6 +6745,10 @@ static int __init cgroup_disable(char *s
43+
@@ -6740,6 +6749,10 @@ static int __init cgroup_disable(char *s
4444
strcmp(token, ss->legacy_name))
4545
continue;
4646

@@ -51,7 +51,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
5151
static_branch_disable(cgroup_subsys_enabled_key[i]);
5252
pr_info("Disabling %s control group subsystem\n",
5353
ss->name);
54-
@@ -6754,6 +6767,31 @@ static int __init cgroup_disable(char *s
54+
@@ -6758,6 +6771,31 @@ static int __init cgroup_disable(char *s
5555
}
5656
__setup("cgroup_disable=", cgroup_disable);
5757

target/linux/bcm27xx/patches-6.6/950-0087-Add-dwc_otg-driver.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1189,7 +1189,7 @@ Signed-off-by: Alexander Winkowski <dereference23@outlook.com>
11891189
}
11901190
--- a/drivers/usb/core/hub.c
11911191
+++ b/drivers/usb/core/hub.c
1192-
@@ -5712,7 +5712,7 @@ static void port_event(struct usb_hub *h
1192+
@@ -5722,7 +5722,7 @@ static void port_event(struct usb_hub *h
11931193
port_dev->over_current_count++;
11941194
port_over_current_notify(port_dev);
11951195

target/linux/bcm27xx/patches-6.6/950-1349-cgroup-Use-kernel-command-line-to-disable-memory-cgr.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ Signed-off-by: Maíra Canal <mcanal@igalia.com>
148148

149149
--- a/kernel/cgroup/cgroup.c
150150
+++ b/kernel/cgroup/cgroup.c
151-
@@ -6063,9 +6063,6 @@ int __init cgroup_init_early(void)
151+
@@ -6059,9 +6059,6 @@ int __init cgroup_init_early(void)
152152
return 0;
153153
}
154154

@@ -158,7 +158,7 @@ Signed-off-by: Maíra Canal <mcanal@igalia.com>
158158
/**
159159
* cgroup_init - cgroup initialization
160160
*
161-
@@ -6099,12 +6096,6 @@ int __init cgroup_init(void)
161+
@@ -6095,12 +6092,6 @@ int __init cgroup_init(void)
162162

163163
cgroup_unlock();
164164

@@ -171,7 +171,7 @@ Signed-off-by: Maíra Canal <mcanal@igalia.com>
171171
for_each_subsys(ss, ssid) {
172172
if (ss->early_init) {
173173
struct cgroup_subsys_state *css =
174-
@@ -6745,10 +6736,6 @@ static int __init cgroup_disable(char *s
174+
@@ -6749,10 +6740,6 @@ static int __init cgroup_disable(char *s
175175
strcmp(token, ss->legacy_name))
176176
continue;
177177

@@ -182,7 +182,7 @@ Signed-off-by: Maíra Canal <mcanal@igalia.com>
182182
static_branch_disable(cgroup_subsys_enabled_key[i]);
183183
pr_info("Disabling %s control group subsystem\n",
184184
ss->name);
185-
@@ -6782,7 +6769,7 @@ static int __init cgroup_enable(char *st
185+
@@ -6786,7 +6773,7 @@ static int __init cgroup_enable(char *st
186186
strcmp(token, ss->legacy_name))
187187
continue;
188188

target/linux/bcm27xx/patches-6.6/950-1445-fixup-cgroup-Use-kernel-command-line-to-disable-memo.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
1414

1515
--- a/kernel/cgroup/cgroup.c
1616
+++ b/kernel/cgroup/cgroup.c
17-
@@ -6769,11 +6769,19 @@ static int __init cgroup_enable(char *st
17+
@@ -6773,11 +6773,19 @@ static int __init cgroup_enable(char *st
1818
strcmp(token, ss->legacy_name))
1919
continue;
2020

target/linux/generic/backport-6.6/602-v6.10-net-Use-backlog-NAPI-to-clean-up-the-defer_list.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
3636

3737
--- a/include/linux/netdevice.h
3838
+++ b/include/linux/netdevice.h
39-
@@ -3300,6 +3300,7 @@ static inline void dev_xmit_recursion_de
39+
@@ -3306,6 +3306,7 @@ static inline void dev_xmit_recursion_de
4040
__this_cpu_dec(softnet_data.xmit.recursion);
4141
}
4242

target/linux/generic/backport-6.6/700-v6.10-net-create-a-dummy-net_device-allocator.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
3737

3838
--- a/include/linux/netdevice.h
3939
+++ b/include/linux/netdevice.h
40-
@@ -4561,6 +4561,9 @@ static inline void netif_addr_unlock_bh(
40+
@@ -4567,6 +4567,9 @@ static inline void netif_addr_unlock_bh(
4141

4242
void ether_setup(struct net_device *dev);
4343

target/linux/generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
4444

4545
#define QUECTEL_VENDOR_ID 0x2c7c
4646
/* These Quectel products use Quectel's vendor ID */
47-
@@ -1162,6 +1167,11 @@ static const struct usb_device_id option
47+
@@ -1153,6 +1158,11 @@ static const struct usb_device_id option
4848
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
4949
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
5050
.driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) },
@@ -56,7 +56,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
5656
/* Quectel products using Qualcomm vendor ID */
5757
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
5858
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
59-
@@ -1203,6 +1213,11 @@ static const struct usb_device_id option
59+
@@ -1194,6 +1204,11 @@ static const struct usb_device_id option
6060
.driver_info = ZLP },
6161
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
6262
.driver_info = RSVD(4) },

target/linux/generic/pending-6.6/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
157157
case RTN_THROW:
158158
case RTN_UNREACHABLE:
159159
default:
160-
@@ -4546,6 +4565,17 @@ static int ip6_pkt_prohibit_out(struct n
160+
@@ -4551,6 +4570,17 @@ static int ip6_pkt_prohibit_out(struct n
161161
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
162162
}
163163

@@ -175,7 +175,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
175175
/*
176176
* Allocate a dst for local (unicast / anycast) address.
177177
*/
178-
@@ -5037,7 +5067,8 @@ static int rtm_to_fib6_config(struct sk_
178+
@@ -5042,7 +5072,8 @@ static int rtm_to_fib6_config(struct sk_
179179
if (rtm->rtm_type == RTN_UNREACHABLE ||
180180
rtm->rtm_type == RTN_BLACKHOLE ||
181181
rtm->rtm_type == RTN_PROHIBIT ||
@@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
185185
cfg->fc_flags |= RTF_REJECT;
186186

187187
if (rtm->rtm_type == RTN_LOCAL)
188-
@@ -6299,6 +6330,8 @@ static int ip6_route_dev_notify(struct n
188+
@@ -6304,6 +6335,8 @@ static int ip6_route_dev_notify(struct n
189189
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
190190
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
191191
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
@@ -194,15 +194,15 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
194194
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
195195
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
196196
#endif
197-
@@ -6310,6 +6343,7 @@ static int ip6_route_dev_notify(struct n
197+
@@ -6315,6 +6348,7 @@ static int ip6_route_dev_notify(struct n
198198
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
199199
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
200200
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
201201
+ in6_dev_put_clear(&net->ipv6.ip6_policy_failed_entry->rt6i_idev);
202202
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
203203
#endif
204204
}
205-
@@ -6510,6 +6544,8 @@ static int __net_init ip6_route_net_init
205+
@@ -6515,6 +6549,8 @@ static int __net_init ip6_route_net_init
206206

207207
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
208208
net->ipv6.fib6_has_custom_rules = false;
@@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
211211
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
212212
sizeof(*net->ipv6.ip6_prohibit_entry),
213213
GFP_KERNEL);
214-
@@ -6520,11 +6556,21 @@ static int __net_init ip6_route_net_init
214+
@@ -6525,11 +6561,21 @@ static int __net_init ip6_route_net_init
215215
ip6_template_metrics, true);
216216
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->dst.rt_uncached);
217217

@@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
234234
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
235235
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
236236
ip6_template_metrics, true);
237-
@@ -6551,6 +6597,8 @@ out:
237+
@@ -6556,6 +6602,8 @@ out:
238238
return ret;
239239

240240
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
@@ -243,15 +243,15 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
243243
out_ip6_prohibit_entry:
244244
kfree(net->ipv6.ip6_prohibit_entry);
245245
out_ip6_null_entry:
246-
@@ -6570,6 +6618,7 @@ static void __net_exit ip6_route_net_exi
246+
@@ -6575,6 +6623,7 @@ static void __net_exit ip6_route_net_exi
247247
kfree(net->ipv6.ip6_null_entry);
248248
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
249249
kfree(net->ipv6.ip6_prohibit_entry);
250250
+ kfree(net->ipv6.ip6_policy_failed_entry);
251251
kfree(net->ipv6.ip6_blk_hole_entry);
252252
#endif
253253
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
254-
@@ -6653,6 +6702,9 @@ void __init ip6_route_init_special_entri
254+
@@ -6658,6 +6707,9 @@ void __init ip6_route_init_special_entri
255255
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
256256
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
257257
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);

0 commit comments

Comments
 (0)