From owner-freebsd-stable@FreeBSD.ORG Wed Jun 10 18:41:58 2015 Return-Path: Delivered-To: freebsd-stable@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8669F491; Wed, 10 Jun 2015 18:41:58 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [IPv6:2001:470:1:117::25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "anubis.delphij.net", Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 66D111BF3; Wed, 10 Jun 2015 18:41:58 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from zeta.ixsystems.com (unknown [12.229.62.2]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by anubis.delphij.net (Postfix) with ESMTPSA id 2392E183DB; Wed, 10 Jun 2015 11:41:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=delphij.net; s=anubis; t=1433961718; x=1433976118; bh=i/TTjt1R+/5Pm4WtzhhI2kGwigmj6SQzg2iBsQpqNCk=; h=Date:From:Reply-To:To:CC:Subject:References:In-Reply-To; b=vlkzQwegLhl0oVY9UB/hvpcKrE4TluYGetM6V7+jMsBgDCXempK43EZkKJyLpXp8x Ava+RQM69Uv8uRglqABT2HsmqZ10WTt+87Fp/dpnFWRYh6SyJfJsUWPRrJyWQMHLPA Ud3xi0285mBjXhIWAxfb4szDZQjs3k9Zv3aaeyps= Message-ID: <557884F5.7080301@delphij.net> Date: Wed, 10 Jun 2015 11:41:57 -0700 From: Xin Li Reply-To: d@delphij.net Organization: The FreeBSD Project MIME-Version: 1.0 To: Palle Girgensohn , delphij@FreeBSD.org CC: freebsd-stable@FreeBSD.org Subject: Re: wrong patch number in releng/10.1? References: <82E830BE-8B28-479A-8CBE-78D192592E26@FreeBSD.org> In-Reply-To: <82E830BE-8B28-479A-8CBE-78D192592E26@FreeBSD.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jun 2015 18:41:58 -0000 -----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@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 >> : >> >> 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 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-----