From owner-freebsd-current@freebsd.org Fri Apr 16 18:19:54 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 A65935DAA40 for ; Fri, 16 Apr 2021 18:19:54 +0000 (UTC) (envelope-from freebsd@grem.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 4FMPd61bn0z4h5S for ; Fri, 16 Apr 2021 18:19:54 +0000 (UTC) (envelope-from freebsd@grem.de) Received: by mailman.nyi.freebsd.org (Postfix) id 36E235DA8F6; Fri, 16 Apr 2021 18:19:54 +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 36ACD5DA6C4 for ; Fri, 16 Apr 2021 18:19:54 +0000 (UTC) (envelope-from freebsd@grem.de) Received: from mail.evolve.de (mail.evolve.de [213.239.217.29]) (using TLSv1.3 with cipher TLS_CHACHA20_POLY1305_SHA256 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA512 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail.evolve.de", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FMPd54ctcz4gjK; Fri, 16 Apr 2021 18:19:53 +0000 (UTC) (envelope-from freebsd@grem.de) Received: by mail.evolve.de (OpenSMTPD) with ESMTP id b41aed9a; Fri, 16 Apr 2021 18:19:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=grem.de; h=content-type :content-transfer-encoding:mime-version:subject:from:in-reply-to :date:cc:message-id:references:to; s=20180501; bh=YLJ0gGoZdXz57R zowu8lei/Tyt0=; b=ga65CYgNipPwBqTao3HLtx5frZ3sAT+FRdWdP1IFbgXaWM yaiLWYBVTx3NlA2OUlg8LxF/JC3Scz0oJWAV1FhZyQvG03AG6fHnaGJ2KWTK/Q3a ZRyZyi+J3Bpyg7zWP8x0V0HVwtss9eVpAh3MKiN0pBcx1dMHCn0OanvFJAIVeyaH Z3D0TpGNmFNodE5pQ6pVfgaIKOQ5HJIIt5UBgI0wYgbRjPxyH+k4m4hc4rzuZdol DR04xCi6fyodtVJrqIPovItQe3N09SEwhulIAYXaC3RWjBwgTf03AZaZdBXxNmUb yRy829dLqT6lze6rGWoPxanMPLseLJYRp560x6pw== DomainKey-Signature: a=rsa-sha1; c=nofws; d=grem.de; h=content-type :content-transfer-encoding:mime-version:subject:from:in-reply-to :date:cc:message-id:references:to; q=dns; s=20180501; b=NP8XsBWG XCYVsbdELMp6YvEiok+w5VLPUTyI6r8/SPXBsK6pBWjtIyFZV9fIfw9EGK7mgBe7 K1DdvsXSOAEUTO2Ov2Siy/tTsN0AGZ7V3tAmww4O086ikHbifljiZTzlqjbgK1LC ldT45PMsil88a62znM2200BJM25lHqfQW5Q7R37UXiSHzDH5qMrQTn7eVQjAJNyW kSgSoEpBrQt3toYHkD8SUegTWh6FC24l9GnH4BqbAZupc6CVTytzikvx7ESKM93p B+q5GVWyDFlv5IzGkd6HM4eVLTgm3iMwvnlsSn1Q2A81VvWec2Zlruw9aWyc/Nxj mdlhMBKh2iPgeQ== Received: by mail.evolve.de (OpenSMTPD) with ESMTPSA id 88916350 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Fri, 16 Apr 2021 18:19:43 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (1.0) Subject: Re: sys/sys/param.h: 'main' instead of 'Master'? From: Michael Gmelin In-Reply-To: <202104161729.13GHT0g1053366@gndrsh.dnsmgr.net> Date: Fri, 16 Apr 2021 20:19:41 +0200 Cc: Kyle Evans , rhurlin@freebsd.org, current Message-Id: References: <202104161729.13GHT0g1053366@gndrsh.dnsmgr.net> To: "Rodney W. Grimes" X-Mailer: iPhone Mail (18D70) X-Rspamd-Queue-Id: 4FMPd54ctcz4gjK 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 18:19:54 -0000 > On 16. Apr 2021, at 19:29, Rodney W. Grimes wrote: >=20 > =EF=BB=BF >>=20 >> n Fri, Apr 16, 2021 at 11:36 AM Rainer Hurling wrote: >>>=20 >>> While viewing sys/sys/param.h I noticed that the comment of the >>> definition of __FreeBSD_version is probably out of date. >>>=20 >>> Since the switch to Git, doesn't it have to be 'main' instead of 'master= '? >>>=20 >>=20 >> 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. >=20 > As well as "Origin". (Single) Source of Truth, maybe? -m >=20 >>=20 >>> #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 *= / >>>=20 >>> /* >>> * __FreeBSD_kernel__ indicates that this system uses the kernel of >>> FreeBSD, >>>=20 >>> _______________________________________________ >>> freebsd-current@freebsd.org mailing list >>> https://lists.freebsd.org/mailman/listinfo/freebsd-current >>> To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.or= g" >> _______________________________________________ >> 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= " >>=20 >=20 > --=20 > Rod Grimes rgrimes@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"=