From nobody Fri Feb 04 22:39:21 2022 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 2B3FE19AFDD7; Fri, 4 Feb 2022 22:39:22 +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 4Jr9Sp0hSWz3r9l; Fri, 4 Feb 2022 22:39:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644014362; 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=zMewZJ544m+iZKzvlSLsMMtdKNhk5Q0C+fxv/AwnYz4=; b=pLQz8Kz+phkdnBK6TrzA9fKEG85tkYY9kMYgcZUrHucc1Eu/Ni0tQaTeEfxJ/XzGzaBfKa 7lFPWqPQiGCuqMYTm4izsmU4U5SMRz8oyuQ1D38eE5UCIAtmkWb3zO5mz1G0/SDx8ccIbU hJVVNBYgXZQz9b8Ru62UAcWYzM4rRWJBirlALohVcen3pwP8owdsiW1FdefLEM/STpVwsn hLopjjbD+AHfKSsDp5h2bckom60+l0WdYnEIfYLnlBEEB5Bp/HOqvIRx9CM6X7EKMTvRUf gG+NgoBL5QC7RTZLWK6gvMExyezf+LGFN3xsiFrinQiTVEgkuSkZEQz1Tn7Ujg== 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 E16E214032; Fri, 4 Feb 2022 22:39:21 +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 214MdLZP006958; Fri, 4 Feb 2022 22:39:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 214MdLFG006957; Fri, 4 Feb 2022 22:39:21 GMT (envelope-from git) Date: Fri, 4 Feb 2022 22:39:21 GMT Message-Id: <202202042239.214MdLFG006957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7510633e76cf - main - style(9): Default to omitting $FreeBSD$ 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 7510633e76cf66ceea6a4b27d0892535f73e3ad5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644014362; 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=zMewZJ544m+iZKzvlSLsMMtdKNhk5Q0C+fxv/AwnYz4=; b=SNmzHaiYIQvk//8rQHpvE1JA0Z+axxWIjoVmKh2/p5iXWSPfDWWwxaB8e+yMeMrABYX0k0 St+qHCI6Ufjyoje4akUD6IF9oGoFVuzn4EH1Y3IYvOlhbeQyYN3y95FFIWpWdLs7CsvOBy +5+fIsJZ9oH6KQAIZaLjpYeKuipebfYu4BIZV3fB58/9UFo6pAKHytD6DtIcW9ArMaaLvA lFgkbJP66+XuGFddGMCdMzR1oTUZOqsUB+r0PZ6vAdohtKW9HIRQx9P9ICfSZK3/SY3Jy6 MnB4KL6Wj41Zfyh9xKr55pGb432f9p5kt5OyB2u1sKIE6FvTjjWy/vOxVD+5sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644014362; a=rsa-sha256; cv=none; b=EPBpdHQZMyIC3OK+y2VRWoG8Lh08XKgYAgfpv1GzX9yiWO3vEZM4ktU/p5OehV10LOmscE nIZHEJ2Irz0Pyi4c/IrXEmUZUcthXf1d+Yumx7BDfKV+5JW8K+Q9vM6gkf6lkpHpMRGIRu NqiPfPIve/hxj3i3UGG9+M1zBIvZvyFPOAbHFc5374wKS1vZUpCQSeFGR0wkPACjwxC/Y+ icV57u7z9Pla74ao3nCmCd884VFg8NMkxmDd2jFYexVzAiFk7e1cvaFI0wYEFlNETDxlMr g5cjOu/GKPvYJ/cDoo1nQ19fpdDbuIlTwKS4OjsXx1GJIHFXv2Xf0KqjWvHSNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7510633e76cf66ceea6a4b27d0892535f73e3ad5 commit 7510633e76cf66ceea6a4b27d0892535f73e3ad5 Author: Warner Losh AuthorDate: 2022-02-04 22:38:15 +0000 Commit: Warner Losh CommitDate: 2022-02-04 22:38:15 +0000 style(9): Default to omitting $FreeBSD$ Advise people to omit $FreeBSD$ (in both comments and macros) unless the code is definitely going to be merged to stable/12. This strengthens previous statements and is appropriate now that stable/11 is no longer supported. If people are wrong and things are unexpected merged to 12, tags can be added before that merge. No sense adding a tag that will never be expanded and removed later on the off chance it might wind up in stable/12. The next step is likely to weaken this to apply just to mergemaster managed files, but not today. Reviewed by: rpokala, cem, erj, hselasky, brooks, kib Differential Revision: https://reviews.freebsd.org/D34152 --- share/man/man9/style.9 | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/share/man/man9/style.9 b/share/man/man9/style.9 index beeb8d4568d2..2c080158567d 100644 --- a/share/man/man9/style.9 +++ b/share/man/man9/style.9 @@ -25,7 +25,7 @@ .\" From: @(#)style 1.14 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd October 28, 2020 +.Dd February 2, 2022 .Dt STYLE 9 .Os .Sh NAME @@ -49,7 +49,6 @@ is silent on an issue. * Style guide for FreeBSD. Based on the CSRG's KNF (Kernel Normal Form). * * @(#)style 1.14 (Berkeley) 4/28/95 - * $FreeBSD$ */ /* @@ -113,15 +112,12 @@ lines should only be added when making substantial changes to the file, not for trivial changes. .Pp After any copyright and license comment, there is a blank line. -If your code needs to be merged into stable/12 or earlier, it -needs to have the +Include .Li $\&FreeBSD$ -tag. -Otherwise, this tag should be omitted in new code. -Legacy code will have the tag removed in the future. -For non C/C++ language source files, -.Li $\&FreeBSD$ -is next, if applicable. +or +.Li __FBSDID("$\&FreeBSD$"); +only if you are certain the new code will be merged to stable/12. +The tag will be removed from legacy code in the future. Non-C/C++ source files follow the example above, while C/C++ source files follow the one below. Version control system ID tags should only exist once in a file @@ -146,9 +142,6 @@ from another FreeBSD file and include relevant copyright info from the original file. .Bd -literal /* From: @(#)style 1.14 (Berkeley) 4/28/95 */ - -#include -__FBSDID("$FreeBSD$"); .Ed .Pp Leave one blank line before the header files.