diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d54484f02a76d473fcab5599e2477ba1a8c77d36..50232bf9b86de30ddc68a11719d849d47adb31c9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,20 @@
+2023-08-22  Juzhe-Zhong  <juzhe.zhong@rivai.ai>
+
+	* config/riscv/t-riscv: Add riscv-vsetvl.def
+
+2023-08-22  Jakub Jelinek  <jakub@redhat.com>
+
+	Backported from master:
+	2023-08-22  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/106652
+	* doc/extend.texi (_Float<n>): Drop obsolete sentence that the
+	types aren't supported in C++.
+
+2023-08-22  xuli  <xuli1@eswincomputing.com>
+
+	* config/riscv/riscv-vsetvl.cc (extract_single_source): Fix bug.
+
 2023-08-21  liuhongt  <hongtao.liu@intel.com>
 
 	Backported from master:
diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 0415c90afee352906a8f1b6d3ae3988952bacd0d..47b00c6c0bd5f37f1a37ce14190bbb7e0d8ffb8e 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20230822
+20230823
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f9b97ecbb048af2077b03ae0d71574c1a8ea2c56..db76dbd6db9acf167393b2fe80eccc0810db8861 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,39 @@
+2023-08-22  Jonathan Wakely  <jwakely@redhat.com>
+
+	Backported from master:
+	2023-08-17  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/std/format (__format::_Pres_type): Add _Pres_F.
+	(__formatter_fp::parse): Use _Pres_F for 'F'.
+	(__formatter_fp::format): Set __upper for _Pres_F.
+	* testsuite/std/format/functions/format.cc: Check formatting of
+	infinity and NaN for each presentation type.
+
+2023-08-22  Jonathan Wakely  <jwakely@redhat.com>
+
+	Backported from master:
+	2023-08-17  Jonathan Wakely  <jwakely@redhat.com>
+
+	* src/c++20/tzdb.cc (tzdata_file, leaps_file): Change type to
+	std::string_view.
+
+2023-08-22  Jonathan Wakely  <jwakely@redhat.com>
+
+	Backported from master:
+	2023-08-17  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/experimental/internet (address_v4::to_string): Remove
+	unused parameter name.
+
+2023-08-22  Jonathan Wakely  <jwakely@redhat.com>
+
+	Backported from master:
+	2023-08-17  Jonathan Wakely  <jwakely@redhat.com>
+
+	* libsupc++/compare (__cmp_cat::__unseq): Make ctor consteval.
+	* testsuite/18_support/comparisons/categories/zero_neg.cc: Prune
+	excess errors caused by invalid consteval calls.
+
 2023-08-14  Jonathan Wakely  <jwakely@redhat.com>
 
 	Backported from master: