From nobody Mon Dec 1 14:53:44 2025 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 4dKn3F3cRlz6Jg8l; Mon, 01 Dec 2025 14:53:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dKn3F35s1z3KfZ; Mon, 01 Dec 2025 14:53:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764600825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CUUJY7s130npIql9xR0r46+qEVZ7xHA5wSSAQFIKdVc=; b=UmQLvfbutS3TVAr+9ceRxQmhdWDqk7dGdo0ZNBVGB83+Q/l6QPVz6DmmOY6amHOQ1iv6Gm iws680kok4Lb2tc+bSoXxMJQPBG3JmgX8P8eZypAP/PYzQXvSYQrb6589QGgiHhxFbDj+Q JfdE0ZW5lxO781v4Mjs1VJu/2LxXLnyFGg4dfHKrGFXJecghDuOezGvUE9rzn2BDg2W8lM XfVTXbB83Ba6GEv2FQDyNNKQQhIKrZObjnWkcQ5wMm6QKPtNdVxt/IavRWvbZ2tztR4FCN 00cCOfuxUj9QKG7DZU1LQhvfOUSKElp7Uk3Ln3NF/6Qh3FiGXkvx2ZUS544f0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764600825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CUUJY7s130npIql9xR0r46+qEVZ7xHA5wSSAQFIKdVc=; b=fGmGZrKHg+O/SxtInD7R6j1Akop5uR5shSkunHZuUT7l2vMc5WpQVg2uiMRy/lOyciAFzL Y9TgmZ/8U5ybjrwUhhl4uS1Ve5/9AXoaP+wFOBDYsGIJyIkYve9BeM5qfkbTW4bl3AG/Dp RvKr5QovQ64kRwplsCmojnDaTVI3IedqRz+WmY38BG78zNqpNDVzbnrcBJYXG1SFDn3NYe 8nX9LHJb3x8TvSzLOknz0JNJhsFE3K7EXvGN2b5nzlChuo79NcCprdfdxtUk0CypJfGRfx ErGJHZmsXIZn2ko5nLhRCC1IkabWSpTkDWQGeTJXzFJaZutMtFnYBqYrzi0Hzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764600825; a=rsa-sha256; cv=none; b=ZsNNYi07RtEFy/L0NtkYaj/UIdbPILFpCz2+feF6GidZRj/ojFKEHLTXnxEBnxoMhizwq/ 05ePsZSKhc8+uD+RwXRaOWygccvN6CnbybL6Y05OpBRfL80uKoKP5QM8ujLH+SpKrZdJIM C8z/JTPZppyD2QONwknf92SOdkgyPXD2IHxtIchaf/Uv7AmQCDsy9IiR44tvEvwbJxfNqC n76kSiCfPDto8m3lOObEcNE8mcNQZ0TvwfUyd6725gCLTrgY7mqogEGJ2/WgWKSImfsH2l mXwodgoeb+QIKbrarjHyG5gy17BIQ21uhk43taOArDas9b0LcnFo+sMvgdYBtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:4cbc:6bd:30e8:ed5d] (unknown [IPv6:2601:5c0:4202:5670:4cbc:6bd:30e8:ed5d]) (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 did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dKn3F1C4Hz6vV; Mon, 01 Dec 2025 14:53:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <6365e335-fcc8-4590-af40-230815012f9d@FreeBSD.org> Date: Mon, 1 Dec 2025 09:53:44 -0500 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 User-Agent: Mozilla Thunderbird Subject: Re: git: 301b8a806f79 - main - nvme: Minor style(9) fixes Content-Language: en-US To: Warner Losh , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <6925d6af.3b42c.336a0065@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <6925d6af.3b42c.336a0065@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/25/25 11:17, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=301b8a806f79292ee3324ca938a4d938df1911e8 > > commit 301b8a806f79292ee3324ca938a4d938df1911e8 > Author: Warner Losh > AuthorDate: 2025-11-25 16:10:23 +0000 > Commit: Warner Losh > CommitDate: 2025-11-25 16:12:51 +0000 > > nvme: Minor style(9) fixes > > needs to be first after . And we don't need > both sys/param.h and sys/types.h. > > Fixes: 032fbda024d78 > Sponsored by: Netflix > --- > sys/dev/nvme/nvme.h | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h > index 3de65a4a481f..ddbc149802f4 100644 > --- a/sys/dev/nvme/nvme.h > +++ b/sys/dev/nvme/nvme.h > @@ -29,15 +29,13 @@ > #ifndef __NVME_H__ > #define __NVME_H__ > > -#ifdef _KERNEL > -#include > -#endif > - > #include > -#include > -#ifndef _KERNEL > +#ifdef _KERNEL > +#include > +#else > #include > #endif > +#include > > struct sbuf; > > @@ -1909,7 +1907,6 @@ void nvme_sc_sbuf(const struct nvme_completion *cpl, struct sbuf *sbuf); > void nvme_strvis(uint8_t *dst, const uint8_t *src, int dstlen, int srclen); > > #ifdef _KERNEL > -#include > #include I should perhaps just move this to the top as well so all the #include's are in one place. -- John Baldwin