fix(scripts): use sentinel file to detect per-attempt .rej files

patch --forward creates .rej files for reversed/already-applied hunks
even when it exits non-zero. Using -newer patch_path was unreliable
because the cached patch file is old. Use a mktemp sentinel created
immediately before each patch attempt so only rejects from that
specific attempt are detected. Also clean up .rej files on skip to
avoid false positives in subsequent patches.

Author: Interested-Deving-1896

scripts/apply-patches.sh

@@ -65,29 +65,35 @@ apply_series() {
       continue
     fi
 
-    # --forward skips hunks already present in the tree (exit 0).
-    # If the patch encodes a stable-point-release version (e.g. v6.19.10-lqx2.patch)
-    # that the tree already satisfies, skip it rather than failing.
+    # If the patch filename encodes a stable-point-release version
+    # (e.g. v6.19.10-lqx2.patch) that the tree already satisfies,
+    # skip it unconditionally — applying it would produce mass rejects.
     local patch_name
     patch_name=$(basename "${patch_path}")
-    local patch_kver=""
     if [[ "${patch_name}" =~ ^v([0-9]+\.[0-9]+\.[0-9]+)- ]]; then
-      patch_kver="${BASH_REMATCH[1]}"
-    fi
-
-    if [[ -n "${patch_kver}" ]]; then
+      local patch_kver="${BASH_REMATCH[1]}"
       local tree_kver
-      tree_kver=$(make -s -C "${KERNEL_SRC}" kernelversion 2>/dev/null | grep -oE '^[0-9]+\.[0-9]+\.[0-9]+')
-      if [[ "${patch_kver}" == "${tree_kver}" ]]; then
+      tree_kver=$(make -s -C "${KERNEL_SRC}" kernelversion 2>/dev/null \
+        | grep -oE '^[0-9]+\.[0-9]+\.[0-9]+' || true)
+      if [[ -n "${tree_kver}" && "${patch_kver}" == "${tree_kver}" ]]; then
         log WARN "patch targets ${patch_kver} which matches tree version — skipping: ${line}"
         (( skipped++ )) || true
         continue
       fi
     fi
 
+    # Use a sentinel file to detect .rej files created by this specific attempt
+    local sentinel
+    sentinel=$(mktemp "${KERNEL_SRC}/.lqxm_sentinel_XXXXXX")
+
     if ! patch -p1 --forward -d "${KERNEL_SRC}" < "${patch_path}" 2>/dev/null; then
-      # Check whether any .rej files were created (genuine conflict)
-      if find "${KERNEL_SRC}" -name '*.rej' -newer "${patch_path}" | grep -q .; then
+      # Check for .rej files newer than our sentinel (genuine conflict)
+      local new_rejects
+      new_rejects=$(find "${KERNEL_SRC}" -name '*.rej' -newer "${sentinel}" 2>/dev/null)
+      rm -f "${sentinel}"
+      if [[ -n "${new_rejects}" ]]; then
+        # Clean up rejects before reporting so the tree is left tidy
+        echo "${new_rejects}" | xargs rm -f
         log ERROR "patch failed with rejects: ${line}"
         log ERROR "Resolve conflicts in ${KERNEL_SRC}, then re-run with --no-fetch."
         exit 1
@@ -96,6 +102,7 @@ apply_series() {
       (( skipped++ )) || true
       continue
     fi
+    rm -f "${sentinel}"
     (( applied++ )) || true
   done < "${series_file}"