Skip to content

Commit cd9998e

Browse files
committed
kernel: bump 5.15 to 5.15.171
No manual changes needed. Link: openwrt/openwrt#16882 Signed-off-by: Hauke Mehrtens <[email protected]>
1 parent 0edb5d4 commit cd9998e

12 files changed

+77
-77
lines changed

include/kernel-5.15

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .170
2-
LINUX_KERNEL_HASH-5.15.170 = fd596545a3d6d93196db3fa29e4926e60900b9c05b3b9ccdee9e35d8e376e7a9
1+
LINUX_VERSION-5.15 = .171
2+
LINUX_KERNEL_HASH-5.15.171 = 2953e064d8123c4c22c4fd48011378d73c8b99a3bf3d989e33f4f5c8f82f2a3b

target/linux/bcm27xx/patches-5.15/950-0800-mm-page_alloc-cma-introduce-a-customisable-threshold.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Signed-off-by: David Plowman <[email protected]>
4848
static bool _init_on_alloc_enabled_early __read_mostly
4949
= IS_ENABLED(CONFIG_INIT_ON_ALLOC_DEFAULT_ON);
5050
static int __init early_init_on_alloc(char *buf)
51-
@@ -2980,12 +3001,13 @@ __rmqueue(struct zone *zone, unsigned in
51+
@@ -2983,12 +3004,13 @@ __rmqueue(struct zone *zone, unsigned in
5252
if (IS_ENABLED(CONFIG_CMA)) {
5353
/*
5454
* Balance movable allocations between regular and CMA areas by
@@ -64,4 +64,4 @@ Signed-off-by: David Plowman <[email protected]>
6464
+ * _alloc_in_cma_threshold) {
6565
page = __rmqueue_cma_fallback(zone, order);
6666
if (page)
67-
goto out;
67+
return page;

target/linux/generic/backport-5.15/020-v6.3-26-mm-multi-gen-LRU-per-node-lru_gen_page-lists.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ Signed-off-by: Andrew Morton <[email protected]>
354354
static void mem_cgroup_css_free(struct cgroup_subsys_state *css)
355355
--- a/mm/page_alloc.c
356356
+++ b/mm/page_alloc.c
357-
@@ -7663,6 +7663,7 @@ static void __init free_area_init_node(i
357+
@@ -7704,6 +7704,7 @@ static void __init free_area_init_node(i
358358
pgdat_set_deferred_range(pgdat);
359359

360360
free_area_init_core(pgdat);

target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,23 +71,23 @@ Signed-off-by: Jakub Kicinski <[email protected]>
7171
ret = stmmac_hw_setup(dev, true);
7272
if (ret < 0) {
7373
netdev_err(priv->dev, "%s: Hw setup failed\n", __func__);
74-
@@ -6399,6 +6392,7 @@ void stmmac_enable_rx_queue(struct stmma
74+
@@ -6411,6 +6404,7 @@ void stmmac_enable_rx_queue(struct stmma
7575
return;
7676
}
7777

7878
+ stmmac_reset_rx_queue(priv, queue);
7979
stmmac_clear_rx_descriptors(priv, queue);
8080

8181
stmmac_init_rx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
82-
@@ -6460,6 +6454,7 @@ void stmmac_enable_tx_queue(struct stmma
82+
@@ -6472,6 +6466,7 @@ void stmmac_enable_tx_queue(struct stmma
8383
return;
8484
}
8585

8686
+ stmmac_reset_tx_queue(priv, queue);
8787
stmmac_clear_tx_descriptors(priv, queue);
8888

8989
stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
90-
@@ -7387,6 +7382,25 @@ int stmmac_suspend(struct device *dev)
90+
@@ -7399,6 +7394,25 @@ int stmmac_suspend(struct device *dev)
9191
}
9292
EXPORT_SYMBOL_GPL(stmmac_suspend);
9393

@@ -113,7 +113,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
113113
/**
114114
* stmmac_reset_queues_param - reset queue parameters
115115
* @priv: device pointer
116-
@@ -7397,22 +7411,11 @@ static void stmmac_reset_queues_param(st
116+
@@ -7409,22 +7423,11 @@ static void stmmac_reset_queues_param(st
117117
u32 tx_cnt = priv->plat->tx_queues_to_use;
118118
u32 queue;
119119

0 commit comments

Comments
 (0)