From 63b8afcd6aa78b9908887c1745b4db600bc03d43 Mon Sep 17 00:00:00 2001
From: Chris Perkins <chris.perkins@intel.com>
Date: Thu, 14 May 2026 12:08:12 -0700
Subject: [PATCH 1/2] some code was moved, but the comment overlooked

Signed-off-by: Chris Perkins <chris.perkins@intel.com>
---
 sycl/include/sycl/detail/get_kernel_info_impl.hpp | 2 +-
 sycl/source/detail/kernel_impl.hpp                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sycl/include/sycl/detail/get_kernel_info_impl.hpp b/sycl/include/sycl/detail/get_kernel_info_impl.hpp
index 9774d479218b2..b564e803a3168 100644
--- a/sycl/include/sycl/detail/get_kernel_info_impl.hpp
+++ b/sycl/include/sycl/detail/get_kernel_info_impl.hpp
@@ -21,7 +21,7 @@ class DeviceKernelInfo;
 // Fetches the cached kernel via the program manager and dispatches to
 // get_kernel_device_specific_info. Validation that kernel_impl::get_info
 // performs is replicated in the library-side definition (see
-// validateDeviceSpecificQuery in source/detail/get_device_kernel_info.cpp).
+// validateDeviceSpecificQuery in source/detail/get_kernel_info_impl.cpp).
 // Explicit instantiations for every kernel_device_specific descriptor form
 // the ABI boundary; user code reaches these through the public entry points
 // in ext/oneapi/get_kernel_info.hpp.
diff --git a/sycl/source/detail/kernel_impl.hpp b/sycl/source/detail/kernel_impl.hpp
index 66d0e647f813f..985715d0cdb56 100644
--- a/sycl/source/detail/kernel_impl.hpp
+++ b/sycl/source/detail/kernel_impl.hpp
@@ -334,7 +334,7 @@ inline context kernel_impl::get_info<info::kernel::context>() const {
 }
 
 // NOTE: the global_work_size and spill_memory_size pre-query checks below are
-// mirrored in validateDeviceSpecificQuery (get_device_kernel_info.cpp), which
+// mirrored in validateDeviceSpecificQuery (get_kernel_info_impl.cpp), which
 // serves the ext::oneapi::get_kernel_info<KernelName, Param> fast path that
 // does not go through kernel_impl. Keep both in sync.
 template <typename Param>

From 1106474d5d41d8e3563dc9d0d95f11028ea25aa9 Mon Sep 17 00:00:00 2001
From: Chris Perkins <chris.perkins@intel.com>
Date: Thu, 14 May 2026 15:45:55 -0700
Subject: [PATCH 2/2] unused include

Signed-off-by: Chris Perkins <chris.perkins@intel.com>
---
 sycl/source/detail/get_kernel_info_impl.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sycl/source/detail/get_kernel_info_impl.cpp b/sycl/source/detail/get_kernel_info_impl.cpp
index 1b3396b162167..4021677776011 100644
--- a/sycl/source/detail/get_kernel_info_impl.cpp
+++ b/sycl/source/detail/get_kernel_info_impl.cpp
@@ -11,7 +11,6 @@
 
 #include <detail/context_impl.hpp>
 #include <detail/device_impl.hpp>
-#include <detail/global_handler.hpp>
 #include <detail/kernel_info.hpp>
 #include <detail/program_manager/program_manager.hpp>