From owner-freebsd-current@freebsd.org Fri Apr 16 17:29:04 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 4513A5D8F5D for ; Fri, 16 Apr 2021 17:29:04 +0000 (UTC) (envelope-from freebsd-rwg@gndrsh.dnsmgr.net) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FMNVS0FCMz4d7b for ; Fri, 16 Apr 2021 17:29:04 +0000 (UTC) (envelope-from freebsd-rwg@gndrsh.dnsmgr.net) Received: by mailman.nyi.freebsd.org (Postfix) id 085425D8F5A; Fri, 16 Apr 2021 17:29:04 +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 082015D8FB8 for ; Fri, 16 Apr 2021 17:29:04 +0000 (UTC) (envelope-from freebsd-rwg@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FMNVR54dcz4dWx; Fri, 16 Apr 2021 17:29:03 +0000 (UTC) (envelope-from freebsd-rwg@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id 13GHT0lx053367; Fri, 16 Apr 2021 10:29:00 -0700 (PDT) (envelope-from freebsd-rwg@gndrsh.dnsmgr.net) Received: (from freebsd-rwg@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 13GHT0g1053366; Fri, 16 Apr 2021 10:29:00 -0700 (PDT) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <202104161729.13GHT0g1053366@gndrsh.dnsmgr.net> Subject: Re: sys/sys/param.h: 'main' instead of 'Master'? In-Reply-To: To: Kyle Evans Date: Fri, 16 Apr 2021 10:29:00 -0700 (PDT) CC: rhurlin@freebsd.org, current X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4FMNVR54dcz4dWx 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 17:29:04 -0000 > 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. As well as "Origin". > > > #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, > > > > _______________________________________________ > > freebsd-current@freebsd.org mailing list > > https://lists.freebsd.org/mailman/listinfo/freebsd-current > > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" > _______________________________________________ > freebsd-current@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" > -- Rod Grimes rgrimes@freebsd.org