aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2024-01-29 20:53:19 -0500
committerTom Rini <trini@konsulko.com>2024-01-29 20:53:19 -0500
commit6faba41927bdc8973b59678649ef83c564cc421e (patch)
treedc7785d3b88c95a18730d307fda78046aa22b446
parentd5c0c990c3128401810514c66b41b386096d206e (diff)
downloadu-boot-2024.04-rc1.zip
u-boot-2024.04-rc1.tar.gz
u-boot-2024.04-rc1.tar.bz2
Prepare v2024.04-rc1v2024.04-rc1
Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--Makefile4
-rw-r--r--doc/develop/release_cycle.rst7
2 files changed, 5 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 7a3209b..3afe314 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 2773313..4f18623 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.