Prepare v2024.04-rc1

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/Makefile b/Makefile
index 7a3209bd9e0c78571bb3e1eb314f0e528f815327..3afe314679cdfa5b521d74473942e2a2a1bc6f85 100644 (file)
--- 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 27733135f5eceb90e1aac7cffd2706331a800e36..4f18623b28e5f55b163a5f93f3da86ce52ec3c2a 100644 (file)
--- 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.