From nobody Sat May 04 15:50:49 2024
X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
	by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VWsZx7048z5J3sD;
	Sat,  4 May 2024 15:50:49 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
	 client-signature RSA-PSS (4096 bits) client-digest SHA256)
	(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4VWsZx5GmPz4bB1;
	Sat,  4 May 2024 15:50:49 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1714837849;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=9VNRsFR7P9srbc89X1xJtkTSH+gD3JiTtu+ohwNGUww=;
	b=bvcMWv3lNyF+8K2G6PW9N0BKEvbPP9b4vjdRx8ZmMpmQgsIGNKmUPhsw8fjQmhjL8zUvVa
	sIGTk3IbWBS2dnNJyYdoYxp7vxe/0fc3j/oDKgyvZiwqg52KyfxXeFT+3aPMQY06xtQgbR
	LuszrP3mExqxfCMIG7X86XvCFNVvqZ/vj5BnNjA+z7w5uFOi5ATAV5/Fcra0o0eBRmlG3V
	j/hhTKooWlwKeLLzuFRF6uDl1pRFHwHgELPHL41vA6Mez68GNY4Y8ZeRmzd1vvTGIqJNJZ
	c1x4kcEnK1RS5Ys8o1N/8vS5I3Z6bk+pjZ625nUq96t3mo0b3QuauSHBp6Y/mQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714837849; a=rsa-sha256; cv=none;
	b=QmcLIBz9CPdIVY/MQRNcJdM/YJDPMQPrHSsRfVohux6MLhAi2a3jnUUOlP/mOcZNRS2XAI
	7Bb7OqNkoXqFELsogFppvqp4it+9xt7alRK02M70697GyroeBCuIsJC0VlmOaYrS6XIUV1
	wRI6O2slWOcX5QoYpjZ1iaHwbqn/W1udLjll+/YBVECnXx253HMqrt7YfBb7tGkoWc07Vg
	fx46v0zEGdLD+O6SSBzMwKKJ23LMjMbH8n4Dsaq8Ju9SBKddsZ6mkysMSsMD4NJp5c72YP
	6uoGl1X076iTaNqBNxhjsnsE1MdYyGgMF0z8clxC+8/Q1+l0mXJnZq+YKfqyyw==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1714837849;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=9VNRsFR7P9srbc89X1xJtkTSH+gD3JiTtu+ohwNGUww=;
	b=Vpdeh6YZNLG7AfFV/YdiJunKOQBarmdUgTjMnNlSnFGTRlj2QVNEIey+m1czXkq4BiMavs
	HfaZM9NzvhlrRzr8VatEHlqbsd+tGleSRRbGeWZdic/k1bMatg/5xzextTqd6ZgZ0XRIjb
	Muc7swfPiv76sikr+ErJOcS5IZGoe5Xv0SSuqcJ/DlzsTpYJIDC3LlmR1JBTZW5F1oYT1+
	nVZdmhZtjpC9EpCdtWouGIuauuOBreU8OSOhO9V00ZbUpUal5plVmGqsKrZ/740nqZfsyb
	eTyR1WzN49De3/9eQV9CZHQxHQ37kKWQ8wKXKS7q+OlDokX05DT3SQUy6a8SLg==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VWsZx4RQ7zc9j;
	Sat,  4 May 2024 15:50:49 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 444FonvT006403;
	Sat, 4 May 2024 15:50:49 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 444FonmX006400;
	Sat, 4 May 2024 15:50:49 GMT
	(envelope-from git)
Date: Sat, 4 May 2024 15:50:49 GMT
Message-Id: <202405041550.444FonmX006400@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-main@FreeBSD.org
From: Dimitry Andric <dim@FreeBSD.org>
Subject: git: 894cb08f0d36 - main - Fixup: Merge llvm-project
  release/18.x llvmorg-18.1.5-0-g617a15a9eac9
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-all@freebsd.org
Sender: owner-dev-commits-src-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: dim
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 894cb08f0d3656fdb81f4d89085bedc4235f3cb6
Auto-Submitted: auto-generated

The branch main has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=894cb08f0d3656fdb81f4d89085bedc4235f3cb6

commit 894cb08f0d3656fdb81f4d89085bedc4235f3cb6
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-05-04 10:19:32 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-05-04 15:49:57 +0000

    Fixup: Merge llvm-project release/18.x llvmorg-18.1.5-0-g617a15a9eac9
    
    Update version numbers, config headers, etc. Git tricked me into losing
    these before pushing.
    
    PR:             276104
    Fixes:          d67fc74b9249
    MFC after:      3 days
---
 lib/clang/include/VCSVersion.inc             | 6 +++---
 lib/clang/include/clang/Basic/Version.inc    | 6 +++---
 lib/clang/include/lld/Common/Version.inc     | 2 +-
 lib/clang/include/lldb/Version/Version.inc   | 6 +++---
 lib/clang/include/llvm/Config/config.h       | 4 ++--
 lib/clang/include/llvm/Config/llvm-config.h  | 4 ++--
 lib/clang/include/llvm/Support/VCSRevision.h | 2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc
index 687fb1656937..c4bb0df4e3a5 100644
--- a/lib/clang/include/VCSVersion.inc
+++ b/lib/clang/include/VCSVersion.inc
@@ -1,8 +1,8 @@
-#define LLVM_REVISION "llvmorg-18.1.4-0-ge6c3289804a6"
+#define LLVM_REVISION "llvmorg-18.1.5-0-g617a15a9eac9"
 #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git"
 
-#define CLANG_REVISION "llvmorg-18.1.4-0-ge6c3289804a6"
+#define CLANG_REVISION "llvmorg-18.1.5-0-g617a15a9eac9"
 #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git"
 
-#define LLDB_REVISION "llvmorg-18.1.4-0-ge6c3289804a6"
+#define LLDB_REVISION "llvmorg-18.1.5-0-g617a15a9eac9"
 #define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git"
diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc
index 536f72efec52..c243016c5f73 100644
--- a/lib/clang/include/clang/Basic/Version.inc
+++ b/lib/clang/include/clang/Basic/Version.inc
@@ -1,8 +1,8 @@
-#define	CLANG_VERSION			18.1.4
-#define	CLANG_VERSION_STRING		"18.1.4"
+#define	CLANG_VERSION			18.1.5
+#define	CLANG_VERSION_STRING		"18.1.5"
 #define	CLANG_VERSION_MAJOR		18
 #define	CLANG_VERSION_MAJOR_STRING	"18"
 #define	CLANG_VERSION_MINOR		1
-#define	CLANG_VERSION_PATCHLEVEL	4
+#define	CLANG_VERSION_PATCHLEVEL	5
 
 #define	CLANG_VENDOR			"FreeBSD "
diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc
index 66642a489e94..8b21c19f95ba 100644
--- a/lib/clang/include/lld/Common/Version.inc
+++ b/lib/clang/include/lld/Common/Version.inc
@@ -1,4 +1,4 @@
 // Local identifier in __FreeBSD_version style
 #define LLD_FREEBSD_VERSION 1500000
 
-#define LLD_VERSION_STRING "18.1.4 (FreeBSD llvmorg-18.1.4-0-ge6c3289804a6-" __XSTRING(LLD_FREEBSD_VERSION) ")"
+#define LLD_VERSION_STRING "18.1.5 (FreeBSD llvmorg-18.1.5-0-g617a15a9eac9-" __XSTRING(LLD_FREEBSD_VERSION) ")"
diff --git a/lib/clang/include/lldb/Version/Version.inc b/lib/clang/include/lldb/Version/Version.inc
index 1fc1a4d88b7b..0e86bd2e01ba 100644
--- a/lib/clang/include/lldb/Version/Version.inc
+++ b/lib/clang/include/lldb/Version/Version.inc
@@ -1,6 +1,6 @@
-#define LLDB_VERSION 18.1.4
-#define LLDB_VERSION_STRING "18.1.4"
+#define LLDB_VERSION 18.1.5
+#define LLDB_VERSION_STRING "18.1.5"
 #define LLDB_VERSION_MAJOR 18
 #define LLDB_VERSION_MINOR 1
-#define LLDB_VERSION_PATCH 4
+#define LLDB_VERSION_PATCH 5
 /* #undef LLDB_FULL_VERSION_STRING */
diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h
index a017437dc568..0760c0b17a87 100644
--- a/lib/clang/include/llvm/Config/config.h
+++ b/lib/clang/include/llvm/Config/config.h
@@ -344,10 +344,10 @@
 #define PACKAGE_NAME "LLVM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "LLVM 18.1.4"
+#define PACKAGE_STRING "LLVM 18.1.5"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "18.1.4"
+#define PACKAGE_VERSION "18.1.5"
 
 /* Define to the vendor of this package. */
 /* #undef PACKAGE_VENDOR */
diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h
index fb878ccdde4d..5ac5d07a3539 100644
--- a/lib/clang/include/llvm/Config/llvm-config.h
+++ b/lib/clang/include/llvm/Config/llvm-config.h
@@ -180,10 +180,10 @@
 #define LLVM_VERSION_MINOR 1
 
 /* Patch version of the LLVM API */
-#define LLVM_VERSION_PATCH 4
+#define LLVM_VERSION_PATCH 5
 
 /* LLVM version string */
-#define LLVM_VERSION_STRING "18.1.4"
+#define LLVM_VERSION_STRING "18.1.5"
 
 /* Whether LLVM records statistics for use with GetStatistics(),
  * PrintStatistics() or PrintStatisticsJSON()
diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h
index e324de0f9fc6..433b2b53b8fe 100644
--- a/lib/clang/include/llvm/Support/VCSRevision.h
+++ b/lib/clang/include/llvm/Support/VCSRevision.h
@@ -1,2 +1,2 @@
-#define LLVM_REVISION "llvmorg-18.1.4-0-ge6c3289804a6"
+#define LLVM_REVISION "llvmorg-18.1.5-0-g617a15a9eac9"
 #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git"