From 6faba41927bdc8973b59678649ef83c564cc421e Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 29 Jan 2024 20:53:19 -0500 Subject: [PATCH] Prepare v2024.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 7a3209bd9e0..3afe314679c 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ # SPDX-License-Identifier: GPL-2.0+ VERSION = 2024 -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 27733135f5e..4f18623b28e 100644 --- a/doc/develop/release_cycle.rst +++ b/doc/develop/release_cycle.rst @@ -50,8 +50,7 @@ Current Status * U-Boot v2024.01 was released on Mon 08 January 2024. -* The Merge Window for the next release (v2024.04) is **open** until the -rc1 - release on Mon 29 January 2024. +* The Merge Window for the next release (v2024.04) is **closed**. * The next branch is now **closed**. @@ -63,9 +62,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 v2024.01-rc1 was released on Mon 29 January 2024. +* U-Boot v2024.01-rc1 was released on Mon 29 January 2024. .. * U-Boot v2024.01-rc2 was released on Mon 12 February 2024.