From nobody Tue Nov 25 16:17:51 2025 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 4dG7C410FWz6HNyR for ; Tue, 25 Nov 2025 16:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dG7C35bcWz3k7N for ; Tue, 25 Nov 2025 16:17:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764087471; 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; bh=wPq6L+KYkfcmwKDmJ63YcuVP0CAEwkf/kbHf4h8nGRw=; b=ZRtokLJJpOf7jeSIDk3vllHVRNjNjzQSEgkDArzfelAerBzp34qefQK4I+o/7RWJUm/2QI PKPEh4bV0KD4AIhfxJU3DisgP9gVUR5uPx9e/CEHxrNZnflW7cgA9QVFeRsjn311IJ5uDZ HOVzdLxgXBF4th3MOMw+zBQznroqAzhA4jO0GN5OIwSwU31lgA9oXOgomyVo81f5g2SWcl pthGPKoP2WOOZKwEks/GuZd7hpi5uw+fugFEdouohydW+g6hNIkLzHYEDGUbsN219n63jp UBn1S/PFma5CmyASw0k2XdgP9o2DLJdYqGsfpz5iQbazgCYtObc52Hs2SiV+uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764087471; 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; bh=wPq6L+KYkfcmwKDmJ63YcuVP0CAEwkf/kbHf4h8nGRw=; b=hNDcdJAICFeIfMrSrttwGXrA6vTxk26mBEPlEkCAgo6m1KoBgRhAZXednG4MW1fMamiift DzdFtT3mX4mvkXQSLepH+k6LCs58gZ2YCFPEd63Q2dhghM+KHRXu69qCrtYmN140CFgQ8/ TV35b8+z729+n8E5LLYVa2cP/7XPIROnllHGBo1RCXfaiU3Gqzf9Lqt051wJTbYM6CRbj2 AO1NgCNf+O3/c3RVUnCLORcALg9hQeN4o33JgiQoxfqDLGm3s2FZ5WWE3zsUmuR8Ks8Shb Tz+uVKJoBXVHbUCxiWcXZW9bq95s+xhO2SQrFERJqHycUriqjMprkj3rJcA5/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764087471; a=rsa-sha256; cv=none; b=ILaGTd77DXj6zhpjIi5AP8l2dczJe+tNywBCEVsf33mMON8+XN0FFPAVhNxqMoOKVoBKl8 mm3bycQDJNEzJkGyOMfz/xmsqbna2DL1ne6+kcp45zZqfn0k5hfrbzbHZ2GDxGcfel6ceG F9gGfqZgD+L54K56fpkskZ/XcNldtAQnEp8Bd8jtmjAbuXRnGLkqDH4G+CvG+pz+V783bf rtY+qhmmEheHCuYKkRW5nmUMnCRmYwsJInkJCIs8YWC0sKeT/cJo1GhUSR7nkXVmVMtebR lAtRlLRklodXCpYBMdZap8HHIwPd1vYfA1ACR8rzeoZSJ70YCUmwgwud3Vw3Jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dG7C34QJ8z17Rf for ; Tue, 25 Nov 2025 16:17:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b42c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Nov 2025 16:17:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 301b8a806f79 - main - nvme: Minor style(9) fixes 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 301b8a806f79292ee3324ca938a4d938df1911e8 Auto-Submitted: auto-generated Date: Tue, 25 Nov 2025 16:17:51 +0000 Message-Id: <6925d6af.3b42c.336a0065@gitrepo.freebsd.org> 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 struct bio;