diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 14212f0ee7bb4e949b6add60f9dac850479073d6..79eb473b56c7f8482efc46dda44a731c8aa652d5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2023-07-17  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/110669
+	* tree-scalar-evolution.cc (analyze_and_compute_bitop_with_inv_effect):
+	Check we matched a header PHI.
+
 2023-07-14  Uros Bizjak  <ubizjak@gmail.com>
 
 	Backported from master:
diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 4a97c3e4719cd24793328ca8e2be116380651eda..5e9edc95482ce5ce9bf174b7efb8d4b6208ac7a5 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20230717
+20230718
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5309abc1ad838962e1c50fe02efbdf63931a489c..e6d020c826d5105f2b4454e0bc8bf38e437803fd 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2023-07-17  Patrick Palka  <ppalka@redhat.com>
+
+	Backported from master:
+	2023-07-15  Patrick Palka  <ppalka@redhat.com>
+
+	PR c++/110524
+	* mangle.cc (write_expression): Handle TEMPLATE_ID_EXPR
+	whose template is already an IDENTIFIER_NODE.
+
 2023-07-01  Patrick Palka  <ppalka@redhat.com>
 
 	Backported from master:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4beb95067c589c8596f3213992e07ed721b6ae6f..a22d899391e28b2747227e96f5c1118eddf15395 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+2023-07-17  Patrick Palka  <ppalka@redhat.com>
+
+	Backported from master:
+	2023-07-15  Patrick Palka  <ppalka@redhat.com>
+
+	PR c++/110524
+	* g++.dg/cpp2a/fn-template26.C: New test.
+
+2023-07-17  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/110669
+	* gcc.dg/torture/pr110669.c: New testcase.
+
 2023-07-14  Uros Bizjak  <ubizjak@gmail.com>
 
 	Backported from master: