Merge Pull Request #11962 from trilinos/Trilinos/master_merge_2023060…

…9_175816

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20230609_175816 branch to master
PR Author: trilinos-autotester

.gitignore

@@ -97,7 +97,9 @@ MPI_DEBUG/
 SERIAL_DEBUG/
 SERIAL_RELEASE/
 
-/build
+# People usually build Trilinos in a 'build' directory. Ignore it.
+build*/
+
 packages/tpetra/test/MatrixMatrix/matrices/*.m
 
 packages/Sundance/Playa/doc/Doxygen/html/

RELEASE_NOTES

@@ -919,20 +919,20 @@ Tpetra
       2. Otherwise, if you're building with OpenMP, Tpetra uses OpenMP by
          default.
       3. Otherwise, if Kokkos enables the Serial execution space (if
-         Kokkos_ENABLE_Serial is ON), Tpetra uses Serial by default.
+         Kokkos_ENABLE_SERIAL is ON), Tpetra uses Serial by default.
       4. Otherwise, if Kokkos enables the Threads execution space (if
-         Kokkos_ENABLE_Pthread is ON), Tpetra uses Threads by default.
+         Kokkos_ENABLE_THREADS is ON), Tpetra uses Threads by default.
 
     If you wish to enable other Node types, you may set the following
     CMake options.  You do NOT need to set any of these options explicitly
     if the Node type would be enabled by default anyway.
 
-      - Tpetra_INST_CUDA (Kokkos_ENABLE_Cuda must be ON, and Trilinos must
+      - Tpetra_INST_CUDA (Kokkos_ENABLE_CUDA must be ON, and Trilinos must
         be built with CUDA; ON by default if building with CUDA)
-      - Tpetra_INST_OPENMP (Kokkos_ENABLE_OpenMP must be ON, and Trilinos
+      - Tpetra_INST_OPENMP (Kokkos_ENABLE_OPENMP must be ON, and Trilinos
         must be built with OpenMP support)
-      - Tpetra_INST_PTHREAD (Kokkos_ENABLE_Pthread must be ON)
-      - Tpetra_INST_SERIAL (Kokkos_ENABLE_Serial must be ON)
+      - Tpetra_INST_PTHREAD (Kokkos_ENABLE_THREADS must be ON)
+      - Tpetra_INST_SERIAL (Kokkos_ENABLE_SERIAL must be ON)
 
     While it is legal to enable both the OpenMP and Pthreads back-ends in
     the same executable, it is a bad idea.  Both back-ends spawn their own
@@ -1893,7 +1893,7 @@ Tpetra
     # Disable KokkosClassic::TPINode
     -D KokkosClassic_ENABLE_ThreadPool:BOOL=OFF
     # Shut off Kokkos' Pthreads back-end in favor of OpenMP
-    -D Kokkos_ENABLE_Pthread:BOOL=OFF
+    -D Kokkos_ENABLE_THREADS:BOOL=OFF
 
     You must also enable the following subpackages explicitly, since they
     are not Primary Tested at the moment: