Fix conflict in following files:

    .github/CODEOWNERS
    SYCL/DeprecatedFeatures/kernel-and-program.cpp
    SYCL/ESIMD/histogram_raw_send.cpp
    SYCL/lit.cfg.py

Author: myler

.github/CODEOWNERS

@@ -14,11 +14,10 @@ SYCL/DeviceCodeSplit @intel/dpcpp-tools-reviewers
 
 # Explicit SIMD
 config_sycl/esimd* @kychendev @kbobrovs @v-vklochkov
-SYCL/ESIMD @kbobrovs @v-klochkov @sndmitriev
+SYCL/ESIMD @intel/dpcpp-esimd-reviewers
 
 # Functor
 SYCL/Functor @AlexeySachkov
-SYCL/ESIMD @intel/dpcpp-esimd-reviewers
 
 # Group algorithms
 SYCL/GroupAlgorithm @Pennycook @intel/llvm-reviewers-runtime
@@ -37,7 +36,7 @@ SYCL/Printf @intel/dpcpp-tools-reviewers
 SYCL/SeparateCompile @intel/dpcpp-tools-reviewers
 
 # Specialization constant
-SYCL/SpecConstants @kbobrovs
+SYCL/SpecConstants @intel/dpcpp-tools-reviewers
 
 # Unified Shared Memory (USM)
 SYCL/USM @jbrodman @sergey-semenov
@@ -67,4 +66,3 @@ SYCL_ESIMD_EMBARGO/ESIMD/EMBARGO/lsc @fveselov
 SYCL_ESIMD_EMBARGO/ESIMD/EMBARGO/named_barriers @fveselov
 # XPTI and XPTI Framework
 SYCL/XPTI @intel/llvm-reviewers-runtime
-SYCL/SpecConstants @intel/dpcpp-tools-reviewers

SYCL/ESIMD/histogram_raw_send.cpp

@@ -8,7 +8,6 @@
 //===----------------------------------------------------------------------===//
 // REQUIRES: gpu
 // UNSUPPORTED: gpu-intel-dg1,cuda,hip
-// UNSUPPORTED: cuda || hip
 // UNSUPPORTED: ze_debug-1,ze_debug4
 // RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %HOST_RUN_PLACEHOLDER %t.out

SYCL/lit.cfg.py

@@ -160,8 +160,6 @@
     # x86_64-pc-windows-msvc will cause compile time error on some
     # configurations
     config.substitutions.append( ('%fPIC', ('' if platform.system() == 'Windows' else '-fPIC')) )
-    if platform.system() != "Windows":
-        config.substitutions.append( ('%fPIC', '-fPIC') )
     config.substitutions.append( ('%shared_lib', '-shared') )
 
 if not config.gpu_aot_target_opts: