Clean up merge

.clang-tidy

@@ -1,4 +1,4 @@
-Checks: 'modernize-*,-modernize-use-nodiscard,-modernize-concat-nested-namespaces,-modernize-make-*,-modernize-use-auto,-modernize-type-traits,-modernize-raw-string-literal,-modernize-avoid-c-arrays,-modernize-use-trailing-return-type,google-*,-google-default-arguments,-clang-diagnostic-#pragma-messages,readability-identifier-naming'
+Checks: 'modernize-*,-modernize-use-nodiscard,-modernize-concat-nested-namespaces,-modernize-make-*,-modernize-use-auto,-modernize-raw-string-literal,-modernize-avoid-c-arrays,-modernize-use-trailing-return-type,google-*,-google-default-arguments,-clang-diagnostic-#pragma-messages,readability-identifier-naming'
 CheckOptions:
   - { key: readability-identifier-naming.ClassCase,                 value: CamelCase  }
   - { key: readability-identifier-naming.StructCase,                value: CamelCase  }

include/xgboost/collective/socket.h

@@ -58,13 +58,6 @@ using ssize_t = int;
 #define HOST_NAME_MAX 256  // macos
 #endif
 
-// Disable BlockInCriticalSection check from clang-tidy
-// Clang-tidy generates a false positive warning because
-// it erroreously assumes that all recv() calls are blocking.
-// Here, we will trust users to set NonBlocking() flag to
-// the socket before using Recv() in a critical section.
-// NOLINTBEGIN(clang-analyzer-unix.BlockInCriticalSection)
-
 namespace xgboost {
 
 #if defined(xgboost_IS_MINGW)
@@ -838,6 +831,4 @@ Result INetNToP(H const &host, std::string *p_out) {
 }  // namespace collective
 }  // namespace xgboost
 
-// NOLINTEND(clang-analyzer-unix.BlockInCriticalSection)
-
 #undef xgboost_CHECK_SYS_CALL

src/common/cuda_pinned_allocator.h

@@ -23,7 +23,6 @@ namespace xgboost::common::cuda_impl {
 //  \see https://en.cppreference.com/w/cpp/memory/allocator
 
 template <typename T>
-
 struct PinnedAllocPolicy {
   using pointer = T*;              // NOLINT: The type returned by address() / allocate()
   using const_pointer = const T*;  // NOLINT: The type returned by address()