Resolve merge conflict

Author: lbushi25

.git-blame-ignore-revs

@@ -87,3 +87,10 @@ e2c2ffbe7a1b5d9e32a2ce64279475b50c4cba5b
 
 # [lldb][nfc] Deindent ProcessGDBRemote::SetThreadStopInfo by two levels
 b32931c5b32eb0d2cf37d688b34f8548c9674c19
+
+# [libc++] Various consistency fixes to the CSV files that we use for tracking Standards Conformance
+64946fdaf9864d8279da1c30e4d7214fe13d1427
+b6262880b34629e9d7a72b5a42f315a3c9ed8139
+39c7dc7207e76e72da21cf4fedda21b5311bf62d
+e80bc777749331e9519575f416c342f7626dd14d
+7e5cd8f1b6c5263ed5e2cc03d60c8779a8d3e9f7

.github/CODEOWNERS

@@ -102,6 +102,9 @@ sycl/test-e2e/InvokeSimd/ @intel/dpcpp-esimd-reviewers
 buildbot/ @intel/dpcpp-devops-reviewers
 devops/ @intel/dpcpp-devops-reviewers
 
+# dev-igc driver update
+devops/dependencies-igc-dev.json @intel/sycl-matrix-reviewers @intel/dpcpp-esimd-reviewers @intel/dpcpp-devops-reviewers
+
 # Kernel fusion JIT compiler
 sycl-jit/ @intel/dpcpp-kernel-fusion-reviewers
 sycl/doc/design/KernelFusionJIT.md @intel/dpcpp-kernel-fusion-reviewers

.github/new-prs-labeler.yml

@@ -990,6 +990,13 @@ clang:openmp:
   - llvm/unittests/Frontend/OpenMP*
   - llvm/test/Transforms/OpenMP/**
 
+clang:as-a-library:
+  - clang/tools/libclang/**
+  - clang/bindings/**
+  - clang/include/clang-c/**
+  - clang/test/LibClang/**
+  - clang/unittest/libclang/**
+
 openmp:libomp:
   - any: ['openmp/**', '!openmp/libomptarget/**']