sys/sys/param.h: 'main' instead of 'Master'?

Post by Rainer Hurling
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.

Post by Rainer Hurling
#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,
_______________________________________________
https://lists.freebsd.org/mailman/listinfo/freebsd-current

Rainer Hurling

2021-04-16 16:49:12 UTC

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.

Rodney W. Grimes

2021-04-16 17:29:00 UTC

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".

_______________________________________________
https://lists.freebsd.org/mailman/listinfo/freebsd-current

--
Rod Grimes ***@freebsd.org

Michael Gmelin

2021-04-16 18:19:41 UTC

Post by Rodney W. Grimes

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?

-m

Post by Rodney W. Grimes

_______________________________________________
https://lists.freebsd.org/mailman/listinfo/freebsd-current

--
_______________________________________________
https://lists.freebsd.org/mailman/listinfo/freebsd-current

Warner Losh

2021-04-16 20:22:40 UTC

Post by Rainer Hurling

On 16. Apr 2021, at 19:29, Rodney W. Grimes <

'master'?

Post by Kyle Evans
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

Post by Rainer Hurling
-m

newvers */

Post by Rainer Hurling
+#define __FreeBSD_version 1400007 /* main, propagated to newvers

Post by Rainer Hurling
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of
FreeBSD,
_______________________________________________
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "

_______________________________________________
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "

--
Rod Grimes
_______________________________________________
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "

_______________________________________________
https://lists.freebsd.org/mailman/listinfo/freebsd-current

Ed Maste

2021-04-18 23:07:44 UTC

Post by Rodney W. Grimes
As well as "Origin".

(Single) Source of Truth, maybe?

s/Master, p/P/ also makes sense.

IMO instead of lightly rewording the existing comment we could just
remove it, it doesn't really add any clarity.

Instead we ought to add an introductory sentence or two to the block
comment above, explaining what __FreeBSD_version actually is.

Baptiste Daroussin

2021-04-19 07:27:23 UTC

Post by Rodney W. Grimes
As well as "Origin".

(Single) Source of Truth, maybe?

s/Master, p/P/ also makes sense.

IMO instead of lightly rewording the existing comment we could just
remove it, it doesn't really add any clarity.
Instead we ought to add an introductory sentence or two to the block
comment above, explaining what __FreeBSD_version actually is.

fully agreed here! I had to explained many time what __FreeBSD_version actually
was. A clear comment would be great ;)

Bapt

Chargen

2021-04-20 01:59:34 UTC

Master of origin;-)
--
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,
_ _
(_)(_)
(,,)
=()=
((__)\
_|L\_______/
Save The Lab Rats

Post by Rainer Hurling

On 16. Apr 2021, at 19:29, Rodney W. Grimes <

'master'?

Post by Kyle Evans
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

Post by Rainer Hurling
-m

newvers */

Post by Rainer Hurling
+#define __FreeBSD_version 1400007 /* main, propagated to

newvers

Post by Rainer Hurling
*/

_______________________________________________
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "

--
Rod Grimes
_______________________________________________
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "

_______________________________________________
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "

_______________________________________________
https://lists.freebsd.org/mailman/listinfo/freebsd-current

Rodney W. Grimes

2021-04-19 13:12:19 UTC

Post by Baptiste Daroussin

Post by Rodney W. Grimes
As well as "Origin".

(Single) Source of Truth, maybe?

s/Master, p/P/ also makes sense.

IMO instead of lightly rewording the existing comment we could just
remove it, it doesn't really add any clarity.
Instead we ought to add an introductory sentence or two to the block
comment above, explaining what __FreeBSD_version actually is.

fully agreed here! I had to explained many time what __FreeBSD_version actually
was. A clear comment would be great ;)

Yes please!

--
Rod Grimes ***@freebsd.org

Warner Losh

2021-04-19 21:58:33 UTC

On Mon, Apr 19, 2021 at 7:12 AM Rodney W. Grimes <

Post by Baptiste Daroussin