Skip to content

Commit

Permalink
kernel: bump 5.15 to 5.15.163
Browse files Browse the repository at this point in the history 
Manually adapted:
   lantiq/patches-5.15/0028-NET-lantiq-various-etop-fixes.patch

Link: openwrt/openwrt#15982
Signed-off-by: Hauke Mehrtens <[email protected]>
  • Loading branch information
@hauke
hauke committed Jul 26, 2024
1 parent 56a84b3 commit f791ec1
Show file tree
Hide file tree
Showing 42 changed files with 131 additions and 131 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.15
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .162
LINUX_KERNEL_HASH-5.15.162 = 91bfc0ea152ce7b102a0b79d35a7c92843874ebf085c99d2ba8b4d85e62b1a7c
LINUX_VERSION-5.15 = .163
LINUX_KERNEL_HASH-5.15.163 = 025fc7d8b1560cf456ccae50591fe1ca21c990645df9791aed25820fe78db302
2 changes: 1 addition & 1 deletion target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ SVN-Revision: 35130
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4192,14 +4192,16 @@ static bool tcp_parse_aligned_timestamp(
@@ -4201,14 +4201,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);

Expand Down
10 changes: 5 additions & 5 deletions ...linux/bcm63xx/patches-5.15/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Signed-off-by: Jonas Gorski <[email protected]>

