From 122705c1f4b8495eceb4668bfb60fe2e845d57ee Mon Sep 17 00:00:00 2001
From: Lisa Delaney <lisa.delaney@amd.com>
Date: Fri, 9 Feb 2024 13:32:06 -0700
Subject: [PATCH 1/4] remove broken links

---
 docs/conceptual/cmake-packages.rst | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/docs/conceptual/cmake-packages.rst b/docs/conceptual/cmake-packages.rst
index a1ffe73842..ec9db0c7fb 100644
--- a/docs/conceptual/cmake-packages.rst
+++ b/docs/conceptual/cmake-packages.rst
@@ -198,15 +198,10 @@ all the flags necessary for device compilation.
 
   Compiling for the GPU device requires at least C++11.
 
-This project can then be configured with the following CMake commands.
+This project can then be configured with the following CMake commands:
 
--  Windows: ``cmake -D CMAKE_CXX_COMPILER:PATH=${env:HIP_PATH}\bin\clang++.exe``
-
--  Linux: ``cmake -D CMAKE_CXX_COMPILER:PATH=/opt/rocm/bin/amdclang++``
-
-Which use the device compiler provided from the binary packages of
-`ROCm HIP SDK <https://www.amd.com/en/developer/rocm-hub.html>`_ and
-`repo.radeon.com <https://repo.radeon.com>`_ respectively.
+*  Windows: ``cmake -D CMAKE_CXX_COMPILER:PATH=${env:HIP_PATH}\bin\clang++.exe``
+*  Linux: ``cmake -D CMAKE_CXX_COMPILER:PATH=/opt/rocm/bin/amdclang++``
 
 When using the ``CXX`` language support to compile HIP device code, selecting the
 target GPU architectures is done via setting the ``GPU_TARGETS`` variable.

From 35acb3da5e34b75e6650f150c27b6d964b69c8c3 Mon Sep 17 00:00:00 2001
From: Lisa Delaney <lisa.delaney@amd.com>
Date: Fri, 9 Feb 2024 13:42:59 -0700
Subject: [PATCH 2/4] update github links

---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 9406c4403c..0013cfcd95 100644
--- a/default.xml
+++ b/default.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
     <remote name="rocm-org" fetch="https://github.com/ROCm/" />
-    <remote name="roc-github" fetch="https://github.com/RadeonOpenCompute/" />
+    <remote name="roc-github" fetch="https://github.com/ROCm/" />
     <remote name="rocm-devtools" fetch="https://github.com/ROCm-Developer-Tools/" />
     <remote name="rocm-swplat" fetch="https://github.com/ROCmSoftwarePlatform/" />
     <remote name="gpuopen-libs" fetch="https://github.com/GPUOpen-ProfessionalCompute-Libraries/" />

From 752d31133aa53e1284e1019fca2529c65f417c94 Mon Sep 17 00:00:00 2001
From: David Galiffi <dgaliffi@amd.com>
Date: Fri, 9 Feb 2024 15:51:36 -0500
Subject: [PATCH 3/4] Remove Unused Remotes from Manifest

Remove the definition of unused remotes from the manifest file.
Everything ROCm is now in the ROCm organization.
---
 default.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/default.xml b/default.xml
index 0013cfcd95..3389e920d1 100644
--- a/default.xml
+++ b/default.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
     <remote name="rocm-org" fetch="https://github.com/ROCm/" />
-    <remote name="roc-github" fetch="https://github.com/ROCm/" />
-    <remote name="rocm-devtools" fetch="https://github.com/ROCm-Developer-Tools/" />
-    <remote name="rocm-swplat" fetch="https://github.com/ROCmSoftwarePlatform/" />
-    <remote name="gpuopen-libs" fetch="https://github.com/GPUOpen-ProfessionalCompute-Libraries/" />
-    <remote name="gpuopen-tools" fetch="https://github.com/GPUOpen-Tools/" />
     <remote name="KhronosGroup" fetch="https://github.com/KhronosGroup/" />
     <default revision="refs/tags/rocm-6.0.2"
      remote="rocm-org"

From 8dc8a0eb62a3f9c302fe26e4b8136699524c6f39 Mon Sep 17 00:00:00 2001
From: Lisa <lisajdelaney@gmail.com>
Date: Fri, 9 Feb 2024 15:58:38 -0700
Subject: [PATCH 4/4] Update docs/conceptual/cmake-packages.rst

Co-authored-by: Sam Wu <sam.wu2@amd.com>
---
 docs/conceptual/cmake-packages.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/conceptual/cmake-packages.rst b/docs/conceptual/cmake-packages.rst
index ec9db0c7fb..4627bacc4f 100644
--- a/docs/conceptual/cmake-packages.rst
+++ b/docs/conceptual/cmake-packages.rst
@@ -203,6 +203,10 @@ This project can then be configured with the following CMake commands:
 *  Windows: ``cmake -D CMAKE_CXX_COMPILER:PATH=${env:HIP_PATH}\bin\clang++.exe``
 *  Linux: ``cmake -D CMAKE_CXX_COMPILER:PATH=/opt/rocm/bin/amdclang++``
 
+Which use the device compiler provided from the binary packages of
+`ROCm HIP SDK <https://www.amd.com/en/developer/resources/rocm-hub/hip-sdk.html>`_ and
+`repo.radeon.com <https://repo.radeon.com>`_ respectively.
+
 When using the ``CXX`` language support to compile HIP device code, selecting the
 target GPU architectures is done via setting the ``GPU_TARGETS`` variable.
 ``CMAKE_HIP_ARCHITECTURES`` only exists when the HIP language is enabled. By