diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cea7108409b3..8c65c68a56da 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2025-10-16  Ayappan Perumal  <ayappap2@in.ibm.com>
+
+	Backported from master:
+	2025-10-16  Ayappan Perumal  <ayappap2@in.ibm.com>
+
+	* config/rs6000/aix.h (SUBTARGET_DRIVER_SELF_SPECS):
+	Error out when stack-protector option is used in AIX
+	as it is not supported on AIX
+	Approved By: Segher Boessenkool <segher@kernel.crashing.org>
+
 2025-10-15  Alice Carlotti  <alice.carlotti@arm.com>
 
 	* config/aarch64/aarch64-sys-regs.def: Fix pmsdsfr_el1 encoding.
diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 8ca925d3df4e..9456ec9f4b41 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20251016
+20251017
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 236a9f186c1f..3a3ab34c349e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2025-10-16  Alex Coplan  <alex.coplan@arm.com>
+
+	Backported from master:
+	2025-10-13  Alex Coplan  <alex.coplan@arm.com>
+
+	PR tree-optimization/121772
+	* gcc.target/aarch64/torture/pr121772.c: Add -fchecking to
+	dg-options.
+
 2025-10-15  Alice Carlotti  <alice.carlotti@arm.com>
 
 	* gcc.target/aarch64/acle/rwsr-armv8p9.c: Fix pmsdsfr_el1