From nobody Fri Feb 24 14:37:12 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 4PNXXm3vD4z3tK4T; Fri, 24 Feb 2023 14:37:12 +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 4PNXXm3Kzkz47b1; Fri, 24 Feb 2023 14:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677249432; 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=1n/N4sR6Ok65g2429/CZjMmU0Jwq5m+9Lsi3ykn6aUE=; b=la+pwyH1QvX/6F/MQu+XlJudfcA+/08vMNmZCsJzsKoE+XXZK5OJptdbe7btKZaZzjUes2 HYL2DCGvZh/ftPLZQDXjNDh4XExAwZbZgXWTRli3H7DCdjXStdUtI6CvAAdMlU2kI+a3TL uUW4pkHhMPvvn8f5+vCKJlugy8GBhZNx0+JeeLpNmE4iuxNCmBFouUnxy63HsaJ3VzADvE XAlZ/1ebtOBxIA6Ek1qx3K5GouG9Ha1XY7pf2pFBLyLhsrPYo1XIqv4nAEZR1eahzRdphr zas22WpqK4xdAsNEq11qqr3l74lgUFM1JkPBPKATpuSbRDIVT9tsIwtSQPoMIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677249432; 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=1n/N4sR6Ok65g2429/CZjMmU0Jwq5m+9Lsi3ykn6aUE=; b=sHfBXSb5ayEVIEskfo9TgSoDuQRHuwFPPYTjpXqRFpgwXIgaWdt0Cp4vNo9ndZR4xvvvYU cvaWjmrGLE2O6l1BT1CbV/ez6KHC90lX8iL92AMYx4ADL9Bh8vXcX6+yfrKR1s6YDe9wmg OkH6qqyGekma/8/j6cgGAA3ag+ba8+KiZSpPZKwDtarh1e3FV6fm5UfsokcvmLllAJV/8i yMa4QWoD0C8AXKM2hF6h4QRhiw7xCS0HjmwTleCsO8vTwvYAaUuhELw8EHdpTJSjWS9YMC J6kWr3zOHlOv26CaAAYqZkxsxiOtizzmmGrkLeIOFQMADxdHCGp1Zitg9FQ77A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677249432; a=rsa-sha256; cv=none; b=KXhFrwDSTCrZJf/XwTVIvS/cowEm/MRcl1XzrJ5JvtP79H6kJ+hG8n/ZJ8u5EVVixd9DZ0 uPj27tCjhqTK4rwMHnEYripm2suLjXsdU/MMvDWTV4rv01Vr6sXvB3nivI6OYJooNxkNoL 2AlIMMBkvqooAvO8Cz8/D+0B9VPDvCfDzQ/yLwXGd9YJaf6vZbGg3gVWRNJkykmUa+y5tS fZ56+AXadI9ds1vRJqMWFCzUZ8cRArPBApzc8X1F66CDchlnMDsPJeiKVsvq3YZiz+WavT pP1mRPeO1uw1yooAkNnYdkGPrjlJqfl5yKChxQbSzBBhD9bMQ5pFuv6FxdPtLw== 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 4PNXXm2G8PzRpS; Fri, 24 Feb 2023 14:37:12 +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 31OEbC4Q049458; Fri, 24 Feb 2023 14:37:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31OEbCvt049457; Fri, 24 Feb 2023 14:37:12 GMT (envelope-from git) Date: Fri, 24 Feb 2023 14:37:12 GMT Message-Id: <202302241437.31OEbCvt049457@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: dd6f6030cc29 - main - amd64 kernel config: clean up whitespace 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: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd6f6030cc2981ce860b664e54bf17cf9fc80668 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=dd6f6030cc2981ce860b664e54bf17cf9fc80668 commit dd6f6030cc2981ce860b664e54bf17cf9fc80668 Author: Mike Karels AuthorDate: 2023-02-23 17:09:39 +0000 Commit: Mike Karels CommitDate: 2023-02-24 14:36:28 +0000 amd64 kernel config: clean up whitespace Most options in kernel config files use "optionsOPTION". This allows the option to be commented out without shifting columns. A few options had two tabs, and some had spaces. Make them consistent. --- sys/amd64/conf/FIRECRACKER | 12 ++++++------ sys/amd64/conf/GENERIC | 12 ++++++------ sys/amd64/conf/GENERIC-MMCCAM | 8 ++++---- sys/amd64/conf/NOTES | 6 +++--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sys/amd64/conf/FIRECRACKER b/sys/amd64/conf/FIRECRACKER index 0ee5c93fe458..4a9946f25991 100644 --- a/sys/amd64/conf/FIRECRACKER +++ b/sys/amd64/conf/FIRECRACKER @@ -29,14 +29,14 @@ options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options ROUTE_MPATH # Multipath routing support -options FIB_ALGO # Modular fib lookups +options ROUTE_MPATH # Multipath routing support +options FIB_ALGO # Modular fib lookups options TCP_OFFLOAD # TCP offload options TCP_BLACKBOX # Enhanced TCP event logging options TCP_HHOOK # hhook(9) framework for TCP -options TCP_RFC7413 # TCP Fast Open +options TCP_RFC7413 # TCP Fast Open options SCTP_SUPPORT # Allow kldload of SCTP -options KERN_TLS # TLS transmit & receive offload +options KERN_TLS # TLS transmit & receive offload options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists @@ -175,11 +175,11 @@ envvar machdep.disable_tsc_calibration="1" # Provide bug-for-bug compatiblity with Linux in MP Table searching # and parsing. Firecracker relies on these bugs. -options MPTABLE_LINUX_BUG_COMPAT +options MPTABLE_LINUX_BUG_COMPAT # Disable the automatic registration of a PCI bridge; we do in fact # not have one. -options NO_LEGACY_PCIB +options NO_LEGACY_PCIB # Bus support. # Note that Firecracker provides neither ACPI nor PCI; but removing these diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 56b881d80a52..46c901300371 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -31,15 +31,15 @@ options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options IPSEC_SUPPORT # Allow kldload of ipsec and tcpmd5 -options NETLINK # netlink(4) support -options ROUTE_MPATH # Multipath routing support -options FIB_ALGO # Modular fib lookups +options NETLINK # netlink(4) support +options ROUTE_MPATH # Multipath routing support +options FIB_ALGO # Modular fib lookups options TCP_OFFLOAD # TCP offload options TCP_BLACKBOX # Enhanced TCP event logging options TCP_HHOOK # hhook(9) framework for TCP -options TCP_RFC7413 # TCP Fast Open +options TCP_RFC7413 # TCP Fast Open options SCTP_SUPPORT # Allow kldload of SCTP -options KERN_TLS # TLS transmit & receive offload +options KERN_TLS # TLS transmit & receive offload options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists @@ -136,7 +136,7 @@ device smbios options IOMMU device pci options PCI_HP # PCI-Express native HotPlug -options PCI_IOV # PCI SR-IOV support +options PCI_IOV # PCI SR-IOV support options COMPAT_LINUXKPI diff --git a/sys/amd64/conf/GENERIC-MMCCAM b/sys/amd64/conf/GENERIC-MMCCAM index 0aa7a7da1072..afb0d128dca4 100644 --- a/sys/amd64/conf/GENERIC-MMCCAM +++ b/sys/amd64/conf/GENERIC-MMCCAM @@ -9,7 +9,7 @@ include MINIMAL ident GENERIC-MMCCAM # Access GPT-formatted and labeled root volume -options GEOM_LABEL +options GEOM_LABEL # UART -- for bhyve console device uart @@ -27,8 +27,8 @@ device pass device scbus device da -options MMCCAM +options MMCCAM # Add CAMDEBUG stuff -options CAMDEBUG -options CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH) +options CAMDEBUG +options CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 4b107b19ac42..e568842f2830 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -630,7 +630,7 @@ options COMPAT_AOUT # ZFS support # NB: This depends on crypto, cryptodev and ZSTDIO -options ZFS +options ZFS ##################################################################### # VM OPTIONS @@ -664,5 +664,5 @@ options VM_KMEM_SIZE_SCALE # GCOV (code coverage) support -options LINDEBUGFS -options GCOV +options LINDEBUGFS +options GCOV