From c14e1664b6394b5a59ccd82f1f858ad6896c35b8 Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Mon, 17 Jun 2024 13:22:38 +0200
Subject: [PATCH] kernel: mainline: Bump 6.10-rc3 to 6.10-rc4

Including kernel config rewrite for RK3588
---
 config/kernel/linux-rockchip-rk3588-6.10.config | 6 ++----
 config/sources/mainline-kernel.conf.sh          | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/config/kernel/linux-rockchip-rk3588-6.10.config b/config/kernel/linux-rockchip-rk3588-6.10.config
index 89f6423ad1..e49bf2b2c5 100644
--- a/config/kernel/linux-rockchip-rk3588-6.10.config
+++ b/config/kernel/linux-rockchip-rk3588-6.10.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.10.0-rc3 Kernel Configuration
+# Linux/arm64 6.10.0-rc4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 13.2.0-23ubuntu4) 13.2.0"
 CONFIG_CC_IS_GCC=y
@@ -4337,9 +4337,7 @@ CONFIG_SERIAL_JSM=m
 CONFIG_SERIAL_SIFIVE=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIAL_SCCNXP_CONSOLE=y
-CONFIG_SERIAL_SC16IS7XX_CORE=m
-CONFIG_SERIAL_SC16IS7XX_I2C=m
-CONFIG_SERIAL_SC16IS7XX_SPI=m
+# CONFIG_SERIAL_SC16IS7XX is not set
 CONFIG_SERIAL_ALTERA_JTAGUART=m
 CONFIG_SERIAL_ALTERA_UART=m
 CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
diff --git a/config/sources/mainline-kernel.conf.sh b/config/sources/mainline-kernel.conf.sh
index 0bc3ab7687..8fecdbedcd 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.10" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
-		declare -g KERNELBRANCH="tag:v6.10-rc3"
+		declare -g KERNELBRANCH="tag:v6.10-rc4"
 		display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info"
 	fi
 }