diff --git a/include/kernel-6.6 b/include/kernel-6.6 index d2d952e254..88d972d66a 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .95 -LINUX_KERNEL_HASH-6.6.95 = 18640ae9a2c952f8f8868324378df1a9e138ad29e6b93a9c38155764ea67ea85 +LINUX_VERSION-6.6 = .96 +LINUX_KERNEL_HASH-6.6.96 = 9ee45843d43adb2e2ac5f6a8cb10a334e39e3e3384af8a0ce383a37f78221bdd diff --git a/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch b/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch index 9f346943cc..2346d42732 100644 --- a/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch +++ b/target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch @@ -17583,7 +17583,7 @@ Signed-off-by: Phil Elwell * For devices with more than one control interface, we assume the --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c -@@ -2258,6 +2258,8 @@ static const struct usb_audio_quirk_flag +@@ -2260,6 +2260,8 @@ static const struct usb_audio_quirk_flag QUIRK_FLAG_ALIGN_TRANSFER), DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */ QUIRK_FLAG_ALIGN_TRANSFER), diff --git a/target/linux/generic/pending-6.6/650-Revert-ipv6-save-dontfrag-in-cork.patch b/target/linux/generic/pending-6.6/650-Revert-ipv6-save-dontfrag-in-cork.patch deleted file mode 100644 index 18ef72ef58..0000000000 --- a/target/linux/generic/pending-6.6/650-Revert-ipv6-save-dontfrag-in-cork.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 988e05f0c036c9c64f211b8b91a4a33c34db216a Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Sat, 21 Jun 2025 19:08:30 +0200 -Subject: [PATCH] Revert "ipv6: save dontfrag in cork" - -This reverts commit 8ebf2709fe4dcd0a1b7b95bf61e529ddcd3cdf51. - -This change breaks IPv6 UDP packet fragmentation. -See discussion: https://lore.kernel.org/stable/aFGl-mb--GOMY8ZQ@karahi.gladserv.com/ - -Signed-off-by: Hauke Mehrtens ---- - include/linux/ipv6.h | 1 - - net/ipv6/ip6_output.c | 9 ++++----- - 2 files changed, 4 insertions(+), 6 deletions(-) - ---- a/include/linux/ipv6.h -+++ b/include/linux/ipv6.h -@@ -199,7 +199,6 @@ struct inet6_cork { - struct ipv6_txoptions *opt; - u8 hop_limit; - u8 tclass; -- u8 dontfrag:1; - }; - - /* struct ipv6_pinfo - ipv6 private area */ ---- a/net/ipv6/ip6_output.c -+++ b/net/ipv6/ip6_output.c -@@ -1452,7 +1452,6 @@ static int ip6_setup_cork(struct sock *s - } - v6_cork->hop_limit = ipc6->hlimit; - v6_cork->tclass = ipc6->tclass; -- v6_cork->dontfrag = ipc6->dontfrag; - if (rt->dst.flags & DST_XFRM_TUNNEL) - mtu = np->pmtudisc >= IPV6_PMTUDISC_PROBE ? - READ_ONCE(rt->dst.dev->mtu) : dst_mtu(&rt->dst); -@@ -1486,7 +1485,7 @@ static int __ip6_append_data(struct sock - int getfrag(void *from, char *to, int offset, - int len, int odd, struct sk_buff *skb), - void *from, size_t length, int transhdrlen, -- unsigned int flags) -+ unsigned int flags, struct ipcm6_cookie *ipc6) - { - struct sk_buff *skb, *skb_prev = NULL; - struct inet_cork *cork = &cork_full->base; -@@ -1542,7 +1541,7 @@ static int __ip6_append_data(struct sock - if (headersize + transhdrlen > mtu) - goto emsgsize; - -- if (cork->length + length > mtu - headersize && v6_cork->dontfrag && -+ if (cork->length + length > mtu - headersize && ipc6->dontfrag && - (sk->sk_protocol == IPPROTO_UDP || - sk->sk_protocol == IPPROTO_ICMPV6 || - sk->sk_protocol == IPPROTO_RAW)) { -@@ -1914,7 +1913,7 @@ int ip6_append_data(struct sock *sk, - - return __ip6_append_data(sk, &sk->sk_write_queue, &inet->cork, - &np->cork, sk_page_frag(sk), getfrag, -- from, length, transhdrlen, flags); -+ from, length, transhdrlen, flags, ipc6); - } - EXPORT_SYMBOL_GPL(ip6_append_data); - -@@ -2119,7 +2118,7 @@ struct sk_buff *ip6_make_skb(struct sock - err = __ip6_append_data(sk, &queue, cork, &v6_cork, - ¤t->task_frag, getfrag, from, - length + exthdrlen, transhdrlen + exthdrlen, -- flags); -+ flags, ipc6); - if (err) { - __ip6_flush_pending_frames(sk, &queue, cork, &v6_cork); - return ERR_PTR(err); diff --git a/target/linux/x86/patches-6.6/103-pcengines_apu6_platform.patch b/target/linux/x86/patches-6.6/103-pcengines_apu6_platform.patch index 1fd6fc89c8..4c22d0bb02 100644 --- a/target/linux/x86/patches-6.6/103-pcengines_apu6_platform.patch +++ b/target/linux/x86/patches-6.6/103-pcengines_apu6_platform.patch @@ -63,7 +63,7 @@ Sighed-off-by: Philip Prindeville --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig -@@ -707,7 +707,7 @@ config XO1_RFKILL +@@ -708,7 +708,7 @@ config XO1_RFKILL laptop. config PCENGINES_APU2 @@ -72,7 +72,7 @@ Sighed-off-by: Philip Prindeville depends on INPUT && INPUT_KEYBOARD && GPIOLIB depends on LEDS_CLASS select GPIO_AMD_FCH -@@ -715,7 +715,7 @@ config PCENGINES_APU2 +@@ -716,7 +716,7 @@ config PCENGINES_APU2 select LEDS_GPIO help This driver provides support for the front button and LEDs on