From owner-freebsd-current@freebsd.org Fri Apr 16 16:36:34 2021 Return-Path: Delivered-To: freebsd-current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CD0BB5D718E for ; Fri, 16 Apr 2021 16:36:34 +0000 (UTC) (envelope-from rhurlin@gwdg.de) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FMMKt4fGfz4ZkY for ; Fri, 16 Apr 2021 16:36:34 +0000 (UTC) (envelope-from rhurlin@gwdg.de) Received: by mailman.nyi.freebsd.org (Postfix) id 9F8925D7292; Fri, 16 Apr 2021 16:36:34 +0000 (UTC) Delivered-To: current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9F5565D718D for ; Fri, 16 Apr 2021 16:36:34 +0000 (UTC) (envelope-from rhurlin@gwdg.de) Received: from tmailer.gwdg.de (tmailer.gwdg.de [134.76.10.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FMMKs6wFzz4Zsm for ; Fri, 16 Apr 2021 16:36:33 +0000 (UTC) (envelope-from rhurlin@gwdg.de) Received: from excmbx-03.um.gwdg.de ([134.76.9.218] helo=email.gwdg.de) by mailer.gwdg.de with esmtp (GWDG Mailer) (envelope-from ) id 1lXRSJ-000886-Na for current@freebsd.org; Fri, 16 Apr 2021 18:36:31 +0200 Received: from krabat.raven.hur (10.250.9.199) by EXCMBX-03.um.gwdg.de (134.76.9.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Fri, 16 Apr 2021 18:36:31 +0200 To: Reply-To: From: Rainer Hurling Subject: sys/sys/param.h: 'main' instead of 'Master'? Message-ID: <485d4871-9890-9463-83c8-fe8d79729278@gwdg.de> Date: Fri, 16 Apr 2021 18:36:19 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.9.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.250.9.199] X-ClientProxiedBy: excmbx-28.um.gwdg.de (134.76.9.201) To EXCMBX-03.um.gwdg.de (134.76.9.218) X-Virus-Scanned: (clean) by clamav X-Rspamd-Queue-Id: 4FMMKs6wFzz4Zsm X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of rhurlin@gwdg.de designates 134.76.10.23 as permitted sender) smtp.mailfrom=rhurlin@gwdg.de X-Spamd-Result: default: False [1.30 / 15.00]; HAS_REPLYTO(0.00)[rhurlin@FreeBSD.org]; ARC_NA(0.00)[]; HAS_XOIP(0.00)[]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[rhurlin]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; TO_DN_NONE(0.00)[]; NEURAL_SPAM_MEDIUM(1.00)[1.000]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; RCVD_TLS_LAST(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:134.76.10.0/23]; RCVD_IN_DNSWL_MED(-0.20)[134.76.10.23:from]; MID_RHS_MATCH_FROM(0.00)[]; DMARC_NA(0.00)[gwdg.de]; NEURAL_SPAM_SHORT(0.80)[0.798]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:680, ipnet:134.76.0.0/16, country:DE]; SUBJECT_ENDS_QUESTION(1.00)[]; MAILMAN_DEST(0.00)[current] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Apr 2021 16:36:34 -0000 While viewing sys/sys/param.h I noticed that the comment of the definition of __FreeBSD_version is probably out of date. Since the switch to Git, doesn't it have to be 'main' instead of 'master'? #cd /usr/src #diff -urN sys/sys/param.h.orig sys/sys/param.h | colordiff --- sys/sys/param.h.orig 2021-04-09 12:59:25.363286000 +0200 +++ sys/sys/param.h 2021-04-16 18:28:46.621429000 +0200 @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1400007 /* Master, propagated to newvers */ +#define __FreeBSD_version 1400007 /* main, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,