Prepare v2023.04-rc1

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

diff --git a/Makefile b/Makefile
index 9c38cc29e9da91e082beda828e07dfba04d1fb1a..7eaf45496c1c549b8aaa6d320121e7374d632ada 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0+
 
 VERSION = 2023
-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 16fb4a62883cc2996f1da6b59a0f4f0738b70a21..746bd9632d9e0216a74bfcce961cc9f9937bce4b 100644 (file)
--- a/doc/develop/release_cycle.rst
+++ b/doc/develop/release_cycle.rst
@@ -50,8 +50,7 @@ Current Status
 
 * U-Boot v2023.01 was released on Mon 09 January 2023.
 
-* The Merge Window for the next release (v2023.04) is **open** until -rc1
-  release on Mon 30 January 2023.
+* The Merge Window for the next release (v2023.04) is **closed**.
 
 * Release "v2023.04" is scheduled for 03 April 2023.
 
@@ -61,9 +60,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 v2023.04-rc1 was released on Mon 30 January 2023.
+* U-Boot v2023.04-rc1 was released on Mon 30 January 2023.
 
 .. * U-Boot v2023.04-rc2 was released on Mon 13 February 2023.