diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ba1f88ef52471ac6aec37fad2c479fc336aa3f0a..2cec10b83c8ae96286bc722ccc77611e53973b6d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2024-04-21  Pan Li  <pan2.li@intel.com>
+
+	Revert:
+	2023-12-01  Juzhe-Zhong  <juzhe.zhong@rivai.ai>
+
+	PR target/112431
+	* config/riscv/vector.md: Support highpart overlap for vx/vf.
+
 2024-04-20  Pan Li  <pan2.li@intel.com>
 
 	Revert:
diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index b0f1ecabfa2e20ce3c5f1cb2dad52093d0dd79d0..ae66f0465524449becbadfec9bc4f978f15d133c 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20240421
+20240422
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 019bca2a6d212f6e9d9433d0ddd07d33fdcdc970..536d914bbd3848f8c3bc049821ad288458fb3f84 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,18 @@
+2024-04-21  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/103471
+	* resolve.cc (resolve_actual_arglist): Catch variables silently
+	set as untyped, resetting the flag so that gfc_resolve_expr can
+	generate the no implicit type error.
+	(gfc_resolve_index_1): Block index expressions of unknown type
+	from being converted to default integer, avoiding the fatal
+	error in trans-decl.cc.
+	* symbol.cc (gfc_set_default_type): Remove '(symbol)' from the
+	'no IMPLICIT type' error message.
+	* trans-decl.cc (gfc_get_symbol_decl): Change fatal error locus
+	to that of the symbol declaration.
+	(gfc_trans_deferred_vars): Remove two trailing tabs.
+
 2024-04-18  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/114739
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8ab813f1b7bafce7404f6b4d33d5f432098e44e7..8d20f6aa3a48a59f4337f7b639c059ebe0e0aab9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,25 @@
+2024-04-21  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/103471
+	* gfortran.dg/pr103471.f90: New test.
+
+2024-04-21  Pan Li  <pan2.li@intel.com>
+
+	Revert:
+	2024-04-21  Juzhe-Zhong  <juzhe.zhong@rivai.ai>
+
+	PR target/112431
+	* gcc.target/riscv/rvv/base/pr112431-22.c: New test.
+	* gcc.target/riscv/rvv/base/pr112431-23.c: New test.
+	* gcc.target/riscv/rvv/base/pr112431-24.c: New test.
+	* gcc.target/riscv/rvv/base/pr112431-25.c: New test.
+	* gcc.target/riscv/rvv/base/pr112431-26.c: New test.
+	* gcc.target/riscv/rvv/base/pr112431-27.c: New test.
+
+2024-04-21  Pan Li  <pan2.li@intel.com>
+
+	* gcc.target/riscv/rvv/base/pr112431-34.c: New test.
+
 2024-04-20  Pan Li  <pan2.li@intel.com>
 
 	Revert:
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 400e4beea688b42ba72f830e0057b24fd1b39903..2eb40a7b83666163a5ea04ee2265996d7fd617f4 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2024-04-21  Georg-Johann Lay  <avr@gjlay.de>
+
+	PR target/114794
+	* config/avr/lib1funcs.S (__udivmodqi4): Tweak.
+
 2024-04-19  Jakub Jelinek  <jakub@redhat.com>
 
 	PR libgcc/114762