Also # uname -a FreeBSD pingpongdb 10.1-RELEASE-p10 FreeBSD 10.1-RELEASE-p10 #0: Wed May 13 06:54:13 UTC 2015 root at amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 # uptime 2:18am up 36 mins, 4 users, load averages: 0,08 0,14 0,10 # ls -lrt /boot/kernel/kernel /boot/kernel/*zfs* -r-xr-xr-x 2 root wheel 21160449 10 Jun 01:36 /boot/kernel/kernel -r-xr-xr-x 2 root wheel 2320144 10 Jun 01:36 /boot/kernel/zfs.ko -r-xr-xr-x 1 root wheel 19103144 10 Jun 01:36 /boot/kernel/zfs.ko.symbols # strings /boot/kernel/kernel|grep 10.1-RELEASE @(#)FreeBSD 10.1-RELEASE-p10 #0: Wed May 13 06:54:13 UTC 2015 FreeBSD 10.1-RELEASE-p10 #0: Wed May 13 06:54:13 UTC 2015 10.1-RELEASE-p10 It seems to me the verions numbering is not correct, but the patch *is* there, it should be 10.1-p11, right?> 10 jun 2015 kl. 11:01 skrev Palle Girgensohn <girgen at FreeBSD.org>: > > Hi, > > It seems the patch level in the UPDATING document is bad in releng/10.1, it is p29 which is the patch level for 8.4? > > Palle > > ------------------------------------------------------------------------ > r284193 | delphij | 2015-06-10 00:13:25 +0200 (Ons, 10 Jun 2015) | 8 lines > > Update base system file(1) to 5.22 to address multiple denial of > service issues. [EN-15:06] > > Improve reliability of ZFS when TRIM/UNMAP and/or L2ARC is used. > [EN-15:07] > > Approved by: so > > ------------------------------------------------------------------------ > > But the UPDATING says: > > 20150609: p29 FreeBSD-EN-15:06.file > FreeBSD-EN-15:07.zfs > > Updated base system file(1) to 5.22 to address multiple denial > of service issues. [EN-15:06] > > Improved reliability of ZFS when TRIM/UNMAP and/or L2ARC is used. > [EN-15:07] > > 20150513: p10 FreeBSD-EN-15:04.freebsd-update > FreeBSD-EN-15:05.ufs > > Fix bug with freebsd-update(8) that does not ensure the previous > upgrade was completed. [EN-15:04] > > Fix deadlock on reboot with UFS tuned with SU+J. [EN-15:05] > > > >-------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 495 bytes Desc: Message signed with OpenPGP using GPGMail URL: <http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20150610/ec780140/attachment.sig>
What does the following say when run from your source directory:
grep BRANCH sys/conf/newvers.sh
Regards
Steve
On 10/06/2015 10:20, Palle Girgensohn wrote:> Also
>
> # uname -a
> FreeBSD pingpongdb 10.1-RELEASE-p10 FreeBSD 10.1-RELEASE-p10 #0: Wed May 13
06:54:13 UTC 2015 root at
amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64
> # uptime
> 2:18am up 36 mins, 4 users, load averages: 0,08 0,14 0,10
> # ls -lrt /boot/kernel/kernel /boot/kernel/*zfs*
> -r-xr-xr-x 2 root wheel 21160449 10 Jun 01:36 /boot/kernel/kernel
> -r-xr-xr-x 2 root wheel 2320144 10 Jun 01:36 /boot/kernel/zfs.ko
> -r-xr-xr-x 1 root wheel 19103144 10 Jun 01:36
/boot/kernel/zfs.ko.symbols
> # strings /boot/kernel/kernel|grep 10.1-RELEASE
> @(#)FreeBSD 10.1-RELEASE-p10 #0: Wed May 13 06:54:13 UTC 2015
> FreeBSD 10.1-RELEASE-p10 #0: Wed May 13 06:54:13 UTC 2015
> 10.1-RELEASE-p10
>
> It seems to me the verions numbering is not correct, but the patch *is*
there, it should be 10.1-p11, right?
>
>> 10 jun 2015 kl. 11:01 skrev Palle Girgensohn <girgen at
FreeBSD.org>:
>>
>> Hi,
>>
>> It seems the patch level in the UPDATING document is bad in
releng/10.1, it is p29 which is the patch level for 8.4?
>>
>> Palle
>>
>>
------------------------------------------------------------------------
>> r284193 | delphij | 2015-06-10 00:13:25 +0200 (Ons, 10 Jun 2015) | 8
lines
>>
>> Update base system file(1) to 5.22 to address multiple denial of
>> service issues. [EN-15:06]
>>
>> Improve reliability of ZFS when TRIM/UNMAP and/or L2ARC is used.
>> [EN-15:07]
>>
>> Approved by: so
>>
>>
------------------------------------------------------------------------
>>
>> But the UPDATING says:
>>
>> 20150609: p29 FreeBSD-EN-15:06.file
>> FreeBSD-EN-15:07.zfs
>>
>> Updated base system file(1) to 5.22 to address multiple denial
>> of service issues. [EN-15:06]
>>
>> Improved reliability of ZFS when TRIM/UNMAP and/or L2ARC is
used.
>> [EN-15:07]
>>
>> 20150513: p10 FreeBSD-EN-15:04.freebsd-update
>> FreeBSD-EN-15:05.ufs
>>
>> Fix bug with freebsd-update(8) that does not ensure the
previous
>> upgrade was completed. [EN-15:04]
>>
>> Fix deadlock on reboot with UFS tuned with SU+J. [EN-15:05]
>>
>>
>>
>>
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On 06/10/15 02:20, Palle Girgensohn wrote:> Also > > # uname -a FreeBSD pingpongdb 10.1-RELEASE-p10 FreeBSD > 10.1-RELEASE-p10 #0: Wed May 13 06:54:13 UTC 2015 > root at amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC > amd64 # uptime 2:18am up 36 mins, 4 users, load averages: 0,08 > 0,14 0,10 # ls -lrt /boot/kernel/kernel /boot/kernel/*zfs* > -r-xr-xr-x 2 root wheel 21160449 10 Jun 01:36 > /boot/kernel/kernel -r-xr-xr-x 2 root wheel 2320144 10 Jun > 01:36 /boot/kernel/zfs.ko -r-xr-xr-x 1 root wheel 19103144 10 > Jun 01:36 /boot/kernel/zfs.ko.symbols # strings > /boot/kernel/kernel|grep 10.1-RELEASE @(#)FreeBSD 10.1-RELEASE-p10 > #0: Wed May 13 06:54:13 UTC 2015 FreeBSD 10.1-RELEASE-p10 #0: Wed > May 13 06:54:13 UTC 2015 10.1-RELEASE-p10 > > It seems to me the verions numbering is not correct, but the patch > *is* there, it should be 10.1-p11, right?Assuming you are using freebsd-update, kernel version is only updated when there is actual change in the kernel *itself*. In this case we have made a few changes to ZFS but that only affected the module, so kernel version is not changed. This is expected behavior . The canonical way of determining system version is 'freebsd-version - -ku' for 10.0 onwards. Hope this helps. Cheers,>> 10 jun 2015 kl. 11:01 skrev Palle Girgensohn >> <girgen at FreeBSD.org>: >> >> Hi, >> >> It seems the patch level in the UPDATING document is bad in >> releng/10.1, it is p29 which is the patch level for 8.4? >> >> Palle >> >> ---------------------------------------------------------------------- --->> >>r284193 | delphij | 2015-06-10 00:13:25 +0200 (Ons, 10 Jun 2015) | 8 lin es>> >> Update base system file(1) to 5.22 to address multiple denial of >> service issues. [EN-15:06] >> >> Improve reliability of ZFS when TRIM/UNMAP and/or L2ARC is used. >> [EN-15:07] >> >> Approved by: so >> >> ---------------------------------------------------------------------- --->> >> >>But the UPDATING says:>> >> 20150609: p29 FreeBSD-EN-15:06.file >> FreeBSD-EN-15:07.zfs >> >> Updated base system file(1) to 5.22 to address multiple denial of >> service issues. [EN-15:06] >> >> Improved reliability of ZFS when TRIM/UNMAP and/or L2ARC is >> used. [EN-15:07] >> >> 20150513: p10 FreeBSD-EN-15:04.freebsd-update >> FreeBSD-EN-15:05.ufs >> >> Fix bug with freebsd-update(8) that does not ensure the previous >> upgrade was completed. [EN-15:04] >> >> Fix deadlock on reboot with UFS tuned with SU+J. [EN-15:05] >> >> >> >> >- -- Xin LI <delphij at delphij.net> https://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.1.4 (FreeBSD) iQIcBAEBCgAGBQJVeIT1AAoJEJW2GBstM+nswC0QAJM5I6A52Lp9vAbMJTwauHGn z8wKzR+P4CyNDgWCpBpyPO+CsRRZgpBEYVTIuj61cTgoK5r2PLoUIGpEwfGX+1L8 izTd25MitSi721+Toy5dFe/ndBb4D7dz8+naFp59TmJtO7ZuLNRCxYLPoou4bcOg ZeX4af7alcEl93ADBE0T8gNDkcFmwxSNcciYxtMiad33TjqWkekNRN78ndpRi/5h raAt9UD6//iT7V+/w7PcdwvXugUgoQMxdaivXA4SV1xXX2MlnaDAU67nrWlPhXDM YbhS11SP1gptNWDlIz016oOblu4AV3dUIbPVjWbJ6KnLEiHg0KVn/PlsBpJ0wIcl WseRSdCNeqMTE7ik1qjfiEzE/Y6A/BTVVQsL5jQ4idRPfRyKGtG9vHxtfyV8itls kKCibaWVaBtUidRQHIyxpSHvSRp614iK3SO0ZR+yecDN0lUZvxCraYXgEXo+Ov4O YQ3/nBTReBFYRtF7PEnk6qtcbJ3UL2EgwOFMkODbkvACdFK/XxByMW4f3H5A4TFm nzDKXb+fmrtmf5e0XE6kZgOEFKBFZmLt4QbnPrAoa7WO/Eu43HE7/skYWNpJVLoz 3lZ16XTK39UKUA+/sniiHRW8m9SFxXv1E9GsLl/xO1HQDXuhiYN1nPkEx/PXYUjp GRGXVDw84qS1kbYHifzu =DXmN -----END PGP SIGNATURE-----