forked from marfrit/kernel-agent
patches/driver/bes2600/*-danctnix + arch/arm64/scs-...: rebased on danctnix baseline (#29 redo)
PR #33's per-series mirrors were generated against the bes2600-dkms cleanups branch (rooted at fe73571) without rebasing onto the v7.0-danctnix1 kernel baseline. Result: per-commit diffs carried stale baseline context (e.g. from_timer rather than the new timer_container_of API), so the cumulative no longer applied cleanly to ohm's actual base. pkgrel=6 build #1 failed with 'Hunk #3 FAILED' in Patch D's sta.c. Fix: in marfrit/bes2600-dkms, create danctnix-sync branch (fe73571 + drop-in replace bes2600/ with v7.0-danctnix1's drivers/staging/bes2600/), rebase cleanups onto it as cleanups-rebased-on-danctnix, manually resolve the resulting conflicts keeping each commit's intent + the new baseline context, rebase Patch H accordingly. Format-patch and re-route to the same series-dir names as PR #33. Conflict resolution notes: - 'remove userspace /dev/bes2600 character device interface' commit: the chardev wrapper was removed but two utility funcs that danctnix's bes2600_btuart.c depends on (bes2600_chrdev_is_bus_error, bes2600_chrdev_switch_subsys_glb) were re-added with EXPORT_SYMBOL_GPL. bes2600_switch_bt re-added as static (file-local, called only from bes2600_chrdev_switch_subsys_glb). - Patch D (atomicize ba_lock): re-resolved bes2600_ba_timer's timer_container_of() vs from_timer() to keep the new API. - SCS Makefile @@ hunk counts corrected from -9,6 +9,10 to -9,6 +9,11 (the original was actually wrong; build-via-fuzz was masking it). Cumulative b2sum: ka-promote ohm now emits eb179c03f35a4dbaec2e40036f0033ef04985bb6b14ab22419d68e5caaa5874f... (279 554 bytes, 32 patches resolved). pkgrel=6 built from this manifest + installed on ohm 2026-05-19 ~23:39. Functional verification: bes2600 + bes2600_btuart both load, Pattern A 0 over fresh boot, wlan0 associates to newton. srcversion 1A919EED0E6DC2478559B17 differs from pkgrel=5's BEB625FA... — the reconstruction is functionally equivalent (5 GHz working, no firmware/driver race conditions) but NOT byte-equivalent (the chardev utility re-add chose different formatting than the original danctnix code). Byte-equivalence is not a goal; per-series traceability and working hardware are. Closes (proper this time): #29. Refs: #28, #30, #33 (the half-working attempt), #31, #32.
This commit is contained in:
+11
-11
@@ -1,4 +1,4 @@
|
||||
From 8dd79199f8a09ee3af6853e01a2ab3bab7684d81 Mon Sep 17 00:00:00 2001
|
||||
From b9e340c78cf7111dd29c9b31dae5fe73d8b5ceec Mon Sep 17 00:00:00 2001
|
||||
From: Markus Fritsche <fritsche.markus@gmail.com>
|
||||
Date: Fri, 8 May 2026 00:03:50 +0200
|
||||
Subject: [PATCH 26/29] =?UTF-8?q?bes2600:=20Patch=20G=20=E2=80=94=20restor?=
|
||||
@@ -103,7 +103,7 @@ copyrights is now resolved.
|
||||
48 files changed, 223 insertions(+), 292 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/bes2600/ap.c b/drivers/staging/bes2600/ap.c
|
||||
index 71660d4..0a23790 100644
|
||||
index 7b1e3b4..8a17545 100644
|
||||
--- a/drivers/staging/bes2600/ap.c
|
||||
+++ b/drivers/staging/bes2600/ap.c
|
||||
@@ -1,12 +1,9 @@
|
||||
@@ -230,7 +230,7 @@ index 63c3275..ebec635 100644
|
||||
#ifndef BES2600_PLAT_H_INCLUDED
|
||||
#define BES2600_PLAT_H_INCLUDED
|
||||
diff --git a/drivers/staging/bes2600/bes2600_sdio.c b/drivers/staging/bes2600/bes2600_sdio.c
|
||||
index b6b4e4e..3abda2a 100644
|
||||
index 3834032..e85c524 100644
|
||||
--- a/drivers/staging/bes2600/bes2600_sdio.c
|
||||
+++ b/drivers/staging/bes2600/bes2600_sdio.c
|
||||
@@ -1,12 +1,13 @@
|
||||
@@ -274,7 +274,7 @@ index 224c62d..02dcd43 100644
|
||||
#include<linux/module.h>
|
||||
#include <linux/init.h>
|
||||
diff --git a/drivers/staging/bes2600/bes_chardev.h b/drivers/staging/bes2600/bes_chardev.h
|
||||
index 310ab81..3e4eee6 100644
|
||||
index 2a7cad7..9edb206 100644
|
||||
--- a/drivers/staging/bes2600/bes_chardev.h
|
||||
+++ b/drivers/staging/bes2600/bes_chardev.h
|
||||
@@ -1,12 +1,9 @@
|
||||
@@ -429,7 +429,7 @@ index 92de90b..49477b3 100644
|
||||
#ifndef __BES_PWR_H__
|
||||
#define __BES_PWR_H__
|
||||
diff --git a/drivers/staging/bes2600/bh.c b/drivers/staging/bes2600/bh.c
|
||||
index d5a8c77..0e0888e 100644
|
||||
index febcaf4..61f6991 100644
|
||||
--- a/drivers/staging/bes2600/bh.c
|
||||
+++ b/drivers/staging/bes2600/bh.c
|
||||
@@ -1,12 +1,12 @@
|
||||
@@ -758,7 +758,7 @@ index 5cfba46..bec3647 100644
|
||||
|
||||
#ifndef BES2600_ITP_H_INCLUDED
|
||||
diff --git a/drivers/staging/bes2600/main.c b/drivers/staging/bes2600/main.c
|
||||
index 90a8ff8..19f196f 100644
|
||||
index 89b5e2d..71dc4ae 100644
|
||||
--- a/drivers/staging/bes2600/main.c
|
||||
+++ b/drivers/staging/bes2600/main.c
|
||||
@@ -1,12 +1,18 @@
|
||||
@@ -833,7 +833,7 @@ index 0f6943e..ae70453 100644
|
||||
|
||||
#ifndef PM_H_INCLUDED
|
||||
diff --git a/drivers/staging/bes2600/queue.c b/drivers/staging/bes2600/queue.c
|
||||
index f050df6..cc606c1 100644
|
||||
index d1b407b..b56ca43 100644
|
||||
--- a/drivers/staging/bes2600/queue.c
|
||||
+++ b/drivers/staging/bes2600/queue.c
|
||||
@@ -1,12 +1,12 @@
|
||||
@@ -902,7 +902,7 @@ index 96b1d4c..43c2dae 100644
|
||||
|
||||
#ifndef BES2600_SBUS_H
|
||||
diff --git a/drivers/staging/bes2600/scan.c b/drivers/staging/bes2600/scan.c
|
||||
index 16b5d0f..fb1d298 100644
|
||||
index 3cd7b64..1905471 100644
|
||||
--- a/drivers/staging/bes2600/scan.c
|
||||
+++ b/drivers/staging/bes2600/scan.c
|
||||
@@ -1,12 +1,12 @@
|
||||
@@ -948,7 +948,7 @@ index 1f3adea..295be18 100644
|
||||
|
||||
#ifndef SCAN_H_INCLUDED
|
||||
diff --git a/drivers/staging/bes2600/sta.c b/drivers/staging/bes2600/sta.c
|
||||
index 81f88ed..bfd8ae9 100644
|
||||
index 5868757..70b12f9 100644
|
||||
--- a/drivers/staging/bes2600/sta.c
|
||||
+++ b/drivers/staging/bes2600/sta.c
|
||||
@@ -1,12 +1,12 @@
|
||||
@@ -971,7 +971,7 @@ index 81f88ed..bfd8ae9 100644
|
||||
|
||||
#include <linux/vmalloc.h>
|
||||
diff --git a/drivers/staging/bes2600/sta.h b/drivers/staging/bes2600/sta.h
|
||||
index e4e266c..6ea3b0f 100644
|
||||
index 39b4b1a..a174e04 100644
|
||||
--- a/drivers/staging/bes2600/sta.h
|
||||
+++ b/drivers/staging/bes2600/sta.h
|
||||
@@ -1,12 +1,12 @@
|
||||
@@ -1034,7 +1034,7 @@ index de82b30..7f42c04 100644
|
||||
#ifndef __TX_LOOP_H__
|
||||
#define __TX_LOOP_H__
|
||||
diff --git a/drivers/staging/bes2600/txrx.c b/drivers/staging/bes2600/txrx.c
|
||||
index 346312c..7cdb7de 100644
|
||||
index f6a66d6..3aef009 100644
|
||||
--- a/drivers/staging/bes2600/txrx.c
|
||||
+++ b/drivers/staging/bes2600/txrx.c
|
||||
@@ -1,12 +1,12 @@
|
||||
|
||||
Reference in New Issue
Block a user