From nobody Tue Apr 28 19:45:45 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 4g4rX94tCYz6c0qW for ; Tue, 28 Apr 2026 19:46:01 +0000 (UTC) (envelope-from ctuffli@gmail.com) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g4rX85Mg9z3Brf for ; Tue, 28 Apr 2026 19:46:00 +0000 (UTC) (envelope-from ctuffli@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of ctuffli@gmail.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=ctuffli@gmail.com Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-827270d50d4so10749326b3a.3 for ; Tue, 28 Apr 2026 12:46:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777405559; x=1778010359; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=sxJJdu9dS1Tq/uM1eYt+u8wtEB5PHrXhjwlDLZRZn2Q=; b=KtGyEJvKfdv4uUtEHt5j1UAf5nZXh90CjWS4d2weGZ/D/06WS2knzUIVBnDUqSWdDg usyoVk+6XfCzNWX21yQMPr9ty4n/Xza8jy1mhfWYLlXzlES6px2xBTPyZlQVNVvsw432 qPYCr75MzLRh6bjfjm3Bg5E+bOR0V1UM9kg1a0iyPAEdAMKt/WZysvIraPz2qjP+cNdy s3J06KWw9dDTK5PdbQGa7Ek2AVNc6/6k7en3hsqqMsUrQIlv+MBaA0kUG2oyXTC161bt yKT+oDzmwJERVD2bM4FlaJEieE6+DGIf0Eq4VUxI22ah0IERN0O/aPqUuD1IARLo9FJ7 ZCbQ== X-Forwarded-Encrypted: i=1; AFNElJ9fj8haQPn0yJ3Ce4ddjDinFY/Blctxy3gY87Z8zbzgyeGJpmcjNnSF/jjDUTqwof3vX24SYk3PUB3Js/VympWJFXNc@freebsd.org X-Gm-Message-State: AOJu0YxjD+WRBq0QrLekTl3mlTrZMGJPEUuveNefTA1/3ihlumBfP9zo FVVr01dt96/unr5i/e0jD/hQT0ZrJpPSl8SAjMEeN2V6Ms14mU9+GJVPwPshjVEN X-Gm-Gg: AeBDiet+oFZwlUbkBY4aB88TeKA7k+l9s7RZNd1TAP18bCVNHLupJxVocZaBNJhwR0f 6cY4MtfsDW6V9Xb1vPTbHzhCK+dzf3eWAZeaaxA/jV1GsibOFjOSZRCCLDv9hiYSOZBcWJa6d7/ ihzgRQWIWSw+cFwhPVp9LXfdvTazHcnNPncUI4TIQueLD4+dN91D6rWjY+r/O4wYYN+Wb7I0f2p ZFpSsdGhNBlpWjsAZ1kAB554SuDXsaotqi22GCTyfc2hEcMoov6XeGbEvwTVjuuWaQe8OjaAMq5 KKBHpIXeOu1Mk0yRdLvxv8gifnWtOl/W7xY3PPeh8JyQV9uEd5J5Pz40nu6czEJGXG/VRgplR48 Y9NKj7WDqWasgQZ73sSzCzgGH08ln8hpM/pN9pBY9bM4SnKCDmInAGVssSFXxUGWz94KvRZZccI uULhIYRRTpigiwGdQW7ipB9+ZHH8+a4e+6BZ8Wjyu+fJGMtEdqMuTv8om275WzL8NCHPuBKE8= X-Received: by 2002:a05:6a00:8e01:b0:82f:5034:77a4 with SMTP id d2e1a72fcca58-834ea5e57f4mr643118b3a.21.1777405558790; Tue, 28 Apr 2026 12:45:58 -0700 (PDT) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com. [209.85.214.175]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-834daf31f04sm3404587b3a.39.2026.04.28.12.45.58 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Apr 2026 12:45:58 -0700 (PDT) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2b24fdac394so112019625ad.3 for ; Tue, 28 Apr 2026 12:45:58 -0700 (PDT) X-Forwarded-Encrypted: i=1; AFNElJ+Y7DSjQ8Y61cztp8RVJYn2tCMTz+7pQ3JvPYPiwcIKngGlh9HOsjtG1nHiuXzuYtOdnrMsqkFUSB6OJ4HjkrAuwxUj@freebsd.org X-Received: by 2002:a17:903:120f:b0:2b0:51f6:d46e with SMTP id d9443c01a7336-2b9873c406dmr7187755ad.15.1777405557805; Tue, 28 Apr 2026 12:45:57 -0700 (PDT) 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 References: <69f0ea0c.19f57.339fcc06@gitrepo.freebsd.org> <20260428180947.83C47130@slippy.cwsent.com> In-Reply-To: From: Chuck Tuffli Date: Tue, 28 Apr 2026 12:45:45 -0700 X-Gmail-Original-Message-ID: X-Gm-Features: AVHnY4KcdXipCLsCmEoYUnfZSYYAoCdLjLBaO-AWDt19b0waVYgqzba_bYT_m0E Message-ID: Subject: Re: git: 68e5b71517e9 - main - Vendor import of smart at 1.0.2 To: Jessica Clarke Cc: Robert Clausecker , Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-0.92 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_SPAM_MEDIUM(1.00)[0.998]; NEURAL_HAM_SHORT(-0.92)[-0.915]; FORGED_SENDER(0.30)[chuck@freebsd.org,ctuffli@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; RWL_MAILSPIKE_GOOD(-0.10)[209.85.210.170:from]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; MISSING_XM_UA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RCVD_IN_DNSWL_NONE(0.00)[209.85.210.170:from,209.85.214.175:received]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_TLS_LAST(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; FROM_NEQ_ENVFROM(0.00)[chuck@freebsd.org,ctuffli@gmail.com]; RCVD_COUNT_THREE(0.00)[3]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[] X-Rspamd-Queue-Id: 4g4rX85Mg9z3Brf X-Spamd-Bar: / 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 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 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 > > 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.