[gcc r11-11169] Daily bump.

[GCC Administrator]

https://gcc.gnu.org/g:43538a7e4bdc0d37e7ed9590e854c8cb2874eaac

commit r11-11169-g43538a7e4bdc0d37e7ed9590e854c8cb2874eaac
Author: GCC Administrator <gccadmin@gcc.gnu.org>
Date:   Mon Dec 25 00:21:13 2023 +0000

    Daily bump.

Diff:
---
 gcc/DATESTAMP           |  2 +-
 gcc/cp/ChangeLog        | 11 +++++++++++
 gcc/testsuite/ChangeLog |  9 +++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index ce9e848178c..3194d0024f2 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20231224
+20231225
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cbaf2efad08..fd1b89d4419 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,14 @@
+2023-12-24  Patrick Palka  <ppalka@redhat.com>
+
+	Backported from master:
+	2023-09-22  Patrick Palka  <ppalka@redhat.com>
+
+	PR c++/111485
+	* pt.c (is_compatible_template_arg): New parameter 'args'.
+	Add the outer template arguments 'args' to 'new_args'.
+	(convert_template_argument): Pass 'args' to
+	is_compatible_template_arg.
+
 2023-12-20  Jason Merrill  <jason@redhat.com>
 
 	Backported from master:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 272c75af2d1..44403ff4e37 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2023-12-24  Patrick Palka  <ppalka@redhat.com>
+
+	Backported from master:
+	2023-09-22  Patrick Palka  <ppalka@redhat.com>
+
+	PR c++/111485
+	* g++.dg/cpp2a/concepts-ttp5.C: New test.
+	* g++.dg/cpp2a/concepts-ttp6.C: New test.
+
 2023-12-20  Jason Merrill  <jason@redhat.com>
 
 	Backported from master: