From nobody Tue Sep 24 22:29:10 2024 X-Original-To: dev-commits-src-main@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 4XCvfh3Hhqz5W9Sn; Tue, 24 Sep 2024 22:29:16 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XCvfh2mlqz4F0S; Tue, 24 Sep 2024 22:29:16 +0000 (UTC) (envelope-from bz@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727216956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=NrkHy59DwMCwMaKg2fWzxZZ/Br8qncskGCuj2PnY++4=; b=g9KRbG++Pe/RC1oo91J06pnZGBpy7fxO6v9/5tGICFBCmcwLy6biOi73XwqzBOnSe4G8AO iWcAb7Bq6qBwP87ZpWq8CUnCIozbvDpKOEfC56dsqrKmMK/XjeaNVBLgASp6jOlBuaKXis FNX2WFRYHwzSBXpRhRKFEhTM/gNhtRO742t8hK4v3iTQT0pv/Y/GegCm1FQEo2g9aiDzOO dXsxbk86GJh2LHdgBaIUJx/5lFL1JoIwSApgtbD8mcR2s+339TrZBGLY/SHPIO+JxR1AkU x7suNqGLWNLIL7Va0v9iduJTktjZi2ILUV5jByd8uBLB6Kx4Pt4+ANTE14EISQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727216956; a=rsa-sha256; cv=none; b=acxbaTPUTT2PpoLHj+2hZr92OiBkj2pZID8InraYN3dmq8hav6Hy7SEDj3ZohKaAUR+pBC puI8qH3uvzr3YEmDhOVE7tKxtULxHpA+2IFESQG7byqOBjJyZvKgUAzfWsy+qytcfFkahq 14m4pOhSyONiArU79gILuk1Q9f//HatLW91BHE3z343e9MG88jUrP+NViKJrENOCtBVvNt FHZw5ovbAzjuodyC1Eq1w+QKX94uADNOjVWHr1WqYU5VchVLnben9E//RmnXCNTCSbSnWH I1j+1Ynr8yp3HLJHFRe6YU6+zFYwxxFZf+sUWa6YLc7itThc3/TUR3fx9djuAg== 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=1727216956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=NrkHy59DwMCwMaKg2fWzxZZ/Br8qncskGCuj2PnY++4=; b=pax4qIrUn+GtqAQHBF5q+szrGGYsjqDn5ME/UB0YhTnVtILFZHr9uENCW+rkD3UQA0oi/d riCXbgKv+7L7+cgGRM2rR5cs10O0yVaP3NbJq4ppyDoK8jrqcsOCheLvEaIlDyF1Kjrknk EB0YLrTC9Ge/NDqnlOLSWP2NLupUQITaQMYjuh5Wk0mk7EsgcJzptunVrpsHInvZY6YaXS zxfNl51TKomUDPixubZqmSIg8mC8efDUjLbWAS1b+nXTKMzt7aocaot6YrrW/DPgQL5f0f /9taVK17fK3icV5GYePnJjGe2SzslEDr0L6r8aq/QBW2NT14fBzCC4pYGfhLvQ== 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 (P-256) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E5" (verified OK)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XCvfh1QdkzTcq; Tue, 24 Sep 2024 22:29:16 +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 63C50A64806; Tue, 24 Sep 2024 22:29:08 +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 D872C2D029D8; Tue, 24 Sep 2024 22:29:11 +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 iq36zNVNZvv2; Tue, 24 Sep 2024 22:29:10 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (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 E21E32D029D2; Tue, 24 Sep 2024 22:29:10 +0000 (UTC) Date: Tue, 24 Sep 2024 22:29:10 +0000 (UTC) From: "Bjoern A. Zeeb" To: "src-committers@freebsd.org" cc: "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 413c5e9082a7 - main - Merge remote-tracking branch 'freebsd/vendor/Linux/ath-common' In-Reply-To: Message-ID: References: <202409242119.48OLJOws002720@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/mixed; BOUNDARY="1098556516-1115143918-1727216662=:5181" Content-ID: <177po972-2q66-430n-n1q9-71p9332o2q8p@mnoonqbm.arg> This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --1098556516-1115143918-1727216662=:5181 Content-Type: text/plain; CHARSET=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT Content-ID: On Tue, 24 Sep 2024, Warner Losh wrote: > On Tue, Sep 24, 2024 at 3:33 PM Jessica Clarke wrote: > >> On 24 Sep 2024, at 22:19, Bjoern A. Zeeb wrote: >>> >>> The branch main has been updated by bz: >>> >>> URL: >> https://cgit.FreeBSD.org/src/commit/?id=413c5e9082a7d1d25fd3a95f0e77a949621f1433 >>> >>> commit 413c5e9082a7d1d25fd3a95f0e77a949621f1433 >>> Merge: 604919c47fa4 9c6b6723ca84 >>> Author: Bjoern A. Zeeb >>> AuthorDate: 2024-09-24 21:06:19 +0000 >>> Commit: Bjoern A. Zeeb >>> CommitDate: 2024-09-24 21:06:19 +0000 >>> >>> Merge remote-tracking branch 'freebsd/vendor/Linux/ath-common' >>> >>> Sponsored by: The FreeBSD Foundation >> >> Hi Bjoern, >> This slew of merge commits has zero context for what they’re actually >> importing beyond the branch name, which goes against the documentation >> for how to do vendor imports: >> >>> Include details about the changes being merged in the merge commit >> message. >> -- >> https://docs.freebsd.org/en/articles/committers-guide/#_updating_the_freebsd_source_tree >> >> This is unhelpful for anyone wanting to understand what you’re doing. >> > > Agreed. However, I looked at these commits. This is bootstrapping vendor > branches for software > that had been directly added to the tree before. I should have had Bjoern > mention this in these > merge commits, but it didn't occur to me until after the commit. It hadn't to me either given you and Ed had explained all this to me and cleaered my other concerns and given they were "empty" not actually "adding" anything. So here's the summary as I understand it: Multiple versions of the driver code had landed in freebsd/main before we created the vendor branches. We added the full import history to the vendor branches which was not linked to freebsd/main---and isn't apart from the current version in main now after these empty merges. These records of "no-change merges" finally add related history between the vendor branches and main to alllow us to use standard procedure for the vendor branches (subtree merges) in the future. This was done using what I'd call "git magic" provided by Ed no one else will hopefully ever need again. HTH. -- Bjoern A. Zeeb r15:7 --1098556516-1115143918-1727216662=:5181--