From owner-freebsd-current@freebsd.org Fri Apr 16 16:49:14 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 9FA975D747A for ; Fri, 16 Apr 2021 16:49:14 +0000 (UTC) (envelope-from rhurlin@gwdg.de) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4FMMcV36fTz4bVB for ; Fri, 16 Apr 2021 16:49:14 +0000 (UTC) (envelope-from rhurlin@gwdg.de) Received: by mailman.nyi.freebsd.org (Postfix) id 68C6E5D7723; Fri, 16 Apr 2021 16:49:14 +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 688EF5D7676 for ; Fri, 16 Apr 2021 16:49:14 +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 4FMMcV2dC4z4bQg; Fri, 16 Apr 2021 16:49:14 +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 1lXReb-0001uc-1b; Fri, 16 Apr 2021 18:49:13 +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_256_CBC_SHA384_P521) id 15.1.2176.2; Fri, 16 Apr 2021 18:49:12 +0200 Subject: Re: sys/sys/param.h: 'main' instead of 'Master'? To: Kyle Evans CC: current References: <485d4871-9890-9463-83c8-fe8d79729278@gwdg.de> Reply-To: From: Rainer Hurling Message-ID: <91e16f11-d6cb-f602-30a1-1a958ba9f0a7@gwdg.de> Date: Fri, 16 Apr 2021 18:49:12 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.9.1 MIME-Version: 1.0 In-Reply-To: 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-04.um.gwdg.de (134.76.9.219) To EXCMBX-03.um.gwdg.de (134.76.9.218) X-Virus-Scanned: (clean) by clamav X-Rspamd-Queue-Id: 4FMMcV2dC4z4bQg X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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:49:14 -0000 Am 16.04.21 um 18:38 schrieb Kyle Evans: > n Fri, Apr 16, 2021 at 11:36 AM Rainer Hurling wrote: >> >> 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'? >> > > This isn't based on a branch name, though I guess if one were going to > touch it anyways then "Authoritative" would be a better descriptor. Sounds reasonable. Thanks for the explanation. > >> #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, >>