Date: Wed, 10 Jun 2015 10:31:45 +0100 From: Steven Hartland <killing@multiplay.co.uk> To: freebsd-stable@freebsd.org Subject: Re: wrong patch number in releng/10.1? Message-ID: <55780401.7050205@multiplay.co.uk> In-Reply-To: <82E830BE-8B28-479A-8CBE-78D192592E26@FreeBSD.org> References: <DB03C1AD-816C-41DA-BCC7-D9BE9C2119BD@FreeBSD.org> <82E830BE-8B28-479A-8CBE-78D192592E26@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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@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@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]
>>
>>
>>
>>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?55780401.7050205>