Re: git: 3c4eef5d838b - main - ath11k: reduce diff to upstream Atheros/QCA's ath11k driver
Date: Fri, 20 Mar 2026 00:09:36 UTC
On Thu, 19 Mar 2026, Bjoern A. Zeeb wrote: > The branch main has been updated by bz: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3c4eef5d838b906e8dc30e29ca98b2c4025e2bb2 > > commit 3c4eef5d838b906e8dc30e29ca98b2c4025e2bb2 > Author: Bjoern A. Zeeb <bz@FreeBSD.org> > AuthorDate: 2026-03-19 23:54:21 +0000 > Commit: Bjoern A. Zeeb <bz@FreeBSD.org> > CommitDate: 2026-03-19 23:54:21 +0000 > > ath11k: reduce diff to upstream Atheros/QCA's ath11k driver > > It seems that over the time of merging and only partly working > on making it compile again a few mis-merges happened. > Reduce diff to the v6.19 upstream version so that we only have > additions to the driver (usually guarded by #ifdef __FreeBSD__). Turns out the problem really was conflict resolution when rebasing a96550206e4bde15bf615ff2127b80404a7ec41f . I am not exactly sure how that partial backout happened on the other subtree given I had this all scripted and run once before. I only noticed now given the module Makefile was changed as well. It's a bit weird on the history but the drivers are not yet connected to the build as-are they are not compiling anyway. This was just to have them all on v6.19. > Sponsored by: The FreeBSD Foundation > MFC after: 3 days > --- > sys/contrib/dev/athk/ath11k/hal.h | 38 ++-- > sys/contrib/dev/athk/ath11k/mac.c | 455 ++++++++++++++++++++++++++------------ > sys/contrib/dev/athk/ath11k/pci.c | 56 ++++- > sys/contrib/dev/athk/ath11k/pci.h | 18 +- > sys/contrib/dev/athk/ath11k/qmi.c | 2 +- > sys/contrib/dev/athk/ath11k/wmi.c | 22 +- > sys/contrib/dev/athk/ath11k/wmi.h | 18 +- > 7 files changed, 415 insertions(+), 194 deletions(-) -- Bjoern A. Zeeb r15:7