From nobody Tue Apr 28 19:54:31 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 4g4rk25QdYz6c1qs; Tue, 28 Apr 2026 19:54:34 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g4rk22pqdz3FVM; Tue, 28 Apr 2026 19:54:34 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002b.ext.cloudfilter.net ([10.228.9.233]) by cmsmtp with ESMTPS id HntOwjB3ck14SHoVtwuxHk; Tue, 28 Apr 2026 19:54:33 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id HoVrw3tzkM2qiHoVswSLdh; Tue, 28 Apr 2026 19:54:33 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=b+a/I9Gx c=1 sm=1 tr=0 ts=69f11079 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=A5OVakUREuEA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=KpeJSf20AAAA:8 a=YxBL1-UpAAAA:8 a=0O_Ru9ZRmp6P_Uu8y7QA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=8GyX2P7uvxEm4O_9qm7Q:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy.cwsent.com [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 4001B48C; Tue, 28 Apr 2026 12:54:31 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 341281BD; Tue, 28 Apr 2026 12:54:31 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Chuck Tuffli cc: Jessica Clarke , Robert Clausecker , Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 68e5b71517e9 - main - Vendor import of smart at 1.0.2 In-reply-to: References: <69f0ea0c.19f57.339fcc06@gitrepo.freebsd.org> <20260428180947.83C47130@slippy.cwsent.com> Comments: In-reply-to Chuck Tuffli message dated "Tue, 28 Apr 2026 12:45:45 -0700." 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 Date: Tue, 28 Apr 2026 12:54:31 -0700 Message-Id: <20260428195431.341281BD@slippy.cwsent.com> X-CMAE-Envelope: MS4xfH/XhCCA7mqOuiBpGS81VbH+kVVaEffcekTlFyv71fYQh5GYTFUQQmHskYNUv4iJLkhn/C14YgQ6ruTS/Ia5LMzGq9tnHviHzd+KWhMbkEQl1gVjOG3/ G5T3w/fWCwkFwQTmbGGgeudfQb4Xy194WTkdF5KavgnYCACgRUWA+IaV6DX5rh+G3dALdM6v0ujpVT4wkhMpFgXCbnPodDge5JQ7xVpCCuSsXv6+hE+pM8nW QlF+Y5Pl6br4UjfsleOYKlfAMg1ghFziLg2nyxx2rdGE+xwYSyGZ9DOhEubFj9LBUfi9zVQgFqOa5ZljLXahALuxlVB6mVFcYOlFw8R/oR2fKR8QjHkwRiPE 6e8TMXyqZ06lGam8wDYfxMslHGAeFA== X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4g4rk22pqdz3FVM X-Spamd-Bar: ---- In message , Chuck Tuffli writes: > On Tue, Apr 28, 2026 at 12:41=E2=80=AFPM Chuck Tuffli w= > rote: > > > > On Tue, Apr 28, 2026 at 11:40=E2=80=AFAM Jessica Clarke rg> wrote: > > > > > > On 28 Apr 2026, at 19:34, Robert Clausecker wrote: > > > > > > > Hi Chuck, > > > > > > > > Am Tue, Apr 28, 2026 at 11:21:26AM -0700 schrieb Chuck Tuffli: > > > >> On Tue, Apr 28, 2026 at 11:09=E2=80=AFAM Cy Schubert chubert.com> wrote: > > > >>> > > > >>> In message <69f0ea0c.19f57.339fcc06@gitrepo.freebsd.org>, Chuck Tuf= > fli > > > >>> writes: > > > >>>> The branch main has been updated by chuck: > > > >>>> > > > >>>> URL: https://cgit.FreeBSD.org/src/commit/?id=3D68e5b71517e947b4e3f= > 349c970af362b > > > >>>> 47b45f27 > > > >>>> > > > >>>> commit 68e5b71517e947b4e3f349c970af362b47b45f27 > > > >>>> Author: Chuck Tuffli > > > >>>> AuthorDate: 2026-04-28 16:55:50 +0000 > > > >>>> Commit: Chuck Tuffli > > > >>>> CommitDate: 2026-04-28 17:08:27 +0000 > > > >>>> > > > >>>> Vendor import of smart at 1.0.2 > > > >>>> > > > >>>> smart/diskhealth is a command line application to monitor disk = > health > > > >>>> from a storage device via SMART. > > > >>>> > > > >>>> Reviewed by: fuz, jrm > > > >>>> Relnotes: yes > > > >>>> Differential Revision: https://reviews.freebsd.org/D56638 > > > >>>> --- > > > >>>> contrib/smart/Changelog | 37 ++ > > > >>>> contrib/smart/LICENSE | 13 + > > > >>>> contrib/smart/Makefile | 26 + > > > >>>> contrib/smart/freebsd_dev.c | 828 +++++++++++++++++++++++++ > > > >>>> contrib/smart/libsmart.c | 1359 +++++++++++++++++++++++++++++= > ++++++++++ > > > >>>> ++ > > > >>>> contrib/smart/libsmart.h | 174 ++++++ > > > >>>> contrib/smart/libsmart_desc.c | 158 +++++ > > > >>>> contrib/smart/libsmart_dev.h | 60 ++ > > > >>>> contrib/smart/libsmart_priv.h | 83 +++ > > > >>>> contrib/smart/smart.8 | 245 ++++++++ > > > >>>> contrib/smart/smart.c | 334 ++++++++++ > > > >>>> packages/Makefile | 1 + > > > >>>> packages/smart/Makefile | 4 + > > > >>>> packages/smart/smart.ucl | 30 + > > > >>>> usr.sbin/Makefile | 1 + > > > >>>> usr.sbin/smart/Makefile | 8 + > > > >>>> 16 files changed, 3361 insertions(+) > > > >>> > > > >>> Why are we doing vendor imports directly to contrib/? Is this a new > > > >>> procedure, do we not need to use the vendor branch anymore? > > > >> > > > >> Sorry, this is new territory for me, and I may have goofed. My > > > >> understanding was the upstream code lives in a vendor/* branch (whic= > h > > > >> I forgot to push) and the contents are copied to the contrib/* > > > >> directory and then committed. If this isn't the right thing to do, l= > et > > > >> me know how to fix this. > > > > > > > > Your understanding is correct, though you are supposed to do a merge > > > > to tie the vendor branch and the change in the contrib directory > > > > together, making it clear which state of the vendor branch the contri= > b > > > > directory corresponds to. > > > > > > > > The best way to fix this is to revert your change and then to retry > > > > with a merge commit. > > > > > > The helpful link seemingly omitted from this thread so far: > > > > > > https://docs.freebsd.org/en/articles/committers-guide/index.html#vendor= > -import-git > > > > Apologies for the goof :( > > > > Just to make sure I have this all correct, I will > > 1. Create a branch vendor/smart containing only the pieces from > > upstream that base needs and commit > > 2. git tag -a vendor/smart/1.0.2 -m "Tag smart at 1.0.2" > > 3. git push --follow-tags freebsd vendor/smart > > 4. git switch main > > 5. git subtree merge -P contrib/smart vendor/smart If it's brand new, i.e. never merged into main before, git subtree add would be the ticket. > > > > Here is where I'm fuzzy on what to do. Am I supposed to push this > > as-is or am I allowed to make changes? If I can make changes, is that > > via git commit --amend? > > Since this is a new import, what commit do the changes to packages/* > > and usr.sbin/* go? Their own commit or as a part of the merge? > > Bah, never mind. Found the directions. Sorry for the noise. NP. Subtree merges are a bit of a PITA because git doesn't support them. But Warner has written excellent documentation in the committers guide. It's easy to mess up though. I've messed up subtree merges a couple of times. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0