From nobody Fri Jul 19 15:40:14 2024 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 4WQYlf58mDz5Rr9d; Fri, 19 Jul 2024 15:40:14 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WQYlf4TK1z4shD; Fri, 19 Jul 2024 15:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721403614; 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=WD+LufB9BvXXcWXHuKOlBk/DO0i0MDOoHUmk+3u5BUU=; b=gW0Y4tTVb3UunKYqcezWTQTirAwB+xLJ4cshZp8WCP8zV9bt2XpYqt8RIr7dTwfF61U8pC 5qVvKZsvNAu41g49bOzDcS5rqIxXlDr6ZBarc6moAG7SaVtdgU7+hX+FRkv442KXuRHaBT yl5ArEqjbd2HH8ERUu3VPtY/mhUo4HHoIW44ZRq16ziqRad18x3ir4MrgAQfPxiai7W3MT yplLO66WmP4czFTR0p8M76tySFVC0FKLYiZGnY1FE8SpeHMIbN9Z2/hEHCq/ERycA0+yOo FVmiHkFwutjmd7UdxetRXs75OeBlSZDce2B5cYId/DkMxnO3eBJmKxgcILn5wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721403614; a=rsa-sha256; cv=none; b=EK4BalN6sxjT71S4CycAJaeG1y+CdIxwUkhYlMk1Wfecgxr2/KgVB8GdEVnT6yaXTLvnna hunZFPK3OXvZcX0tljhULGipC5qmbUKux349V+yFPNEIwpxt3VzCXFhejPJPI1JKRKwi7y rCJ3VpTxWT0mz3YEU6fv+tQL/gGx1p9BMc/afXSPCLy7hI0HPw/O9dsGywbeI6MbGwLcbW QXAg6uxIN9RHVfJ3dai9lSploHXKg5+ihWZ/UZE6njDE9T8N0yNxqpPAXnFsuOoehFEFk8 yoxZ01cGhzbF+FZMKy4vA9Q6pggiEdxZADKJb0bn1gaSzTenrmPW6mm73Xp0CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721403614; 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=WD+LufB9BvXXcWXHuKOlBk/DO0i0MDOoHUmk+3u5BUU=; b=rRppGPolNU+eossLXAjrnQaBHkxq0rAbiBRUfxhNcE65RCA8ZIALzruhAKDYDKikiLgHqz SlbLGCzUKp3eGWAXHVR/7JZRW9fvhvp4d6cGrYpfzmB7FoPITP6otSxmbrzjVw3SPdrNAy i/fqO4qkZWAij5F0BRRWoPPxFyNggzm38hjP9Kx7obM1AQ/nf2g4lj9In88t2wEHaBa42X zHQcSs0kyCgV0dzyapO2f+TqMSbE0xVH1U7qGMYKuG4/2Q95bdhSmauuPPvuHWvGgbNfdE PeV8hfT8kdN0afoTSwGdE32pffgP8pqzl2yMYf60p3LqxGTvmvyqDksrhAGohw== 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 4WQYlf45Clzd8P; Fri, 19 Jul 2024 15:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46JFeESR080684; Fri, 19 Jul 2024 15:40:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46JFeEFl080678; Fri, 19 Jul 2024 15:40:14 GMT (envelope-from git) Date: Fri, 19 Jul 2024 15:40:14 GMT Message-Id: <202407191540.46JFeEFl080678@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 422911ca5873 - stable/14 - NOTES: Move OFED options to MI NOTES 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 422911ca5873bd945e52d60f99b135488d3b6846 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=422911ca5873bd945e52d60f99b135488d3b6846 commit 422911ca5873bd945e52d60f99b135488d3b6846 Author: John Baldwin AuthorDate: 2024-04-09 22:02:58 +0000 Commit: John Baldwin CommitDate: 2024-07-18 17:06:06 +0000 NOTES: Move OFED options to MI NOTES Disable in armv7 NOTES to match sys/modules/Makefile Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44686 (cherry picked from commit 973d3a82096bc135f6c230e348e2f33c382096bc) --- sys/amd64/conf/NOTES | 13 ------------- sys/arm/conf/NOTES | 5 +++++ sys/conf/NOTES | 13 +++++++++++++ sys/i386/conf/NOTES | 13 ------------- 4 files changed, 18 insertions(+), 26 deletions(-) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 9c91a4fa9bbb..761728337ac2 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -90,19 +90,6 @@ options DEVICE_POLLING options BPF_JITTER -# OpenFabrics Enterprise Distribution (Infiniband). -options OFED -options OFED_DEBUG_INIT - -# Sockets Direct Protocol -options SDP -options SDP_DEBUG - -# IP over Infiniband -options IPOIB -options IPOIB_DEBUG -options IPOIB_CM - ##################################################################### # CLOCK OPTIONS diff --git a/sys/arm/conf/NOTES b/sys/arm/conf/NOTES index 74ee03dd4764..e868d6b60496 100644 --- a/sys/arm/conf/NOTES +++ b/sys/arm/conf/NOTES @@ -66,6 +66,11 @@ nooptions COMPAT_FREEBSD9 nooptions PPC_PROBE_CHIPSET nooptions MAXCPU # value is set in machine/param.h +nooptions OFED +nooptions SDP +nooptions IPOIB +nooptions IPOIB_CM + nodevice sym nodevice ccr diff --git a/sys/conf/NOTES b/sys/conf/NOTES index c6434d1ea85d..5da6c6292c83 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -768,6 +768,19 @@ options SCTP_PACKET_LOGGING options SCTP_LTRACE_CHUNKS options SCTP_LTRACE_ERRORS +# OpenFabrics Enterprise Distribution (Infiniband). +options OFED +options OFED_DEBUG_INIT + +# Sockets Direct Protocol +options SDP +options SDP_DEBUG + +# IP over Infiniband +options IPOIB +options IPOIB_DEBUG +options IPOIB_CM + # altq(9). Enable the base part of the hooks with the ALTQ option. # Individual disciplines must be built into the base system and can not be # loaded as modules at this point. ALTQ requires a stable TSC so if yours is diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index ce115b1640e0..45613c10c583 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -238,19 +238,6 @@ options DEVICE_POLLING options BPF_JITTER -# OpenFabrics Enterprise Distribution (Infiniband). -options OFED -options OFED_DEBUG_INIT - -# Sockets Direct Protocol -options SDP -options SDP_DEBUG - -# IP over Infiniband -options IPOIB -options IPOIB_DEBUG -options IPOIB_CM - ##################################################################### # CLOCK OPTIONS