From nobody Tue Apr 28 19:45:45 2026 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 4g4rX947Crz6c0wL for ; Tue, 28 Apr 2026 19:46:01 +0000 (UTC) (envelope-from ctuffli@gmail.com) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 4g4rX82gXvz3Bpd 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.214.172 as permitted sender) smtp.mailfrom=ctuffli@gmail.com Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2b2ea1b3962so66873435ad.0 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=1777405558; x=1778010358; 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=Ym8qpZntuxZ/05OgyK5S70IRbNynklesWO3T5jMCVAF8YpnonprS4ZjnYGAAFtQhma rmK0uRaRZkMDtKjn8lHhEx2s9kjUpttJLFwcZujY3vZPX2TbiZnfMuphcuEgZBfxdYVi Y/+tohXnsQ09Mi1t2M+2+Z39CHLHebSAvyrGgpAJ6XNAvupTHi5nfkpk9vBxEOXmGLGt JTazyE1wKCvDQj6mxUySLdfNsY+uQNdlRdqaY+yhugjzX4h/N9i7btlJfx1yz9lGJEcx pE5iDRspRY6zZ9iTjGJvgOIv1S00uMLX3GbmmfjohRyPCjzt/hr0HM/uuqdpFu6kSmhn CnHg== X-Forwarded-Encrypted: i=1; AFNElJ8iiVBc91bQ3hf76lBttBY5HJCHplT8HJn/F0bH5QbthYVwHQL2vf2KpX91shsbYS4Oco3qAV87+AEdYC16VTtzwpX/lQ==@freebsd.org X-Gm-Message-State: AOJu0YyF7ZiGuJTtbwY4LzMNcFvi/rwNFCru9F+mBmGFC8rbi2IYqx4B a/mZ+SWns422qP8mEavAtG+iNU8ZweB7WzE9fxj686Gfn+bv1yN0UYIyYT7nkc6K X-Gm-Gg: AeBDieuXKnSZm8k+DeX4BZ2ico80wDgmLvTj0VH8cgHXiQ9IE3oy6DE7nJDQklufMUw 8x/Ww0l10Bl9TiqcNJ/fjZuEpZuB5FxjY+EAohAolGt9eKB65UZO6qEUXPOuKh3JwBVVLUeNQ7Z enDgFHGwVbmUhIQ36i5uhk3e+9Q+n/ABojTZd25oqPW9Wh+Np4DmdLW52C28edUIUlQAp5DpVJn ovMp47pL9H9At6srCZO6feav7us17jmXWqZZMNA0D7YguspSpz73hB3DDH6F8cUIRBIalboJkpu ULwfv9wm7H45ousQDAhmLkN8C/UIo7Fmn75yeKd1lhM8wXvPv0f8pmJwE1nq4sGu0fZGWp7s403 pE7EKf7EZmb70q1rcU4rAolBBmcU1vV0D274pFuymqJBzAaKwdM7YW+wEHLzZdDj1VCIW/aGcLo QyNolKivAk5DJZ1Uz48U+jtN6UCPud6tgwBdH8VEul7pyQYtvLNpH6Iql6iWKOE+JrP93GJBY= X-Received: by 2002:a17:902:988c:b0:2b2:501c:bc0 with SMTP id d9443c01a7336-2b987359d23mr5366695ad.7.1777405558526; Tue, 28 Apr 2026 12:45:58 -0700 (PDT) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com. [209.85.214.170]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b98893f1e8sm327225ad.44.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-f170.google.com with SMTP id d9443c01a7336-2b2589c26e3so109535535ad.1 for ; Tue, 28 Apr 2026 12:45:58 -0700 (PDT) X-Forwarded-Encrypted: i=1; AFNElJ/0SbpO3g4xmqwWFI0tdvEZCg9WFhJYV7Ha/fNW6IsnuHev50LweKJuPIdL4ZYIBRrvbFlm9vs04VrB9e6wi5YL6fVUag==@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 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 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.82 / 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]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MISSING_XM_UA(0.00)[]; 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.214.172:from,209.85.214.170: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-main@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-main@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.214.172:from] X-Rspamd-Queue-Id: 4g4rX82gXvz3Bpd 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.