From owner-freebsd-stable@FreeBSD.ORG Wed Jun 10 09:31:35 2015 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 953638C6 for ; Wed, 10 Jun 2015 09:31:35 +0000 (UTC) (envelope-from killing@multiplay.co.uk) Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2EF4B15C1 for ; Wed, 10 Jun 2015 09:31:34 +0000 (UTC) (envelope-from killing@multiplay.co.uk) Received: by wifx6 with SMTP id x6so40928729wif.0 for ; Wed, 10 Jun 2015 02:31:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=M8y3AMoQmVyD4gi3zTWqcqIE5YohFVSH6mNp6xf5dHg=; b=XlhVDm+kd2ILGBfo/pMiw2dxbNT65dFWMAoOSBsVtt2sNf/twEVAjpEyJF/ycPtnn5 N21JgElpBRC7CU8C99bUxaWVJOd9eAIAkNlxBrPQ7VcogfU8x1s+tMtT6tLV4FldjqYE xOeubB3zMcKex9Q9RtE3y+xY9gOx7hu8XdWtzSPROWZ29GIDAyxVbICdSl6PNxqAHc5n 9DdInhAi/YcLcebgR2ryflrxLUD1jGAU7CKRGY7puztwiFpfHkpAo5aL3l9xgJr8WRTI 0ymYOLTsMEfzMysFsSQ9Sf2SpxYMdwtYEtrjoVA/+G2TOHG9y0FyhDOmqAiQsgc5Cgxz zvZg== X-Gm-Message-State: ALoCoQlLRLD7Fsg8mAEc6nEZ6HvB/9kOlccxMa5DGbZ7nqjb3wMAGfVJHwJhvLzSeJ9FsyDD82Q8 X-Received: by 10.194.237.34 with SMTP id uz2mr4499576wjc.155.1433928686888; Wed, 10 Jun 2015 02:31:26 -0700 (PDT) Received: from [10.10.1.68] (82-69-141-170.dsl.in-addr.zen.co.uk. [82.69.141.170]) by mx.google.com with ESMTPSA id m2sm6991854wiy.7.2015.06.10.02.31.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jun 2015 02:31:25 -0700 (PDT) Message-ID: <55780401.7050205@multiplay.co.uk> Date: Wed, 10 Jun 2015 10:31:45 +0100 From: Steven Hartland User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: 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; format=flowed 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 09:31:35 -0000 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 : >> >> 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] >> >> >> >>