kernel: bump 6.6 to 6.6.131
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.131 All patches autorefreshed. Signed-off-by: Goetz Goerisch <ggoerisch@gmail.com> Link: https://github.com/openwrt/openwrt/pull/22752 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit 51ac6f9a7f0eff3b24b9edfa4c52d41faa20dcbc)
This commit is contained in:
parent
8fff1fbf68
commit
30ff66fbb5
@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
|
|||||||
|
|
||||||
--- a/drivers/mtd/spi-nor/core.c
|
--- a/drivers/mtd/spi-nor/core.c
|
||||||
+++ b/drivers/mtd/spi-nor/core.c
|
+++ b/drivers/mtd/spi-nor/core.c
|
||||||
@@ -3420,12 +3420,19 @@ static void spi_nor_set_mtd_info(struct
|
@@ -3561,12 +3561,19 @@ static void spi_nor_set_mtd_info(struct
|
||||||
{
|
{
|
||||||
struct mtd_info *mtd = &nor->mtd;
|
struct mtd_info *mtd = &nor->mtd;
|
||||||
struct device *dev = nor->dev;
|
struct device *dev = nor->dev;
|
||||||
|
|||||||
@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||||||
|
|
||||||
--- a/drivers/hid/hid-ids.h
|
--- a/drivers/hid/hid-ids.h
|
||||||
+++ b/drivers/hid/hid-ids.h
|
+++ b/drivers/hid/hid-ids.h
|
||||||
@@ -248,6 +248,9 @@
|
@@ -249,6 +249,9 @@
|
||||||
#define USB_VENDOR_ID_BAANTO 0x2453
|
#define USB_VENDOR_ID_BAANTO 0x2453
|
||||||
#define USB_DEVICE_ID_BAANTO_MT_190W2 0x0100
|
#define USB_DEVICE_ID_BAANTO_MT_190W2 0x0100
|
||||||
|
|
||||||
@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|||||||
#define USB_VENDOR_ID_BELKIN 0x050d
|
#define USB_VENDOR_ID_BELKIN 0x050d
|
||||||
#define USB_DEVICE_ID_FLIP_KVM 0x3201
|
#define USB_DEVICE_ID_FLIP_KVM 0x3201
|
||||||
|
|
||||||
@@ -1462,6 +1465,9 @@
|
@@ -1463,6 +1466,9 @@
|
||||||
#define USB_VENDOR_ID_XIAOMI 0x2717
|
#define USB_VENDOR_ID_XIAOMI 0x2717
|
||||||
#define USB_DEVICE_ID_MI_SILENT_MOUSE 0x5014
|
#define USB_DEVICE_ID_MI_SILENT_MOUSE 0x5014
|
||||||
|
|
||||||
|
|||||||
@ -25,7 +25,7 @@ Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
|
|||||||
|
|
||||||
--- a/drivers/media/mc/mc-request.c
|
--- a/drivers/media/mc/mc-request.c
|
||||||
+++ b/drivers/media/mc/mc-request.c
|
+++ b/drivers/media/mc/mc-request.c
|
||||||
@@ -505,3 +505,38 @@ unlock:
|
@@ -510,3 +510,38 @@ unlock:
|
||||||
media_request_put(req);
|
media_request_put(req);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(media_request_object_complete);
|
EXPORT_SYMBOL_GPL(media_request_object_complete);
|
||||||
|
|||||||
@ -20,7 +20,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|||||||
|
|
||||||
--- a/net/bluetooth/hci_sync.c
|
--- a/net/bluetooth/hci_sync.c
|
||||||
+++ b/net/bluetooth/hci_sync.c
|
+++ b/net/bluetooth/hci_sync.c
|
||||||
@@ -4941,6 +4941,7 @@ static const struct {
|
@@ -4947,6 +4947,7 @@ static const struct {
|
||||||
*/
|
*/
|
||||||
static int hci_dev_setup_sync(struct hci_dev *hdev)
|
static int hci_dev_setup_sync(struct hci_dev *hdev)
|
||||||
{
|
{
|
||||||
@ -28,7 +28,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|||||||
int ret = 0;
|
int ret = 0;
|
||||||
bool invalid_bdaddr;
|
bool invalid_bdaddr;
|
||||||
size_t i;
|
size_t i;
|
||||||
@@ -4969,7 +4970,8 @@ static int hci_dev_setup_sync(struct hci
|
@@ -4975,7 +4976,8 @@ static int hci_dev_setup_sync(struct hci
|
||||||
test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
|
test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks) &&
|
if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks) &&
|
||||||
|
|||||||
@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|||||||
|
|
||||||
--- a/net/bluetooth/hci_sync.c
|
--- a/net/bluetooth/hci_sync.c
|
||||||
+++ b/net/bluetooth/hci_sync.c
|
+++ b/net/bluetooth/hci_sync.c
|
||||||
@@ -4941,7 +4941,8 @@ static const struct {
|
@@ -4947,7 +4947,8 @@ static const struct {
|
||||||
*/
|
*/
|
||||||
static int hci_dev_setup_sync(struct hci_dev *hdev)
|
static int hci_dev_setup_sync(struct hci_dev *hdev)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -18,7 +18,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|||||||
|
|
||||||
--- a/drivers/nvme/host/pci.c
|
--- a/drivers/nvme/host/pci.c
|
||||||
+++ b/drivers/nvme/host/pci.c
|
+++ b/drivers/nvme/host/pci.c
|
||||||
@@ -2010,6 +2010,7 @@ static void nvme_free_host_mem(struct nv
|
@@ -2011,6 +2011,7 @@ static void nvme_free_host_mem(struct nv
|
||||||
dev->nr_host_mem_descs = 0;
|
dev->nr_host_mem_descs = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|||||||
static int __nvme_alloc_host_mem(struct nvme_dev *dev, u64 preferred,
|
static int __nvme_alloc_host_mem(struct nvme_dev *dev, u64 preferred,
|
||||||
u32 chunk_size)
|
u32 chunk_size)
|
||||||
{
|
{
|
||||||
@@ -2078,9 +2079,11 @@ out:
|
@@ -2079,9 +2080,11 @@ out:
|
||||||
dev->host_mem_descs = NULL;
|
dev->host_mem_descs = NULL;
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
@ -38,7 +38,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|||||||
u64 min_chunk = min_t(u64, preferred, PAGE_SIZE * MAX_ORDER_NR_PAGES);
|
u64 min_chunk = min_t(u64, preferred, PAGE_SIZE * MAX_ORDER_NR_PAGES);
|
||||||
u64 hmminds = max_t(u32, dev->ctrl.hmminds * 4096, PAGE_SIZE * 2);
|
u64 hmminds = max_t(u32, dev->ctrl.hmminds * 4096, PAGE_SIZE * 2);
|
||||||
u64 chunk_size;
|
u64 chunk_size;
|
||||||
@@ -2093,6 +2096,7 @@ static int nvme_alloc_host_mem(struct nv
|
@@ -2094,6 +2097,7 @@ static int nvme_alloc_host_mem(struct nv
|
||||||
nvme_free_host_mem(dev);
|
nvme_free_host_mem(dev);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -118,7 +118,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
/* Parse tag=value strings from .modinfo section */
|
/* Parse tag=value strings from .modinfo section */
|
||||||
char *module_next_tag_pair(char *string, unsigned long *secsize)
|
char *module_next_tag_pair(char *string, unsigned long *secsize)
|
||||||
@@ -2077,9 +2079,11 @@ static void module_augment_kernel_taints
|
@@ -2084,9 +2086,11 @@ static void module_augment_kernel_taints
|
||||||
|
|
||||||
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
|
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
|
||||||
{
|
{
|
||||||
@ -131,7 +131,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
if (flags & MODULE_INIT_IGNORE_VERMAGIC)
|
if (flags & MODULE_INIT_IGNORE_VERMAGIC)
|
||||||
modmagic = NULL;
|
modmagic = NULL;
|
||||||
|
|
||||||
@@ -2093,6 +2097,7 @@ static int check_modinfo(struct module *
|
@@ -2100,6 +2104,7 @@ static int check_modinfo(struct module *
|
||||||
info->name, modmagic, vermagic);
|
info->name, modmagic, vermagic);
|
||||||
return -ENOEXEC;
|
return -ENOEXEC;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -137,7 +137,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
#include <linux/property.h>
|
#include <linux/property.h>
|
||||||
@@ -3487,3 +3488,5 @@ static int __init regmap_initcall(void)
|
@@ -3509,3 +3510,5 @@ static int __init regmap_initcall(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
postcore_initcall(regmap_initcall);
|
postcore_initcall(regmap_initcall);
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-6.6 = .130
|
LINUX_VERSION-6.6 = .131
|
||||||
LINUX_KERNEL_HASH-6.6.130 = 2460aa67b9494cff6f9fc2b235470867d2005469d40f29da452e8ee82940248d
|
LINUX_KERNEL_HASH-6.6.131 = 73fe2310d2cb1e8271f3d8ce11cf810efa9c95404a154a792b98b2d6da931048
|
||||||
|
|||||||
@ -202,7 +202,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
|
|||||||
return !!nor->params->erase_map.uniform_erase_type;
|
return !!nor->params->erase_map.uniform_erase_type;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2582,6 +2584,7 @@ static int spi_nor_select_erase(struct s
|
@@ -2723,6 +2725,7 @@ static int spi_nor_select_erase(struct s
|
||||||
{
|
{
|
||||||
struct spi_nor_erase_map *map = &nor->params->erase_map;
|
struct spi_nor_erase_map *map = &nor->params->erase_map;
|
||||||
const struct spi_nor_erase_type *erase = NULL;
|
const struct spi_nor_erase_type *erase = NULL;
|
||||||
@ -210,7 +210,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
|
|||||||
struct mtd_info *mtd = &nor->mtd;
|
struct mtd_info *mtd = &nor->mtd;
|
||||||
u32 wanted_size = nor->info->sector_size;
|
u32 wanted_size = nor->info->sector_size;
|
||||||
int i;
|
int i;
|
||||||
@@ -2614,8 +2617,9 @@ static int spi_nor_select_erase(struct s
|
@@ -2755,8 +2758,9 @@ static int spi_nor_select_erase(struct s
|
||||||
*/
|
*/
|
||||||
for (i = SNOR_ERASE_TYPE_MAX - 1; i >= 0; i--) {
|
for (i = SNOR_ERASE_TYPE_MAX - 1; i >= 0; i--) {
|
||||||
if (map->erase_type[i].size) {
|
if (map->erase_type[i].size) {
|
||||||
@ -222,7 +222,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2623,6 +2627,9 @@ static int spi_nor_select_erase(struct s
|
@@ -2764,6 +2768,9 @@ static int spi_nor_select_erase(struct s
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
mtd->erasesize = erase->size;
|
mtd->erasesize = erase->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;
|
||||||
|
|
||||||
@@ -3436,6 +3438,7 @@ static int packet_create(struct net *net
|
@@ -3437,6 +3439,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;
|
||||||
@@ -4103,6 +4106,16 @@ packet_setsockopt(struct socket *sock, i
|
@@ -4104,6 +4107,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;
|
||||||
}
|
}
|
||||||
@@ -4162,6 +4175,13 @@ static int packet_getsockopt(struct sock
|
@@ -4163,6 +4176,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;
|
||||||
|
|||||||
@ -161,7 +161,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
struct rtnl_link {
|
struct rtnl_link {
|
||||||
rtnl_doit_func doit;
|
rtnl_doit_func doit;
|
||||||
@@ -4978,7 +4978,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
|
@@ -4981,7 +4981,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
|
||||||
brport_nla_put_flag(skb, flags, mask,
|
brport_nla_put_flag(skb, flags, mask,
|
||||||
IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
|
IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
|
||||||
brport_nla_put_flag(skb, flags, mask,
|
brport_nla_put_flag(skb, flags, mask,
|
||||||
|
|||||||
@ -26,7 +26,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
|
|||||||
|
|
||||||
--- a/drivers/mtd/spi-nor/core.c
|
--- a/drivers/mtd/spi-nor/core.c
|
||||||
+++ b/drivers/mtd/spi-nor/core.c
|
+++ b/drivers/mtd/spi-nor/core.c
|
||||||
@@ -3378,6 +3378,18 @@ static const struct flash_info *spi_nor_
|
@@ -3519,6 +3519,18 @@ static const struct flash_info *spi_nor_
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -45,7 +45,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
|
|||||||
static const struct flash_info *spi_nor_get_flash_info(struct spi_nor *nor,
|
static const struct flash_info *spi_nor_get_flash_info(struct spi_nor *nor,
|
||||||
const char *name)
|
const char *name)
|
||||||
{
|
{
|
||||||
@@ -3506,6 +3518,9 @@ int spi_nor_scan(struct spi_nor *nor, co
|
@@ -3647,6 +3659,9 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user