Merge remote-tracking branch 'nccl/master' into develop

[ROCm/rccl commit: 3a919c1f49]

projects/rccl/src/include/core.h

@@ -1,10 +1,6 @@
 /*************************************************************************
-<<<<<<< HEAD
- * Copyright (c) 2015-2020, NVIDIA CORPORATION. All rights reserved.
- * Modifications Copyright (c) 2019-2021 Advanced Micro Devices, Inc. All rights reserved.
-=======
  * Copyright (c) 2015-2021, NVIDIA CORPORATION. All rights reserved.
->>>>>>> nccl/master
+ * Modifications Copyright (c) 2019-2021 Advanced Micro Devices, Inc. All rights reserved.
  *
  * See LICENSE.txt for license information
  ************************************************************************/