From nobody Tue Dec 2 05:51:26 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 4dL8zM4Hh7z6JkxC for ; Tue, 02 Dec 2025 05:51:43 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) (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 4dL8zM25jrz3LkT for ; Tue, 02 Dec 2025 05:51:43 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-343f35d0f99so3898311a91.0 for ; Mon, 01 Dec 2025 21:51:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1764654697; x=1765259497; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=wEpKIytbPhLALPgO2GL4+SAC7u0EVkUR0/MsabC5fpQ=; b=fN5s8IHH6O+FWJUFM1UG5JPGZV3I5l35JOWvzyIaZDJuRHoRzS9d8IRZ6Lfq09Voxf fQN0di1d1FWhUbzRKLktJ4pDxt706Oli3JPqWeOxp4e9m/NQfUVgAg5awDHdHA14buW2 y8nkLKVDW4jmh3wVUj4RkHgczsMdUNHgdhEW5muNhHKtwJJKhmdEGfFWeHrJYb2e0m7A yv0XE9Epil2U0lMf0Vz339C7LP9CFh+1qL+W3Z7lBmg9Wq4ClCjuJgtBRRTQRm8qIXdq 3BLJjlaG9SlMaaRRb3wMH4qP6R0Cu1j2YfO++FL9QIcXN2Da32zDQE1xlsbqF3y3f0Wg 1cCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764654697; x=1765259497; h=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=wEpKIytbPhLALPgO2GL4+SAC7u0EVkUR0/MsabC5fpQ=; b=Qdyxp2hvaaS3KL+149PIu1pN9NGLrDTZ8Mkvq4vlbii8zlg0frbCLZNF/o09mtiby+ C2/eb5WGfsz6vyFK5tm53Fn8ELkg81dkH3YNu9USIGvtJ8/8cXgb6hsm2kXBio0lxeYh 3886g7kdHQlM1ItFG2spqatTMoBD+xm49yXmVVE1IpUMedssD1IHVCzExpGAXz8XbraD z5SiTrfN4arqmqJ/Jt/W8EH0RqD/wGzfGYCRyUTsE2MpoCUfZgSx7U99flBfkUgyEpvS LxzUISURk9J5msfednOKGLLYIlVLY97/JvibUe/ITM6vO8TlOOEw4mPxxrkS8hSc75Ln PWuw== X-Forwarded-Encrypted: i=1; AJvYcCVQh2hXiblipI6VcTkZEoettlT99nHnBapg/9yBqLkrWc3lF+ciw6agL7yYDmNWk0Sm7dfehJHSvYPJ0xvlEPgWMVFd@freebsd.org X-Gm-Message-State: AOJu0YyH0y7Z/9BaDzSRI3vNs0HD7Ls0XimVVhmSd45zp0KQX4st6co6 GsbIQYB81DRRfmvutGM+CgnI5rovX7M5SHdgOFdnPZOPj/29kEKz/i1vZ1u4uJJjxJ+c83Y+xC7 KO2YcZhT4ESB/v7K+lBROJDzE1hn9I/8dF7lrZ+gMEw== X-Gm-Gg: ASbGncs6gUumkjHahDACyx0KDi0QoPlMi5bnw6tYRtgVI0cpmR3XAfQGlW0VjdtMUTU 7r6majhH2wp5JiigxRkxi6xcwJag0mRMsf4Qc7u/QmE2Vut0vyuKSDtgZEqVfSGNT/hxYxSY18q 4hT2aPTUPg+V8aVrSCPSrzYolewDMp6gv4ZtMlD+h+lBnMMd67xfk1CBhFrIlCHdjhhP5lmh3ZX KRAMXvNuEtZ3EDq0nidnFKoGPxKeS+1bwIFxSnwGAxIPLq3rHm0g22GrvP8V9N80pjJ6dwp4tFW S3aKVQ== X-Google-Smtp-Source: AGHT+IFGn9t39qdaeDy0XpHlqgnH2+HjvUVvZqOOIotl2I/1bmwIq3jhfxSsP4ttkoYf4jLC0gQhV/DNTGlQY2tNEak= X-Received: by 2002:a17:90b:2587:b0:340:f7d6:dc70 with SMTP id 98e67ed59e1d1-3475ebfa0d3mr24793822a91.13.1764654697043; Mon, 01 Dec 2025 21:51:37 -0800 (PST) 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: <6925d6af.3b42c.336a0065@gitrepo.freebsd.org> <6365e335-fcc8-4590-af40-230815012f9d@FreeBSD.org> In-Reply-To: <6365e335-fcc8-4590-af40-230815012f9d@FreeBSD.org> From: Warner Losh Date: Mon, 1 Dec 2025 22:51:26 -0700 X-Gm-Features: AWmQ_bntB_u9Xhw5oOwk5QTxeOusfTxRWfWSkFX4NlXfl-015X2OcWWq37ixGHc Message-ID: Subject: Re: git: 301b8a806f79 - main - nvme: Minor style(9) fixes To: John Baldwin Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000005e6a340644f1b078" X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4dL8zM25jrz3LkT --0000000000005e6a340644f1b078 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Dec 1, 2025 at 7:53=E2=80=AFAM John Baldwin wrote= : > 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=3D301b8a806f79292ee3324ca938a4d93= 8df1911e8 > > > > 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. > Done --0000000000005e6a340644f1b078 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Mon, Dec 1, = 2025 at 7:53=E2=80=AFAM John Baldwin <jhb@freebsd.org> wrote:
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=3D301b8a806f79292ee3324ca938a4d938df1911e8<= /a>
>
> commit 301b8a806f79292ee3324ca938a4d938df1911e8
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2025-11-25 16:10:23 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2025-11-25 16:12:51 +0000
>
>=C2=A0 =C2=A0 =C2=A0 nvme: Minor style(9) fixes
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 <sys/systm.h> needs to be first after <sy= s/param.h>. And we don't need
>=C2=A0 =C2=A0 =C2=A0 both sys/param.h and sys/types.h.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 032fbda02= 4d78
>=C2=A0 =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0Netflix
> ---
>=C2=A0 =C2=A0sys/dev/nvme/nvme.h | 11 ++++-------
>=C2=A0 =C2=A01 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 @@
>=C2=A0 =C2=A0#ifndef __NVME_H__
>=C2=A0 =C2=A0#define __NVME_H__
>=C2=A0 =C2=A0
> -#ifdef _KERNEL
> -#include <sys/types.h>
> -#endif
> -
>=C2=A0 =C2=A0#include <sys/param.h>
> -#include <sys/endian.h>
> -#ifndef _KERNEL
> +#ifdef _KERNEL
> +#include <sys/systm.h>
> +#else
>=C2=A0 =C2=A0#include <stdbool.h>
>=C2=A0 =C2=A0#endif
> +#include <sys/endian.h>
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0struct sbuf;
>=C2=A0 =C2=A0
> @@ -1909,7 +1907,6 @@ void=C2=A0 =C2=A0 nvme_sc_sbuf(const struct nvme= _completion *cpl, struct sbuf *sbuf);
>=C2=A0 =C2=A0void=C2=A0 =C2=A0 =C2=A0 =C2=A0 nvme_strvis(uint8_t *dst, = const uint8_t *src, int dstlen, int srclen);
>=C2=A0 =C2=A0
>=C2=A0 =C2=A0#ifdef _KERNEL
> -#include <sys/systm.h>
>=C2=A0 =C2=A0#include <sys/disk.h>

I should perhaps just move this to the top as well so all the #include'= s are in one place.

--0000000000005e6a340644f1b078--