diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index fcb6f128085..9d05bc7fa40 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20230505
+20230506
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 272e87dad25..caaa2463d58 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,23 @@
+2023-05-05  Julian Brown  <julian@codesourcery.com>
+
+	Backported from master:
+	2023-05-04  Julian Brown  <julian@codesourcery.com>
+
+	PR fortran/109622
+	* openmp.cc (resolve_omp_clauses): Add diagnostic for
+	non-pointer/non-allocatable attach/detach.
+	* trans-openmp.cc (gfc_trans_omp_clauses): Remove dereference for
+	pointer-to-scalar derived type component attach/detach.  Fix
+	attach/detach handling for descriptors.
+
+2023-05-05  Julian Brown  <julian@codesourcery.com>
+
+	Backported from master:
+	2023-04-28  Julian Brown  <julian@codesourcery.com>
+
+	PR fortran/109622
+	* trans-openmp.cc (gfc_trans_omp_clauses): Attach/detach clause fixes.
+
 2023-04-26  Release Manager
 
 	* GCC 13.1.0 released.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 99439e8a8e0..11e3cd0404f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,28 @@
+2023-05-05  Patrick Palka  <ppalka@redhat.com>
+
+	Backported from master:
+	2023-05-02  Patrick Palka  <ppalka@redhat.com>
+
+	PR c++/109506
+	* g++.dg/cpp0x/nsdmi-template26.C: New test.
+
+2023-05-05  Julian Brown  <julian@codesourcery.com>
+
+	Backported from master:
+	2023-05-04  Julian Brown  <julian@codesourcery.com>
+
+	PR fortran/109622
+	* gfortran.dg/goacc/pr109622-5.f90: New test.
+	* gfortran.dg/goacc/pr109622-6.f90: New test.
+
+2023-05-05  Julian Brown  <julian@codesourcery.com>
+
+	Backported from master:
+	2023-04-28  Julian Brown  <julian@codesourcery.com>
+
+	PR fortran/109622
+	* gfortran.dg/goacc/attach-descriptor.f90: Adjust expected output.
+
 2023-05-04  Richard Biener  <rguenther@suse.de>
 
 	Backported from master:
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index be63f44be7d..d776e4dd2da 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,30 @@
+2023-05-05  Julian Brown  <julian@codesourcery.com>
+
+	Backported from master:
+	2023-05-04  Julian Brown  <julian@codesourcery.com>
+
+	PR fortran/109622
+	* testsuite/libgomp.fortran/pr109622.f90: Move test...
+	* testsuite/libgomp.oacc-fortran/pr109622.f90: ...to here. Ignore
+	vector length warning.
+	* testsuite/libgomp.fortran/pr109622-2.f90: Move test...
+	* testsuite/libgomp.oacc-fortran/pr109622-2.f90: ...to here.  Add
+	missing copyin/copyout variable. Ignore vector length warnings.
+	* testsuite/libgomp.fortran/pr109622-3.f90: Move test...
+	* testsuite/libgomp.oacc-fortran/pr109622-3.f90: ...to here.  Ignore
+	vector length warnings.
+	* testsuite/libgomp.oacc-fortran/pr109622-4.f90: New test.
+
+2023-05-05  Julian Brown  <julian@codesourcery.com>
+
+	Backported from master:
+	2023-04-28  Julian Brown  <julian@codesourcery.com>
+
+	PR fortran/109622
+	* testsuite/libgomp.fortran/pr109622.f90: New test.
+	* testsuite/libgomp.fortran/pr109622-2.f90: New test.
+	* testsuite/libgomp.fortran/pr109622-3.f90: New test.
+
 2023-04-26  Release Manager
 
 	* GCC 13.1.0 released.
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7b53dbdb7c1..7f344dfb997 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2023-05-05  Alexandre Oliva  <oliva@adacore.com>
+
+	Backported from master:
+	2023-05-05  Alexandre Oliva  <oliva@adacore.com>
+
+	* testsuite/20_util/from_chars/4.cc: Skip long double test06
+	on aarch64-vxworks.
+	* testsuite/20_util/to_chars/long_double.cc: Xfail run on
+	aarch64-vxworks.
+
 2023-05-04  Jonathan Wakely  <jwakely@redhat.com>
 
 	Backported from master: