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
(cherry picked from commit 05d344cb2c)
Co-authored-by: Goetz Goerisch <ggoerisch@gmail.com>
Signed-off-by: Goetz Goerisch <ggoerisch@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/19533
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
committed by
Hauke Mehrtens
parent
01bee440ad
commit
254f6b2414
@@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-6.6 = .99
|
LINUX_VERSION-6.6 = .100
|
||||||
LINUX_KERNEL_HASH-6.6.99 = b08679729f1ec74b9fa829f5990936ca2511039d87acc7e8b3f39912de89ab36
|
LINUX_KERNEL_HASH-6.6.100 = d6c0ec4d55b14814f55b62a0b23a2d95faf66877e48fbfb4b83523e4afdf97ba
|
||||||
|
|||||||
@@ -1189,7 +1189,7 @@ Signed-off-by: Alexander Winkowski <dereference23@outlook.com>
|
|||||||
}
|
}
|
||||||
--- a/drivers/usb/core/hub.c
|
--- a/drivers/usb/core/hub.c
|
||||||
+++ b/drivers/usb/core/hub.c
|
+++ b/drivers/usb/core/hub.c
|
||||||
@@ -5722,7 +5722,7 @@ static void port_event(struct usb_hub *h
|
@@ -5751,7 +5751,7 @@ static void port_event(struct usb_hub *h
|
||||||
port_dev->over_current_count++;
|
port_dev->over_current_count++;
|
||||||
port_over_current_notify(port_dev);
|
port_over_current_notify(port_dev);
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|||||||
#include <linux/of_irq.h>
|
#include <linux/of_irq.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/scatterlist.h>
|
#include <linux/scatterlist.h>
|
||||||
@@ -1347,8 +1346,8 @@ static int bcm2835_probe(struct platform
|
@@ -1348,8 +1347,8 @@ static int bcm2835_probe(struct platform
|
||||||
struct device *dev = &pdev->dev;
|
struct device *dev = &pdev->dev;
|
||||||
struct clk *clk;
|
struct clk *clk;
|
||||||
struct bcm2835_host *host;
|
struct bcm2835_host *host;
|
||||||
@@ -33,7 +33,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
dev_dbg(dev, "%s\n", __func__);
|
dev_dbg(dev, "%s\n", __func__);
|
||||||
@@ -1361,23 +1360,13 @@ static int bcm2835_probe(struct platform
|
@@ -1362,23 +1361,13 @@ static int bcm2835_probe(struct platform
|
||||||
host->pdev = pdev;
|
host->pdev = pdev;
|
||||||
spin_lock_init(&host->lock);
|
spin_lock_init(&host->lock);
|
||||||
|
|
||||||
|
|||||||
@@ -16,8 +16,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|||||||
|
|
||||||
--- a/drivers/nvmem/imx-ocotp-ele.c
|
--- a/drivers/nvmem/imx-ocotp-ele.c
|
||||||
+++ b/drivers/nvmem/imx-ocotp-ele.c
|
+++ b/drivers/nvmem/imx-ocotp-ele.c
|
||||||
@@ -14,8 +14,9 @@
|
@@ -15,8 +15,9 @@
|
||||||
#include <linux/slab.h>
|
#include <linux/if_ether.h> /* ETH_ALEN */
|
||||||
|
|
||||||
enum fuse_type {
|
enum fuse_type {
|
||||||
- FUSE_FSB = 1,
|
- FUSE_FSB = 1,
|
||||||
@@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|||||||
FUSE_INVALID = -1
|
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;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|||||||
}
|
}
|
||||||
|
|
||||||
memcpy(val, ((u8 *)p) + skipbytes, bytes);
|
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_offset;
|
||||||
+ size_t crc32_data_len;
|
+ size_t crc32_data_len;
|
||||||
+ size_t crc32_offset;
|
+ size_t crc32_offset;
|
||||||
+ __le32 *crc32_addr;
|
+ uint32_t *crc32_addr;
|
||||||
+ size_t data_offset;
|
+ size_t data_offset;
|
||||||
+ size_t data_len;
|
+ size_t data_len;
|
||||||
+ size_t dev_size;
|
+ size_t dev_size;
|
||||||
@@ -236,8 +236,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|||||||
+ goto err_kfree;
|
+ goto err_kfree;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ crc32_addr = (__le32 *)(buf + crc32_offset);
|
+ crc32_addr = (uint32_t *)(buf + crc32_offset);
|
||||||
+ crc32 = le32_to_cpu(*crc32_addr);
|
+ crc32 = *crc32_addr;
|
||||||
+ crc32_data_len = dev_size - crc32_data_offset;
|
+ crc32_data_len = dev_size - crc32_data_offset;
|
||||||
+ data_len = dev_size - 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_offset;
|
||||||
- size_t crc32_data_len;
|
- size_t crc32_data_len;
|
||||||
- size_t crc32_offset;
|
- size_t crc32_offset;
|
||||||
- __le32 *crc32_addr;
|
- uint32_t *crc32_addr;
|
||||||
- size_t data_offset;
|
- size_t data_offset;
|
||||||
- size_t data_len;
|
- size_t data_len;
|
||||||
- size_t dev_size;
|
- size_t dev_size;
|
||||||
@@ -490,8 +490,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|||||||
- goto err_kfree;
|
- goto err_kfree;
|
||||||
- }
|
- }
|
||||||
-
|
-
|
||||||
- crc32_addr = (__le32 *)(buf + crc32_offset);
|
- crc32_addr = (uint32_t *)(buf + crc32_offset);
|
||||||
- crc32 = le32_to_cpu(*crc32_addr);
|
- crc32 = *crc32_addr;
|
||||||
- crc32_data_len = dev_size - crc32_data_offset;
|
- crc32_data_len = dev_size - crc32_data_offset;
|
||||||
- data_len = dev_size - 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
|
--- a/net/netfilter/nf_conntrack_core.c
|
||||||
+++ b/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) {
|
if (!nf_conntrack_htable_size) {
|
||||||
nf_conntrack_htable_size
|
nf_conntrack_htable_size
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
if (!net_eq(dev_net(dev), sock_net(sk)))
|
if (!net_eq(dev_net(dev), sock_net(sk)))
|
||||||
goto drop;
|
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);
|
mutex_init(&po->pg_vec_lock);
|
||||||
po->rollover = NULL;
|
po->rollover = NULL;
|
||||||
po->prot_hook.func = packet_rcv;
|
po->prot_hook.func = packet_rcv;
|
||||||
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
if (sock->type == SOCK_PACKET)
|
if (sock->type == SOCK_PACKET)
|
||||||
po->prot_hook.func = packet_rcv_spkt;
|
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);
|
packet_sock_flag_set(po, PACKET_SOCK_QDISC_BYPASS, val);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
default:
|
default:
|
||||||
return -ENOPROTOOPT;
|
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:
|
case PACKET_VNET_HDR_SZ:
|
||||||
val = READ_ONCE(po->vnet_hdr_sz);
|
val = READ_ONCE(po->vnet_hdr_sz);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/net/bridge/br_switchdev.c
|
--- a/net/bridge/br_switchdev.c
|
||||||
+++ b/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_bridge_mdb_entry *mp, int type)
|
||||||
{
|
{
|
||||||
struct net_device *lower_dev;
|
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
|
--- a/net/bridge/br_switchdev.c
|
||||||
+++ b/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);
|
struct br_input_skb_cb *cb = BR_INPUT_SKB_CB(skb);
|
||||||
|
|
||||||
return !test_bit(p->hwdom, &cb->fwd_hwdoms) &&
|
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
|
--- a/net/8021q/vlan.h
|
||||||
+++ b/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;
|
netdev_features_t ret;
|
||||||
|
|
||||||
ret = real_dev->hw_enc_features &
|
ret = real_dev->hw_enc_features &
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||||||
+};
|
+};
|
||||||
--- a/drivers/i2c/busses/Kconfig
|
--- a/drivers/i2c/busses/Kconfig
|
||||||
+++ b/drivers/i2c/busses/Kconfig
|
+++ b/drivers/i2c/busses/Kconfig
|
||||||
@@ -1023,6 +1023,11 @@ config I2C_RK3X
|
@@ -1024,6 +1024,11 @@ config I2C_RK3X
|
||||||
This driver can also be built as a module. If so, the module will
|
This driver can also be built as a module. If so, the module will
|
||||||
be called i2c-rk3x.
|
be called i2c-rk3x.
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ Submitted-by: Birger Koblitz <git@birger-koblitz.de>
|
|||||||
|
|
||||||
--- a/drivers/i2c/busses/Kconfig
|
--- a/drivers/i2c/busses/Kconfig
|
||||||
+++ b/drivers/i2c/busses/Kconfig
|
+++ b/drivers/i2c/busses/Kconfig
|
||||||
@@ -1023,6 +1023,16 @@ config I2C_RK3X
|
@@ -1024,6 +1024,16 @@ config I2C_RK3X
|
||||||
This driver can also be built as a module. If so, the module will
|
This driver can also be built as a module. If so, the module will
|
||||||
be called i2c-rk3x.
|
be called i2c-rk3x.
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user