From cfe73560a252a4a0362f0bfe883c31c67770e266 Mon Sep 17 00:00:00 2001
From: "Ralf W. Grosse-Kunstleve" <rwgk@google.com>
Date: Tue, 2 Apr 2024 11:11:44 -0700
Subject: [PATCH] Fix merge accident in pybind11/detail/descr.h (#5086)

This was noticed only when manually reviewing the diffs with the Google review tools.
---
 include/pybind11/detail/descr.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/pybind11/detail/descr.h b/include/pybind11/detail/descr.h
index d239830e2c..5b20c88431 100644
--- a/include/pybind11/detail/descr.h
+++ b/include/pybind11/detail/descr.h
@@ -259,7 +259,8 @@ template <size_t N, typename... Ts, typename... Args>
 constexpr auto concat(const descr<N, Ts...> &d,
                       const Args &...args) -> decltype(std::declval<descr<N + 2, Ts...>>()
                                                        + concat(args...)) {
-    return d + const_name(", ") + concat(args...);
+    // Ensure that src_loc of existing descr is used.
+    return d + const_name(", ", src_loc{nullptr, 0}) + concat(args...);
 }
 #endif