Date: Fri, 10 Oct 2014 13:56:15 -0400 From: John Wolfe <jlw@xinuos.com> To: Kevin Oberman <rkoberman@gmail.com>, Johan Hendriks <joh.hendriks@gmail.com> Cc: FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org> Subject: Re: Naming of Stable Message-ID: <54381DBF.5020907@xinuos.com> In-Reply-To: <CAN6yY1tpXYy9OQe3fOOTkrFx9F08dmyEZ20f2MN-ZHijWPCTXg@mail.gmail.com> References: <5437E811.1030304@gmail.com> <CAN6yY1tpXYy9OQe3fOOTkrFx9F08dmyEZ20f2MN-ZHijWPCTXg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
I took Johan's e-mail to be a suggestion that the changes made by Glen B. to sys/conf/newvers.h through the 10.1 Beta and RC1 stages be reverted back to "10-STABLE" now that the releng/10.1 branch has been made. -- John On 10/10/2014 1:28 PM, Kevin Oberman wrote: > On Fri, Oct 10, 2014 at 7:07 AM, Johan Hendriks <joh.hendriks@gmail.com> > wrote: > >> Hello all. >> >> I used to track Stable 10, when I do a uname -a now I get the following. >> >> FreeBSD beasty.mylab.local 10.1-RC1 FreeBSD 10.1-RC1 #0 r272893: Fri Oct >> 10 15:40:39 CEST 2014 root@beasty.mylab.local:/usr/obj/usr/src/sys/KRNL >> amd64 >> >> When I did a svnup today there where a lot of updates to zfs and the cam >> subsytem. >> >> * svn commit: r272629 - in stable/10: sys/cam/ctl usr.sbin/ctladm >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003378.html>/Alexander >> Motin / >> * svn commit: r272630 - in stable/10: sys/cam/ctl usr.sbin/ctladm >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003379.html>/Alexander >> Motin / >> * svn commit: r272631 - stable/10/sys/cam/ctl >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003380.html>/Alexander >> Motin / >> * svn commit: r272632 - in stable/10/sys/cam: ctl scsi >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003381.html>/Alexander >> Motin / >> * svn commit: r272633 - in stable/10/sys/cam: ctl scsi >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003382.html>/Alexander >> Motin / >> * svn commit: r272634 - stable/10/sys/cam/ctl >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003383.html>/Alexander >> Motin / >> * svn commit: r272635 - stable/10/sys/cam/ctl >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003384.html>/Alexander >> Motin / >> * svn commit: r272636 - stable/10/sys/cam/ctl >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003385.html>/Alexander >> Motin / >> * svn commit: r272637 - stable/10/sys/cam/ctl >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003386.html>/Alexander >> Motin / >> * svn commit: r272638 - stable/10/sys/cam/ctl >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003387.html>/Alexander >> Motin / >> * svn commit: r272639 - stable/10/sys/cam/ctl >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003388.html>/Alexander >> Motin / >> * svn commit: r272640 - stable/10/sys/cam/ctl >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003389.html>/Alexander >> Motin / >> * svn commit: r272641 - stable/10/sys/cam/ctl >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003390.html>/Alexander >> Motin / >> * svn commit: r272642 - stable/10/sys/cam/ctl >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003391.html>/Alexander >> Motin / >> * svn commit: r272643 - stable/10/sys/cam/ctl >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003392.html>/Alexander >> Motin / >> * svn commit: r272644 - stable/10/sys/cam/ctl >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003393.html>/Alexander >> Motin / >> * svn commit: r272645 - in stable/10/sys: netinet netinet6 >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003394.html>/Michael >> Tuexen / >> * svn commit: r272646 - stable/10/sys/cam/ctl >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003395.html>/Alexander >> Motin / >> * svn commit: r272647 - stable/10/sys/cam/ctl >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003396.html>/Alexander >> Motin / >> * svn commit: r272648 - stable/10/sys/modules/netmap >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003397.html>/Luigi >> Rizzo / >> * svn commit: r272654 - stable/10/sys/dev/iscsi_initiator >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003398.html>/Alexander >> Motin / >> * svn commit: r272656 - stable/10/sys/cam/scsi >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003399.html>/Alexander >> Motin / >> * svn commit: r272657 - stable/10/sys/cam/scsi >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003400.html>/Alexander >> Motin / >> * svn commit: r272660 - stable/10/sys/netinet >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003401.html>/Michael >> Tuexen / >> * svn commit: r272661 - in stable/10: share/man/man4 sys/netinet >> sys/netinet6 >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003402.html>/Michael >> Tuexen / >> * svn commit: r272662 - stable/10/sys/netinet6 >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003403.html>/Michael >> Tuexen / >> * svn commit: r272663 - stable/10/sys/netinet6 >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003404.html>/Michael >> Tuexen / >> * svn commit: r272664 - stable/10/sys/netinet6 >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003405.html>/Michael >> Tuexen / >> * svn commit: r272665 - >> stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003406.html>/Xin >> LI / >> * svn commit: r272672 - stable/10/sys/net >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003407.html>/Alan >> Somers / >> * svn commit: r272676 - >> stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003408.html>/Marcelo >> Araujo / >> * svn commit: r272680 - stable/10/sys/net >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003409.html>/Andrey >> V. Elsukov / >> * svn commit: r272688 - stable/10/cddl/contrib/opensolaris/cmd/zpool >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003410.html>/Andriy >> Gapon / >> * svn commit: r272690 - stable/10/cddl/contrib/opensolaris/cmd/zfs >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003411.html>/Andriy >> Gapon / >> * svn commit: r272693 - in stable/10/etc: . devd >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003412.html>/Andriy >> Gapon / >> * svn commit: r272696 - in stable/10/sys/boot: common i386/gptzfsboot >> i386/zfsboot >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003413.html>/Andriy >> Gapon / >> * svn commit: r272722 - stable/10/sys/vm >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003414.html>/Bryan >> Venteicher / >> * svn commit: r272724 - in stable/10: release release/amd64 >> release/i386 share/man/man7 >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003415.html>/Glen >> Barber / >> * svn commit: r272726 - stable/10/sys/kern >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003416.html>/Neel >> Natu / >> * svn commit: r272727 - in stable/10: release release/amd64 >> release/i386 share/man/man7 >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003417.html>/Glen >> Barber / >> o svn commit: r272727 - in stable/10: release release/amd64 >> release/i386 share/man/man7 >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003418.html>/Glen >> Barber / >> * svn commit: r272753 - stable/10/contrib/libc-vis >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003419.html>/Brooks >> Davis / >> * svn commit: r272754 - stable/10/sys/netinet6 >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003420.html>/Michael >> Tuexen / >> * svn commit: r272758 - stable/10/lib/libc/stdtime >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003421.html>/Pedro >> F. Giffuni / >> * svn commit: r272773 - stable/10/usr.bin/mkimg >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003422.html>/Marcel >> Moolenaar / >> * svn commit: r272774 - stable/10/usr.bin/mkimg >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003423.html>/Marcel >> Moolenaar / >> * svn commit: r272775 - stable/10/usr.bin/mkimg >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003424.html>/Marcel >> Moolenaar / >> * svn commit: r272776 - stable/10/usr.bin/mkimg >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003425.html>/Marcel >> Moolenaar / >> * svn commit: r272790 - in stable/10: sbin/ifconfig sys/netinet6 >> usr.bin/netstat >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003426.html>/Andrey >> V. Elsukov / >> * svn commit: r272798 - stable/10/sys/cam/ctl >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003427.html>/Alexander >> Motin / >> * svn commit: r272846 - stable/10/usr.bin/netstat >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003428.html>/Hiroki >> Sato / >> * svn commit: r272847 - stable/10/sys/netinet6 >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003429.html>/Hiroki >> Sato / >> * svn commit: r272850 - in stable/10: include/rpcsvc lib/libc/rpc >> lib/libc/xdr usr.sbin/ypbind >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003430.html>/Hiroki >> Sato / >> * svn commit: r272852 - stable/10/sbin/route >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003431.html>/Hiroki >> Sato / >> * svn commit: r272853 - stable/10/sbin/route >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003432.html>/Hiroki >> Sato / >> * svn commit: r272854 - stable/10/sbin/mdconfig >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003433.html>/Hiroki >> Sato / >> * svn commit: r272855 - stable/10/usr.bin/netstat >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003434.html>/Hiroki >> Sato / >> * svn commit: r272856 - stable/10/etc >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003435.html>/Hiroki >> Sato / >> * svn commit: r272857 - stable/10/sys/netinet6 >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003436.html>/Hiroki >> Sato / >> * svn commit: r272858 - stable/10/etc >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003437.html>/Hiroki >> Sato / >> * svn commit: r272859 - in stable/10/sys: netinet netinet6 >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003438.html>/Hiroki >> Sato / >> * svn commit: r272860 - stable/10/usr.sbin/route6d >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003439.html>/Hiroki >> Sato / >> * svn commit: r272861 - in stable/10/etc: defaults rc.d >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003440.html>/Hiroki >> Sato / >> * svn commit: r272862 - in stable/10/etc: defaults rc.d >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003441.html>/Hiroki >> Sato / >> o svn commit: r272862 - in stable/10/etc: defaults rc.d >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003459.html>/Garrett >> Cooper / >> * svn commit: r272863 - stable/10/etc/rc.d >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003442.html>/Hiroki >> Sato / >> * svn commit: r272864 - stable/10/etc/rc.d >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003443.html>/Hiroki >> Sato / >> * svn commit: r272865 - stable/10/etc/rc.d >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003444.html>/Hiroki >> Sato / >> * svn commit: r272866 - stable/10/usr.bin/vmstat >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003445.html>/Hiroki >> Sato / >> * svn commit: r272867 - stable/10/sbin/dump >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003446.html>/Hiroki >> Sato / >> * svn commit: r272868 - in stable/10: etc sys/netinet >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003447.html>/Hiroki >> Sato / >> * svn commit: r272869 - stable/10/sys/netinet >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003448.html>/Hiroki >> Sato / >> * svn commit: r272870 - in stable/10/etc: defaults rc.d >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003449.html>/Hiroki >> Sato / >> * svn commit: r272871 - stable/10/sbin/ping6 >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003450.html>/Hiroki >> Sato / >> o svn commit: r272871 - stable/10/sbin/ping6 >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003452.html>/Bryan >> Drewery / >> + svn commit: r272871 - stable/10/sbin/ping6 >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003455.html>/Hiroki >> Sato / >> * svn commit: r272872 - stable/10/sbin/routed >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003451.html>/Hiroki >> Sato / >> * svn commit: r272873 - stable/10/sbin/routed >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003453.html>/Hiroki >> Sato / >> * svn commit: r272874 - stable/10/etc >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003454.html>/Hiroki >> Sato / >> * svn commit: r272875 - in stable/10/sys: cddl/compat/opensolaris/kern >> cddl/compat/opensolaris/sys >> cddl/contrib/opensolaris/uts/common/fs/zfs vm >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003456.html>/Steven >> Hartland / >> * svn commit: r272877 - in stable/10: share/man/man9 >> sys/cddl/compat/opensolaris/kern sys/cddl/compat/opensolaris/sys >> sys/conf sys/modules/zfs >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003457.html>/Steven >> Hartland / >> * svn commit: r272879 - in >> stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003458.html>/Steven >> Hartland / >> * svn commit: r272882 - >> stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003460.html>/Steven >> Hartland / >> * svn commit: r272883 - >> stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003461.html>/Steven >> Hartland / >> * svn commit: r272892 - stable/10/sys/dev/hwpmc >> <http://lists.freebsd.org/pipermail/svn-src-stable-10/ >> 2014-October/003462.html>/Bjoern >> A. Zeeb / >> >> On a second system witch is tracking RELENG/10.1 I do not get these >> updates. >> I think it is a little confusing to know which updates will make it into >> 10.1 and which not at this point. >> Both systems report there are 10.1, should the stable tree not be renamed >> to 10.1 post-release or just stable/10 >> >> regards >> Johan >> > This pops up most every time through the release cycle. > > A week ago releng/10.1 was branched off of sable/10. At this point the > stable path was unfrozen and MFH of non-critical patches can begin. RE > typically requests that major changes be held until the actual release, but > other MFHs that have been held up due to the freeze so start getting > committed to stable. Any committer can request that RE allow any of these > changes be allowed into the RELENG branch, but RE is generally very hard to > convince unless the MFH fixes a critical issue (show stopper)or is clearly > innocuous. the latter is usually things like correcting errors in man pages > and text output to logs. > > This has resulted in heated discussions which have. on occasion, made it to > core. It comes down to "This is a critical fix" vs. "The problem can be > worked around and it is too late to do adequate testing to be sure that > there are no hidden regressions". RE tends to always be on the conservative > side. > > So, without knowing anything about these commits, it is unlikely that any > will be in 10.1. Whether RE is considering any, I have no idea, but odds > are that, unless they fix real serious issues, they will not be committed > to RELENG and will not be in 10.1. Also, the tree is stable/10, not > stable/10.1. It is only the string in uname that uses the RC-10.1 as that > is the name of the stable code at the time releng is branched. I think it > would minimize confusion if it was changed back to "stable" after > branching, but that raises the bikeshed of whether it would be 10.0-STABLE > or 10.1-STABLE until 10.1 is released. Now that the uname includes the > subversion revision number, I think it should just be tagged as 10-STABLE > as that is what it really is. There is no stable/10.1 in the tree, so why > do we tag the system with a name that does not exist? But that is just my > opinion. > -- > R. Kevin Oberman, Network Engineer, Retired > E-mail: rkoberman@gmail.com > _______________________________________________ > freebsd-stable@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?54381DBF.5020907>