From 29a9a5ea368a0909be7080aac20befb4424ef38e Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Wed, 6 Mar 2024 00:22:32 +0100 Subject: [PATCH] mainline-kernel: bump 6.8 to 6.8-rc7; update linux-rockchip-rk3588-edge.config --- config/kernel/linux-rockchip-rk3588-edge.config | 3 +-- config/sources/mainline-kernel.conf.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/kernel/linux-rockchip-rk3588-edge.config b/config/kernel/linux-rockchip-rk3588-edge.config index 2904b27fcb..b47c36d473 100644 --- a/config/kernel/linux-rockchip-rk3588-edge.config +++ b/config/kernel/linux-rockchip-rk3588-edge.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.8.0-rc6 Kernel Configuration +# Linux/arm64 6.8.0-rc7 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0" CONFIG_CC_IS_GCC=y @@ -6372,7 +6372,6 @@ CONFIG_DRM_DISPLAY_HDMI_HELPER=y # CONFIG_DRM_DP_AUX_CHARDEV is not set CONFIG_DRM_DP_CEC=y CONFIG_DRM_TTM=m -# CONFIG_DRM_TTM_KUNIT_TEST is not set CONFIG_DRM_EXEC=m CONFIG_DRM_BUDDY=m CONFIG_DRM_VRAM_HELPER=m diff --git a/config/sources/mainline-kernel.conf.sh b/config/sources/mainline-kernel.conf.sh index 6b53c655c6..3874b93347 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.8" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released - declare -g KERNELBRANCH="tag:v6.8-rc6" # @TODO roll to rc7 on March 4th, 2024, might very well have an rc8 for 6.8 too + declare -g KERNELBRANCH="tag:v6.8-rc7" display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info" fi }