From 10bcdb1cb9c2f2e2670902fc822cfe7043fb7794 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 3 Nov 2025 14:59:43 +0000 Subject: [PATCH] rockchip64: bump to 6.18.0-rc4, rewrite patches --- config/sources/mainline-kernel.conf.sh | 2 +- .../rockchip64-6.18/general-disable-mtu-validation.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/sources/mainline-kernel.conf.sh b/config/sources/mainline-kernel.conf.sh index dae4304c7f..0326e2d9c9 100644 --- a/config/sources/mainline-kernel.conf.sh +++ b/config/sources/mainline-kernel.conf.sh @@ -8,7 +8,7 @@ function mainline_kernel_decide_version__upstream_release_candidate_number() { [[ -n "${KERNELBRANCH}" ]] && return 0 # if already set, don't touch it; that way other hooks can run in any order if [[ "${KERNEL_MAJOR_MINOR}" == "6.18" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released - declare -g KERNELBRANCH="tag:v6.18-rc3" + declare -g KERNELBRANCH="tag:v6.18-rc4" display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info" fi } diff --git a/patch/kernel/archive/rockchip64-6.18/general-disable-mtu-validation.patch b/patch/kernel/archive/rockchip64-6.18/general-disable-mtu-validation.patch index 4553c87fa2..2d9301e7c4 100644 --- a/patch/kernel/archive/rockchip64-6.18/general-disable-mtu-validation.patch +++ b/patch/kernel/archive/rockchip64-6.18/general-disable-mtu-validation.patch @@ -18,7 +18,7 @@ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/eth index 111111111111..222222222222 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -5847,27 +5847,15 @@ static void stmmac_set_rx_mode(struct net_device *dev) +@@ -5846,27 +5846,15 @@ static void stmmac_set_rx_mode(struct net_device *dev) static int stmmac_change_mtu(struct net_device *dev, int new_mtu) { struct stmmac_priv *priv = netdev_priv(dev);