Merge pull request 'fleet/ohm: pkgrel=6 — per-series converged (closes ka#29, includes besser#22 / #25 fixes)' (#37 ) from noether/ohm-pkgrel6-perseries-converged into main

Reviewed-on: #37
2026-05-21 10:35:31 +00:00
3 changed files with 20 additions and 3797 deletions
@@ -46,22 +46,28 @@ baseline:
 # patches/driver/bes2600/cumulative-c5x-danctnix/README.md). This is
 # the c5x stack as it shipped in pkgrel=3 on 2026-05-18.
 includes:
-  # bes2600 driver pkgrel=6 cumulative: 22 commits squashed, equivalent
-  # to marfrit/bes2600-dkms bes2600/join-confirm-failure-reset (top
-  # commit 3d833f8) overlaid on v7.0-danctnix1 staging tree. Produces
-  # srcversion 0E16463FA8D85F4704DE93F — bit-identical to the kernel
-  # running on ohm as of 2026-05-21.
-  #
-  # Includes c5.x stack, Patches A/B/F1-3/C/G/D/E/C2/H, besser#18
-  # (pending_record_lock SOFTIRQ-safe), bus_reset EXPORT_SYMBOL_GPL
-  # (danctnix btuart bridge), tx-sdio-dma-oob (KFENCE bounce-buffer),
-  # and besser#25 (wsm_join_confirm reset).
-  #
-  # Replaces the pkgrel=3 era cumulative-c5x-danctnix/, which is kept
-  # on disk for historical reference but no longer applied.
-  - driver/bes2600/cumulative-pkgrel6-danctnix/
+  # bes2600 driver (c5x stack as shipped in pkgrel=3) — single-file
+  # interim cumulative; per-series reconstruction tracked separately.
+  - driver/bes2600/cumulative-c5x-danctnix/
  # close besser#1 — refuse multi-channel 5 GHz scans at driver boundary.
  - driver/bes2600/scan-filter-5ghz-danctnix/
+  # GCC 15.2.1 build-fix for arm_neon.h + SHADOW_CALL_STACK interaction.
+  # Runtime no-op as long as the config has CONFIG_SHADOW_CALL_STACK=n
+  # (current ohm setting). Kept in the manifest for the day SCS gets
+  # re-enabled. See reference_arm64_scs_arm_neon_gcc15 memory.
+  - arch/arm64/scs-arm-neon-build-fix/
+  # close besser#18 — pending_record_lock SOFTIRQ-safe -> -unsafe inversion.
+  # Mirror of marfrit/bes2600-dkms#11 (d95453c). 5-site spin_lock -> _bh.
+  - driver/bes2600/queue-pending-record-lock-bh-danctnix/
+  # bounce-buffer fix for SDIO TX DMA OOB (KFENCE-detected on pkgrel=4 soak);
+  # the per-series mirror of marfrit/bes2600-dkms bes2600/tx-sdio-dma-oob.
+  # cumulative-c5x-danctnix did NOT include this — it was the regression
+  # surfaced during the per-series reconstruction.
+  - driver/bes2600/tx-sdio-dma-oob-danctnix/
+  # close besser#25 — wsm_reset + serialised unjoin on JOIN reject.
+  # cw1200 ancestor port (drivers/net/wireless/st/cw1200/sta.c:1339-1344)
+  # with bes2600-specific PASSIVE-gate compensation.  pkgrel=6 verified.
+  - driver/bes2600/join-confirm-reset-danctnix/

 # Explicitly NOT included (decision logged):
 #   - debian-copyright-fsf-address: Debian packaging metadata, not kernel
@@ -1,48 +0,0 @@
-# bes2600/cumulative-pkgrel6-danctnix
-
-Single-file cumulative diff representing the bes2600 driver source state
-that produces srcversion `0E16463FA8D85F4704DE93F` (pkgrel=6 on ohm,
-soak-verified 2026-05-21).
-
-## Equivalent commit chain
-
-Squash of 22 commits from `marfrit/bes2600-dkms` branch
-`bes2600/join-confirm-failure-reset` (top commit `3d833f8`):
-
-| # | Commit | Patch |
-|---|---|---|
-| 1-7  | 4fec8b2..3942404 | c5.x scan-defer / firmware-recovery stack |
-| 8-13 | 91640bd..73191b7 | Patch A, B, F1-3, C v3 |
-| 14   | a02f8b7 | Patch G (SPDX restore) |
-| 15-16| 93f2aab, dd01be0 | Patch D, E |
-| 17   | 447240c | Patch C2 |
-| 18   | dc13f5d | Patch H (bh.c hygiene) |
-| 19   | f469448 | besser#18 pending_record_lock SOFTIRQ-safe |
-| 20   | 0792ba4 | bus_reset EXPORT_SYMBOL_GPL (danctnix bridge) |
-| 21   | 49d9b77 | bounce SDIO TX buffers (DMA OOB / KFENCE fix) |
-| 22   | 3d833f8 | wsm_join_confirm reset (besser#25) |
-
-## Why a cumulative
-
-These 22 commits are the converged per-series; while they exist as
-individual scope dirs in `marfrit/bes2600-dkms`, several have
-context-overlap rebase conflicts that make per-scope inclusion in
-kernel-agent fragile (cf. ka#29 / besser#22 reconstruction debacle).
-
-Shipping the cumulative as one file in kernel-agent guarantees the
-applied source state on `v7.0-danctnix1` is bit-identical to the
-pkgrel=6 build on ohm, without dragging the besser-repo branch state
-into kernel-agent's resolution path.
-
-## Apply order
-
-This patch is the **base** for the bes2600 driver scope. The remaining
-non-bes2600 patch (`scan-filter-5ghz-danctnix` for besser#1) layers on
-top via the apply order in `fleet/ohm.yaml`.
-
-## Provenance
-
-Generated by `git diff e0d752a..bes2600/join-confirm-failure-reset --
-bes2600/` against `marfrit/bes2600-dkms`, then path-rewritten
-`bes2600/` → `drivers/staging/bes2600/`. The baseline `e0d752a`
-corresponds to the v7.0-danctnix1 bes2600 staging tree.