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 <leobrsky@proton.me> Link: https://github.com/openwrt/openwrt/pull/19514 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Leo Barsky
Hauke Mehrtens
parent
15a4d621d8
commit
05d344cb2c
|
|
@ -16,8 +16,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|||
|
||||
--- a/drivers/nvmem/imx-ocotp-ele.c
|
||||
+++ b/drivers/nvmem/imx-ocotp-ele.c
|
||||
@@ -14,8 +14,9 @@
|
||||
#include <linux/slab.h>
|
||||
@@ -15,8 +15,9 @@
|
||||
#include <linux/if_ether.h> /* ETH_ALEN */
|
||||
|
||||
enum fuse_type {
|
||||
- FUSE_FSB = 1,
|
||||
|
|
@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|||
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 <gregkh@linuxfoundation.org>
|
|||
}
|
||||
|
||||
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
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|||
+ 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 <gregkh@linuxfoundation.org>
|
|||
+ 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 <gregkh@linuxfoundation.org>
|
|||
- 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 <gregkh@linuxfoundation.org>
|
|||
- 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;
|
||||
-
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
|
|||
|
||||
--- 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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||
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 <nbd@nbd.name>
|
|||
|
||||
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 <nbd@nbd.name>
|
|||
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;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||
|
||||
--- 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;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ Signed-off-by: Leon M. Busch-George <leon@georgemail.eu>
|
|||
|
||||
--- 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) &&
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||
|
||||
--- 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 &
|
||||
|
|
|
|||
Loading…
Reference in New Issue