From nobody Tue Jun 27 03:31:16 2023 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 4Qqqxc6f9bz4hyj5; Tue, 27 Jun 2023 03:31:16 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qqqxc68nyz3J93; Tue, 27 Jun 2023 03:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687836676; 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=cQxJUKWvON4g5gIWsm6PKC1XZz6CO8sVA4YHPElAhK4=; b=FRIgSLyzV8f7D2POXr1dBbFL5m8NVsUTcwsfoDuUBSobLdN50SCituPX8VGydvY5bCw2uU gtlDj+yaoXUHRiuWrAt6jDaE6KfdibiYUevD16UKwjnxxjmjZ3tITzB+I7vcqyRMHDo93W 7q3HcS0bGdP/F7svH0ZI5jVTcR+8PygXzK2eZyNNExJOdCo9iS8AW+NaaAPSBDIQKM+E/V iYx9FFghZV71KoCTtC97+/0BCCBoX8+fcqyK318LNJVU9fiVTjt/UbgWXF/e/FM/lxCLB+ lHa9/N/WoootcwuyxXKyJV8Lq7bPsad74up09X58rpXfHoveZZxSDFdA81s3TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687836676; 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=cQxJUKWvON4g5gIWsm6PKC1XZz6CO8sVA4YHPElAhK4=; b=NEsBPaWfnerB9IkatukLnAUzuL5LPpfNrg9+ORadoK6wMulKdhyPd4tuol5Mg+AB8JiHqF B2tHqBhlmWyaLONASUSRrFbkhZwVjjMtdHTgSvYNa+NU/pCQ0Dene/RJqukUNiYLDEScBn 35YTC5kDfNkfkcjSCslwMKd9pW1C468lrZHIrPkmJk0q3syGZ9VNqR3GhKjsvElhcXxNGk 8wOi/5W/+vV4DaHCRxd0R7+31/f/Bbuti8RzsH4nyqwqftEuDHnTgBBecH+2sFGFQAHeRS tqHRmUeNPsqnwH4kyqJ6GTab4t9ZnNF8LhJNcBzhYleLNYFIIEButqje54eHjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687836676; a=rsa-sha256; cv=none; b=MUr5K4ySxOcHUkOEgDW93GSliIaTNoeqzfGwYULFj8pnMGnJMEIyE7m5sTej08JHKnDzsV EVqfPi7oO51pBCLumwyNYOrIv3X21F4la1zAe7wMcRY5ICGXGAWDAxdu9yAZJmF21L6zlq GZ8oo+qmCdEcnXGk0B9QN0tx3pTbXHh/WHRhu2oUHiWYO9qrpD+zV2aFwty10SB6EN7nUy Ipzy2OEZBkxDKx14pM9d5ho1BO8gYium/eAOPo/DgahQbZLeM5IFj5xOdSIpOJo/DC4LVQ hznsKOohkbmFOuDdEpfobGS9T1ly1BFbOAjVCZWdHSk5qwkGV1DcAwF/HTVWCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qqqxc57QqzcN5; Tue, 27 Jun 2023 03:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35R3VGIi026797; Tue, 27 Jun 2023 03:31:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35R3VGe8026796; Tue, 27 Jun 2023 03:31:16 GMT (envelope-from git) Date: Tue, 27 Jun 2023 03:31:16 GMT Message-Id: <202306270331.35R3VGe8026796@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 1aaa8f670a01 - main - nvme: Don't install nvme_private.h in /usr/include. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1aaa8f670a0188677bd7d2ff1c83e18906715144 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1aaa8f670a0188677bd7d2ff1c83e18906715144 commit 1aaa8f670a0188677bd7d2ff1c83e18906715144 Author: John Baldwin AuthorDate: 2023-06-27 03:30:45 +0000 Commit: John Baldwin CommitDate: 2023-06-27 03:30:45 +0000 nvme: Don't install nvme_private.h in /usr/include. Reviewed by: chuck, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D40394 --- ObsoleteFiles.inc | 3 +++ include/Makefile | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index c5f19d070741..25a1ce080c39 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20230626: Only install sys/dev/nvme/nvme.h to /usr/include +OLD_FILES+=usr/include/dev/nvme/nvme_private.h + # 20230623: OpenSSL 3.0.9 OLD_LIBS+=lib/libcrypto.so.111 OLD_FILES+=usr/include/openssl/rand_drbg.h diff --git a/include/Makefile b/include/Makefile index eba2675e1d1f..922337a87772 100644 --- a/include/Makefile +++ b/include/Makefile @@ -48,7 +48,7 @@ LDIRS= geom net net80211 netgraph netinet netinet6 \ LSUBDIRS= dev/acpica dev/agp dev/ciss dev/filemon dev/firewire \ dev/hwpmc dev/hyperv \ - dev/ic dev/iicbus dev/io dev/mfi dev/mmc dev/nvme \ + dev/ic dev/iicbus dev/io dev/mfi dev/mmc \ dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/pwm \ dev/smbus dev/speaker dev/tcp_log dev/veriexec dev/vkbd dev/wg \ fs/devfs fs/fdescfs fs/msdosfs fs/nfs fs/nullfs \ @@ -174,6 +174,10 @@ HYPERVDIR= ${INCLUDEDIR}/dev/hyperv OPENCRYPTO= cryptodev.h OPENCRYPTODIR= ${INCLUDEDIR}/crypto +.PATH: ${SRCTOP}/sys/dev/nvme +NVME= nvme.h +NVMEDIR= ${INCLUDEDIR}/dev/nvme + .PATH: ${SRCTOP}/sys/dev/pci PCI= pcireg.h PCIDIR= ${INCLUDEDIR}/dev/pci @@ -245,6 +249,7 @@ INCSGROUPS= INCS \ HID \ HYPERV \ OPENCRYPTO \ + NVME \ PCI \ RPC \ SECAUDIT \