From owner-freebsd-current@freebsd.org Fri Apr 16 20:22: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 2D9465DE985 for ; Fri, 16 Apr 2021 20:22:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) 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 4FMSM06KwZz4njq for ; Fri, 16 Apr 2021 20:22:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id D90225DEB06; Fri, 16 Apr 2021 20:22:52 +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 D8C6A5DEB05 for ; Fri, 16 Apr 2021 20:22:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) (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 4FMSM05TM6z4nlf for ; Fri, 16 Apr 2021 20:22:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x731.google.com with SMTP id t17so1732822qkg.4 for ; Fri, 16 Apr 2021 13:22:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=4dAD648lgPA/lU9v3usyDsE7k7O8ZUq7Lb/CKbyFDeI=; b=YE2OwDq2KFKIPAO/HhjAwBgSRX13Th8o4DYMnOO+K1UTG+IYtOYs6P3o+luN1BEy7l JOR6YlQnlti6R77HCyBFxmil4GSm7ulpWO7im2XeQ+imZiywoQ+8nl03wE15WdomZnOG 5oNOkDbXusaJDuzeaIZcGlqsHFFHk1MPFubz/VY8OP3L3T/SlM4hca1CrpgleeAKKhh0 bSyODrA/tWz6SOFRTUNRyBHVr1Sp8abtTnbqSr03GyUL7+f8Zel/yrl3ChOIch/iYLfo j34W3zT8CPmZwpm5Mzs0Mir6aeEFH0s3Hdg0GKSIClBhGoRx7kLnyFQ3lRKLeBVgtiOz BXmw== 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=4dAD648lgPA/lU9v3usyDsE7k7O8ZUq7Lb/CKbyFDeI=; b=EK4fKqlZQfDDwaEDERVGhXlJxugjW5sG9V3k0gh0JzJHAMyHoDqnRQPUIznoKPAgj8 PdPWQR6tCUQiK85yDJ4z1GvXLfBrFw6ng6NOrVrshtpVvIaoxiUQsv6o2DspnfyvXnhb +yPu8TIm5aIDAnAxud3R3U5fF+yW4TGsVoHMWRu+DSjUab5n1owi1LTEoSGWiISR9G02 Zry9zyfA7E/9EdEvfRlEBpTWXhyCXuf/8ON4hs2Km2ssWA3wbUsk/lZplgD2pfaTuZiF Xm5wuGC3jiBrJuUyptq1cHpvcuuSji2qTyCar3Ta36Q3PAHKwXwSxSuVSlkpOMib5IJW C/8g== X-Gm-Message-State: AOAM531/4VZ0KU8UoaAHftPZZrUqbtC+hluuY14gKOXnWo/LznSIoVtI WN//jYc4VPAmMVbM4ILL/B5SRRm46wbjQasjFrzAVw== X-Google-Smtp-Source: ABdhPJwd+09cw3hkDNz73ioVL1SMB2+TvvxkrRHscQ8iDGYfJFXN8Q9pGkLY4U3ToWd9qqpooULnku3I0+BVej58VJ4= X-Received: by 2002:a37:7685:: with SMTP id r127mr960728qkc.359.1618604571769; Fri, 16 Apr 2021 13:22:51 -0700 (PDT) MIME-Version: 1.0 References: <202104161729.13GHT0g1053366@gndrsh.dnsmgr.net> In-Reply-To: From: Warner Losh Date: Fri, 16 Apr 2021 14:22:40 -0600 Message-ID: Subject: Re: sys/sys/param.h: 'main' instead of 'Master'? To: Michael Gmelin Cc: "Rodney W. Grimes" , Kyle Evans , rhurlin@freebsd.org, current X-Rspamd-Queue-Id: 4FMSM05TM6z4nlf X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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: Fri, 16 Apr 2021 20:22:53 -0000 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 newver= s > */ > >>> > >>> /* > >>> * __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= " >