From owner-freebsd-current@freebsd.org Tue Apr 20 01:59:53 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 9337F5DF15C for ; Tue, 20 Apr 2021 01:59:53 +0000 (UTC) (envelope-from chargen@gmail.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FPRhT29Xrz3Mn0 for ; Tue, 20 Apr 2021 01:59:53 +0000 (UTC) (envelope-from chargen@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 4A9135DF15B; Tue, 20 Apr 2021 01:59:53 +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 4A59D5DF63B for ; Tue, 20 Apr 2021 01:59:53 +0000 (UTC) (envelope-from chargen@gmail.com) Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPRhS3fVmz3MkP; Tue, 20 Apr 2021 01:59:52 +0000 (UTC) (envelope-from chargen@gmail.com) Received: by mail-lj1-x22a.google.com with SMTP id a36so30823552ljq.8; Mon, 19 Apr 2021 18:59:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=FpzUrOeuNw7MLVNttEtQ/oeQX01eDyblyCyT8RjX3O8=; b=uEUcHGJxoUY0tp0qapzLh1c6IkSusVsFDN2zZQH1ET6zGGFCftO8w4ImdENWjbg0OH 7Y3WRyhp7Gn86ACIAV2bh4jilFR9R8Yj9S9HAsX/WKYxo1yGXGsHrKSmDQ1iDWNJrze4 Ru7hBvNrn3KnFjLESr5poQdvqsa21+jCiviCPOFcVSxax/EpxYkHWTwaxAZ7fk85HodU H9W5T3N6jHamZ9jevpkLTrk0jmBQzeftxrEqqjmYoDGx51d5hFYIMTRoRfKIaNztQY3L gMasOeGtVEnm3huvqtvEMnSw7YxYJ1/cXxey6Ez0wyr/3VdA3bmUGumlcklf7dOuQ/0w V8lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=FpzUrOeuNw7MLVNttEtQ/oeQX01eDyblyCyT8RjX3O8=; b=MJhgciAq3caqyJbUVCQly5XgoO7Qop1ouESYlcwDx0kF6yhJMFhe3GNKod9Y1YXywH zS6Y+wGnNlwr6tR23UsQ9FzM/ympzIHXVBCf8Ax0Kz0M0OgDZnt0ZFKe9x4zndCzIsbB De7PRNuooihdRWxtDA+BBCWoZ/PUy9EYbnnJ5SUWSDyTKwN+mV9a7mvb2h0GFp4BAR0C jv4SXRQQvLIeyBbxSdZnVACrWeEKqNpbyFYbCCJz+Ze8fXbSddZKUMa7hdg5vFOO0cXC xI5kPpdmPufPsCXryySc4aYBBZj5wF8izx3cWlWhJKyiVystu7KPYNA/tkrrxE91tYoU kyDw== X-Gm-Message-State: AOAM532ww1i8Ht4mhJvl026pq+vpOQUFoTaZ233FOz2DUp+ViZw3Ma9d w9ovhx7AecS9UQc+dHw9F6nW9ykSC9XTFf9QDDB5Nuv+pVo= X-Google-Smtp-Source: ABdhPJyYPqFSDdE+Pkc/TxcMwCEu5sXzBrkrQE63kqd+CNmToQ1IS3l7SIBrDLpKhCN0vxlJ4o86tCD83h6NQMmuqBI= X-Received: by 2002:a05:651c:2001:: with SMTP id s1mr13205078ljo.236.1618883989925; Mon, 19 Apr 2021 18:59:49 -0700 (PDT) MIME-Version: 1.0 References: <202104161729.13GHT0g1053366@gndrsh.dnsmgr.net> In-Reply-To: From: Chargen Date: Tue, 20 Apr 2021 03:59:34 +0200 Message-ID: Subject: Re: sys/sys/param.h: 'main' instead of 'Master'? To: Warner Losh Cc: Michael Gmelin , "Rodney W. Grimes" , Kyle Evans , rhurlin@freebsd.org, current X-Rspamd-Queue-Id: 4FPRhS3fVmz3MkP X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=uEUcHGJx; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of chargen@gmail.com designates 2a00:1450:4864:20::22a as permitted sender) smtp.mailfrom=chargen@gmail.com X-Spamd-Result: default: False [-2.79 / 15.00]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; RCPT_COUNT_FIVE(0.00)[6]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-0.79)[-0.788]; FROM_EQ_ENVFROM(0.00)[]; SUBJECT_ENDS_QUESTION(1.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a00:1450:4864:20::22a:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; SPAMHAUS_ZRD(0.00)[2a00:1450:4864:20::22a:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::22a:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[current] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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: Tue, 20 Apr 2021 01:59:53 -0000 Master of origin;-) --=20 Deze e-mail en de inhoud is vertrouwelijk en uitsluitend bestemd voor de geadresseerde(n). Indien u niet de geadresseerde bent van deze e-mail verzoeken wij u dit direct door te geven aan de verzender door middel van een reply e-mail en de ontvangen e-mail uit uw systemen te verwijderen. Als u geen geadresseerde bent, is het niet toegestaan om kennis te nemen van de inhoud, deze te kopieren, te verspreiden, bekend te maken aan derden noch anderszins te gebruiken. The information contained in this e-mail is confidential and may be legally privileged. It is intended solely for the addressee. If you are not the intended recipient, any disclosure, copying, distribution or any action taken or omitted to be taken in reliance on it, is prohibited and may be unlawful. Please notify us immediately if you have received it in error by reply e-mail and then delete this message from your system. Thanks, _ _ (_)(_) (,,) =3D()=3D ((__)\ _|L\_______/ Save The Lab Rats On Fri, Apr 16, 2021 at 10:23 PM Warner Losh wrote: > On Fri, Apr 16, 2021 at 12:20 PM Michael Gmelin wrote: > > > > > > > > On 16. Apr 2021, at 19:29, Rodney W. Grimes < > > freebsd-rwg@gndrsh.dnsmgr.net> wrote: > > > > > > =EF=BB=BF > > >> > > >> 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". > > > > (Single) Source of Truth, maybe? > > > > s/Master, p/P/ also makes sense. > > Warner > > > > -m > > > > > > > >> > > >>> #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 > > > _______________________________________________ > > > 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" > > > _______________________________________________ > 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= " >