From nobody Tue Apr 28 18:40:31 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 4g4q4s5rxMz6bw4J for ; Tue, 28 Apr 2026 18:40:45 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 4g4q4s3Ymrz3tNS for ; Tue, 28 Apr 2026 18:40:45 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-48984d29fe3so142902945e9.0 for ; Tue, 28 Apr 2026 11:40:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777401644; x=1778006444; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=OnsVW3lXMJyavPJsdxDntC6ttqHoMKHQOklNTxkH0NY=; b=PQgcO8cUG+b25X5+eStm0o4zYZSwMTSaFVS+dp/GrrYnpCljfBwtRDTgDVc2T54kkO sNfL2fwPW3MhzATSj8C028txvAyn5W6ADHONnbH7nOuctc/CkIaMKWriEOMWYRFXznTY B70/3qZxDpVbssF1/ePUbz9JOBnfLgPVtCG3HODEY0aWH4iEEkK+fHPueewxWinZnUsd 4uArD6WOZxIkkPcWoHSp/QzBi3BEwvWkJoPuC21/2CDA4DG1fcC9XPK0ymVANaCSSaQP Si1egIPE9+GUj9clkm74lBQKBtDMnFWvIXzv7ueG6jophAl+zzY8mROW2iztpIJxEMml KJqw== X-Forwarded-Encrypted: i=1; AFNElJ9Xl4mQ/er1RGMRmgTSzx3lbTez6X6L1hCz+g0ItWb80rn4XOY7AQDKcMZKz8TAmcsYyL+3Bl4Xt78uVNDz7eWUJgzNlg==@freebsd.org X-Gm-Message-State: AOJu0Yz2kQUWHPT+QngRvZVa0UeiF8ypCGDiNBuo7hm07okHKql4pgyb pEUGRsOQ/Hh1aq17/ErvBKTKSf5Gtdh8o6f2JZJk/5nD6lQfUoxUBYZSTeogQGc7e4c= X-Gm-Gg: AeBDieuNSj3Eh13efEaCLSoCwKhGTfoS5xIBN9BGMLrXoScfScQbsJj2Hn5q/Z2Q5o0 Tupfxzyh1qkWX7saZfEekWvaDuFu6LcSI/IdQ+dOkQ8j+heTWgyZSJpu+JUgDarQyPoN5jIJwTu +rJ2xqdKB1Wm6YFHpfeW3zsv7+DaisZAzQ4mRjkoLj4fEHueJjJ57emJe5ZfS6HRI+2MVj1SOXR du6TkszusdjJsqrs2CbKlbKzrNOsNLGyaDbHAeOURNT0QnIewo6+ghHdrt3Zdhw3XlcmXNx7bWk pEpXy/O0goY9hwfzZi1qmUUdO4CE7EqHBN3CUsTCvWKQS8U0oyxX0YZ7oNEAe6kiJhysZDguAQT EcUVkv9h3Sn+3u3KPdtzlin+OWCWcglNkUk3h7AeC62UScq/GIZ3Pjzr01TuwlYI+1Cq5R2ftMt NAlSdbjSescicLyE1uJqZ1+ZcFZnQqfFkTQIWoPHvsHktGJ/OqMxPnFYYd0Pri8qGe6nqd2WW75 jCrxA== X-Received: by 2002:a05:600c:5494:b0:488:ffad:6728 with SMTP id 5b1f17b1804b1-48a77b05c77mr74398405e9.19.1777401643761; Tue, 28 Apr 2026 11:40:43 -0700 (PDT) Received: from smtpclient.apple (nat-184-78.net.cam.ac.uk. [131.111.184.78]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48a7bc8518dsm3608785e9.4.2026.04.28.11.40.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Apr 2026 11:40:43 -0700 (PDT) Content-Type: text/plain; charset=utf-8 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 (Mac OS X Mail 16.0 \(3864.400.21\)) Subject: Re: git: 68e5b71517e9 - main - Vendor import of smart at 1.0.2 From: Jessica Clarke In-Reply-To: Date: Tue, 28 Apr 2026 19:40:31 +0100 Cc: Chuck Tuffli , Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <69f0ea0c.19f57.339fcc06@gitrepo.freebsd.org> <20260428180947.83C47130@slippy.cwsent.com> To: Robert Clausecker X-Mailer: Apple Mail (2.3864.400.21) 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:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4g4q4s3Ymrz3tNS X-Spamd-Bar: ---- On 28 Apr 2026, at 19:34, Robert Clausecker wrote: > Hi Chuck, >=20 > 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: >>>=20 >>> In message <69f0ea0c.19f57.339fcc06@gitrepo.freebsd.org>, Chuck = Tuffli >>> writes: >>>> The branch main has been updated by chuck: >>>>=20 >>>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D68e5b71517e947b4e3f349c970af362b= >>>> 47b45f27 >>>>=20 >>>> commit 68e5b71517e947b4e3f349c970af362b47b45f27 >>>> Author: Chuck Tuffli >>>> AuthorDate: 2026-04-28 16:55:50 +0000 >>>> Commit: Chuck Tuffli >>>> CommitDate: 2026-04-28 17:08:27 +0000 >>>>=20 >>>> Vendor import of smart at 1.0.2 >>>>=20 >>>> smart/diskhealth is a command line application to monitor disk = health >>>> from a storage device via SMART. >>>>=20 >>>> 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(+) >>>=20 >>> Why are we doing vendor imports directly to contrib/? Is this a new >>> procedure, do we not need to use the vendor branch anymore? >>=20 >> Sorry, this is new territory for me, and I may have goofed. My >> understanding was the upstream code lives in a vendor/* branch (which >> 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, = let >> me know how to fix this. >=20 > 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 contrib > directory corresponds to. >=20 > 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-im= port-git Jessica