From 020b2a6bfa8afa72c5744b52068194cf01abeffb Mon Sep 17 00:00:00 2001
From: Wesley Maxey <wesley.maxey@gmail.com>
Date: Fri, 30 Jul 2021 14:34:28 -0700
Subject: [PATCH 1/3] Create changelog for release 1.6.0

---
 docs/releases/changelog.md | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/docs/releases/changelog.md b/docs/releases/changelog.md
index db5a93de28..4744eb9463 100644
--- a/docs/releases/changelog.md
+++ b/docs/releases/changelog.md
@@ -11,9 +11,37 @@ It pulls in the latest version of upstream libc++ and marks the beginning of
 
 !-->
 
+## libcu++ 1.6.0 (CUDA Toolkit 11.5)
+
+libcu++ 1.6.0 is a major release. It adds two new functions to the `cuda::std::barrier` API and
+uses `<nv/target>` as the primary dispatch mechanism for `cuda::std::atomic`. This is an ABI breaking release.
+
+Supported ABI Versions: 4 (default), 3, and 2.
+
+Included in: CUDA Toolkit 11.5.
+
+### New Features
+
+- #111: Adds two APIs to `cuda::std::barrier` for waiting on the parity of the barrier.
+  - Thanks to Olivier Giroux for this contribution.
+
+### Issues fixed
+
+- #179: Refactors the atomic layer to allow for layering the host device/host abstractions.
+- #189: Changed pragmas for silencing chrono long double warnings.
+- #186: Allows `<nv/target>` to be used under NVRTC.
+- #177: Allows `<nv/target>` to build when compiled under C and C++98.
+  - Thanks to David Olsen for this contribution.
+- #172: Introduces ABI version 4.
+  - Forces `cuda::std::complex` alignment for enhanced performance.
+  - Sets the internal representation of `cuda::std::chrono` literals to `double`.
+- #165: For tests on some older distributions keep using Python 3, but downgrade lit.
+- #164: Fixes testing issues related to Python 2/3 switch for lit.
+  - Thanks to Royil Damer for this contribution.
+
 ## libcu++ 1.5.0 (CUDA Toolkit 11.4)
 
-libcu++ 1.5.0 is a major release.  It adds `<nv/target>`, 
+libcu++ 1.5.0 is a major release.  It adds `<nv/target>`,
 the library support header for the new `if target`
 target specialization mechanism.
 

From 0bf8fb258ddcd792eeb4d46afec2761546e6df32 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <wesley.maxey@gmail.com>
Date: Fri, 30 Jul 2021 14:35:16 -0700
Subject: [PATCH 2/3] Bump libcudacxx API version to 1.6.0

---
 include/cuda/std/detail/__config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/cuda/std/detail/__config b/include/cuda/std/detail/__config
index 4a2b5a1d1d..e735f7a053 100644
--- a/include/cuda/std/detail/__config
+++ b/include/cuda/std/detail/__config
@@ -97,7 +97,7 @@
 #  define _LIBCUDACXX_ABI_UNSTABLE
 #endif
 
-#define _LIBCUDACXX_CUDA_API_VERSION 001005000
+#define _LIBCUDACXX_CUDA_API_VERSION 001006000
 
 #define _LIBCUDACXX_CUDA_API_VERSION_MAJOR \
   (_LIBCUDACXX_CUDA_API_VERSION / 1000000)

From 64f88f635c42c990d20b31fb960ab468b547d308 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Tue, 3 Aug 2021 20:10:19 -0700
Subject: [PATCH 3/3] Add clearer notification about ABI break. Fix
 capitalization.

---
 docs/releases/changelog.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/releases/changelog.md b/docs/releases/changelog.md
index 4744eb9463..cde1871e83 100644
--- a/docs/releases/changelog.md
+++ b/docs/releases/changelog.md
@@ -14,7 +14,9 @@ It pulls in the latest version of upstream libc++ and marks the beginning of
 ## libcu++ 1.6.0 (CUDA Toolkit 11.5)
 
 libcu++ 1.6.0 is a major release. It adds two new functions to the `cuda::std::barrier` API and
-uses `<nv/target>` as the primary dispatch mechanism for `cuda::std::atomic`. This is an ABI breaking release.
+uses `<nv/target>` as the primary dispatch mechanism for `cuda::std::atomic`.
+
+This release introduces ABI version 4, which is now the default.
 
 Supported ABI Versions: 4 (default), 3, and 2.
 
@@ -25,7 +27,7 @@ Included in: CUDA Toolkit 11.5.
 - #111: Adds two APIs to `cuda::std::barrier` for waiting on the parity of the barrier.
   - Thanks to Olivier Giroux for this contribution.
 
-### Issues fixed
+### Issues Fixed
 
 - #179: Refactors the atomic layer to allow for layering the host device/host abstractions.
 - #189: Changed pragmas for silencing chrono long double warnings.