Skip to content

Commit 254f6b2

Browse files
leobskyGoetzGoerisch
authored andcommitted
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 <[email protected]> Link: openwrt/openwrt#19514 (cherry picked from commit 05d344c) Co-authored-by: Goetz Goerisch <[email protected]> Signed-off-by: Goetz Goerisch <[email protected]> Link: openwrt/openwrt#19533 Signed-off-by: Hauke Mehrtens <[email protected]>
1 parent 01bee44 commit 254f6b2

12 files changed

+24
-24
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 = .99
2-
LINUX_KERNEL_HASH-6.6.99 = b08679729f1ec74b9fa829f5990936ca2511039d87acc7e8b3f39912de89ab36
1+
LINUX_VERSION-6.6 = .100
2+
LINUX_KERNEL_HASH-6.6.100 = d6c0ec4d55b14814f55b62a0b23a2d95faf66877e48fbfb4b83523e4afdf97ba

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 <[email protected]>
11891189
}
11901190
--- a/drivers/usb/core/hub.c
11911191
+++ b/drivers/usb/core/hub.c
1192-
@@ -5722,7 +5722,7 @@ static void port_event(struct usb_hub *h
1192+
@@ -5751,7 +5751,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-0466-mmc-bcm2835-Use-phys-addresses-for-slave-DMA-config.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Signed-off-by: Phil Elwell <[email protected]>
2323
#include <linux/of_irq.h>
2424
#include <linux/platform_device.h>
2525
#include <linux/scatterlist.h>
26-
@@ -1347,8 +1346,8 @@ static int bcm2835_probe(struct platform
26+
@@ -1348,8 +1347,8 @@ static int bcm2835_probe(struct platform
2727
struct device *dev = &pdev->dev;
2828
struct clk *clk;
2929
struct bcm2835_host *host;
@@ -33,7 +33,7 @@ Signed-off-by: Phil Elwell <[email protected]>
3333
int ret;
3434

3535
dev_dbg(dev, "%s\n", __func__);
36-
@@ -1361,23 +1360,13 @@ static int bcm2835_probe(struct platform
36+
@@ -1362,23 +1361,13 @@ static int bcm2835_probe(struct platform
3737
host->pdev = pdev;
3838
spin_lock_init(&host->lock);
3939

target/linux/generic/backport-6.6/823-v6.12-0001-nvmem-imx-ocotp-ele-support-i.MX95.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
1616

1717
--- a/drivers/nvmem/imx-ocotp-ele.c
1818
+++ b/drivers/nvmem/imx-ocotp-ele.c
19-
@@ -14,8 +14,9 @@
20-
#include <linux/slab.h>
19+
@@ -15,8 +15,9 @@
20+
#include <linux/if_ether.h> /* ETH_ALEN */
2121

2222
enum fuse_type {
2323
- FUSE_FSB = 1,
@@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
2828
FUSE_INVALID = -1
2929
};
3030

31-
@@ -95,7 +96,10 @@ static int imx_ocotp_reg_read(void *cont
31+
@@ -96,7 +97,10 @@ static int imx_ocotp_reg_read(void *cont
3232
continue;
3333
}
3434

@@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
4040
}
4141

4242
memcpy(val, ((u8 *)p) + skipbytes, bytes);
43-
@@ -179,8 +183,30 @@ static const struct ocotp_devtype_data i
43+
@@ -182,8 +186,30 @@ static const struct ocotp_devtype_data i
4444
},
4545
};
4646

target/linux/generic/backport-6.6/823-v6.12-0003-nvmem-layouts-add-U-Boot-env-layout.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
185185
+ size_t crc32_data_offset;
186186
+ size_t crc32_data_len;
187187
+ size_t crc32_offset;
188-
+ __le32 *crc32_addr;
188+
+ uint32_t *crc32_addr;
189189
+ size_t data_offset;
190190
+ size_t data_len;
191191
+ size_t dev_size;
@@ -236,8 +236,8 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
236236
+ goto err_kfree;
237237
+ }
238238
+
239-
+ crc32_addr = (__le32 *)(buf + crc32_offset);
240-
+ crc32 = le32_to_cpu(*crc32_addr);
239+
+ crc32_addr = (uint32_t *)(buf + crc32_offset);
240+
+ crc32 = *crc32_addr;
241241
+ crc32_data_len = dev_size - crc32_data_offset;
242242
+ data_len = dev_size - data_offset;
243243
+
@@ -439,7 +439,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
439439
- size_t crc32_data_offset;
440440
- size_t crc32_data_len;
441441
- size_t crc32_offset;
442-
- __le32 *crc32_addr;
442+
- uint32_t *crc32_addr;
443443
- size_t data_offset;
444444
- size_t data_len;
445445
- size_t dev_size;
@@ -490,8 +490,8 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
490490
- goto err_kfree;
491491
- }
492492
-
493-
- crc32_addr = (__le32 *)(buf + crc32_offset);
494-
- crc32 = le32_to_cpu(*crc32_addr);
493+
- crc32_addr = (uint32_t *)(buf + crc32_offset);
494+
- crc32 = *crc32_addr;
495495
- crc32_data_len = dev_size - crc32_data_offset;
496496
- data_len = dev_size - data_offset;
497497
-

target/linux/generic/hack-6.6/661-kernel-ct-size-the-hashtable-more-adequately.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Rui Salvaterra <[email protected]>
1414

1515
--- a/net/netfilter/nf_conntrack_core.c
1616
+++ b/net/netfilter/nf_conntrack_core.c
17-
@@ -2685,7 +2685,7 @@ int nf_conntrack_init_start(void)
17+
@@ -2699,7 +2699,7 @@ int nf_conntrack_init_start(void)
1818

1919
if (!nf_conntrack_htable_size) {
2020
nf_conntrack_htable_size

target/linux/generic/pending-6.6/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 <[email protected]>
8787
if (!net_eq(dev_net(dev), sock_net(sk)))
8888
goto drop;
8989

90-
@@ -3437,6 +3439,7 @@ static int packet_create(struct net *net
90+
@@ -3436,6 +3438,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-
@@ -4104,6 +4107,16 @@ packet_setsockopt(struct socket *sock, i
98+
@@ -4103,6 +4106,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 <[email protected]>
112112
default:
113113
return -ENOPROTOOPT;
114114
}
115-
@@ -4163,6 +4176,13 @@ static int packet_getsockopt(struct sock
115+
@@ -4162,6 +4175,13 @@ static int packet_getsockopt(struct sock
116116
case PACKET_VNET_HDR_SZ:
117117
val = READ_ONCE(po->vnet_hdr_sz);
118118
break;

target/linux/generic/pending-6.6/640-net-bridge-fix-switchdev-host-mdb-entry-updates.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
2020

2121
--- a/net/bridge/br_switchdev.c
2222
+++ b/net/bridge/br_switchdev.c
23-
@@ -568,10 +568,18 @@ static void br_switchdev_host_mdb(struct
23+
@@ -571,10 +571,18 @@ static void br_switchdev_host_mdb(struct
2424
struct net_bridge_mdb_entry *mp, int type)
2525
{
2626
struct net_device *lower_dev;

target/linux/generic/pending-6.6/641-net-bridge-switchdev-Don-t-drop-packets-between-port.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Signed-off-by: Leon M. Busch-George <[email protected]>
2727

2828
--- a/net/bridge/br_switchdev.c
2929
+++ b/net/bridge/br_switchdev.c
30-
@@ -67,7 +67,7 @@ bool nbp_switchdev_allowed_egress(const
30+
@@ -70,7 +70,7 @@ bool nbp_switchdev_allowed_egress(const
3131
struct br_input_skb_cb *cb = BR_INPUT_SKB_CB(skb);
3232

3333
return !test_bit(p->hwdom, &cb->fwd_hwdoms) &&

target/linux/generic/pending-6.6/681-net-remove-NETIF_F_GSO_FRAGLIST-from-NETIF_F_GSO_SOF.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
6565

6666
--- a/net/8021q/vlan.h
6767
+++ b/net/8021q/vlan.h
68-
@@ -108,7 +108,7 @@ static inline netdev_features_t vlan_tnl
68+
@@ -109,7 +109,7 @@ static inline netdev_features_t vlan_tnl
6969
netdev_features_t ret;
7070

7171
ret = real_dev->hw_enc_features &

0 commit comments

Comments
 (0)