diff --git a/ChangeLog b/ChangeLog
index e55a5e4a2bb0..ff2c2d31ab8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-11  Hafiz Abid Qadeer  <abidh@codesourcery.com>
+
+	* MAINTAINERS (Write After Approval): Add myself.
+
 2021-03-26  Dimitar Dimitrov  <dimitar@dinux.eu>
 
 	* MAINTAINERS: Add myself as pru port maintainer.
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8afd53b9b3b6..56c66b2d1fc4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2021-04-11  Hafiz Abid Qadeer  <abidh@codesourcery.com>
+
+	PR middle-end/98088
+	* omp-expand.c (expand_oacc_collapse_init): Update condition in
+	a gcc_assert.
+
 2021-04-10  H.J. Lu  <hjl.tools@gmail.com>
 
 	PR target/99744
diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 4320a50e9c47..d61002305d5f 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20210411
+20210412
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 651f9519e058..6972d1ff768f 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-11  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* gnat_ugn.texi (Top): Avoid invalid "up" link.
+
 2021-03-29  Eric Botcazou  <ebotcazou@adacore.com>
 
 	PR ada/99802
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a6e03cb64814..fcb7c2a6ad9f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2021-04-11  Jason Merrill  <jason@redhat.com>
+
+	PR c++/97974
+	* decl.c (fixup_anonymous_aggr): Prune all functions from
+	CLASSTYPE_MEMBER_VEC.
+
 2021-04-10  Jason Merrill  <jason@redhat.com>
 
 	PR c++/98800
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a994245502d4..646e092dfd1c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2021-04-11  Hafiz Abid Qadeer  <abidh@codesourcery.com>
+
+	PR middle-end/98088
+	* c-c++-common/goacc/collapse-2.c: New.
+
+2021-04-11  Jason Merrill  <jason@redhat.com>
+
+	PR c++/97974
+	* g++.dg/lookup/pr84962.C: Adjust diagnostic.
+	* g++.dg/other/anon-union5.C: New test.
+
 2021-04-10  Jason Merrill  <jason@redhat.com>
 
 	PR c++/98800
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 05fb2b0c156a..0be18fbde64b 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2021-04-11  Hafiz Abid Qadeer  <abidh@codesourcery.com>
+
+	PR middle-end/98088
+	* testsuite/libgomp.oacc-c-c++-common/collapse-2.c: Add check
+	for loop with GT/GE condition.
+	* testsuite/libgomp.oacc-c-c++-common/collapse-3.c: Likewise.
+
 2021-04-09  Thomas Schwinge  <thomas@codesourcery.com>
 
 	PR middle-end/84991