--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -646,23 +646,30 @@ static struct gpio_desc *of_parse_own_gp
@@ -698,23 +698,30 @@ static struct gpio_desc *of_parse_own_gp
* of_gpiochip_add_hog - Add all hogs in a hog device node
* @chip: gpio chip to act on
* @hog: device node describing the hogs
Expand Down Expand Up @@ -62,7 +62,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
ret = gpiod_hog(desc, name, lflags, dflags);
if (ret < 0)
return ret;
@@ -678,12 +685,15 @@ static int of_gpiochip_add_hog(struct gp
@@ -730,12 +737,15 @@ static int of_gpiochip_add_hog(struct gp
/**
* of_gpiochip_scan_gpios - Scan gpio-controller for gpio definitions
* @chip: gpio chip to act on
Expand All @@ -81,7 +81,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
{
struct device_node *np;
int ret;
@@ -692,7 +702,7 @@ static int of_gpiochip_scan_gpios(struct
@@ -744,7 +754,7 @@ static int of_gpiochip_scan_gpios(struct
if (!of_property_read_bool(np, "gpio-hog"))
continue;

Expand All @@ -90,7 +90,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
if (ret < 0) {
of_node_put(np);
return ret;
@@ -758,7 +768,7 @@ static int of_gpio_notify(struct notifie
@@ -810,7 +820,7 @@ static int of_gpio_notify(struct notifie
if (chip == NULL)
return NOTIFY_OK; /* not for us */

Expand All @@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
if (ret < 0) {
pr_err("%s: failed to add hogs for %pOF\n", __func__,
rd->dn);
@@ -1037,9 +1047,11 @@ int of_gpiochip_add(struct gpio_chip *ch
@@ -1089,9 +1099,11 @@ int of_gpiochip_add(struct gpio_chip *ch

of_node_get(chip->of_node);

Expand Down
2 changes: 1 addition & 1 deletion ...t/linux/generic/backport-5.15/020-v6.1-08-mm-multi-gen-LRU-support-page-table-walks.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ Signed-off-by: Andrew Morton <[email protected]>
#ifdef __KERNEL__
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -469,6 +469,7 @@ assign_new_owner:
@@ -471,6 +471,7 @@ assign_new_owner:
goto retry;
}
WRITE_ONCE(mm->owner, c);
Expand Down
4 changes: 2 additions & 2 deletions ...eric/backport-5.15/423-v6.1-0003-mtd-add-ECC-error-accounting-for-each-read-request.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ Link: https://lore.kernel.org/linux-mtd/[email protected]
return ret;
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -3815,6 +3815,7 @@ static int nand_read_oob(struct mtd_info
@@ -3822,6 +3822,7 @@ static int nand_read_oob(struct mtd_info
struct mtd_oob_ops *ops)
{
struct nand_chip *chip = mtd_to_nand(mtd);
+ struct mtd_ecc_stats old_stats;
int ret;

ops->retlen = 0;
@@ -3826,11 +3827,20 @@ static int nand_read_oob(struct mtd_info
@@ -3833,11 +3834,20 @@ static int nand_read_oob(struct mtd_info

nand_get_device(chip);

Expand Down
52 changes: 26 additions & 26 deletions ...generic/backport-5.15/802-v5.16-0001-nvmem-core-rework-nvmem-cell-instance-creation.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
static DEFINE_MUTEX(nvmem_mutex);
static DEFINE_IDA(nvmem_ida);

@@ -424,7 +428,7 @@ static struct bus_type nvmem_bus_type =
@@ -423,7 +427,7 @@ static struct bus_type nvmem_bus_type =
.name = "nvmem",
};

Expand All @@ -65,7 +65,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
{
blocking_notifier_call_chain(&nvmem_notifier, NVMEM_CELL_REMOVE, cell);
mutex_lock(&nvmem_mutex);
@@ -437,13 +441,13 @@ static void nvmem_cell_drop(struct nvmem
@@ -436,13 +440,13 @@ static void nvmem_cell_drop(struct nvmem

static void nvmem_device_remove_all_cells(const struct nvmem_device *nvmem)
{
Expand All @@ -82,7 +82,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
{
mutex_lock(&nvmem_mutex);
list_add_tail(&cell->node, &cell->nvmem->cells);
@@ -451,9 +455,9 @@ static void nvmem_cell_add(struct nvmem_
@@ -450,9 +454,9 @@ static void nvmem_cell_add(struct nvmem_
blocking_notifier_call_chain(&nvmem_notifier, NVMEM_CELL_ADD, cell);
}

Expand All @@ -95,7 +95,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
{
cell->nvmem = nvmem;
cell->offset = info->offset;
@@ -477,13 +481,13 @@ static int nvmem_cell_info_to_nvmem_cell
@@ -476,13 +480,13 @@ static int nvmem_cell_info_to_nvmem_cell
return 0;
}

Expand All @@ -113,7 +113,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
if (err)
return err;

@@ -507,7 +511,7 @@ static int nvmem_add_cells(struct nvmem_
@@ -506,7 +510,7 @@ static int nvmem_add_cells(struct nvmem_
const struct nvmem_cell_info *info,
int ncells)
{
Expand All @@ -122,7 +122,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
int i, rval;

cells = kcalloc(ncells, sizeof(*cells), GFP_KERNEL);
@@ -521,13 +525,13 @@ static int nvmem_add_cells(struct nvmem_
@@ -520,13 +524,13 @@ static int nvmem_add_cells(struct nvmem_
goto err;
}

Expand All @@ -138,7 +138,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
}

/* remove tmp array */
@@ -536,7 +540,7 @@ static int nvmem_add_cells(struct nvmem_
@@ -535,7 +539,7 @@ static int nvmem_add_cells(struct nvmem_
return 0;
err:
while (i--)
Expand All @@ -147,7 +147,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>

kfree(cells);

@@ -573,7 +577,7 @@ static int nvmem_add_cells_from_table(st
@@ -572,7 +576,7 @@ static int nvmem_add_cells_from_table(st
{
const struct nvmem_cell_info *info;
struct nvmem_cell_table *table;
Expand All @@ -156,7 +156,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
int rval = 0, i;

mutex_lock(&nvmem_cell_mutex);
@@ -588,15 +592,13 @@ static int nvmem_add_cells_from_table(st
@@ -587,15 +591,13 @@ static int nvmem_add_cells_from_table(st
goto out;
}

Expand All @@ -174,7 +174,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
}
}
}
@@ -606,10 +608,10 @@ out:
@@ -605,10 +607,10 @@ out:
return rval;
}

Expand All @@ -188,7 +188,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>

mutex_lock(&nvmem_mutex);
list_for_each_entry(iter, &nvmem->cells, node) {
@@ -680,7 +682,7 @@ static int nvmem_add_cells_from_of(struc
@@ -679,7 +681,7 @@ static int nvmem_add_cells_from_of(struc
{
struct device_node *parent, *child;
struct device *dev = &nvmem->dev;
Expand All @@ -197,7 +197,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
const __be32 *addr;
int len;

@@ -729,7 +731,7 @@ static int nvmem_add_cells_from_of(struc
@@ -728,7 +730,7 @@ static int nvmem_add_cells_from_of(struc
}

cell->np = of_node_get(child);
Expand All @@ -206,7 +206,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
}

return 0;
@@ -1142,9 +1144,33 @@ struct nvmem_device *devm_nvmem_device_g
@@ -1141,9 +1143,33 @@ struct nvmem_device *devm_nvmem_device_g
}
EXPORT_SYMBOL_GPL(devm_nvmem_device_get);

Expand Down Expand Up @@ -240,7 +240,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
struct nvmem_cell *cell = ERR_PTR(-ENOENT);
struct nvmem_cell_lookup *lookup;
struct nvmem_device *nvmem;
@@ -1169,11 +1195,15 @@ nvmem_cell_get_from_lookup(struct device
@@ -1168,11 +1194,15 @@ nvmem_cell_get_from_lookup(struct device
break;
}

Expand All @@ -259,7 +259,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
}
break;
}
@@ -1184,10 +1214,10 @@ nvmem_cell_get_from_lookup(struct device
@@ -1183,10 +1213,10 @@ nvmem_cell_get_from_lookup(struct device
}

#if IS_ENABLED(CONFIG_OF)
Expand All @@ -273,15 +273,15 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>

mutex_lock(&nvmem_mutex);
list_for_each_entry(iter, &nvmem->cells, node) {
@@ -1217,6 +1247,7 @@ struct nvmem_cell *of_nvmem_cell_get(str
@@ -1216,6 +1246,7 @@ struct nvmem_cell *of_nvmem_cell_get(str
{
struct device_node *cell_np, *nvmem_np;
struct nvmem_device *nvmem;
+ struct nvmem_cell_entry *cell_entry;
struct nvmem_cell *cell;
int index = 0;

@@ -1237,12 +1268,16 @@ struct nvmem_cell *of_nvmem_cell_get(str
@@ -1236,12 +1267,16 @@ struct nvmem_cell *of_nvmem_cell_get(str
if (IS_ERR(nvmem))
return ERR_CAST(nvmem);

Expand All @@ -300,7 +300,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
return cell;
}
EXPORT_SYMBOL_GPL(of_nvmem_cell_get);
@@ -1348,13 +1383,17 @@ EXPORT_SYMBOL(devm_nvmem_cell_put);
@@ -1347,13 +1382,17 @@ EXPORT_SYMBOL(devm_nvmem_cell_put);
*/
void nvmem_cell_put(struct nvmem_cell *cell)
{
Expand All @@ -320,7 +320,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
{
u8 *p, *b;
int i, extra, bit_offset = cell->bit_offset;
@@ -1388,8 +1427,8 @@ static void nvmem_shift_read_buffer_in_p
@@ -1387,8 +1426,8 @@ static void nvmem_shift_read_buffer_in_p
}

static int __nvmem_cell_read(struct nvmem_device *nvmem,
Expand All @@ -331,7 +331,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
{
int rc;

@@ -1420,18 +1459,18 @@ static int __nvmem_cell_read(struct nvme
@@ -1419,18 +1458,18 @@ static int __nvmem_cell_read(struct nvme
*/
void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
{
Expand All @@ -353,7 +353,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
if (rc) {
kfree(buf);
return ERR_PTR(rc);
@@ -1441,7 +1480,7 @@ void *nvmem_cell_read(struct nvmem_cell
@@ -1440,7 +1479,7 @@ void *nvmem_cell_read(struct nvmem_cell
}
EXPORT_SYMBOL_GPL(nvmem_cell_read);

Expand All @@ -362,7 +362,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
u8 *_buf, int len)
{
struct nvmem_device *nvmem = cell->nvmem;
@@ -1494,16 +1533,7 @@ err:
@@ -1493,16 +1532,7 @@ err:
return ERR_PTR(rc);
}

Expand All @@ -380,7 +380,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
{
struct nvmem_device *nvmem = cell->nvmem;
int rc;
@@ -1529,6 +1559,21 @@ int nvmem_cell_write(struct nvmem_cell *
@@ -1528,6 +1558,21 @@ int nvmem_cell_write(struct nvmem_cell *

return len;
}
Expand All @@ -402,7 +402,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
EXPORT_SYMBOL_GPL(nvmem_cell_write);

static int nvmem_cell_read_common(struct device *dev, const char *cell_id,
@@ -1631,7 +1676,7 @@ static const void *nvmem_cell_read_varia
@@ -1630,7 +1675,7 @@ static const void *nvmem_cell_read_varia
if (IS_ERR(cell))
return cell;

Expand All @@ -411,7 +411,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
buf = nvmem_cell_read(cell, len);
nvmem_cell_put(cell);
if (IS_ERR(buf))
@@ -1727,18 +1772,18 @@ EXPORT_SYMBOL_GPL(nvmem_cell_read_variab
@@ -1726,18 +1771,18 @@ EXPORT_SYMBOL_GPL(nvmem_cell_read_variab
ssize_t nvmem_device_cell_read(struct nvmem_device *nvmem,
struct nvmem_cell_info *info, void *buf)
{
Expand All @@ -433,7 +433,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
if (rc)
return rc;

@@ -1758,17 +1803,17 @@ EXPORT_SYMBOL_GPL(nvmem_device_cell_read
@@ -1757,17 +1802,17 @@ EXPORT_SYMBOL_GPL(nvmem_device_cell_read
int nvmem_device_cell_write(struct nvmem_device *nvmem,
struct nvmem_cell_info *info, void *buf)
{
Expand Down
4 changes: 2 additions & 2 deletions ...ric/backport-5.15/802-v5.16-0002-nvmem-core-add-nvmem-cell-post-processing-callback.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
struct gpio_desc *wp_gpio;
void *priv;
};
@@ -799,6 +800,7 @@ struct nvmem_device *nvmem_register(cons
@@ -798,6 +799,7 @@ struct nvmem_device *nvmem_register(cons
nvmem->type = config->type;
nvmem->reg_read = config->reg_read;
nvmem->reg_write = config->reg_write;
+ nvmem->cell_post_process = config->cell_post_process;
nvmem->keepout = config->keepout;
nvmem->nkeepout = config->nkeepout;
if (config->of_node)
@@ -1441,6 +1443,13 @@ static int __nvmem_cell_read(struct nvme
@@ -1440,6 +1442,13 @@ static int __nvmem_cell_read(struct nvme
if (cell->bit_offset || cell->nbits)
nvmem_shift_read_buffer_in_place(cell, buf);

Expand Down
2 changes: 1 addition & 1 deletion ...generic/backport-5.15/804-v5.18-0001-nvmem-core-Remove-unused-devm_nvmem_unregister.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>

--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -943,28 +943,6 @@ struct nvmem_device *devm_nvmem_register
@@ -942,28 +942,6 @@ struct nvmem_device *devm_nvmem_register
}
EXPORT_SYMBOL_GPL(devm_nvmem_register);

Expand Down
4 changes: 2 additions & 2 deletions .../linux/generic/backport-5.15/804-v5.18-0002-nvmem-core-Use-devm_add_action_or_reset.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>

--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -905,9 +905,9 @@ void nvmem_unregister(struct nvmem_devic
@@ -904,9 +904,9 @@ void nvmem_unregister(struct nvmem_devic
}
EXPORT_SYMBOL_GPL(nvmem_unregister);

Expand All @@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
}

/**
@@ -924,20 +924,16 @@ static void devm_nvmem_release(struct de
@@ -923,20 +923,16 @@ static void devm_nvmem_release(struct de
struct nvmem_device *devm_nvmem_register(struct device *dev,
const struct nvmem_config *config)
{
Expand Down
2 changes: 1 addition & 1 deletion ...c/backport-5.15/804-v5.18-0003-nvmem-core-Check-input-parameter-for-NULL-in-nvmem_u.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>

--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -901,7 +901,8 @@ static void nvmem_device_release(struct
@@ -900,7 +900,8 @@ static void nvmem_device_release(struct
*/
void nvmem_unregister(struct nvmem_device *nvmem)
{
Expand Down
2 changes: 1 addition & 1 deletion ...eneric/backport-5.15/805-v5.19-0004-nvmem-core-support-passing-DT-node-in-cell-info.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>

--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -467,6 +467,7 @@ static int nvmem_cell_info_to_nvmem_cell
@@ -466,6 +466,7 @@ static int nvmem_cell_info_to_nvmem_cell

cell->bit_offset = info->bit_offset;
cell->nbits = info->nbits;
Expand Down
2 changes: 1 addition & 1 deletion ...et/linux/generic/backport-5.15/808-v6.2-0013-nvmem-core-fix-device-node-refcounting.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>

--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -1237,16 +1237,21 @@ struct nvmem_cell *of_nvmem_cell_get(str
@@ -1236,16 +1236,21 @@ struct nvmem_cell *of_nvmem_cell_get(str
if (!cell_np)
return ERR_PTR(-ENOENT);

Expand Down
Loading

0 comments on commit f791ec1

Please sign in to comment.