diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 54167a9c7fa..57d03435ad0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2021-10-30  Tobias Burnus  <tobias@codesourcery.com>
+
+	PR middle-end/102972
+	* omp-low.c (omp_runtime_api_call): Use DECL_ASSEMBLER_NAME to get
+	internal Fortran name; new permit_num_teams arg to permit
+	omp_get_num_teams and omp_get_team_num.
+	(scan_omp_1_stmt): Update call to it, add missing call for
+	reverse offload, and check for strictly nested API calls in teams.
+
+2021-10-30  Jakub Jelinek  <jakub@redhat.com>
+
+	* gimplify.c (gimplify_omp_for): Diagnose threadprivate iterators.
+
 2021-10-29  David Malcolm  <dmalcolm@redhat.com>
 
 	* selftest.c (assert_streq): Add newlines when emitting non-equal
diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 41c1c08effe..259d8523342 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20211030
+20211031
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index a298881b779..914086ff02f 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2021-10-30  Alexandre Oliva  <oliva@adacore.com>
+
+	* doc/gnat_rm/security_hardening_features.rst: Mention
+	optimization to operations with implied compares.
+
 2021-10-28  Alexandre Oliva  <oliva@adacore.com>
 
 	* doc/gnat_rm/security_hardening_features.rst
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 129fe30a191..62bc5e99106 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,35 @@
+2021-10-30  Manfred Schwarb  <manfred99@gmx.ch>
+
+	* intrinsic.texi: Remove entries for SHORT and LONG intrinsics.
+
+2021-10-30  Manfred Schwarb  <manfred99@gmx.ch>
+
+	* check.c (gfc_check_intconv): Change error message.
+
+2021-10-30  Manfred Schwarb  <manfred99@gmx.ch>
+
+	* intrinsic.texi (REAL): Fix entries in Specific names table.
+
+2021-10-30  Manfred Schwarb  <manfred99@gmx.ch>
+
+	* intrinsic.texi: Adjust @columnfractions commands to improve
+	appearance for narrow 80 character terminals.
+
+2021-10-30  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>
+
+	* parse.c (clean_up_modules): Free gsym.
+
+2021-10-30  Harald Anlauf  <anlauf@gmx.de>
+
+	* gfortran.texi (bug reports): credit Gerhard Steinmetz for
+	  numerous bug reports.
+
+2021-10-30  Steve Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/99853
+	* resolve.c (resolve_select): Generate regular gfc_error on
+	invalid conversions instead of an gfc_internal_error.
+
 2021-10-29  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>
 
 	* symbol.c (free_tb_tree): Free type-bound procedure struct.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 64c469a6a9d..da6787c2461 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,26 @@
+2021-10-30  Tobias Burnus  <tobias@codesourcery.com>
+
+	PR middle-end/102972
+	* c-c++-common/gomp/target-device-ancestor-3.c: Add non-API
+	routine test.
+	* gfortran.dg/gomp/order-6.f90: Add missing bind(C).
+	* c-c++-common/gomp/teams-3.c: New test.
+	* gfortran.dg/gomp/teams-3.f90: New test.
+	* gfortran.dg/gomp/teams-4.f90: New test.
+
+2021-10-30  Manfred Schwarb  <manfred99@gmx.ch>
+
+	* gfortran.dg/intrinsic_short-long.f90: New test.
+
+2021-10-30  Steve Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/99853
+	* gfortran.dg/pr99853.f90: New test.
+
+2021-10-30  Jakub Jelinek  <jakub@redhat.com>
+
+	* c-c++-common/gomp/loop-10.c: New test.
+
 2021-10-29  Tamar Christina  <tamar.christina@arm.com>
 
 	* g++.dg/vect/pr99149.cc: Update case.
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 642497fda41..8e3bf91f49c 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,22 @@
+2021-10-30  Tobias Burnus  <tobias@codesourcery.com>
+
+	PR middle-end/102972
+	* testsuite/libgomp.c-c++-common/icv-3.c: Nest API calls inside
+	parallel construct.
+	* testsuite/libgomp.c-c++-common/icv-4.c: Likewise.
+	* testsuite/libgomp.c/target-3.c: Likewise.
+	* testsuite/libgomp.c/target-5.c: Likewise.
+	* testsuite/libgomp.c/target-6.c: Likewise.
+	* testsuite/libgomp.c/target-teams-1.c: Likewise.
+	* testsuite/libgomp.c/teams-1.c: Likewise.
+	* testsuite/libgomp.c/thread-limit-2.c: Likewise.
+	* testsuite/libgomp.c/thread-limit-3.c: Likewise.
+	* testsuite/libgomp.c/thread-limit-4.c: Likewise.
+	* testsuite/libgomp.c/thread-limit-5.c: Likewise.
+	* testsuite/libgomp.fortran/icv-3.f90: Likewise.
+	* testsuite/libgomp.fortran/icv-4.f90: Likewise.
+	* testsuite/libgomp.fortran/teams1.f90: Likewise.
+
 2021-10-29  Aldy Hernandez  <aldyh@redhat.com>
 
 	* testsuite/libgomp.graphite/force-parallel-4.c: Adjust for threading changes.