From 6b275d3f2f09eb17ef2ec044720996059296a00b Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Sun, 7 Jul 2024 17:11:09 +0800 Subject: [PATCH] kernel: bump 6.1 to 6.1.97 (#12312) --- include/kernel-6.1 | 4 +- ...111-MMC-added-alternative-MMC-driver.patch | 4 +- ...-Add-a-timing-for-the-Raspberry-Pi-7.patch | 4 +- ...nel-simple-add-Geekworm-MZP280-Panel.patch | 2 +- ...a-introduce-a-customisable-threshold.patch | 2 +- ...nel-ilitek9881c-Use-cansleep-methods.patch | 37 ------------------- ...mple-Add-Innolux-AT056tN53V1-5.6-VGA.patch | 2 +- ...-mmc-brcmstb-add-support-for-BCM2712.patch | 18 ++++----- .../950-0860-sdhci-Add-SD-Express-hook.patch | 6 +-- ...-Alter-the-timing-for-the-Pi-7-DSI-d.patch | 2 +- ...mc-sdhci-add-SPURIOUS_INT_RESP-quirk.patch | 2 +- .../950-1182-drm-panel-add-panel-dsi.patch | 6 +-- ...i-gen-LRU-per-node-lru_gen_folio-lis.patch | 4 +- .../765-mxl-gpy-control-LED-reg-from-DT.patch | 7 +++- ...e_mem_map-with-ARCH_PFN_OFFSET-calcu.patch | 2 +- ...les-ignore-EOPNOTSUPP-on-flowtable-d.patch | 2 +- ...to-enable-disable-tcp_collapse-logic.patch | 6 +-- 17 files changed, 39 insertions(+), 71 deletions(-) delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0510-drm-panel-panel-ilitek9881c-Use-cansleep-methods.patch diff --git a/include/kernel-6.1 b/include/kernel-6.1 index e8acd5ca1..d67049a6b 100644 --- a/include/kernel-6.1 +++ b/include/kernel-6.1 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.1 = .96 -LINUX_KERNEL_HASH-6.1.96 = 3e77c9069de5e7ab02ff9c2dcfe77dab193613fc1de21071901b4153374862a9 +LINUX_VERSION-6.1 = .97 +LINUX_KERNEL_HASH-6.1.97 = 890b845f36452328716e62dd893b634584f607cdd44b4e685392d302d3be41af diff --git a/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch index 6ca3493e4..0b5fce727 100644 --- a/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch +++ b/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch @@ -1987,7 +1987,7 @@ Signed-off-by: Phil Elwell #define MAX_TUNING_LOOP 40 -@@ -3233,7 +3233,7 @@ static void sdhci_timeout_timer(struct t +@@ -3236,7 +3236,7 @@ static void sdhci_timeout_timer(struct t spin_lock_irqsave(&host->lock, flags); if (host->cmd && !sdhci_data_line_cmd(host->cmd)) { @@ -1996,7 +1996,7 @@ Signed-off-by: Phil Elwell mmc_hostname(host->mmc)); sdhci_err_stats_inc(host, REQ_TIMEOUT); sdhci_dumpregs(host); -@@ -3256,7 +3256,7 @@ static void sdhci_timeout_data_timer(str +@@ -3259,7 +3259,7 @@ static void sdhci_timeout_data_timer(str if (host->data || host->data_cmd || (host->cmd && sdhci_data_line_cmd(host->cmd))) { diff --git a/target/linux/bcm27xx/patches-6.1/950-0332-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch b/target/linux/bcm27xx/patches-6.1/950-0332-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch index fa6aaa3d1..d0ba026a5 100644 --- a/target/linux/bcm27xx/patches-6.1/950-0332-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch +++ b/target/linux/bcm27xx/patches-6.1/950-0332-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch @@ -15,7 +15,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c -@@ -3196,6 +3196,31 @@ static const struct panel_desc qishenglo +@@ -3197,6 +3197,31 @@ static const struct panel_desc qishenglo .connector_type = DRM_MODE_CONNECTOR_DPI, }; @@ -47,7 +47,7 @@ Signed-off-by: Dave Stevenson static const struct display_timing rocktech_rk070er9427_timing = { .pixelclock = { 26400000, 33300000, 46800000 }, .hactive = { 800, 800, 800 }, -@@ -4229,6 +4254,9 @@ static const struct of_device_id platfor +@@ -4230,6 +4255,9 @@ static const struct of_device_id platfor .compatible = "qishenglong,gopher2b-lcd", .data = &qishenglong_gopher2b_lcd, }, { diff --git a/target/linux/bcm27xx/patches-6.1/950-0383-drm-panel-simple-add-Geekworm-MZP280-Panel.patch b/target/linux/bcm27xx/patches-6.1/950-0383-drm-panel-simple-add-Geekworm-MZP280-Panel.patch index 904df714d..fa19c29ff 100644 --- a/target/linux/bcm27xx/patches-6.1/950-0383-drm-panel-simple-add-Geekworm-MZP280-Panel.patch +++ b/target/linux/bcm27xx/patches-6.1/950-0383-drm-panel-simple-add-Geekworm-MZP280-Panel.patch @@ -46,7 +46,7 @@ Acked-by: Maxime Ripard static const struct drm_display_mode giantplus_gpg482739qs5_mode = { .clock = 9000, .hdisplay = 480, -@@ -4113,6 +4139,9 @@ static const struct of_device_id platfor +@@ -4114,6 +4140,9 @@ static const struct of_device_id platfor .compatible = "friendlyarm,hd702e", .data = &friendlyarm_hd702e, }, { diff --git a/target/linux/bcm27xx/patches-6.1/950-0401-mm-page_alloc-cma-introduce-a-customisable-threshold.patch b/target/linux/bcm27xx/patches-6.1/950-0401-mm-page_alloc-cma-introduce-a-customisable-threshold.patch index fed130ca8..1c4155624 100644 --- a/target/linux/bcm27xx/patches-6.1/950-0401-mm-page_alloc-cma-introduce-a-customisable-threshold.patch +++ b/target/linux/bcm27xx/patches-6.1/950-0401-mm-page_alloc-cma-introduce-a-customisable-threshold.patch @@ -48,7 +48,7 @@ Signed-off-by: David Plowman static bool _init_on_alloc_enabled_early __read_mostly = IS_ENABLED(CONFIG_INIT_ON_ALLOC_DEFAULT_ON); static int __init early_init_on_alloc(char *buf) -@@ -3073,12 +3094,13 @@ __rmqueue(struct zone *zone, unsigned in +@@ -3077,12 +3098,13 @@ __rmqueue(struct zone *zone, unsigned in if (IS_ENABLED(CONFIG_CMA)) { /* * Balance movable allocations between regular and CMA areas by diff --git a/target/linux/bcm27xx/patches-6.1/950-0510-drm-panel-panel-ilitek9881c-Use-cansleep-methods.patch b/target/linux/bcm27xx/patches-6.1/950-0510-drm-panel-panel-ilitek9881c-Use-cansleep-methods.patch deleted file mode 100644 index c95f4c032..000000000 --- a/target/linux/bcm27xx/patches-6.1/950-0510-drm-panel-panel-ilitek9881c-Use-cansleep-methods.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b969ef21e3522c6829aafaa1fecd33fa653596e4 Mon Sep 17 00:00:00 2001 -From: Mark Williams -Date: Wed, 7 Dec 2022 18:20:40 -0700 -Subject: [PATCH] drm/panel: panel-ilitek9881c: Use cansleep methods - -Use cansleep version of gpiod_set_value so external IO drivers (like -via I2C) can be used. - -Signed-off-by: Mark Williams ---- - drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c -+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c -@@ -940,10 +940,10 @@ static int ili9881c_prepare(struct drm_p - msleep(5); - - /* And reset it */ -- gpiod_set_value(ctx->reset, 1); -+ gpiod_set_value_cansleep(ctx->reset, 1); - msleep(20); - -- gpiod_set_value(ctx->reset, 0); -+ gpiod_set_value_cansleep(ctx->reset, 0); - msleep(20); - - for (i = 0; i < ctx->desc->init_length; i++) { -@@ -998,7 +998,7 @@ static int ili9881c_unprepare(struct drm - - mipi_dsi_dcs_enter_sleep_mode(ctx->dsi); - regulator_disable(ctx->power); -- gpiod_set_value(ctx->reset, 1); -+ gpiod_set_value_cansleep(ctx->reset, 1); - - return 0; - } diff --git a/target/linux/bcm27xx/patches-6.1/950-0521-drm-panel-simple-Add-Innolux-AT056tN53V1-5.6-VGA.patch b/target/linux/bcm27xx/patches-6.1/950-0521-drm-panel-simple-Add-Innolux-AT056tN53V1-5.6-VGA.patch index 9abd05b5e..692b9110b 100644 --- a/target/linux/bcm27xx/patches-6.1/950-0521-drm-panel-simple-Add-Innolux-AT056tN53V1-5.6-VGA.patch +++ b/target/linux/bcm27xx/patches-6.1/950-0521-drm-panel-simple-Add-Innolux-AT056tN53V1-5.6-VGA.patch @@ -165,7 +165,7 @@ Signed-off-by: Phil Elwell static const struct drm_display_mode innolux_at070tn92_mode = { .clock = 33333, .hdisplay = 800, -@@ -4149,6 +4181,9 @@ static const struct of_device_id platfor +@@ -4150,6 +4182,9 @@ static const struct of_device_id platfor .compatible = "innolux,at043tn24", .data = &innolux_at043tn24, }, { diff --git a/target/linux/bcm27xx/patches-6.1/950-0859-mmc-brcmstb-add-support-for-BCM2712.patch b/target/linux/bcm27xx/patches-6.1/950-0859-mmc-brcmstb-add-support-for-BCM2712.patch index 05d403a63..165dffb86 100644 --- a/target/linux/bcm27xx/patches-6.1/950-0859-mmc-brcmstb-add-support-for-BCM2712.patch +++ b/target/linux/bcm27xx/patches-6.1/950-0859-mmc-brcmstb-add-support-for-BCM2712.patch @@ -63,7 +63,7 @@ Signed-off-by: Jonathan Bell #include "sdhci-cqhci.h" #include "sdhci-pltfm.h" -@@ -26,18 +28,43 @@ +@@ -27,18 +29,43 @@ #define BRCMSTB_PRIV_FLAGS_HAS_CQE BIT(0) #define BRCMSTB_PRIV_FLAGS_GATE_CLOCK BIT(1) @@ -107,7 +107,7 @@ Signed-off-by: Jonathan Bell struct sdhci_ops *ops; const unsigned int flags; }; -@@ -94,6 +121,124 @@ static void sdhci_brcmstb_set_clock(stru +@@ -95,6 +122,124 @@ static void sdhci_brcmstb_set_clock(stru sdhci_enable_clk(host, clk); } @@ -232,7 +232,7 @@ Signed-off-by: Jonathan Bell static void sdhci_brcmstb_set_uhs_signaling(struct sdhci_host *host, unsigned int timing) { -@@ -123,6 +268,146 @@ static void sdhci_brcmstb_set_uhs_signal +@@ -124,6 +269,146 @@ static void sdhci_brcmstb_set_uhs_signal sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2); } @@ -379,7 +379,7 @@ Signed-off-by: Jonathan Bell static void sdhci_brcmstb_dumpregs(struct mmc_host *mmc) { sdhci_dumpregs(mmc_priv(mmc)); -@@ -155,6 +440,21 @@ static struct sdhci_ops sdhci_brcmstb_op +@@ -156,6 +441,21 @@ static struct sdhci_ops sdhci_brcmstb_op .set_uhs_signaling = sdhci_set_uhs_signaling, }; @@ -401,7 +401,7 @@ Signed-off-by: Jonathan Bell static struct sdhci_ops sdhci_brcmstb_ops_7216 = { .set_clock = sdhci_brcmstb_set_clock, .set_bus_width = sdhci_set_bus_width, -@@ -179,10 +479,16 @@ static const struct brcmstb_match_priv m +@@ -180,10 +480,16 @@ static const struct brcmstb_match_priv m .ops = &sdhci_brcmstb_ops_7216, }; @@ -418,7 +418,7 @@ Signed-off-by: Jonathan Bell {}, }; -@@ -256,6 +562,7 @@ static int sdhci_brcmstb_probe(struct pl +@@ -257,6 +563,7 @@ static int sdhci_brcmstb_probe(struct pl u32 actual_clock_mhz; struct sdhci_host *host; struct resource *iomem; @@ -426,7 +426,7 @@ Signed-off-by: Jonathan Bell struct clk *clk; struct clk *base_clk = NULL; int res; -@@ -290,6 +597,11 @@ static int sdhci_brcmstb_probe(struct pl +@@ -291,6 +598,11 @@ static int sdhci_brcmstb_probe(struct pl match_priv->ops->irq = sdhci_brcmstb_cqhci_irq; } @@ -438,7 +438,7 @@ Signed-off-by: Jonathan Bell /* Map in the non-standard CFG registers */ iomem = platform_get_resource(pdev, IORESOURCE_MEM, 1); priv->cfg_regs = devm_ioremap_resource(&pdev->dev, iomem); -@@ -303,6 +615,43 @@ static int sdhci_brcmstb_probe(struct pl +@@ -304,6 +616,43 @@ static int sdhci_brcmstb_probe(struct pl if (res) goto err; @@ -482,7 +482,7 @@ Signed-off-by: Jonathan Bell /* * Automatic clock gating does not work for SD cards that may * voltage switch so only enable it for non-removable devices. -@@ -319,6 +668,13 @@ static int sdhci_brcmstb_probe(struct pl +@@ -320,6 +669,13 @@ static int sdhci_brcmstb_probe(struct pl (host->mmc->caps2 & MMC_CAP2_HS400_ES)) host->mmc_host_ops.hs400_enhanced_strobe = match_priv->hs400es; diff --git a/target/linux/bcm27xx/patches-6.1/950-0860-sdhci-Add-SD-Express-hook.patch b/target/linux/bcm27xx/patches-6.1/950-0860-sdhci-Add-SD-Express-hook.patch index c7d53f977..b79101859 100644 --- a/target/linux/bcm27xx/patches-6.1/950-0860-sdhci-Add-SD-Express-hook.patch +++ b/target/linux/bcm27xx/patches-6.1/950-0860-sdhci-Add-SD-Express-hook.patch @@ -26,7 +26,7 @@ sdhci: remove PYA0_INTR_BUG quirk. Add quirks to disable some of the higher SDR static int dwcmshc_rk35xx_init(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv) --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c -@@ -3071,6 +3071,15 @@ static void sdhci_card_event(struct mmc_ +@@ -3074,6 +3074,15 @@ static void sdhci_card_event(struct mmc_ spin_unlock_irqrestore(&host->lock, flags); } @@ -42,7 +42,7 @@ sdhci: remove PYA0_INTR_BUG quirk. Add quirks to disable some of the higher SDR static const struct mmc_host_ops sdhci_ops = { .request = sdhci_request, .post_req = sdhci_post_req, -@@ -3086,6 +3095,7 @@ static const struct mmc_host_ops sdhci_o +@@ -3089,6 +3098,7 @@ static const struct mmc_host_ops sdhci_o .execute_tuning = sdhci_execute_tuning, .card_event = sdhci_card_event, .card_busy = sdhci_card_busy, @@ -50,7 +50,7 @@ sdhci: remove PYA0_INTR_BUG quirk. Add quirks to disable some of the higher SDR }; /*****************************************************************************\ -@@ -4611,6 +4621,15 @@ int sdhci_setup_host(struct sdhci_host * +@@ -4614,6 +4624,15 @@ int sdhci_setup_host(struct sdhci_host * !(host->quirks2 & SDHCI_QUIRK2_BROKEN_DDR50)) mmc->caps |= MMC_CAP_UHS_DDR50; diff --git a/target/linux/bcm27xx/patches-6.1/950-0989-drm-panel-simple-Alter-the-timing-for-the-Pi-7-DSI-d.patch b/target/linux/bcm27xx/patches-6.1/950-0989-drm-panel-simple-Alter-the-timing-for-the-Pi-7-DSI-d.patch index 42f426668..e5484f652 100644 --- a/target/linux/bcm27xx/patches-6.1/950-0989-drm-panel-simple-Alter-the-timing-for-the-Pi-7-DSI-d.patch +++ b/target/linux/bcm27xx/patches-6.1/950-0989-drm-panel-simple-Alter-the-timing-for-the-Pi-7-DSI-d.patch @@ -15,7 +15,7 @@ Signed-off-by: Dave Stevenson --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c -@@ -3244,11 +3244,11 @@ static const struct panel_desc qishenglo +@@ -3245,11 +3245,11 @@ static const struct panel_desc qishenglo }; static const struct drm_display_mode raspberrypi_7inch_mode = { diff --git a/target/linux/bcm27xx/patches-6.1/950-1075-drivers-mmc-sdhci-add-SPURIOUS_INT_RESP-quirk.patch b/target/linux/bcm27xx/patches-6.1/950-1075-drivers-mmc-sdhci-add-SPURIOUS_INT_RESP-quirk.patch index 5b3b66c1f..94943c88b 100644 --- a/target/linux/bcm27xx/patches-6.1/950-1075-drivers-mmc-sdhci-add-SPURIOUS_INT_RESP-quirk.patch +++ b/target/linux/bcm27xx/patches-6.1/950-1075-drivers-mmc-sdhci-add-SPURIOUS_INT_RESP-quirk.patch @@ -36,7 +36,7 @@ Signed-off-by: Jonathan Bell sdhci_writew(host, SDHCI_MAKE_CMD(cmd->opcode, flags), SDHCI_COMMAND); return true; -@@ -3330,6 +3336,11 @@ static void sdhci_cmd_irq(struct sdhci_h +@@ -3333,6 +3339,11 @@ static void sdhci_cmd_irq(struct sdhci_h if (intmask & SDHCI_INT_TIMEOUT) { host->cmd->error = -ETIMEDOUT; sdhci_err_stats_inc(host, CMD_TIMEOUT); diff --git a/target/linux/bcm27xx/patches-6.1/950-1182-drm-panel-add-panel-dsi.patch b/target/linux/bcm27xx/patches-6.1/950-1182-drm-panel-add-panel-dsi.patch index a46d6d3f1..cfa7813fa 100644 --- a/target/linux/bcm27xx/patches-6.1/950-1182-drm-panel-add-panel-dsi.patch +++ b/target/linux/bcm27xx/patches-6.1/950-1182-drm-panel-add-panel-dsi.patch @@ -23,7 +23,7 @@ Signed-off-by: Timon Skerutsch /** * struct panel_desc - Describes a simple panel. -@@ -4665,6 +4666,9 @@ static const struct panel_desc_dsi osd10 +@@ -4666,6 +4667,9 @@ static const struct panel_desc_dsi osd10 .lanes = 4, }; @@ -33,7 +33,7 @@ Signed-off-by: Timon Skerutsch static const struct of_device_id dsi_of_match[] = { { .compatible = "auo,b080uan01", -@@ -4688,14 +4692,118 @@ static const struct of_device_id dsi_of_ +@@ -4689,14 +4693,118 @@ static const struct of_device_id dsi_of_ .compatible = "osddisplays,osd101t2045-53ts", .data = &osd101t2045_53ts }, { @@ -152,7 +152,7 @@ Signed-off-by: Timon Skerutsch const struct of_device_id *id; int err; -@@ -4703,7 +4811,20 @@ static int panel_simple_dsi_probe(struct +@@ -4704,7 +4812,20 @@ static int panel_simple_dsi_probe(struct if (!id) return -ENODEV; diff --git a/target/linux/generic/backport-6.1/020-v6.3-06-BACKPORT-mm-multi-gen-LRU-per-node-lru_gen_folio-lis.patch b/target/linux/generic/backport-6.1/020-v6.3-06-BACKPORT-mm-multi-gen-LRU-per-node-lru_gen_folio-lis.patch index 69f52fa40..7756d19d9 100644 --- a/target/linux/generic/backport-6.1/020-v6.3-06-BACKPORT-mm-multi-gen-LRU-per-node-lru_gen_folio-lis.patch +++ b/target/linux/generic/backport-6.1/020-v6.3-06-BACKPORT-mm-multi-gen-LRU-per-node-lru_gen_folio-lis.patch @@ -297,7 +297,7 @@ Signed-off-by: T.J. Mercier #endif /* CONFIG_LRU_GEN */ -@@ -1219,6 +1330,8 @@ typedef struct pglist_data { +@@ -1218,6 +1329,8 @@ typedef struct pglist_data { #ifdef CONFIG_LRU_GEN /* kswap mm walk data */ struct lru_gen_mm_walk mm_walk; @@ -361,7 +361,7 @@ Signed-off-by: T.J. Mercier static void mem_cgroup_css_free(struct cgroup_subsys_state *css) --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -7945,6 +7945,7 @@ static void __init free_area_init_node(i +@@ -7949,6 +7949,7 @@ static void __init free_area_init_node(i pgdat_set_deferred_range(pgdat); free_area_init_core(pgdat); diff --git a/target/linux/generic/hack-6.1/765-mxl-gpy-control-LED-reg-from-DT.patch b/target/linux/generic/hack-6.1/765-mxl-gpy-control-LED-reg-from-DT.patch index d285da60c..70851ec9a 100644 --- a/target/linux/generic/hack-6.1/765-mxl-gpy-control-LED-reg-from-DT.patch +++ b/target/linux/generic/hack-6.1/765-mxl-gpy-control-LED-reg-from-DT.patch @@ -55,7 +55,7 @@ Signed-off-by: David Bauer /* SGMII */ #define VSPEC1_SGMII_CTRL 0x08 #define VSPEC1_SGMII_CTRL_ANEN BIT(12) /* Aneg enable */ -@@ -258,6 +265,35 @@ out: +@@ -258,10 +265,39 @@ out: return ret; } @@ -91,3 +91,8 @@ Signed-off-by: David Bauer static int gpy_config_init(struct phy_device *phydev) { /* Nothing to configure. Configuration Requirement Placeholder */ +- return 0; ++ return gpy_led_write(phydev); + } + + static bool gpy_has_broken_mdint(struct phy_device *phydev) diff --git a/target/linux/generic/pending-6.1/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-6.1/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch index a3d66c54b..edee0e46a 100644 --- a/target/linux/generic/pending-6.1/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch +++ b/target/linux/generic/pending-6.1/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch @@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -7899,7 +7899,7 @@ static void __init alloc_node_mem_map(st +@@ -7903,7 +7903,7 @@ static void __init alloc_node_mem_map(st if (pgdat == NODE_DATA(0)) { mem_map = NODE_DATA(0)->node_mem_map; if (page_to_pfn(mem_map) != pgdat->node_start_pfn) diff --git a/target/linux/generic/pending-6.1/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch b/target/linux/generic/pending-6.1/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch index 9f8c3d6ff..916b6bc6a 100644 --- a/target/linux/generic/pending-6.1/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch +++ b/target/linux/generic/pending-6.1/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch @@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -7959,7 +7959,7 @@ static int nft_register_flowtable_net_ho +@@ -7958,7 +7958,7 @@ static int nft_register_flowtable_net_ho err = flowtable->data.type->setup(&flowtable->data, hook->ops.dev, FLOW_BLOCK_BIND); diff --git a/target/linux/x86/patches-6.1/998-add-a-sysctl-to-enable-disable-tcp_collapse-logic.patch b/target/linux/x86/patches-6.1/998-add-a-sysctl-to-enable-disable-tcp_collapse-logic.patch index df453d5ef..111527f43 100644 --- a/target/linux/x86/patches-6.1/998-add-a-sysctl-to-enable-disable-tcp_collapse-logic.patch +++ b/target/linux/x86/patches-6.1/998-add-a-sysctl-to-enable-disable-tcp_collapse-logic.patch @@ -81,7 +81,7 @@ and performance for all other cases. --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -5407,6 +5407,7 @@ static bool tcp_prune_ofo_queue(struct s +@@ -5424,6 +5424,7 @@ static bool tcp_prune_ofo_queue(struct s static int tcp_prune_queue(struct sock *sk) { struct tcp_sock *tp = tcp_sk(sk); @@ -89,7 +89,7 @@ and performance for all other cases. NET_INC_STATS(sock_net(sk), LINUX_MIB_PRUNECALLED); -@@ -5418,6 +5419,39 @@ static int tcp_prune_queue(struct sock * +@@ -5435,6 +5436,39 @@ static int tcp_prune_queue(struct sock * if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf) return 0; @@ -129,7 +129,7 @@ and performance for all other cases. tcp_collapse_ofo_queue(sk); if (!skb_queue_empty(&sk->sk_receive_queue)) tcp_collapse(sk, &sk->sk_receive_queue, NULL, -@@ -5436,6 +5470,8 @@ static int tcp_prune_queue(struct sock * +@@ -5453,6 +5487,8 @@ static int tcp_prune_queue(struct sock * if (atomic_read(&sk->sk_rmem_alloc) <= sk->sk_rcvbuf) return 0;