From a517796cfa5d8f4ca2f0c11c78c24a08a102c047 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 27 Jan 2025 16:38:46 -0600 Subject: [PATCH] Prepare v2025.04-rc1 Signed-off-by: Tom Rini --- Makefile | 4 ++-- doc/develop/release_cycle.rst | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 5c6f467153c..33bb86343c5 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ # SPDX-License-Identifier: GPL-2.0+ VERSION = 2025 -PATCHLEVEL = 01 +PATCHLEVEL = 04 SUBLEVEL = -EXTRAVERSION = +EXTRAVERSION = -rc1 NAME = # *DOCUMENTATION* diff --git a/doc/develop/release_cycle.rst b/doc/develop/release_cycle.rst index 859ae3b1974..9ecd6b6ab87 100644 --- a/doc/develop/release_cycle.rst +++ b/doc/develop/release_cycle.rst @@ -53,8 +53,7 @@ Current Status * U-Boot v2025.01 was released on Mon 06 January 2025. -* The Merge Window for the next release (v2025.04) is **open** until the -rc1 - release on Mon 27 January 2025. +* The Merge Window for the next release (v2025.04) is **closed**. * The next branch is now **closed** until the -rc2 release on Mon 10 February 2025. @@ -67,9 +66,9 @@ Future Releases .. The following commented out dates are for when release candidates are planned to be tagged. -.. For the next scheduled release, release candidates were made on:: +For the next scheduled release, release candidates were made on:: -.. * U-Boot v2025.04-rc1 was released on Mon 27 January 2025. +* U-Boot v2025.04-rc1 was released on Mon 27 January 2025. .. * U-Boot v2025.04-rc2 was released on Mon 10 February 2025.