From 05d344cb2ca3b95f6c3536981af4fd85122eae0d Mon Sep 17 00:00:00 2001 From: Leo Barsky Date: Thu, 24 Jul 2025 12:12:33 +0000 Subject: [PATCH] kernel: bump 6.6 to 6.6.100 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.100 Manually refreshed: 823-v6.12-0003-nvmem-layouts-add-U-Boot-env-layout.patch All other patches auto-refreshed. Signed-off-by: Leo Barsky Link: https://github.com/openwrt/openwrt/pull/19514 Signed-off-by: Hauke Mehrtens --- ....12-0001-nvmem-imx-ocotp-ele-support-i.MX95.patch | 8 ++++---- ...12-0003-nvmem-layouts-add-U-Boot-env-layout.patch | 12 ++++++------ ...ernel-ct-size-the-hashtable-more-adequately.patch | 2 +- target/linux/generic/kernel-6.6 | 4 ++-- .../generic/pending-6.6/630-packet_socket_type.patch | 6 +++--- ...bridge-fix-switchdev-host-mdb-entry-updates.patch | 2 +- ...e-switchdev-Don-t-drop-packets-between-port.patch | 2 +- ...e-NETIF_F_GSO_FRAGLIST-from-NETIF_F_GSO_SOF.patch | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/target/linux/generic/backport-6.6/823-v6.12-0001-nvmem-imx-ocotp-ele-support-i.MX95.patch b/target/linux/generic/backport-6.6/823-v6.12-0001-nvmem-imx-ocotp-ele-support-i.MX95.patch index de965e1ccd..04ac6f1334 100644 --- a/target/linux/generic/backport-6.6/823-v6.12-0001-nvmem-imx-ocotp-ele-support-i.MX95.patch +++ b/target/linux/generic/backport-6.6/823-v6.12-0001-nvmem-imx-ocotp-ele-support-i.MX95.patch @@ -16,8 +16,8 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/nvmem/imx-ocotp-ele.c +++ b/drivers/nvmem/imx-ocotp-ele.c -@@ -14,8 +14,9 @@ - #include +@@ -15,8 +15,9 @@ + #include /* ETH_ALEN */ enum fuse_type { - FUSE_FSB = 1, @@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman FUSE_INVALID = -1 }; -@@ -95,7 +96,10 @@ static int imx_ocotp_reg_read(void *cont +@@ -96,7 +97,10 @@ static int imx_ocotp_reg_read(void *cont continue; } @@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman } memcpy(val, ((u8 *)p) + skipbytes, bytes); -@@ -179,8 +183,30 @@ static const struct ocotp_devtype_data i +@@ -182,8 +186,30 @@ static const struct ocotp_devtype_data i }, }; diff --git a/target/linux/generic/backport-6.6/823-v6.12-0003-nvmem-layouts-add-U-Boot-env-layout.patch b/target/linux/generic/backport-6.6/823-v6.12-0003-nvmem-layouts-add-U-Boot-env-layout.patch index 2d71c4b3b4..f869fc2037 100644 --- a/target/linux/generic/backport-6.6/823-v6.12-0003-nvmem-layouts-add-U-Boot-env-layout.patch +++ b/target/linux/generic/backport-6.6/823-v6.12-0003-nvmem-layouts-add-U-Boot-env-layout.patch @@ -185,7 +185,7 @@ Signed-off-by: Greg Kroah-Hartman + size_t crc32_data_offset; + size_t crc32_data_len; + size_t crc32_offset; -+ __le32 *crc32_addr; ++ uint32_t *crc32_addr; + size_t data_offset; + size_t data_len; + size_t dev_size; @@ -236,8 +236,8 @@ Signed-off-by: Greg Kroah-Hartman + goto err_kfree; + } + -+ crc32_addr = (__le32 *)(buf + crc32_offset); -+ crc32 = le32_to_cpu(*crc32_addr); ++ crc32_addr = (uint32_t *)(buf + crc32_offset); ++ crc32 = *crc32_addr; + crc32_data_len = dev_size - crc32_data_offset; + data_len = dev_size - data_offset; + @@ -439,7 +439,7 @@ Signed-off-by: Greg Kroah-Hartman - size_t crc32_data_offset; - size_t crc32_data_len; - size_t crc32_offset; -- __le32 *crc32_addr; +- uint32_t *crc32_addr; - size_t data_offset; - size_t data_len; - size_t dev_size; @@ -490,8 +490,8 @@ Signed-off-by: Greg Kroah-Hartman - goto err_kfree; - } - -- crc32_addr = (__le32 *)(buf + crc32_offset); -- crc32 = le32_to_cpu(*crc32_addr); +- crc32_addr = (uint32_t *)(buf + crc32_offset); +- crc32 = *crc32_addr; - crc32_data_len = dev_size - crc32_data_offset; - data_len = dev_size - data_offset; - diff --git a/target/linux/generic/hack-6.6/661-kernel-ct-size-the-hashtable-more-adequately.patch b/target/linux/generic/hack-6.6/661-kernel-ct-size-the-hashtable-more-adequately.patch index ff959ec8d2..64ef073611 100644 --- a/target/linux/generic/hack-6.6/661-kernel-ct-size-the-hashtable-more-adequately.patch +++ b/target/linux/generic/hack-6.6/661-kernel-ct-size-the-hashtable-more-adequately.patch @@ -14,7 +14,7 @@ Signed-off-by: Rui Salvaterra --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -2685,7 +2685,7 @@ int nf_conntrack_init_start(void) +@@ -2699,7 +2699,7 @@ int nf_conntrack_init_start(void) if (!nf_conntrack_htable_size) { nf_conntrack_htable_size diff --git a/target/linux/generic/kernel-6.6 b/target/linux/generic/kernel-6.6 index 7ed3e4f41d..4a55a573ae 100644 --- a/target/linux/generic/kernel-6.6 +++ b/target/linux/generic/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .99 -LINUX_KERNEL_HASH-6.6.99 = b08679729f1ec74b9fa829f5990936ca2511039d87acc7e8b3f39912de89ab36 +LINUX_VERSION-6.6 = .100 +LINUX_KERNEL_HASH-6.6.100 = d6c0ec4d55b14814f55b62a0b23a2d95faf66877e48fbfb4b83523e4afdf97ba diff --git a/target/linux/generic/pending-6.6/630-packet_socket_type.patch b/target/linux/generic/pending-6.6/630-packet_socket_type.patch index f5c15756c5..4992dd7816 100644 --- a/target/linux/generic/pending-6.6/630-packet_socket_type.patch +++ b/target/linux/generic/pending-6.6/630-packet_socket_type.patch @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -3437,6 +3439,7 @@ static int packet_create(struct net *net +@@ -3436,6 +3438,7 @@ static int packet_create(struct net *net mutex_init(&po->pg_vec_lock); po->rollover = NULL; po->prot_hook.func = packet_rcv; @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -4104,6 +4107,16 @@ packet_setsockopt(struct socket *sock, i +@@ -4103,6 +4106,16 @@ packet_setsockopt(struct socket *sock, i packet_sock_flag_set(po, PACKET_SOCK_QDISC_BYPASS, val); return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -4163,6 +4176,13 @@ static int packet_getsockopt(struct sock +@@ -4162,6 +4175,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR_SZ: val = READ_ONCE(po->vnet_hdr_sz); break; diff --git a/target/linux/generic/pending-6.6/640-net-bridge-fix-switchdev-host-mdb-entry-updates.patch b/target/linux/generic/pending-6.6/640-net-bridge-fix-switchdev-host-mdb-entry-updates.patch index cf55c6a3fb..8271e062ff 100644 --- a/target/linux/generic/pending-6.6/640-net-bridge-fix-switchdev-host-mdb-entry-updates.patch +++ b/target/linux/generic/pending-6.6/640-net-bridge-fix-switchdev-host-mdb-entry-updates.patch @@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau --- a/net/bridge/br_switchdev.c +++ b/net/bridge/br_switchdev.c -@@ -568,10 +568,18 @@ static void br_switchdev_host_mdb(struct +@@ -571,10 +571,18 @@ static void br_switchdev_host_mdb(struct struct net_bridge_mdb_entry *mp, int type) { struct net_device *lower_dev; diff --git a/target/linux/generic/pending-6.6/641-net-bridge-switchdev-Don-t-drop-packets-between-port.patch b/target/linux/generic/pending-6.6/641-net-bridge-switchdev-Don-t-drop-packets-between-port.patch index 1c4ec61b50..531e1c99c6 100644 --- a/target/linux/generic/pending-6.6/641-net-bridge-switchdev-Don-t-drop-packets-between-port.patch +++ b/target/linux/generic/pending-6.6/641-net-bridge-switchdev-Don-t-drop-packets-between-port.patch @@ -27,7 +27,7 @@ Signed-off-by: Leon M. Busch-George --- a/net/bridge/br_switchdev.c +++ b/net/bridge/br_switchdev.c -@@ -67,7 +67,7 @@ bool nbp_switchdev_allowed_egress(const +@@ -70,7 +70,7 @@ bool nbp_switchdev_allowed_egress(const struct br_input_skb_cb *cb = BR_INPUT_SKB_CB(skb); return !test_bit(p->hwdom, &cb->fwd_hwdoms) && diff --git a/target/linux/generic/pending-6.6/681-net-remove-NETIF_F_GSO_FRAGLIST-from-NETIF_F_GSO_SOF.patch b/target/linux/generic/pending-6.6/681-net-remove-NETIF_F_GSO_FRAGLIST-from-NETIF_F_GSO_SOF.patch index fffb6cbb54..1d69f9f775 100644 --- a/target/linux/generic/pending-6.6/681-net-remove-NETIF_F_GSO_FRAGLIST-from-NETIF_F_GSO_SOF.patch +++ b/target/linux/generic/pending-6.6/681-net-remove-NETIF_F_GSO_FRAGLIST-from-NETIF_F_GSO_SOF.patch @@ -65,7 +65,7 @@ Signed-off-by: Felix Fietkau --- a/net/8021q/vlan.h +++ b/net/8021q/vlan.h -@@ -108,7 +108,7 @@ static inline netdev_features_t vlan_tnl +@@ -109,7 +109,7 @@ static inline netdev_features_t vlan_tnl netdev_features_t ret; ret = real_dev->hw_enc_features &