From nobody Fri Mar 20 00:09:36 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fcNGx0y9cz6WC5L; Fri, 20 Mar 2026 00:09:45 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fcNGx0HfTz3gSQ; Fri, 20 Mar 2026 00:09:45 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773965385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=EA95gXe+8OHYaBkVRDF42c3eJJzyOr0D8LWJcLJoS3s=; b=eRvPqJ/thvQHo0Yqjij2R4kcNGARV00kAhaysfMthsvgm5d43u618HLu4vLKlEAxlw39MG DiXbacXJDagZR2E5etPx+o0yenP/79MYDj3yr/MTOfeKWa1BKZO7L5Gsd2aMikAdi6c+v3 4OLb0KK69Qt200HVGpu17BBx/60utYs3yhu4cORJhrBza0cf6LgQKtZ0y2jJBJif/zjR5L S5WeioMUYE9YN1ChNUrfxEWLmuPXJfLbXzPiv+I//g4eoTbsFu0+j/vQYy4nfxvHcIzyHi JOd0IyB8AsyhSUsUgaAh+QOGXWrr8gGucwtrbynp2Znz5LF0aAd5liWmw/iGiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773965385; a=rsa-sha256; cv=none; b=g9+PDkJm1wJXqdHzb+6kZD3s8luAd/bBE8RDJtFmSwrHlZevOPnoZbWH2ZvShW+ZKZ6I86 50+YGT8IETPBMmOy9f0TLu3WWQ801/IT5cnxHyRMC5g1uQXsORyOERydvR45ploSJ/q1z0 bOWaLD5AHA65FIs8dQnX1k53stFsAo05Xg+vYIm17Wk2teWQRu/KOb2L5h/oQcKQroLssZ 5Hk0sD45rpg39sh4fi0lqc7/DmkpnOWyyQaUwinZKOa6BNyAP3wqTUlsb+tdLjl6hbQX0W wC70yoecuawneqYk8DdguUoy5ONB777WbTV5UmCJFljJj92db4qwRdcCLKq9qQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773965385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=EA95gXe+8OHYaBkVRDF42c3eJJzyOr0D8LWJcLJoS3s=; b=uUQVgXGjdviZb4iFsgo5v56HXPea7o3m97PKWeKm4ubmzJcqIp4XeK9erB42nSbJyuZUjR DsvCyF/6KSH+2iT+osZrNeDomkss3Bc+1JodraXO+fFqFVrmnM+Fn5bjVbjkkb55z9/HMn +O2yclSCZnGEJLo5eGiqjRIKPxCRXWnS3Mf/Trn+WyJQ+SDtyQikoDeVAGfJqlmIiwfnfa mkDZ/idADkI1bn2mxV8vCuatJ/QFaLnajelrA6JSZRxPBCcZJDny/JD13lyOTQHnvXDu5B HdHfsau/PPPkaNPxHR41UAk+WLppMJGN13Rmq94Hre8+nwbz5b3kVdiOQEGxxA== Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E7" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fcNGw5b2Fz13WP; Fri, 20 Mar 2026 00:09:44 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id DE2D3A64805; Fri, 20 Mar 2026 00:09:17 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id F38852D029E9; Fri, 20 Mar 2026 00:09:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id 1vJmxx6mHrV0; Fri, 20 Mar 2026 00:09:37 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 0B9252D029D8; Fri, 20 Mar 2026 00:09:37 +0000 (UTC) Date: Fri, 20 Mar 2026 00:09:36 +0000 (UTC) From: "Bjoern A. Zeeb" To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 3c4eef5d838b - main - ath11k: reduce diff to upstream Atheros/QCA's ath11k driver In-Reply-To: <69bc8ccb.3741f.3a2d93d1@gitrepo.freebsd.org> Message-ID: <20ro9113-36r0-407q-2sr7-90o51p96pnr5@mnoonqbm.arg> References: <69bc8ccb.3741f.3a2d93d1@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed 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 > AuthorDate: 2026-03-19 23:54:21 +0000 > Commit: Bjoern A. Zeeb > 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