Merge upstream

Author: danielfleischer

.github/workflows/security-audit.yml

@@ -121,7 +121,7 @@ jobs:
           === DIFF ===
           PROMPT
             cat /tmp/changes.diff
-          } | claude -p --model claude-opus-4-6 > /tmp/audit_result.txt
+          } | claude -p --model claude-opus-4-7 > /tmp/audit_result.txt
 
           if grep -q "NO_FINDINGS" /tmp/audit_result.txt; then
             echo "has_findings=false" >> "$GITHUB_OUTPUT"

docs/source/api/kernels.md

@@ -26,7 +26,6 @@
 
 ### get_locked_kernel
 
-<<<<<<< kernels-use-kernels-data
 [[autodoc]] kernels.get_locked_kernel
 
 ## Classes
@@ -38,6 +37,3 @@
 ### RepoInfo
 
 [[autodoc]] kernels.RepoInfo
-=======
-[[autodoc]] kernels.get_locked_kernel
->>>>>>> main