mirror/openwrt
1
0
Fork 0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-11-08 07:49:21 +01:00
Code Issues

kernel: bump 6.6 to 6.6.41

Browse Source 
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.41

Manually rebased:
	lantiq/patches-6.6/0028-NET-lantiq-various-etop-fixes.patch

All other patches automatically rebased.

Build system: x86/64
Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod

Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
John Audia 2024-07-18 16:15:36 -04:00 committed by Nick Hainke
parent 85e1e1ac34
commit 66177c081f
18 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-6.6
View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.6 = .40 LINUX_VERSION-6.6 = .41
LINUX_KERNEL_HASH-6.6.40 = 5c3a3c03c055b8d601a6d7f80d1465ada6b83a12299f6ace2027b47f0baff538 LINUX_KERNEL_HASH-6.6.41 = 9ec99c578158ab85d99b37791a76643d2ea4c3f72ecbef7b5eb6d60f3de032ef

2
target/linux/ath79/patches-6.6/900-unaligned_access_hacks.patch
View File

@ -751,7 +751,7 @@ SVN-Revision: 35130
EXPORT_SYMBOL(xfrm_parse_spi); EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c --- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c
@@ -4205,14 +4205,16 @@ static bool tcp_parse_aligned_timestamp( @@ -4214,14 +4214,16 @@ static bool tcp_parse_aligned_timestamp(
{ {
const __be32 *ptr = (const __be32 *)(th + 1); const __be32 *ptr = (const __be32 *)(th + 1);

4
target/linux/bcm27xx/patches-6.6/950-0161-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
--- a/drivers/usb/host/xhci.c --- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c
@@ -1487,6 +1487,109 @@ command_cleanup: @@ -1497,6 +1497,109 @@ command_cleanup:
} }
/* /*
@ -125,7 +125,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
* non-error returns are a promise to giveback() the urb later * non-error returns are a promise to giveback() the urb later
* we drop ownership so next owner (or urb unlink) can get it * we drop ownership so next owner (or urb unlink) can get it
*/ */
@@ -5316,6 +5419,7 @@ static const struct hc_driver xhci_hc_dr @@ -5326,6 +5429,7 @@ static const struct hc_driver xhci_hc_dr
.endpoint_reset = xhci_endpoint_reset, .endpoint_reset = xhci_endpoint_reset,
.check_bandwidth = xhci_check_bandwidth, .check_bandwidth = xhci_check_bandwidth,
.reset_bandwidth = xhci_reset_bandwidth, .reset_bandwidth = xhci_reset_bandwidth,

2
target/linux/bcm27xx/patches-6.6/950-0163-usb-xhci-drop-and-add-the-endpoint-context-in-xhci_f.patch
View File

@ -19,7 +19,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
--- a/drivers/usb/host/xhci.c --- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c
@@ -1576,7 +1576,7 @@ static void xhci_fixup_endpoint(struct u @@ -1586,7 +1586,7 @@ static void xhci_fixup_endpoint(struct u
return; return;
} }
ctrl_ctx->add_flags = xhci_get_endpoint_flag_from_index(ep_index); ctrl_ctx->add_flags = xhci_get_endpoint_flag_from_index(ep_index);

2
target/linux/generic/backport-6.6/816-v6.7-0004-Revert-nvmem-add-new-config-option.patch
View File

@ -48,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
mtd->nvmem = nvmem_register(&config); mtd->nvmem = nvmem_register(&config);
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -941,7 +941,7 @@ struct nvmem_device *nvmem_register(cons @@ -940,7 +940,7 @@ struct nvmem_device *nvmem_register(cons
nvmem->nkeepout = config->nkeepout; nvmem->nkeepout = config->nkeepout;
if (config->of_node) if (config->of_node)
nvmem->dev.of_node = config->of_node; nvmem->dev.of_node = config->of_node;

2
target/linux/generic/backport-6.6/819-v6.8-0001-nvmem-Move-of_nvmem_layout_get_container-in-another-.patch
View File

@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -847,14 +847,6 @@ static int nvmem_add_cells_from_layout(s @@ -846,14 +846,6 @@ static int nvmem_add_cells_from_layout(s
} }
#if IS_ENABLED(CONFIG_OF) #if IS_ENABLED(CONFIG_OF)

2
target/linux/generic/backport-6.6/819-v6.8-0003-nvmem-Simplify-the-add_cells-hook.patch
View File

@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -816,7 +816,7 @@ static int nvmem_add_cells_from_layout(s @@ -815,7 +815,7 @@ static int nvmem_add_cells_from_layout(s
int ret; int ret;
if (layout && layout->add_cells) { if (layout && layout->add_cells) {

6
target/linux/generic/backport-6.6/819-v6.8-0004-nvmem-Move-and-rename-fixup_cell_info.patch
View File

@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -675,7 +675,6 @@ static int nvmem_validate_keepouts(struc @@ -674,7 +674,6 @@ static int nvmem_validate_keepouts(struc
static int nvmem_add_cells_from_dt(struct nvmem_device *nvmem, struct device_node *np) static int nvmem_add_cells_from_dt(struct nvmem_device *nvmem, struct device_node *np)
{ {
@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
struct device *dev = &nvmem->dev; struct device *dev = &nvmem->dev;
struct device_node *child; struct device_node *child;
const __be32 *addr; const __be32 *addr;
@@ -705,8 +704,8 @@ static int nvmem_add_cells_from_dt(struc @@ -704,8 +703,8 @@ static int nvmem_add_cells_from_dt(struc
info.np = of_node_get(child); info.np = of_node_get(child);
@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
ret = nvmem_add_one_cell(nvmem, &info); ret = nvmem_add_one_cell(nvmem, &info);
kfree(info.name); kfree(info.name);
@@ -895,6 +894,7 @@ struct nvmem_device *nvmem_register(cons @@ -894,6 +893,7 @@ struct nvmem_device *nvmem_register(cons
kref_init(&nvmem->refcnt); kref_init(&nvmem->refcnt);
INIT_LIST_HEAD(&nvmem->cells); INIT_LIST_HEAD(&nvmem->cells);

20
target/linux/generic/backport-6.6/819-v6.8-0005-nvmem-core-Rework-layouts-to-become-regular-devices.patch
View File

@ -84,7 +84,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
static int __nvmem_reg_read(struct nvmem_device *nvmem, unsigned int offset, static int __nvmem_reg_read(struct nvmem_device *nvmem, unsigned int offset,
void *val, size_t bytes) void *val, size_t bytes)
{ {
@@ -740,97 +737,22 @@ static int nvmem_add_cells_from_fixed_la @@ -739,97 +736,22 @@ static int nvmem_add_cells_from_fixed_la
return err; return err;
} }
@ -189,7 +189,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
const void *nvmem_layout_get_match_data(struct nvmem_device *nvmem, const void *nvmem_layout_get_match_data(struct nvmem_device *nvmem,
struct nvmem_layout *layout) struct nvmem_layout *layout)
{ {
@@ -838,7 +760,7 @@ const void *nvmem_layout_get_match_data( @@ -837,7 +759,7 @@ const void *nvmem_layout_get_match_data(
const struct of_device_id *match; const struct of_device_id *match;
layout_np = of_nvmem_layout_get_container(nvmem); layout_np = of_nvmem_layout_get_container(nvmem);
@ -198,7 +198,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
return match ? match->data : NULL; return match ? match->data : NULL;
} }
@@ -950,19 +872,6 @@ struct nvmem_device *nvmem_register(cons @@ -949,19 +871,6 @@ struct nvmem_device *nvmem_register(cons
goto err_put_device; goto err_put_device;
} }
@ -218,7 +218,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
if (config->cells) { if (config->cells) {
rval = nvmem_add_cells(nvmem, config->cells, config->ncells); rval = nvmem_add_cells(nvmem, config->cells, config->ncells);
if (rval) if (rval)
@@ -983,24 +892,24 @@ struct nvmem_device *nvmem_register(cons @@ -982,24 +891,24 @@ struct nvmem_device *nvmem_register(cons
if (rval) if (rval)
goto err_remove_cells; goto err_remove_cells;
@ -249,7 +249,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
if (config->compat) if (config->compat)
nvmem_sysfs_remove_compat(nvmem, config); nvmem_sysfs_remove_compat(nvmem, config);
err_put_device: err_put_device:
@@ -1022,7 +931,7 @@ static void nvmem_device_release(struct @@ -1021,7 +930,7 @@ static void nvmem_device_release(struct
device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom); device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom);
nvmem_device_remove_all_cells(nvmem); nvmem_device_remove_all_cells(nvmem);
@ -258,7 +258,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
device_unregister(&nvmem->dev); device_unregister(&nvmem->dev);
} }
@@ -1324,6 +1233,12 @@ nvmem_cell_get_from_lookup(struct device @@ -1323,6 +1232,12 @@ nvmem_cell_get_from_lookup(struct device
return cell; return cell;
} }
@ -271,7 +271,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
#if IS_ENABLED(CONFIG_OF) #if IS_ENABLED(CONFIG_OF)
static struct nvmem_cell_entry * static struct nvmem_cell_entry *
nvmem_find_cell_entry_by_node(struct nvmem_device *nvmem, struct device_node *np) nvmem_find_cell_entry_by_node(struct nvmem_device *nvmem, struct device_node *np)
@@ -1342,6 +1257,18 @@ nvmem_find_cell_entry_by_node(struct nvm @@ -1341,6 +1256,18 @@ nvmem_find_cell_entry_by_node(struct nvm
return cell; return cell;
} }
@ -290,7 +290,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
/** /**
* of_nvmem_cell_get() - Get a nvmem cell from given device node and cell id * of_nvmem_cell_get() - Get a nvmem cell from given device node and cell id
* *
@@ -1404,16 +1331,29 @@ struct nvmem_cell *of_nvmem_cell_get(str @@ -1403,16 +1330,29 @@ struct nvmem_cell *of_nvmem_cell_get(str
return ERR_CAST(nvmem); return ERR_CAST(nvmem);
} }
@ -322,7 +322,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
return cell; return cell;
} }
@@ -1527,6 +1467,7 @@ void nvmem_cell_put(struct nvmem_cell *c @@ -1526,6 +1466,7 @@ void nvmem_cell_put(struct nvmem_cell *c
kfree(cell); kfree(cell);
__nvmem_device_put(nvmem); __nvmem_device_put(nvmem);
@ -330,7 +330,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
} }
EXPORT_SYMBOL_GPL(nvmem_cell_put); EXPORT_SYMBOL_GPL(nvmem_cell_put);
@@ -2104,11 +2045,22 @@ EXPORT_SYMBOL_GPL(nvmem_dev_name); @@ -2103,11 +2044,22 @@ EXPORT_SYMBOL_GPL(nvmem_dev_name);
static int __init nvmem_init(void) static int __init nvmem_init(void)
{ {

6
target/linux/generic/backport-6.6/819-v6.8-0006-nvmem-core-Expose-cells-through-sysfs.patch
View File

@ -111,7 +111,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
static struct bin_attribute bin_attr_nvmem_eeprom_compat = { static struct bin_attribute bin_attr_nvmem_eeprom_compat = {
.attr = { .attr = {
.name = "eeprom", .name = "eeprom",
@@ -380,6 +427,68 @@ static void nvmem_sysfs_remove_compat(st @@ -379,6 +426,68 @@ static void nvmem_sysfs_remove_compat(st
device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom); device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom);
} }
@ -180,7 +180,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
#else /* CONFIG_NVMEM_SYSFS */ #else /* CONFIG_NVMEM_SYSFS */
static int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem, static int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem,
@@ -739,11 +848,25 @@ static int nvmem_add_cells_from_fixed_la @@ -738,11 +847,25 @@ static int nvmem_add_cells_from_fixed_la
int nvmem_layout_register(struct nvmem_layout *layout) int nvmem_layout_register(struct nvmem_layout *layout)
{ {
@ -207,7 +207,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
} }
EXPORT_SYMBOL_GPL(nvmem_layout_register); EXPORT_SYMBOL_GPL(nvmem_layout_register);
@@ -902,10 +1025,20 @@ struct nvmem_device *nvmem_register(cons @@ -901,10 +1024,20 @@ struct nvmem_device *nvmem_register(cons
if (rval) if (rval)
goto err_remove_dev; goto err_remove_dev;

2
target/linux/generic/backport-6.6/819-v6.8-0008-nvmem-layouts-refactor-.add_cells-callback-arguments.patch
View File

@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -854,7 +854,7 @@ int nvmem_layout_register(struct nvmem_l @@ -853,7 +853,7 @@ int nvmem_layout_register(struct nvmem_l
return -EINVAL; return -EINVAL;
/* Populate the cells */ /* Populate the cells */

2
target/linux/generic/backport-6.6/819-v6.8-0009-nvmem-drop-nvmem_layout_get_match_data.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -876,19 +876,6 @@ void nvmem_layout_unregister(struct nvme @@ -875,19 +875,6 @@ void nvmem_layout_unregister(struct nvme
} }
EXPORT_SYMBOL_GPL(nvmem_layout_unregister); EXPORT_SYMBOL_GPL(nvmem_layout_unregister);

2
target/linux/generic/backport-6.6/819-v6.8-0010-nvmem-core-add-nvmem_dev_size-helper.patch
View File

@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -2163,6 +2163,19 @@ const char *nvmem_dev_name(struct nvmem_ @@ -2162,6 +2162,19 @@ const char *nvmem_dev_name(struct nvmem_
} }
EXPORT_SYMBOL_GPL(nvmem_dev_name); EXPORT_SYMBOL_GPL(nvmem_dev_name);

2
target/linux/generic/hack-6.6/902-debloat_proc.patch
View File

@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!pe) if (!pe)
--- a/mm/vmalloc.c --- a/mm/vmalloc.c
+++ b/mm/vmalloc.c +++ b/mm/vmalloc.c
@@ -4447,6 +4447,8 @@ static const struct seq_operations vmall @@ -4455,6 +4455,8 @@ static const struct seq_operations vmall
static int __init proc_vmalloc_init(void) static int __init proc_vmalloc_init(void)
{ {

2
target/linux/generic/hack-6.6/904-debloat_dma_buf.patch
View File

@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
--- a/kernel/sched/core.c --- a/kernel/sched/core.c
+++ b/kernel/sched/core.c +++ b/kernel/sched/core.c
@@ -4487,6 +4487,7 @@ int wake_up_state(struct task_struct *p, @@ -4486,6 +4486,7 @@ int wake_up_state(struct task_struct *p,
{ {
return try_to_wake_up(p, state, 0); return try_to_wake_up(p, state, 0);
} }

4
target/linux/generic/pending-6.6/804-nvmem-core-support-mac-base-fixed-layout-cells.patch
View File

@ -33,7 +33,7 @@ string.
#include <linux/init.h> #include <linux/init.h>
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/module.h> #include <linux/module.h>
@@ -779,6 +782,62 @@ static int nvmem_validate_keepouts(struc @@ -778,6 +781,62 @@ static int nvmem_validate_keepouts(struc
return 0; return 0;
} }
@ -96,7 +96,7 @@ string.
static int nvmem_add_cells_from_dt(struct nvmem_device *nvmem, struct device_node *np) static int nvmem_add_cells_from_dt(struct nvmem_device *nvmem, struct device_node *np)
{ {
struct device *dev = &nvmem->dev; struct device *dev = &nvmem->dev;
@@ -813,6 +872,25 @@ static int nvmem_add_cells_from_dt(struc @@ -812,6 +871,25 @@ static int nvmem_add_cells_from_dt(struc
if (nvmem->fixup_dt_cell_info) if (nvmem->fixup_dt_cell_info)
nvmem->fixup_dt_cell_info(nvmem, &info); nvmem->fixup_dt_cell_info(nvmem, &info);

4
target/linux/ipq40xx/patches-6.6/999-atm-mpoa-intel-dsl-phy-support.patch
View File

@ -4,7 +4,7 @@ Subject: [PATCH] UGW_SW-29163: ATM oam support
--- a/drivers/net/ppp/ppp_generic.c --- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c
@@ -2953,6 +2953,22 @@ char *ppp_dev_name(struct ppp_channel *c @@ -2968,6 +2968,22 @@ char *ppp_dev_name(struct ppp_channel *c
return name; return name;
} }
@ -27,7 +27,7 @@ Subject: [PATCH] UGW_SW-29163: ATM oam support
/* /*
* Disconnect a channel from the generic layer. * Disconnect a channel from the generic layer.
@@ -3599,6 +3615,7 @@ EXPORT_SYMBOL(ppp_unregister_channel); @@ -3614,6 +3630,7 @@ EXPORT_SYMBOL(ppp_unregister_channel);
EXPORT_SYMBOL(ppp_channel_index); EXPORT_SYMBOL(ppp_channel_index);
EXPORT_SYMBOL(ppp_unit_number); EXPORT_SYMBOL(ppp_unit_number);
EXPORT_SYMBOL(ppp_dev_name); EXPORT_SYMBOL(ppp_dev_name);

4
target/linux/lantiq/patches-6.6/0028-NET-lantiq-various-etop-fixes.patch
View File

@ -276,9 +276,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
free_irq(ch->dma.irq, priv); free_irq(ch->dma.irq, priv);
- if (IS_RX(ch->idx)) { - if (IS_RX(ch->idx)) {
+ if (ch == &priv->txch) { + if (ch == &priv->txch) {
int desc; struct ltq_dma_channel *dma = &ch->dma;
for (desc = 0; desc < LTQ_DESC_NUM; desc++) for (dma->desc = 0; dma->desc < LTQ_DESC_NUM; dma->desc++)
@@ -228,80 +305,135 @@ static void @@ -228,80 +305,135 @@ static void
ltq_etop_hw_exit(struct net_device *dev) ltq_etop_hw_exit(struct net_device *dev)
{ {