From owner-freebsd-stable@freebsd.org Mon Dec 21 20:50:18 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EA5604C3E4C; Mon, 21 Dec 2020 20:50:18 +0000 (UTC) (envelope-from warlock@phouka1.phouka.net) Received: from phouka1.phouka.net (phouka1.phouka.net [107.170.196.116]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "phouka.net", Issuer "Go Daddy Secure Certificate Authority - G2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D0BSB082cz4X8k; Mon, 21 Dec 2020 20:50:17 +0000 (UTC) (envelope-from warlock@phouka1.phouka.net) Received: from phouka1.phouka.net (localhost [127.0.0.1]) by phouka1.phouka.net (8.16.1/8.16.1) with ESMTPS id 0BLKldUW033956 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 21 Dec 2020 12:47:39 -0800 (PST) (envelope-from warlock@phouka1.phouka.net) Received: (from warlock@localhost) by phouka1.phouka.net (8.16.1/8.16.1/Submit) id 0BLKldNw033955; Mon, 21 Dec 2020 12:47:39 -0800 (PST) (envelope-from warlock) Date: Mon, 21 Dec 2020 12:47:38 -0800 From: John Kennedy To: Warner Losh Cc: FreeBSD Current , FreeBSD-STABLE Mailing List Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4D0BSB082cz4X8k X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of warlock@phouka1.phouka.net has no SPF policy when checking 107.170.196.116) smtp.mailfrom=warlock@phouka1.phouka.net X-Spamd-Result: default: False [-1.80 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[phouka.net]; RBL_DBL_DONT_QUERY_IPS(0.00)[107.170.196.116:from]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[107.170.196.116:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[warlock@phouka.net,warlock@phouka1.phouka.net]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:14061, ipnet:107.170.192.0/18, country:US]; FROM_NEQ_ENVFROM(0.00)[warlock@phouka.net,warlock@phouka1.phouka.net]; MAILMAN_DEST(0.00)[freebsd-current,freebsd-stable]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Dec 2020 20:50:19 -0000 On Wed, Dec 16, 2020 at 05:46:35PM -0700, Warner Losh wrote: > The FreeBSD project will be moving it's source repo from subversion to git > starting this this weekend. The docs repo was moved 2 weeks ago. The ports > repo will move at the end of March, 2021 due to timing issues. ... I filed Bug 252028 (sys/conf/newvers.sh: git "-dirty" even when clean), but that's just a trivial issue with my source tree being marked -dirty when it isn't, and that would have been part of r368709 anyway. All my other git nits have been my own (refs/notes and origin name). From owner-freebsd-stable@freebsd.org Mon Dec 21 23:35:09 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5C0ED4C6CC1 for ; Mon, 21 Dec 2020 23:35:09 +0000 (UTC) (envelope-from naddy@mips.inka.de) Received: from mail.inka.de (mail.inka.de [IPv6:2a04:c9c7:0:1073:217:a4ff:fe3b:e77c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D0G6N30yyz4fhR for ; Mon, 21 Dec 2020 23:35:07 +0000 (UTC) (envelope-from naddy@mips.inka.de) Received: from mips.inka.de (naddy@[127.0.0.1]) by mail.inka.de with uucp (rmailwrap 0.5) id 1krUhm-00286c-Pc; Tue, 22 Dec 2020 00:35:06 +0100 Received: from lorvorc.mips.inka.de (localhost [127.0.0.1]) by lorvorc.mips.inka.de (8.16.1/8.16.1) with ESMTP id 0BLNUf0b021377 for ; Tue, 22 Dec 2020 00:30:41 +0100 (CET) (envelope-from naddy@lorvorc.mips.inka.de) Received: (from naddy@localhost) by lorvorc.mips.inka.de (8.16.1/8.16.1/Submit) id 0BLNUfNa021376 for freebsd-stable@freebsd.org; Tue, 22 Dec 2020 00:30:41 +0100 (CET) (envelope-from naddy) Date: Tue, 22 Dec 2020 00:30:41 +0100 From: Christian Weisgerber To: freebsd-stable@freebsd.org Subject: 12.2-STABLE: Something has broken the bash prompt Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Rspamd-Queue-Id: 4D0G6N30yyz4fhR X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of naddy@mips.inka.de has no SPF policy when checking 2a04:c9c7:0:1073:217:a4ff:fe3b:e77c) smtp.mailfrom=naddy@mips.inka.de X-Spamd-Result: default: False [-2.10 / 15.00]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a04:c9c7:0:1073:217:a4ff:fe3b:e77c:from]; FREEFALL_USER(0.00)[naddy]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-stable@freebsd.org]; TO_DN_NONE(0.00)[]; AUTH_NA(1.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2a04:c9c7:0:1073:217:a4ff:fe3b:e77c:from:127.0.2.255]; RCVD_COUNT_THREE(0.00)[3]; DMARC_NA(0.00)[inka.de]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:202113, ipnet:2a04:c9c7::/32, country:DE]; RCVD_TLS_LAST(0.00)[]; MAILMAN_DEST(0.00)[freebsd-stable] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Dec 2020 23:35:09 -0000 I updated my 12.2-STABLE system from circa December 10 to the last stable/12 SVN commit and now my bash prompt is broken. I use a prompt with properly delineated non-printing characters: PS1="\[$(tput so)\]\u@\h\[$(tput se)\][\w] " Suddenly bash is very confused about the size of the prompt. To reproduce the problem, set PS1 as above, type a few characters, hit ^A to go to the beginning of the line, type some more, see the mess. A prompt without non-printing characters is perfectly fine. The problem is evident with LC_CTYPE=C.UTF-8, but LC_CTYPE=C is fine. Yes, there have been recent updates to the bash port. But I checked several versions, and 5.0.18, 5.1, and 5.1.4 are equally affected. And I was already running 5.1 before the problem appeared after I updated base. So I have reason to suspect that the breakage originates in base. I've looked over the stable/12 commits starting December 10 and I am very suspicious of yuripv's locale changes, in particular "update wcwidth data from utf8proc" looks like a potential culprit. Any insights? -- Christian "naddy" Weisgerber naddy@mips.inka.de From owner-freebsd-stable@freebsd.org Tue Dec 22 02:17:51 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3CB194AC836 for ; Tue, 22 Dec 2020 02:17:51 +0000 (UTC) (envelope-from yuripv@yuripv.dev) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D0Kk60zTWz4qxM for ; Tue, 22 Dec 2020 02:17:49 +0000 (UTC) (envelope-from yuripv@yuripv.dev) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 65E555C01DA; Mon, 21 Dec 2020 21:17:49 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Mon, 21 Dec 2020 21:17:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yuripv.dev; h= subject:to:references:from:message-id:date:mime-version :in-reply-to:content-type:content-transfer-encoding; s=fm1; bh=w v8zrWGRuUSxZGrOnzC0wWh3ocm2jwS1eCn6bhj51zs=; b=NyPtz+OZTuVqubCPu nxuUIChPUd+Z/bRZwlSl0IAVPMJ9IBu5YRvl85o1QBLnrkdmYIKo+kweLUVBgUYC G7f4Tg8J+oLtMLVmp4MqCvdRetizEg7LzQ1xd+WiPbpYQ8WKe233WuN7x/VpyaGh LT66o7UF1mwCFfTMqufGCL/dEA3TB6zbveqJzk8gCw8uYoWTq7UfUHe9goI2iQEd xqB9e51+hi8O43fzk6Mkb2+Dn7rv+BuJ8iFUdXOQfrvq/XjeCGSXW1xMkSLGVCTb E1jK7kSkpf+nWRc9V2dUHqu2Hg/CombFSTcTD8UK38oZIPI07vNa8aTEV3Oq6c/M glyyw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=wv8zrWGRuUSxZGrOnzC0wWh3ocm2jwS1eCn6bhj51 zs=; b=IRhcPyqYrGMkdEhngtlvtFGggg/gwpfocF6qV4VPmdWuPzMHRxviwN3hj rFJfaEgE77qxIWV+z8jZYzXkoRUtoas85mzNarf8N4s0L52TZuxzaJ3jBJOJbEmz TWJEV8aeUa2DlAaxxvmOcBbpek7jrOaTMIeg+wVusjxTm+7rDdDdIeMMY2Fsi+HD mPIgwntGzs/GOWD6Lk8B93V3vkuF76oLiVu6qtmVFgwaUKOc27UTvmi0Haqjommg fJ263H09WapuKrFvhfWmTjx9O+lfLi/RN6aQ3M1s8CPYsjLeYOtC/P0JEC2qlQeB 83u5BLPdz43e9j8vS8n4RwTtxPH3A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvddtfedggeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvfhfhffkffgfgggjtgfgsehtje ertddtfeejnecuhfhrohhmpegjuhhrihcurfgrnhhkohhvuceohihurhhiphhvseihuhhr ihhpvhdruggvvheqnecuggftrfgrthhtvghrnhepieekteeftdeftdekhfffueeljeefff fgffffuefhhefgheejvdegfeehieevudfgnecuffhomhgrihhnpehfrhgvvggsshgurdho rhhgnecukfhppeeluddrvdegtddruddvgedrudehjeenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpeihuhhrihhpvheshihurhhiphhvrdguvghv X-ME-Proxy: Received: from [192.168.1.6] (unknown [91.240.124.157]) by mail.messagingengine.com (Postfix) with ESMTPA id 7A2B6108005B; Mon, 21 Dec 2020 21:17:48 -0500 (EST) Subject: Re: 12.2-STABLE: Something has broken the bash prompt To: Christian Weisgerber , freebsd-stable@freebsd.org References: From: Yuri Pankov Message-ID: <9560e43c-6da4-e90b-d579-b7bbd9b46902@yuripv.dev> Date: Tue, 22 Dec 2020 05:17:46 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4D0Kk60zTWz4qxM X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yuripv.dev header.s=fm1 header.b=NyPtz+OZ; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=IRhcPyqY; dmarc=none; spf=pass (mx1.freebsd.org: domain of yuripv@yuripv.dev designates 66.111.4.27 as permitted sender) smtp.mailfrom=yuripv@yuripv.dev X-Spamd-Result: default: False [-3.60 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.27]; RWL_MAILSPIKE_GOOD(0.00)[66.111.4.27:from]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[yuripv.dev:+,messagingengine.com:+]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[66.111.4.27:from]; ASN(0.00)[asn:11403, ipnet:66.111.4.0/24, country:US]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.27:from]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[yuripv.dev:s=fm1,messagingengine.com:s=fm1]; FREEFALL_USER(0.00)[yuripv]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[yuripv.dev]; SPAMHAUS_ZRD(0.00)[66.111.4.27:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MAILMAN_DEST(0.00)[freebsd-stable] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2020 02:17:51 -0000 Christian Weisgerber wrote: > I updated my 12.2-STABLE system from circa December 10 to the last > stable/12 SVN commit and now my bash prompt is broken. > > I use a prompt with properly delineated non-printing characters: > > PS1="\[$(tput so)\]\u@\h\[$(tput se)\][\w] " > > Suddenly bash is very confused about the size of the prompt. To > reproduce the problem, set PS1 as above, type a few characters, hit > ^A to go to the beginning of the line, type some more, see the mess. > > A prompt without non-printing characters is perfectly fine. > The problem is evident with LC_CTYPE=C.UTF-8, but LC_CTYPE=C is > fine. > > Yes, there have been recent updates to the bash port. But I checked > several versions, and 5.0.18, 5.1, and 5.1.4 are equally affected. > And I was already running 5.1 before the problem appeared after I > updated base. > > So I have reason to suspect that the breakage originates in base. > I've looked over the stable/12 commits starting December 10 and I > am very suspicious of yuripv's locale changes, in particular > "update wcwidth data from utf8proc" looks like a potential culprit. > > Any insights? Correct, my mistake -- I failed to see the (not so) subtle difference between values returned by wcwidth() and utf8proc_charwidth() for non-printable characters. Will fix once the repos are back; for the moment you can drop the following file to tools/tools/locale/etc/final-maps/ and rebuild/reinstall ctype data in share/ctypedef/ (don't forget `make clean` there first, known issue): https://people.freebsd.org/~yuripv/widths.txt From owner-freebsd-stable@freebsd.org Tue Dec 22 14:05:03 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 479174BEFC6 for ; Tue, 22 Dec 2020 14:05:03 +0000 (UTC) (envelope-from mike@sentex.net) Received: from pyroxene2a.sentex.ca (pyroxene19.sentex.ca [IPv6:2607:f3e0:0:3::19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "pyroxene.sentex.ca", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D0dQ63l9Rz4Sxn for ; Tue, 22 Dec 2020 14:05:02 +0000 (UTC) (envelope-from mike@sentex.net) Received: from [IPv6:2607:f3e0:0:4:a036:2df8:c2fe:5d58] ([IPv6:2607:f3e0:0:4:a036:2df8:c2fe:5d58]) by pyroxene2a.sentex.ca (8.15.2/8.15.2) with ESMTPS id 0BME51wK058374 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NO); Tue, 22 Dec 2020 09:05:01 -0500 (EST) (envelope-from mike@sentex.net) Subject: Re: zfs panic RELENG_12 From: mike tancsa To: FreeBSD-STABLE Mailing List References: <878824fe-dde2-b551-4685-e8bd27371275@sentex.net> Message-ID: <5b3415cb-2176-895e-9d22-4f4f0f359d85@sentex.net> Date: Tue, 22 Dec 2020 09:05:01 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <878824fe-dde2-b551-4685-e8bd27371275@sentex.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US X-Rspamd-Queue-Id: 4D0dQ63l9Rz4Sxn X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of mike@sentex.net designates 2607:f3e0:0:3::19 as permitted sender) smtp.mailfrom=mike@sentex.net X-Spamd-Result: default: False [-2.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[mike]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f3e0:0:3::19:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; HFILTER_HELO_IP_A(1.00)[pyroxene2a.sentex.ca]; HFILTER_HELO_NORES_A_OR_MX(0.30)[pyroxene2a.sentex.ca]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2607:f3e0:0:3::19:from:127.0.2.255]; DMARC_NA(0.00)[sentex.net]; TO_DN_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_ALLOW(-0.20)[+ip6:2607:f3e0::/32]; NEURAL_HAM_MEDIUM(-1.00)[-0.997]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:11647, ipnet:2607:f3e0::/32, country:CA]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-stable] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2020 14:05:03 -0000 Hmmm, another one. Not sure if this is hardware as it seems different ? Fatal trap 12: page fault while in kernel mode cpuid = 11; apic id = 0b fault virtual address   = 0x0 fault code              = supervisor write data, page not present instruction pointer     = 0x20:0xffffffff80ca0826 stack pointer           = 0x28:0xfffffe00bc0f8540 frame pointer           = 0x28:0xfffffe00bc0f8590 code segment            = base 0x0, limit 0xfffff, type 0x1b                         = DPL 0, pres 1, long 1, def32 0, gran 1 processor eflags        = interrupt enabled, resume, IOPL = 0 current process         = 33 (dom0) trap number             = 12 panic: page fault cpuid = 11 time = 1608641071 KDB: stack backtrace: #0 0xffffffff80a3fe85 at kdb_backtrace+0x65 #1 0xffffffff809f406b at vpanic+0x17b #2 0xffffffff809f3ee3 at panic+0x43 #3 0xffffffff80e3fe71 at trap_fatal+0x391 #4 0xffffffff80e3fecf at trap_pfault+0x4f #5 0xffffffff80e3f516 at trap+0x286 #6 0xffffffff80e19318 at calltrap+0x8 #7 0xffffffff80ca47d4 at bucket_cache_drain+0x134 #8 0xffffffff80c9e302 at zone_drain_wait+0xa2 #9 0xffffffff80ca2bbd at uma_reclaim_locked+0x6d #10 0xffffffff80ca2af4 at uma_reclaim+0x34 #11 0xffffffff80cc5321 at vm_pageout_worker+0x421 #12 0xffffffff80cc4ee3 at vm_pageout+0x193 #13 0xffffffff809b55be at fork_exit+0x7e #14 0xffffffff80e1a34e at fork_trampoline+0xe Uptime: 5d20h37m16s Dumping 16057 out of 65398 MB:..1%..11%..21%..31%..41%..51%..61%..71%..81%..91% __curthread () at /usr/src/sys/amd64/include/pcpu_aux.h:55 55              __asm("movq %%gs:%P1,%0" : "=r" (td) : "n" (offsetof(struct pcpu, (kgdb) bt #0  __curthread () at /usr/src/sys/amd64/include/pcpu_aux.h:55 #1  doadump (textdump=) at /usr/src/sys/kern/kern_shutdown.c:371 #2  0xffffffff809f3c85 in kern_reboot (howto=260) at /usr/src/sys/kern/kern_shutdown.c:451 #3  0xffffffff809f40c3 in vpanic (fmt=, ap=) at /usr/src/sys/kern/kern_shutdown.c:880 #4  0xffffffff809f3ee3 in panic (fmt=) at /usr/src/sys/kern/kern_shutdown.c:807 #5  0xffffffff80e3fe71 in trap_fatal (frame=0xfffffe00bc0f8480, eva=0) at /usr/src/sys/amd64/amd64/trap.c:921 #6  0xffffffff80e3fecf in trap_pfault (frame=0xfffffe00bc0f8480, usermode=, signo=, ucode=) at /usr/src/sys/amd64/amd64/trap.c:739 #7  0xffffffff80e3f516 in trap (frame=0xfffffe00bc0f8480) at /usr/src/sys/amd64/amd64/trap.c:405 #8  #9  0xffffffff80ca0826 in slab_free_item (keg=0xfffff800037fa380, slab=0xfffff80de4656fb0, item=) at /usr/src/sys/vm/uma_core.c:3357 #10 zone_release (zone=, bucket=0xfffff801c7fd5218, cnt=) at /usr/src/sys/vm/uma_core.c:3404 #11 0xffffffff80ca47d4 in bucket_drain (zone=0xfffff800037da000, bucket=0xfffff801c7fd5200) at /usr/src/sys/vm/uma_core.c:758 #12 bucket_cache_drain (zone=0xfffff800037da000) at /usr/src/sys/vm/uma_core.c:915 #13 0xffffffff80c9e302 in zone_drain_wait (zone=0xfffff800037da000, waitok=1) at /usr/src/sys/vm/uma_core.c:1037 #14 0xffffffff80ca2bbd in zone_drain (zone=0xfffff800037da000) at /usr/src/sys/vm/uma_core.c:1056 #15 zone_foreach (zfunc=) at /usr/src/sys/vm/uma_core.c:1985 #16 uma_reclaim_locked (kmem_danger=) at /usr/src/sys/vm/uma_core.c:3737 #17 0xffffffff80ca2af4 in uma_reclaim () at /usr/src/sys/vm/uma_core.c:3757 #18 0xffffffff80cc5321 in vm_pageout_lowmem () at /usr/src/sys/vm/vm_pageout.c:1890 #19 vm_pageout_worker (arg=) at /usr/src/sys/vm/vm_pageout.c:1966 #20 0xffffffff80cc4ee3 in vm_pageout () at /usr/src/sys/vm/vm_pageout.c:2126 #21 0xffffffff809b55be in fork_exit (callout=0xffffffff80cc4d50 , arg=0x0, frame=0xfffffe00bc0f8b00) at /usr/src/sys/kern/kern_fork.c:1080 #22 (kgdb) bt full #0  __curthread () at /usr/src/sys/amd64/include/pcpu_aux.h:55         td = #1  doadump (textdump=) at /usr/src/sys/kern/kern_shutdown.c:371         error =         coredump = #2  0xffffffff809f3c85 in kern_reboot (howto=260) at /usr/src/sys/kern/kern_shutdown.c:451         once = #3  0xffffffff809f40c3 in vpanic (fmt=, ap=) at /usr/src/sys/kern/kern_shutdown.c:880         buf = "page fault", '\000'         other_cpus = {__bits = {2047, 0, 0, 0}}         td = 0xfffff80004964740         newpanic =         bootopt = #4  0xffffffff809f3ee3 in panic (fmt=) at /usr/src/sys/kern/kern_shutdown.c:807         ap = {{gp_offset = 16, fp_offset = 48, overflow_arg_area = 0xfffffe00bc0f82c0, reg_save_area = 0xfffffe00bc0f8260}} #5  0xffffffff80e3fe71 in trap_fatal (frame=0xfffffe00bc0f8480, eva=0) at /usr/src/sys/amd64/amd64/trap.c:921         softseg = {ssd_base = 0, ssd_limit = 1048575, ssd_type = 27, ssd_dpl = 0, ssd_p = 1, ssd_long = 1, ssd_def32 = 0, ssd_gran = 1}         code =         type =         ss = 40         handled = #6  0xffffffff80e3fecf in trap_pfault (frame=0xfffffe00bc0f8480, usermode=, signo=, ucode=) at /usr/src/sys/amd64/amd64/trap.c:739         td = 0xfffff80004964740         p =         eva = 0         map =         ftype =         rv = #7  0xffffffff80e3f516 in trap (frame=0xfffffe00bc0f8480) at /usr/src/sys/amd64/amd64/trap.c:405         ksi = {ksi_link = {tqe_next = 0x5fe1ea2f, tqe_prev = 0x1}, ksi_info = {si_signo = 76957504, si_errno = -2048, si_code = -1891515752, si_pid = 506236, si_uid = 0, si_status = 0, si_addr = 0x46, si_value = {sival_int = 0, sival_ptr = 0x0,               sigval_int = 0, sigval_ptr = 0x0}, _reason = {_fault = {_trapno = -1891515752}, _timer = {_timerid = -1891515752, _overrun = 506236}, _mesgq = {_mqd = -1891515752}, _poll = {_band = 2174269467509400}, __spare__ = {                 __spare1__ = 2174269467509400, __spare2__ = {-1139833872, -512, -2131811593, -1, 1, 0, 0}}}}, ksi_flags = 2126206336, ksi_sigq = 0xfffffe00002e4af8}         td = 0xfffff80004964740         dr6 =         p =         type = 12         addr =         signo =         ucode =         pf = #8  No locals. #9  0xffffffff80ca0826 in slab_free_item (keg=0xfffff800037fa380, slab=0xfffff80de4656fb0, item=) at /usr/src/sys/vm/uma_core.c:3357         dom =         freei = #10 zone_release (zone=, bucket=0xfffff801c7fd5218, cnt=) at /usr/src/sys/vm/uma_core.c:3404         clearfull = 0         keg = 0xfffff800037fa380         i = 18         item =         mem =         slab = 0xfffff80de4656fb0 #11 0xffffffff80ca47d4 in bucket_drain (zone=0xfffff800037da000, bucket=0xfffff801c7fd5200) at /usr/src/sys/vm/uma_core.c:758         i = #12 bucket_cache_drain (zone=0xfffff800037da000) at /usr/src/sys/vm/uma_core.c:915         i = 0         bucket = 0xfffff801c7fd5200         zdom = #13 0xffffffff80c9e302 in zone_drain_wait (zone=0xfffff800037da000, waitok=1) at /usr/src/sys/vm/uma_core.c:1037 No locals. #14 0xffffffff80ca2bbd in zone_drain (zone=0xfffff800037da000) at /usr/src/sys/vm/uma_core.c:1056 --Type for more, q to quit, c to continue without paging-- No locals. #15 zone_foreach (zfunc=) at /usr/src/sys/vm/uma_core.c:1985         keg = 0xfffff800037fa380         zone = 0xfffff800037da000 #16 uma_reclaim_locked (kmem_danger=) at /usr/src/sys/vm/uma_core.c:3737 No locals. #17 0xffffffff80ca2af4 in uma_reclaim () at /usr/src/sys/vm/uma_core.c:3757 No locals. #18 0xffffffff80cc5321 in vm_pageout_lowmem () at /usr/src/sys/vm/vm_pageout.c:1890         last =         _el =         _ep =         _t =         _v =         _tid =         _v =         _v = #19 vm_pageout_worker (arg=) at /usr/src/sys/vm/vm_pageout.c:1966         domain =         target_met = true         shortage = 107         vmd =         ofree = 348095         addl_shortage = #20 0xffffffff80cc4ee3 in vm_pageout () at /usr/src/sys/vm/vm_pageout.c:2126         td =         p = 0xfffff800049f8530         i =         first = 0         error = #21 0xffffffff809b55be in fork_exit (callout=0xffffffff80cc4d50 , arg=0x0, frame=0xfffffe00bc0f8b00) at /usr/src/sys/kern/kern_fork.c:1080         td = 0xfffff80004964740         p = 0xfffff800049f8530         dtd = #22 No locals. (kgdb) On 12/15/2020 4:39 PM, mike tancsa wrote: > Was doing a backup via zfs send | zfs recv when the box panic'd.  Its a > not so old RELENG_12 box from last week. Any ideas if this is a hardware > issue or a bug ? Its r368493 from last Wednesday. I dont see an ECC > errors logged, so dont think its hardware. > > Reading symbols from /boot/kernel/kernel... > Reading symbols from /usr/lib/debug//boot/kernel/kernel.debug... > > Unread portion of the kernel message buffer: > > > Fatal trap 12: page fault while in kernel mode > cpuid = 1; apic id = 01 > fault virtual address   = 0x0 > fault code              = supervisor read data, page not present > instruction pointer     = 0x20:0xffffffff823a554b > stack pointer           = 0x28:0xfffffe0343231000 > frame pointer           = 0x28:0xfffffe03432310c0 > code segment            = base 0x0, limit 0xfffff, type 0x1b >                         = DPL 0, pres 1, long 1, def32 0, gran 1 > processor eflags        = interrupt enabled, resume, IOPL = 0 > current process         = 87427 (zfs) > trap number             = 12 > panic: page fault > cpuid = 1 > time = 1608065221 > KDB: stack backtrace: > #0 0xffffffff80a3fa05 at kdb_backtrace+0x65 > #1 0xffffffff809f3beb at vpanic+0x17b > #2 0xffffffff809f3a63 at panic+0x43 > #3 0xffffffff80e400d1 at trap_fatal+0x391 > #4 0xffffffff80e4012f at trap_pfault+0x4f > #5 0xffffffff80e3f776 at trap+0x286 > #6 0xffffffff80e19568 at calltrap+0x8 > #7 0xffffffff82393a5e at dmu_object_info+0x1e > #8 0xffffffff823983a5 at dmu_recv_stream+0x7b5 > #9 0xffffffff8244b706 at zfs_ioc_recv+0xac6 > #10 0xffffffff8244dd3d at zfsdev_ioctl+0x62d > #11 0xffffffff808a35e0 at devfs_ioctl+0xb0 > #12 0xffffffff80f3becb at VOP_IOCTL_APV+0x7b > #13 0xffffffff80ad1b0a at vn_ioctl+0x16a > #14 0xffffffff808a3bce at devfs_ioctl_f+0x1e > #15 0xffffffff80a5d807 at kern_ioctl+0x2b7 > #16 0xffffffff80a5d4aa at sys_ioctl+0xfa > #17 0xffffffff80e40c87 at amd64_syscall+0x387 > Uptime: 3d14h59m52s > Dumping 17213 out of 65366 > MB:..1%..11%..21%..31%..41%..51%..61%..71%..81%..91% > > __curthread () at /usr/src/sys/amd64/include/pcpu_aux.h:55 > 55              __asm("movq %%gs:%P1,%0" : "=r" (td) : "n" > (offsetof(struct pcpu, > (kgdb) #0  __curthread () at /usr/src/sys/amd64/include/pcpu_aux.h:55 > #1  doadump (textdump=) >     at /usr/src/sys/kern/kern_shutdown.c:371 > #2  0xffffffff809f3805 in kern_reboot (howto=260) >     at /usr/src/sys/kern/kern_shutdown.c:451 > #3  0xffffffff809f3c43 in vpanic (fmt=, ap=) >     at /usr/src/sys/kern/kern_shutdown.c:880 > #4  0xffffffff809f3a63 in panic (fmt=) >     at /usr/src/sys/kern/kern_shutdown.c:807 > #5  0xffffffff80e400d1 in trap_fatal (frame=0xfffffe0343230f40, eva=0) >     at /usr/src/sys/amd64/amd64/trap.c:921 > #6  0xffffffff80e4012f in trap_pfault (frame=0xfffffe0343230f40, >     usermode=, signo=, ucode=) >     at /usr/src/sys/amd64/amd64/trap.c:739 > #7  0xffffffff80e3f776 in trap (frame=0xfffffe0343230f40) >     at /usr/src/sys/amd64/amd64/trap.c:405 > #8  > #9  0xffffffff823a554b in dnode_hold_impl (os=0xfffff805e1d2b800, >     object=, flag=, slots=, >     tag=, dnp=0xfffffe03432310d8) >     at /usr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c:1370 > #10 0xffffffff82393a5e in dmu_object_info (os=0xfffff80777890070, >     object=18446744071600721588, doi=0xfffffe03432312e0) >     at /usr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c:2615 > #11 0xffffffff823983a5 in receive_read_record (ra=) >     at > /usr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c:2821 > #12 dmu_recv_stream (drc=0xfffffe0343231430, fp=, >     voffp=, cleanup_fd=8, action_handlep=) >     at > /usr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c:3203 > #13 0xffffffff8244b706 in zfs_ioc_recv (zc=) >     at > /usr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c:4745 > #14 0xffffffff8244dd3d in zfsdev_ioctl (dev=, >     zcmd=, arg=, flag=, >     td=) >     at > /usr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c:6956 > #15 0xffffffff808a35e0 in devfs_ioctl (ap=0xfffffe0343231778) >     at /usr/src/sys/fs/devfs/devfs_vnops.c:797 > #16 0xffffffff80f3becb in VOP_IOCTL_APV ( >     vop=0xffffffff816a2fe0 , a=0xfffffe0343231778) >     at vnode_if.c:1067 > #17 0xffffffff80ad1b0a in vn_ioctl (fp=0xfffff8001802b5a0, >     com=, data=0xfffffe0343231910, >     active_cred=0xfffff80032214300, td=0x20700000) >     at /usr/src/sys/kern/vfs_vnops.c:1508 > #18 0xffffffff808a3bce in devfs_ioctl_f (fp=0xfffff80777890070, >     com=18446744071600721588, data=0xffffffff824e34ed <.L.str+1>, cred=0x0, >     td=0xfffff80298850000) at /usr/src/sys/fs/devfs/devfs_vnops.c:755 > #19 0xffffffff80a5d807 in fo_ioctl (fp=0xfffff8001802b5a0, com=3222821403, >     data=0xffffffff824e34ed <.L.str+1>, active_cred=0x0, >     td=0xfffff80298850000) at /usr/src/sys/sys/file.h:337 > #20 kern_ioctl (td=0x20700000, fd=, com=3222821403, >     data=0xffffffff824e34ed <.L.str+1> "zrl->zr_mtx") >     at /usr/src/sys/kern/sys_generic.c:805 > #21 0xffffffff80a5d4aa in sys_ioctl (td=0xfffff80298850000, >     uap=0xfffff802988503c0) at /usr/src/sys/kern/sys_generic.c:713 > #22 0xffffffff80e40c87 in syscallenter (td=0xfffff80298850000) >     at /usr/src/sys/amd64/amd64/../../kern/subr_syscall.c:144 > #23 amd64_syscall (td=0xfffff80298850000, traced=0) >     at /usr/src/sys/amd64/amd64/trap.c:1163 > #24 > #25 0x00000008004a8cba in ?? () > Backtrace stopped: Cannot access memory at address 0x7fffffffa988 > (kgdb) > > > _______________________________________________ > freebsd-stable@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org" > From owner-freebsd-stable@freebsd.org Tue Dec 22 15:07:10 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 36F5B4C049A for ; Tue, 22 Dec 2020 15:07:10 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D0fnm4Qgxz4WjF for ; Tue, 22 Dec 2020 15:07:07 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-qk1-x72f.google.com with SMTP id f26so10460446qka.0 for ; Tue, 22 Dec 2020 07:07:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=7reyerwyXxi6D/O4ovzww68ZJrYmL2cvn0m27U6EcB8=; b=kijI+RCY4a0pAcKI3hPlC7illr9iXhDnN9aSCnXYwSXaQHVXgDYbc47kqKo1rxMxcj oENqX2AjHW5uia49mTIUxfQbrHroUQc8RBQK5EnsTrE4Sl7ZnR/A1EIvaPleM3/Fs95i hDWhVNsr/1pyUQJe9wMXRyTbvOL3ZDgBVYA27vFX2LPHZaHK5gIThPjUE7SDewa0tpf5 X7mobS1XL/TkJLdc4hMuHwuTXJZx1MI/aZEBGWurkZ6jBAYdHxTrPDJqudLmkuFcaxu4 8oFlhsZ8K6npcAQInj+pksF0G2pt40qCB/cNQw/pSH2hu+XlZfes0HSsIJWNBLl8IUD2 odIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition :content-transfer-encoding:in-reply-to; bh=7reyerwyXxi6D/O4ovzww68ZJrYmL2cvn0m27U6EcB8=; b=WsiTxMthkAZXjdC50/GiN2OKAjbb2sBbh+hC5LjC0JrdO32n7qlVHvEThpXpmxKgqC UxITlMgvm/WCxMQ01kgZ8KjcCdSwcxnPNZ1SZ4BCxw8dIzP7zOvykk2stnCkdio7EdlT Z28ecZk5WjStQKaFIleiBVIv6kSQHi2mqo96Ic9XSG9KRPpcSbR4kT3EKVJmVVUFR+16 hKfTphti1Y46fDm8WV4YOP6sZI/Dh1Y/ZBhWoXnvFPS5qdCKf17ilULmgCSwmioAcs5S WqHV1kpJMs+ov7zptst6DrPVW4nDsBkjSJ0NbM36eC2Pj3m9Ju52bJgA59xFwIjo/PW9 QVCw== X-Gm-Message-State: AOAM531OLWrw3V5QsxaScmq2pBK6NgtUKuagn0l9kns2LQ4BrWHQ8OPO VIYH9+lFpYICfS9frbe6xw5YbAYF+PYxdg== X-Google-Smtp-Source: ABdhPJzepm7mEF5LjVLTF3Wy199hdmcrrtd4v+FfOAWqnTB8bmnqImOMpXWIZhU6Q8If0oC4bKLEqg== X-Received: by 2002:ae9:e648:: with SMTP id x8mr21909987qkl.226.1608649626854; Tue, 22 Dec 2020 07:07:06 -0800 (PST) Received: from raichu ([142.126.164.150]) by smtp.gmail.com with ESMTPSA id j124sm13439030qkf.113.2020.12.22.07.07.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Dec 2020 07:07:06 -0800 (PST) Sender: Mark Johnston Date: Tue, 22 Dec 2020 10:07:04 -0500 From: Mark Johnston To: mike tancsa Cc: FreeBSD-STABLE Mailing List Subject: Re: zfs panic RELENG_12 Message-ID: References: <878824fe-dde2-b551-4685-e8bd27371275@sentex.net> <5b3415cb-2176-895e-9d22-4f4f0f359d85@sentex.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <5b3415cb-2176-895e-9d22-4f4f0f359d85@sentex.net> X-Rspamd-Queue-Id: 4D0fnm4Qgxz4WjF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=kijI+RCY; dmarc=none; spf=pass (mx1.freebsd.org: domain of markjdb@gmail.com designates 2607:f8b0:4864:20::72f as permitted sender) smtp.mailfrom=markjdb@gmail.com X-Spamd-Result: default: False [-2.68 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-0.98)[-0.985]; FORGED_SENDER(0.30)[markj@freebsd.org,markjdb@gmail.com]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::72f:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[markj@freebsd.org,markjdb@gmail.com]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-stable@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::72f:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72f:from]; MID_RHS_NOT_FQDN(0.50)[]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-stable] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2020 15:07:10 -0000 On Tue, Dec 22, 2020 at 09:05:01AM -0500, mike tancsa wrote: > Hmmm, another one. Not sure if this is hardware as it seems different ? > > > > Fatal trap 12: page fault while in kernel mode > cpuid = 11; apic id = 0b > fault virtual address   = 0x0 > fault code              = supervisor write data, page not present > instruction pointer     = 0x20:0xffffffff80ca0826 > stack pointer           = 0x28:0xfffffe00bc0f8540 > frame pointer           = 0x28:0xfffffe00bc0f8590 > code segment            = base 0x0, limit 0xfffff, type 0x1b >                         = DPL 0, pres 1, long 1, def32 0, gran 1 > processor eflags        = interrupt enabled, resume, IOPL = 0 > current process         = 33 (dom0) > trap number             = 12 > panic: page fault > cpuid = 11 > time = 1608641071 > KDB: stack backtrace: > #0 0xffffffff80a3fe85 at kdb_backtrace+0x65 > #1 0xffffffff809f406b at vpanic+0x17b > #2 0xffffffff809f3ee3 at panic+0x43 > #3 0xffffffff80e3fe71 at trap_fatal+0x391 > #4 0xffffffff80e3fecf at trap_pfault+0x4f > #5 0xffffffff80e3f516 at trap+0x286 > #6 0xffffffff80e19318 at calltrap+0x8 > #7 0xffffffff80ca47d4 at bucket_cache_drain+0x134 > #8 0xffffffff80c9e302 at zone_drain_wait+0xa2 > #9 0xffffffff80ca2bbd at uma_reclaim_locked+0x6d > #10 0xffffffff80ca2af4 at uma_reclaim+0x34 > #11 0xffffffff80cc5321 at vm_pageout_worker+0x421 > #12 0xffffffff80cc4ee3 at vm_pageout+0x193 > #13 0xffffffff809b55be at fork_exit+0x7e > #14 0xffffffff80e1a34e at fork_trampoline+0xe > Uptime: 5d20h37m16s > Dumping 16057 out of 65398 > MB:..1%..11%..21%..31%..41%..51%..61%..71%..81%..91% > > __curthread () at /usr/src/sys/amd64/include/pcpu_aux.h:55 > 55              __asm("movq %%gs:%P1,%0" : "=r" (td) : "n" > (offsetof(struct pcpu, > (kgdb) bt Could you go to frame 11 and print zone->uz_name and bucket->ub_bucket[18]? I'm wondering if the item pointer was mangled somehow. From owner-freebsd-stable@freebsd.org Tue Dec 22 15:09:52 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9D9564C063F for ; Tue, 22 Dec 2020 15:09:52 +0000 (UTC) (envelope-from mike@sentex.net) Received: from pyroxene2a.sentex.ca (pyroxene19.sentex.ca [IPv6:2607:f3e0:0:3::19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "pyroxene.sentex.ca", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D0frw0q1Zz4WpB; Tue, 22 Dec 2020 15:09:52 +0000 (UTC) (envelope-from mike@sentex.net) Received: from [IPv6:2607:f3e0:0:4:a036:2df8:c2fe:5d58] ([IPv6:2607:f3e0:0:4:a036:2df8:c2fe:5d58]) by pyroxene2a.sentex.ca (8.15.2/8.15.2) with ESMTPS id 0BMF9ptj081952 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NO); Tue, 22 Dec 2020 10:09:51 -0500 (EST) (envelope-from mike@sentex.net) Subject: Re: zfs panic RELENG_12 To: Mark Johnston Cc: FreeBSD-STABLE Mailing List References: <878824fe-dde2-b551-4685-e8bd27371275@sentex.net> <5b3415cb-2176-895e-9d22-4f4f0f359d85@sentex.net> From: mike tancsa Message-ID: <7f49e64d-c875-f12d-744e-7b174e197cbb@sentex.net> Date: Tue, 22 Dec 2020 10:09:51 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US X-Rspamd-Queue-Id: 4D0frw0q1Zz4WpB X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of mike@sentex.net designates 2607:f3e0:0:3::19 as permitted sender) smtp.mailfrom=mike@sentex.net X-Spamd-Result: default: False [-1.78 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[mike]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f3e0:0:3::19:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; HFILTER_HELO_IP_A(1.00)[pyroxene2a.sentex.ca]; HFILTER_HELO_NORES_A_OR_MX(0.30)[pyroxene2a.sentex.ca]; R_SPF_ALLOW(-0.20)[+ip6:2607:f3e0::/32]; SPAMHAUS_ZRD(0.00)[2607:f3e0:0:3::19:from:127.0.2.255]; DMARC_NA(0.00)[sentex.net]; TO_DN_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-0.78)[-0.783]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:11647, ipnet:2607:f3e0::/32, country:CA]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-stable] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2020 15:09:52 -0000 On 12/22/2020 10:07 AM, Mark Johnston wrote: > > Could you go to frame 11 and print zone->uz_name and > bucket->ub_bucket[18]? I'm wondering if the item pointer was mangled > somehow. Thank you for looking! (kgdb) frame 11 #11 0xffffffff80ca47d4 in bucket_drain (zone=0xfffff800037da000, bucket=0xfffff801c7fd5200) at /usr/src/sys/vm/uma_core.c:758 758             zone->uz_release(zone->uz_arg, bucket->ub_bucket, bucket->ub_cnt); (kgdb) p zone->uz_name $1 = 0xffffffff8102118a "mbuf_jumbo_9k" (kgdb) p bucket->ub_bucket[18] $2 = (void *) 0xfffff80de4654000 (kgdb) p bucket->ub_bucket    $3 = 0xfffff801c7fd5218 (kgdb)     ---Mike From owner-freebsd-stable@freebsd.org Tue Dec 22 19:14:44 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 920094C5F39 for ; Tue, 22 Dec 2020 19:14:44 +0000 (UTC) (envelope-from mike@sentex.net) Received: from pyroxene2a.sentex.ca (pyroxene19.sentex.ca [IPv6:2607:f3e0:0:3::19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "pyroxene.sentex.ca", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D0mHR5r6sz4n6f; Tue, 22 Dec 2020 19:14:43 +0000 (UTC) (envelope-from mike@sentex.net) Received: from [IPv6:2607:f3e0:0:4:a036:2df8:c2fe:5d58] ([IPv6:2607:f3e0:0:4:a036:2df8:c2fe:5d58]) by pyroxene2a.sentex.ca (8.15.2/8.15.2) with ESMTPS id 0BMJEh5f068858 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NO); Tue, 22 Dec 2020 14:14:43 -0500 (EST) (envelope-from mike@sentex.net) From: mike tancsa To: Mark Johnston Cc: FreeBSD-STABLE Mailing List References: <878824fe-dde2-b551-4685-e8bd27371275@sentex.net> <5b3415cb-2176-895e-9d22-4f4f0f359d85@sentex.net> <7f49e64d-c875-f12d-744e-7b174e197cbb@sentex.net> Subject: Re: zfs panic RELENG_12 Message-ID: <5e2bef97-f124-036f-4e71-874707925ef0@sentex.net> Date: Tue, 22 Dec 2020 14:14:43 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <7f49e64d-c875-f12d-744e-7b174e197cbb@sentex.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Language: en-US X-Rspamd-Queue-Id: 4D0mHR5r6sz4n6f X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of mike@sentex.net designates 2607:f3e0:0:3::19 as permitted sender) smtp.mailfrom=mike@sentex.net X-Spamd-Result: default: False [0.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; NEURAL_SPAM_SHORT(1.00)[1.000]; FREEFALL_USER(0.00)[mike]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f3e0:0:3::19:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; HFILTER_HELO_IP_A(1.00)[pyroxene2a.sentex.ca]; HFILTER_HELO_NORES_A_OR_MX(0.30)[pyroxene2a.sentex.ca]; R_SPF_ALLOW(-0.20)[+ip6:2607:f3e0::/32]; SPAMHAUS_ZRD(0.00)[2607:f3e0:0:3::19:from:127.0.2.255]; DMARC_NA(0.00)[sentex.net]; TO_DN_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:11647, ipnet:2607:f3e0::/32, country:CA]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-stable] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2020 19:14:44 -0000 On 12/22/2020 10:09 AM, mike tancsa wrote: > On 12/22/2020 10:07 AM, Mark Johnston wrote: >> Could you go to frame 11 and print zone->uz_name and >> bucket->ub_bucket[18]? I'm wondering if the item pointer was mangled >> somehow. > Thank you for looking! > > (kgdb) frame 11 > > #11 0xffffffff80ca47d4 in bucket_drain (zone=3D0xfffff800037da000, > bucket=3D0xfffff801c7fd5200) at /usr/src/sys/vm/uma_core.c:758 > 758=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 zone->uz_release(zone->uz_arg, bucket->ub_bucket, > bucket->ub_cnt); > (kgdb) p zone->uz_name > $1 =3D 0xffffffff8102118a "mbuf_jumbo_9k" > (kgdb) p bucket->ub_bucket[18] > $2 =3D (void *) 0xfffff80de4654000 > (kgdb) p bucket->ub_bucket=C2=A0=C2=A0=C2=A0 > $3 =3D 0xfffff801c7fd5218 > > (kgdb) > Not sure if its coincidence or not, but previously I was running with arc being limited to ~30G of the 64G of RAM on the box.=C2=A0 I removed t= hat limit a few weeks ago after upgrading the box to RELENG_12 to pull in the OpenSSL changes.=C2=A0 The panic seems to happen under disk load. I h= ave 3 zfs pools that are pretty busy receiving snapshots. One day a week, we write a full set to a 4th zfs pool off some geli attached drives via USB for offsite cold storage.=C2=A0 The crashes happened with that extra leve= l of disk work.=C2=A0 gstat shows most of the 12 drives off 2 mrsas controller= s at or close to 100% busy during the 18hrs it takes to dump out the files. Trying a new cold storage run now with the arc limit back to vfs.zfs.arc_max=3D29334498304 =C2=A0=C2=A0=C2=A0 ---Mike From owner-freebsd-stable@freebsd.org Wed Dec 23 10:35:35 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 388734BAA93; Wed, 23 Dec 2020 10:35:35 +0000 (UTC) (envelope-from zarychtam@plan-b.pwste.edu.pl) Received: from plan-b.pwste.edu.pl (plan-b.pwste.edu.pl [IPv6:2001:678:618::40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "plan-b.pwste.edu.pl", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D18jw6G0yz4fFY; Wed, 23 Dec 2020 10:35:32 +0000 (UTC) (envelope-from zarychtam@plan-b.pwste.edu.pl) Received: from fomalhaut.potoki.eu ([IPv6:2001:470:71:d47:b5d1:8eb5:3029:f41e]) (authenticated bits=0) by plan-b.pwste.edu.pl (8.16.1/8.16.1) with ESMTPSA id 0BNAZLTZ004230 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Wed, 23 Dec 2020 11:35:21 +0100 (CET) (envelope-from zarychtam@plan-b.pwste.edu.pl) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=plan-b.pwste.edu.pl; s=plan-b-mailer; t=1608719722; bh=ReHhf4e3AlG8W3i8YZGkDz5UGQZZCUr+RMUc34av0vs=; h=To:References:From:Subject:Date:In-Reply-To; b=LIVuN0xdAizOHjdI9fjcpRgy/lj2T39kOFeKd/xyTtGnuKwYhLuCwAdQAzbYT0PHd jeSlNGs1ZpsxHreMD0MswQ2xRui5FKQgaBk3XLcnGPWI/V+NOoArBZ50OSsAeSNFgD /KndlPmhMJn1n5AkNakCN/GcxPAdTR5F32iKO9c15eNhsdcbSoskzZ46EsHdjscoZ7 Sn4PnaDu2+g2VrFO3Bo7QUoGQSn3eORFJvVktCc+v8j9EM2I6wvOoYhwpU7n1Fcn1P h4uL0heItIUpR68SOQYacW2rESW+xfSoQ9EcTwgI3WtmmCiUDwrlVcSs1UsZpO51oi 2AELiuLWbAgaA== X-Authentication-Warning: plan-b.pwste.edu.pl: Host [IPv6:2001:470:71:d47:b5d1:8eb5:3029:f41e] claimed to be fomalhaut.potoki.eu To: Warner Losh , FreeBSD Current , FreeBSD-STABLE Mailing List References: From: Marek Zarychta Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend Message-ID: Date: Wed, 23 Dec 2020 11:35:20 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.5.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4D18jw6G0yz4fFY X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=plan-b.pwste.edu.pl header.s=plan-b-mailer header.b=LIVuN0xd; dmarc=pass (policy=none) header.from=plan-b.pwste.edu.pl; spf=none (mx1.freebsd.org: domain of zarychtam@plan-b.pwste.edu.pl has no SPF policy when checking 2001:678:618::40) smtp.mailfrom=zarychtam@plan-b.pwste.edu.pl X-Spamd-Result: default: False [-3.80 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[plan-b.pwste.edu.pl:s=plan-b-mailer]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; DWL_DNSWL_MED(-2.00)[pwste.edu.pl:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_SPAM_SHORT(1.00)[1.000]; SPAMHAUS_ZRD(0.00)[2001:678:618::40:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[plan-b.pwste.edu.pl:+]; DMARC_POLICY_ALLOW(-0.50)[plan-b.pwste.edu.pl,none]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2001:678:618::40:from]; ASN(0.00)[asn:206006, ipnet:2001:678:618::/48, country:PL]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-current,freebsd-stable]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 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, 23 Dec 2020 10:35:35 -0000 W dniu 17.12.2020 o 01:46, Warner Losh pisze: > Greetings, > > The FreeBSD project will be moving it's source repo from subversion to git > starting this this weekend. The docs repo was moved 2 weeks ago. The ports > repo will move at the end of March, 2021 due to timing issues. > > The short version is that we're switching the version control we're using. > This switch will preserve much of the current FreeBSD development workflow. > After the switch, the subversion repo will become almost read-only. All > future work will be done in git, however as a transition aide we'll be > replaying the MFCs to stable/11, stable/12 and the related releng branches > for the life of those branches. > > For more detailed information, please see > https://github.com/bsdimp/freebsd-git-docs/ for the current documentation. > > Please see https://wiki.freebsd.org/git for the latest detailed schedule > (please note that this schedule is subject to change). > > Warner > _______________________________________________ > freebsd-current@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" > Will the project utilize gitatributes(5) to support ident as $Id:$ in git repository? In file header, we have now only $FreeBSD$ since svn tags disappeared after the transition. Adding ident tags to certain files which are updated by mergemaster(8) or etcupdated(8) would be appreciated. Best regards, -- Marek Zarychta From owner-freebsd-stable@freebsd.org Wed Dec 23 14:32:26 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2BD734C054F; Wed, 23 Dec 2020 14:32:26 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from mx1.enfer-du-nord.net (mx1.enfer-du-nord.net [IPv6:2001:41d0:302:1100::e:1def]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1FzD5sTlz3CMq; Wed, 23 Dec 2020 14:32:23 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from [IPv6:2003:fb:4f00:fc01:958a:3805:d7e4:4d3e] (p200300fB4f00fC01958A3805D7E44D3e.dip0.t-ipconnect.de [IPv6:2003:fb:4f00:fc01:958a:3805:d7e4:4d3e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.enfer-du-nord.net (Postfix) with ESMTPSA id 4D1Fz3689dzdPS; Wed, 23 Dec 2020 15:32:15 +0100 (CET) From: Michael Grimm Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend Date: Wed, 23 Dec 2020 15:32:13 +0100 References: To: FreeBSD Current , FreeBSD-STABLE Mailing List In-Reply-To: Message-Id: X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4D1FzD5sTlz3CMq X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of trashcan@ellael.org has no SPF policy when checking 2001:41d0:302:1100::e:1def) smtp.mailfrom=trashcan@ellael.org X-Spamd-Result: default: False [-1.60 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2001:41d0:302:1100::e:1def:from]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[ellael.org]; ARC_NA(0.00)[]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[2001:41d0:302:1100::e:1def:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; TO_DN_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:16276, ipnet:2001:41d0::/32, country:FR]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-current,freebsd-stable] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 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, 23 Dec 2020 14:32:26 -0000 Hi, Warner Losh wrote: > The FreeBSD project will be moving it's source repo from subversion to = git > starting this this weekend.=20 First of all I'd like to thank all those involved in this for their = efforts. Following = https://github.com/bsdimp/freebsd-git-docs/blob/main/mini-primer.md form = your other mail I was able to migrate from svn to git without running = into any issues. Right now I am learning how to use git the way I sed svn before. I am = just following 12-STABLE in order to build world and kernel. I am not = developing, neither am I committing. I wonder how one would switch from a currently used branch (OLD) to = another branch (NEW). With svn I used: svn switch svn://svn.freebsd.org/base/stable/NEW /usr/src For git I found: git branch -m stable/OLD stable/NEW or git branch -M stable/OLD stable/NEW git-branch(1): With a -m or -M option, will be renamed to = . If had a corresponding reflog, it is renamed to match , and a reflog entry is created to remember the branch renaming. If exists, -M must be used to force the = rename to happen. I don't understand that text completely, because I don't know what a = reflog is, yet ;-) Thus: Should I use "-m" or "-M" in my scenario when switching from = stable/12 to stable/13 in the near future? Thanks and regards, Michael From owner-freebsd-stable@freebsd.org Wed Dec 23 15:04:44 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AF2EF4C17B7; Wed, 23 Dec 2020 15:04:44 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1GhX4ddGz3Fv8; Wed, 23 Dec 2020 15:04:44 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from onlyone.not-for.work (onlyone.not-for.work [IPv6:2a01:4f8:201:6350::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: lev/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 739F9273EF; Wed, 23 Dec 2020 15:04:44 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from [192.168.23.230] (unknown [89.113.128.32]) (Authenticated sender: lev@serebryakov.spb.ru) by onlyone.not-for.work (Postfix) with ESMTPSA id 4A80F6173; Wed, 23 Dec 2020 18:04:41 +0300 (MSK) Reply-To: lev@FreeBSD.org Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend To: Michael Grimm , FreeBSD Current , FreeBSD-STABLE Mailing List References: From: Lev Serebryakov Organization: FreeBSD Message-ID: <996b191c-635e-3248-c8f9-ea1b5f70507e@FreeBSD.org> Date: Wed, 23 Dec 2020 18:04:40 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 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, 23 Dec 2020 15:04:44 -0000 On 23.12.2020 17:32, Michael Grimm wrote: > git-branch(1): > With a -m or -M option, will be renamed to . If ==============================================^^^^^^^^^^^^^^^^^^^^ > had a corresponding reflog, it is renamed to match > , and a reflog entry is created to remember the branch > renaming. If exists, -M must be used to force the rename to > happen. > > I don't understand that text completely, because I don't know what a reflog is, yet ;-) > > Thus: Should I use "-m" or "-M" in my scenario when switching from stable/12 to stable/13 in the near future? You should not use any options if you want to switch your working copy to new branch. `-m` and `-M` *renames* branch! -- // Lev Serebryakov From owner-freebsd-stable@freebsd.org Wed Dec 23 15:09:08 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0C3DE4C1E18; Wed, 23 Dec 2020 15:09:08 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1Gnb6s8Zz3GC9; Wed, 23 Dec 2020 15:09:07 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from onlyone.not-for.work (onlyone.not-for.work [148.251.9.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: lev/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id C4C71265D9; Wed, 23 Dec 2020 15:09:07 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from [192.168.23.230] (unknown [89.113.128.32]) (Authenticated sender: lev@serebryakov.spb.ru) by onlyone.not-for.work (Postfix) with ESMTPSA id 20A9B6176; Wed, 23 Dec 2020 18:09:05 +0300 (MSK) Reply-To: lev@FreeBSD.org Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend From: Lev Serebryakov To: Michael Grimm , FreeBSD Current , FreeBSD-STABLE Mailing List References: <996b191c-635e-3248-c8f9-ea1b5f70507e@FreeBSD.org> Organization: FreeBSD Message-ID: Date: Wed, 23 Dec 2020 18:09:05 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <996b191c-635e-3248-c8f9-ea1b5f70507e@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 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, 23 Dec 2020 15:09:08 -0000 On 23.12.2020 18:04, Lev Serebryakov wrote: > On 23.12.2020 17:32, Michael Grimm wrote: > >> git-branch(1): >>         With a -m or -M option, will    be renamed to . If > ==============================================^^^^^^^^^^^^^^^^^^^^ >>         had a corresponding reflog, it is renamed to    match >>         , and    a reflog entry is created to remember the branch >>         renaming. If     exists,    -M must    be used    to force the rename to >>         happen. >> >> I don't understand that text completely, because I don't know what a reflog is, yet ;-) >> >> Thus: Should I use "-m" or "-M" in my scenario when switching from stable/12 to stable/13 in the near future? > You should not use any options if you want to switch your working copy to new branch. `-m` and `-M` *renames* branch! I'm idiot today, it is `git checkout ` of course. -- // Lev Serebryakov From owner-freebsd-stable@freebsd.org Wed Dec 23 16:58:23 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B0D7F4C49ED for ; Wed, 23 Dec 2020 16:58:23 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1KCf66Vkz3QW6 for ; Wed, 23 Dec 2020 16:58:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf2a.google.com with SMTP id bd6so38808qvb.9 for ; Wed, 23 Dec 2020 08:58:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=XBlfh13lQPoUv1fPqXP65w4/14nny66wIZboI+33OQo=; b=dsVtYsnbN9BxBvoZItvOZzp3wbTk1HHX/4udK/EbFi2DV+PL7vpxZkXkqFjAfrH3Pm A/y2B1uxuQQM2dHMpz6eub+a0dlNsL3+f/YE98GyiiAw7o+IVNi0xfb9ox4sZSC3jxey /Wreli9hj2y428wOjdJEfZt/e+W6svo/a24tIwhHuKXsuTbNL+rT8a1CmDcRQx54Xawo siBdaAt8RmzRhiPvTFNtEIWaGXnxOpfKw9QFonQ1LoZiSaU5s91VZpUTp0UnSp3APG/6 b2ouplrTibxOfN5iuN7P1BP/Z+vWIJp40HPqwOLpUG/C/C9jX4jTZoFqf5zdffODr+Tm B1pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=XBlfh13lQPoUv1fPqXP65w4/14nny66wIZboI+33OQo=; b=Y1shAA5UhZHSZsXis9RkFKJEndamJSNwmPoVJuy7HoVUoG/ELL6NhFhRiAOS4aJJ+r +Mj2AbExlnXtatCpjf5yN1L7jmWk5NZPlQJy50BLLD8FhHpHX/VwEuN1EhQylfPKyzkL mwkre6S3xS4q/ec2noihZl/V+7EPg/DbE6s7MKTX+OLQqqHq0nUcjmDqo4AQKVBHl1Ys Hj90ShuG9EB31efJXyIw9AUl6US3RedXfeFY/V2Lw2M3z5FR3AV4C+2wKOUViKopMZKB 7kO20ihsV+PKJi/iptcyJrCF0gr7Ig7YwO+KrBN/Mw7pnFYH6ip28kQcJqHUQspo/ulI sDxg== X-Gm-Message-State: AOAM532smswWPcwySlgmvm2E1vpwaUQzDXbIuJcZ0iHBZdJc0BdovtNQ m4DF8Jz1eFWu5SY7xij9laV8tzBv2b0ENhPMtrXlRgpCDgYv3Q== X-Google-Smtp-Source: ABdhPJzKb1pa4tUf6I92dc0D9PHSnqg5FpxaSnnbSlUZ3oRUCQXNlY+A34Uh8KfXGUL17+8VyLpcZGaZzvVRbEDBJjc= X-Received: by 2002:a0c:b347:: with SMTP id a7mr22952839qvf.23.1608742701951; Wed, 23 Dec 2020 08:58:21 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Wed, 23 Dec 2020 09:58:10 -0700 Message-ID: Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend To: Marek Zarychta Cc: FreeBSD Current , FreeBSD-STABLE Mailing List X-Rspamd-Queue-Id: 4D1KCf66Vkz3QW6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=dsVtYsnb; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f2a) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-stable@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::f2a:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f2a:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::f2a:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-stable]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 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, 23 Dec 2020 16:58:23 -0000 On Wed, Dec 23, 2020 at 3:35 AM Marek Zarychta < zarychtam@plan-b.pwste.edu.pl> wrote: > W dniu 17.12.2020 o 01:46, Warner Losh pisze: > > Greetings, > > > > The FreeBSD project will be moving it's source repo from subversion to > git > > starting this this weekend. The docs repo was moved 2 weeks ago. The > ports > > repo will move at the end of March, 2021 due to timing issues. > > > > The short version is that we're switching the version control we're > using. > > This switch will preserve much of the current FreeBSD development > workflow. > > After the switch, the subversion repo will become almost read-only. All > > future work will be done in git, however as a transition aide we'll be > > replaying the MFCs to stable/11, stable/12 and the related releng > branches > > for the life of those branches. > > > > For more detailed information, please see > > https://github.com/bsdimp/freebsd-git-docs/ for the current > documentation. > > > > Please see https://wiki.freebsd.org/git for the latest detailed schedule > > (please note that this schedule is subject to change). > > > > Warner > > _______________________________________________ > > freebsd-current@freebsd.org mailing list > > https://lists.freebsd.org/mailman/listinfo/freebsd-current > > To unsubscribe, send any mail to " > freebsd-current-unsubscribe@freebsd.org" > > > > Will the project utilize gitatributes(5) to support ident as $Id:$ in > git repository? > There are no plans. $Id$, as implemented in git, records the wrong information. Rather than a commit hash, it's the blob object hash which can be hard to puzzle out. It would cause way more confusion were we to use it. Plus, when I did experiments with it, it was slow and difficult to work with. Given these issues, we've opted to not use it. Plus there's no documented way to change $Id$ to $FreeBSD$ in an easy way, and the filtering stuff looked extra fragile. > In file header, we have now only $FreeBSD$ since svn tags disappeared > after the transition. Adding ident tags to certain files which are > updated by mergemaster(8) or etcupdated(8) would be appreciated. > mergemaster and etcupdate can cope without them. Warner From owner-freebsd-stable@freebsd.org Wed Dec 23 17:02:04 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BF9284C5724 for ; Wed, 23 Dec 2020 17:02:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1KHv6WkNz3hFb for ; Wed, 23 Dec 2020 17:02:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x833.google.com with SMTP id z20so11698853qtq.3 for ; Wed, 23 Dec 2020 09:02:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=BOA+J6Z7w3e4LMsKM1gFFHRjbAek4Ioeg2T8we6li4w=; b=lQKNAKzHeQCBQBEhyVVBZ5xMNFHpX15sZELUXQpj/bOaBdm/NlHsQfUrw6FAWvejTM YMEjIllOub3wrW+s7fmzn9cHTFBu529vIo0G2rfcNFCXF3OI2lww4APqVFFYnWOeiEoU 6XwHuyIHmQrhUcewqYKqytuQJQ+f3k3lRckjI6FHeqfO35A7ZolKDmHx4K++o9rwZK3M AcylveBYoTm/RL45TTGzHgz4kWeJT5zHnHIk5Q8JDoa+iPOpWUzSMAEfgjbtwEDttcJP DJK06Kf/Eyw5a2k7TtajPyo471FNHNHmFPXMiiDPKsv3BDDWdvvvb2Ggm14+W50RX86a v5QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=BOA+J6Z7w3e4LMsKM1gFFHRjbAek4Ioeg2T8we6li4w=; b=szgOMmUK2AuRRlq26oywjuMxS56ox/Y0fMY7u0GhX9H2Gzgk6mX5A1yjwkzlcxPgwb MCk5k726qG2o0vhPU7KBcpzLvV2nr4bg2WV+bIlQKB51euz4rQLzMBPI0xUzJOSr1hIP Yoa58ADO0b9zbgYW3b3f2ebvgO3sRPKQTPq2GRbyofGn3sSUeC4+THj+Yv5ndTQGws8C CnMl97IgFjs0H6HIUlF4lHe76GFWFlScWlUAorqGnwQFCy60se46IQIocHBGsXoeAFY6 BQYmMNa9yVvd+/ks3PcYT61/f6tPvginrzN1B5+vpUkuq7vGMFLLlQPSKcn5+BRyRP7K ayug== X-Gm-Message-State: AOAM530mWh+8+JH+Tpu+7snOj9HAm1xqbKavCkPsqoEKWR4X9Ha5wKG3 FFpg1IxPNGUS3Gwwpm4WJ0tNLvpyfDaqrMLUx/0IyqHGDuxwRw== X-Google-Smtp-Source: ABdhPJxhat8tjUG1W+pyMjy6OMOE+0yVqTXSpF0at3hsCM7NEzKkeTLthdBGTzNgd+6sEeI45+B0zl7wuDysKB93Qik= X-Received: by 2002:ac8:74d4:: with SMTP id j20mr26394105qtr.101.1608742922755; Wed, 23 Dec 2020 09:02:02 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Wed, 23 Dec 2020 10:01:51 -0700 Message-ID: Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend To: Michael Grimm Cc: FreeBSD Current , FreeBSD-STABLE Mailing List X-Rspamd-Queue-Id: 4D1KHv6WkNz3hFb X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=lQKNAKzH; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::833) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-stable@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::833:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::833:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::833:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-stable]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 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, 23 Dec 2020 17:02:04 -0000 On Wed, Dec 23, 2020 at 7:32 AM Michael Grimm wrote: > Hi, > > Warner Losh wrote: > > > The FreeBSD project will be moving it's source repo from subversion to > git > > starting this this weekend. > > First of all I'd like to thank all those involved in this for their > efforts. > > Following > https://github.com/bsdimp/freebsd-git-docs/blob/main/mini-primer.md form > your other mail I was able to migrate from svn to git without running into > any issues. > > Right now I am learning how to use git the way I sed svn before. I am just > following 12-STABLE in order to build world and kernel. I am not > developing, neither am I committing. > > I wonder how one would switch from a currently used branch (OLD) to > another branch (NEW). > > With svn I used: > svn switch svn://svn.freebsd.org/base/stable/NEW /usr/src > > For git I found: > git branch -m stable/OLD stable/NEW > or > git branch -M stable/OLD stable/NEW > > git-branch(1): > With a -m or -M option, will be renamed to . > If > had a corresponding reflog, it is renamed to match > , and a reflog entry is created to remember the branch > renaming. If exists, -M must be used to force the > rename to > happen. > > I don't understand that text completely, because I don't know what a > reflog is, yet ;-) > > Thus: Should I use "-m" or "-M" in my scenario when switching from > stable/12 to stable/13 in the near future? > I think the answer is a simple "git checkout NEW". This will replace the current tree at branch OLD with the contents of branch NEW. git branch -m is different and changes what the branch means. If you did what you suggested then you'd be renaming the OLD brnach to NEW, which isn't what I think you're asking about. Warner From owner-freebsd-stable@freebsd.org Wed Dec 23 18:00:21 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D31EF4C6F97 for ; Wed, 23 Dec 2020 18:00:21 +0000 (UTC) (envelope-from karl@denninger.net) Received: from colo1.denninger.net (colo1.denninger.net [104.236.120.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1Lb90Bssz3m91 for ; Wed, 23 Dec 2020 18:00:20 +0000 (UTC) (envelope-from karl@denninger.net) Received: from denninger.net (096-033-205-208.res.spectrum.com [96.33.205.208]) by colo1.denninger.net (Postfix) with ESMTP id D90C6211087 for ; Wed, 23 Dec 2020 13:00:15 -0500 (EST) Received: from [192.168.10.25] (D15.Denninger.Net [192.168.10.25]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by denninger.net (Postfix) with ESMTPSA id D6E0B1F7BA6 for ; Wed, 23 Dec 2020 13:00:17 -0500 (EST) Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend To: freebsd-stable@freebsd.org References: From: Karl Denninger Message-ID: <555bd9da-a106-c70c-0f1a-a6a5136a4d41@denninger.net> Date: Wed, 23 Dec 2020 13:00:18 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-512; boundary="------------ms030004020708060708040001" X-Rspamd-Queue-Id: 4D1Lb90Bssz3m91 X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=pass (policy=none) header.from=denninger.net; spf=pass (mx1.freebsd.org: domain of karl@denninger.net designates 104.236.120.189 as permitted sender) smtp.mailfrom=karl@denninger.net X-Spamd-Result: default: False [-5.90 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; HAS_ATTACHMENT(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[denninger.net,none]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; R_DKIM_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[104.236.120.189:from]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:14061, ipnet:104.236.64.0/18, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEFALL_USER(0.00)[karl]; FROM_HAS_DN(0.00)[]; SIGNED_SMIME(-2.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,multipart/alternative,text/plain]; MIME_TRACE(0.00)[0:+,1:+,2:+,3:~,4:~]; PREVIOUSLY_DELIVERED(0.00)[freebsd-stable@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[104.236.120.189:from:127.0.2.255]; MAILMAN_DEST(0.00)[freebsd-stable] X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 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, 23 Dec 2020 18:00:21 -0000 This is a cryptographically signed message in MIME format. --------------ms030004020708060708040001 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable On 12/23/2020 12:01, Warner Losh wrote: > On Wed, Dec 23, 2020 at 7:32 AM Michael Grimm wro= te: > >> Hi, >> >> Warner Losh wrote: >> >>> The FreeBSD project will be moving it's source repo from subversion t= o >> git >>> starting this this weekend. >> First of all I'd like to thank all those involved in this for their >> efforts. >> >> Following >> https://github.com/bsdimp/freebsd-git-docs/blob/main/mini-primer.md fo= rm >> your other mail I was able to migrate from svn to git without running = into >> any issues. >> >> Right now I am learning how to use git the way I sed svn before. I am = just >> following 12-STABLE in order to build world and kernel. I am not >> developing, neither am I committing. >> >> I wonder how one would switch from a currently used branch (OLD) to >> another branch (NEW). >> >> With svn I used: >> svn switch svn://svn.freebsd.org/base/stable/NEW /usr/src >> >> For git I found: >> git branch -m stable/OLD stable/NEW >> or >> git branch -M stable/OLD stable/NEW >> >> git-branch(1): >> With a -m or -M option, will be renamed to . >> If >> had a corresponding reflog, it is renamed to match= >> , and a reflog entry is created to remember the bra= nch >> renaming. If exists, -M must be used to force the >> rename to >> happen. >> >> I don't understand that text completely, because I don't know what a >> reflog is, yet ;-) >> >> Thus: Should I use "-m" or "-M" in my scenario when switching from >> stable/12 to stable/13 in the near future? >> > I think the answer is a simple "git checkout NEW". This will replace th= e > current tree at branch OLD with the contents of branch NEW. > > git branch -m is different and changes what the branch means. If you di= d > what you suggested then you'd be renaming the OLD brnach to NEW, which > isn't what I think you're asking about. Correct -- "git checkout NEW" where "new" is the desired branch you wish = to have "active." If you have made local changes it will tell you to act on that first;=20 the usual is "git stash" to save them.=C2=A0 You can then apply them with= =20 "git stash apply" to the *new* branch, assuming that makes sense to do=20 (e.g. a kernel configuration file, etc.) "Stash" maintains a stack which = can be manipulated as well (so a "stash" if you already "stash"ed and=20 did not drop it creates a second one, aka "stash@(0) and stash@(1)". --=20 Karl Denninger karl@denninger.net /The Market Ticker/ /[S/MIME encrypted email preferred]/ --------------ms030004020708060708040001 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature 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 --------------ms030004020708060708040001-- From owner-freebsd-stable@freebsd.org Wed Dec 23 18:15:19 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0C9954C7799; Wed, 23 Dec 2020 18:15:19 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from mx2.enfer-du-nord.net (mx2.enfer-du-nord.net [IPv6:2001:41d0:401:2100::5:8a0e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1LwQ0sn7z3nFm; Wed, 23 Dec 2020 18:15:17 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from [IPv6:2003:fb:4f00:fc01:958a:3805:d7e4:4d3e] (p200300fB4f00fc01958A3805D7E44D3E.dip0.t-ipconnect.de [IPv6:2003:fb:4f00:fc01:958a:3805:d7e4:4d3e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.enfer-du-nord.net (Postfix) with ESMTPSA id 4D1LwD0pd0zv8M; Wed, 23 Dec 2020 19:15:08 +0100 (CET) From: Michael Grimm Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend Date: Wed, 23 Dec 2020 19:15:01 +0100 References: To: FreeBSD Current , FreeBSD-STABLE Mailing List In-Reply-To: Message-Id: <8E062816-5CC1-42A4-ACE2-E0382960AC07@ellael.org> X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4D1LwQ0sn7z3nFm X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of trashcan@ellael.org has no SPF policy when checking 2001:41d0:401:2100::5:8a0e) smtp.mailfrom=trashcan@ellael.org X-Spamd-Result: default: False [-1.60 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2001:41d0:401:2100::5:8a0e:from]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[ellael.org]; ARC_NA(0.00)[]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[2001:41d0:401:2100::5:8a0e:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; TO_DN_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:16276, ipnet:2001:41d0::/32, country:FR]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-current,freebsd-stable] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 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, 23 Dec 2020 18:15:19 -0000 Warner Losh wrote: > On Wed, Dec 23, 2020 at 7:32 AM Michael Grimm = wrote: >> With svn I used: >> svn switch svn://svn.freebsd.org/base/stable/NEW /usr/src >>=20 >> For git I found: >> git branch -m stable/OLD stable/NEW >> or >> git branch -M stable/OLD stable/NEW >=20 > I think the answer is a simple "git checkout NEW". This will replace = the > current tree at branch OLD with the contents of branch NEW. Thanks to all of you pointing me away from renaming a branch instead of = simply checking out the branch of interest. > git branch -m is different and changes what the branch means. If you = did > what you suggested then you'd be renaming the OLD brnach to NEW, which > isn't what I think you're asking about. No, I will not apply anything before having it understood. In this case = I looked into git-branch(1) because I believed this the command to be. = Haven't found git-checkout(1) :-( Sorry for the noise. Now, stable/13 may come, I am ready to switch ;-) Thanks again and regards, Michael= From owner-freebsd-stable@freebsd.org Wed Dec 23 18:20:07 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 276B74C7C29; Wed, 23 Dec 2020 18:20:07 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from mx2.enfer-du-nord.net (mx2.enfer-du-nord.net [IPv6:2001:41d0:401:2100::5:8a0e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1M1y2SMzz3nZl; Wed, 23 Dec 2020 18:20:06 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from [IPv6:2003:fb:4f00:fc01:958a:3805:d7e4:4d3e] (p200300fB4f00fc01958A3805D7E44D3E.dip0.t-ipconnect.de [IPv6:2003:fb:4f00:fc01:958a:3805:d7e4:4d3e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.enfer-du-nord.net (Postfix) with ESMTPSA id 4D1M1w4BVBzv8w; Wed, 23 Dec 2020 19:20:04 +0100 (CET) From: Michael Grimm Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend Date: Wed, 23 Dec 2020 19:20:00 +0100 References: <0bce6fd0-7a54-b90a-ac6b-24226d77a87f@FreeBSD.org> To: FreeBSD Current , FreeBSD-STABLE Mailing List In-Reply-To: <0bce6fd0-7a54-b90a-ac6b-24226d77a87f@FreeBSD.org> Message-Id: X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4D1M1y2SMzz3nZl X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of trashcan@ellael.org has no SPF policy when checking 2001:41d0:401:2100::5:8a0e) smtp.mailfrom=trashcan@ellael.org X-Spamd-Result: default: False [-1.60 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2001:41d0:401:2100::5:8a0e:from]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[ellael.org]; ARC_NA(0.00)[]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[2001:41d0:401:2100::5:8a0e:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; TO_DN_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:16276, ipnet:2001:41d0::/32, country:FR]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-current,freebsd-stable] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 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, 23 Dec 2020 18:20:07 -0000 Renato Botelho wrote: > If you want to switch to a different already existing branch, as svn = switch does, you should look at git-checkout. >=20 > It can be a bit expensive due to the size of src repository so if you = do work on multiple branches too often you can improve it using = git-worktree. If I understand git-worktree(1) correctly I will most probably not need = it, because I will only follow one single branch stable/12, and soon = stable/13. Or do I miss something important? Thanks and regards, Michael =20= From owner-freebsd-stable@freebsd.org Wed Dec 23 20:22:22 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3EC944CA2F0; Wed, 23 Dec 2020 20:22:22 +0000 (UTC) (envelope-from warlock@phouka1.phouka.net) Received: from phouka1.phouka.net (phouka1.phouka.net [107.170.196.116]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "phouka.net", Issuer "Go Daddy Secure Certificate Authority - G2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1Pl10g3Kz4RCy; Wed, 23 Dec 2020 20:22:20 +0000 (UTC) (envelope-from warlock@phouka1.phouka.net) Received: from phouka1.phouka.net (localhost [127.0.0.1]) by phouka1.phouka.net (8.16.1/8.16.1) with ESMTPS id 0BNKJlHa010418 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 23 Dec 2020 12:19:47 -0800 (PST) (envelope-from warlock@phouka1.phouka.net) Received: (from warlock@localhost) by phouka1.phouka.net (8.16.1/8.16.1/Submit) id 0BNKJl4g010417; Wed, 23 Dec 2020 12:19:47 -0800 (PST) (envelope-from warlock) Date: Wed, 23 Dec 2020 12:19:47 -0800 From: John Kennedy To: Warner Losh Cc: FreeBSD Current , FreeBSD-STABLE Mailing List Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4D1Pl10g3Kz4RCy X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of warlock@phouka1.phouka.net has no SPF policy when checking 107.170.196.116) smtp.mailfrom=warlock@phouka1.phouka.net X-Spamd-Result: default: False [-1.78 / 15.00]; ARC_NA(0.00)[]; MAILMAN_DEST(0.00)[freebsd-current,freebsd-stable]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[phouka.net]; RBL_DBL_DONT_QUERY_IPS(0.00)[107.170.196.116:from]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[107.170.196.116:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-0.98)[-0.977]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[warlock@phouka.net,warlock@phouka1.phouka.net]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[warlock@phouka.net,warlock@phouka1.phouka.net]; ASN(0.00)[asn:14061, ipnet:107.170.192.0/18, country:US] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 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, 23 Dec 2020 20:22:22 -0000 On Mon, Dec 21, 2020 at 12:47:38PM -0800, John Kennedy wrote: > On Wed, Dec 16, 2020 at 05:46:35PM -0700, Warner Losh wrote: > > The FreeBSD project will be moving it's source repo from subversion to git > > starting this this weekend. The docs repo was moved 2 weeks ago. The ports > > repo will move at the end of March, 2021 due to timing issues. ... > > I filed Bug 252028 (sys/conf/newvers.sh: git "-dirty" even when clean), > but that's just a trivial issue with my source tree being marked -dirty > when it isn't, and that would have been part of r368709 anyway. All my > other git nits have been my own (refs/notes and origin name). Warner/others, up to r368820, we had log entries that looked like this: commit 3cc0c0d66a065554459bd2f9b4f80cc07426464a Author: Li-Wen Hsu Date: Sun Dec 20 02:59:44 2020 +0000 Mark the repository as being converted to Git. This is the last Subversion commit to src. Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=368820 Now, our git logs look like this: commit 17eba5e32a2cf7a217bb9f1e5dcca351f2b71cfc Author: Ed Maste Date: Tue Dec 22 23:31:15 2020 -0500 newvers.sh: fix sense of git dirty check Previously we reported -dirty for an unmodified tree, and no -dirty if there were changes. PR: 252028 Reported by: John Kennedy (Specifically, no Notes: with revision= value) For the kernel I compiled today, the uname output dumps out: FreeBSD 13.0-CURRENT #245 r368820+878d53410f75-c255274(main): ... Last kernel was (-dirty since fixed): FreeBSD 13.0-CURRENT #244 r368820+3cc0c0d66a06-c255241(main)-dirty: ... So, the r368820-value isn't being updated for it to find anymore. The middle value corresponds to the git commit and does have value (878d53410f75 is your "UPDATING: Announce git transition", 3cc0c0d66a06 was the "Mark the repository as being converted to Git" r368820 commit). How do you plan on referencing distinct patches now? If the revision number is going away, we might as well yank it out since it'll be r368820 forever. For my git projects, I often use a "git tag -a" (annotated) commit at useful milestones, but I'm not sure what you're using it for: [git describe] vendor/bc/3.2.3-255270-g3f3cc995a35a From owner-freebsd-stable@freebsd.org Wed Dec 23 20:55:06 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B631C4CB407; Wed, 23 Dec 2020 20:55:06 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1QSp2RyMz4TSM; Wed, 23 Dec 2020 20:55:06 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 0BNKt1ms053858 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 23 Dec 2020 21:55:01 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Wed, 23 Dec 2020 21:55:01 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: John Kennedy Cc: Warner Losh , FreeBSD Current , FreeBSD-STABLE Mailing List Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend Message-ID: Mail-Followup-To: John Kennedy , Warner Losh , FreeBSD Current , FreeBSD-STABLE Mailing List References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: User-Agent: Mutt/2.0.2 (2020-11-20) X-Rspamd-Queue-Id: 4D1QSp2RyMz4TSM X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 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, 23 Dec 2020 20:55:06 -0000 On Wed, 2020-12-23 at 12:19:47 -0800, John Kennedy wrote: >On Mon, Dec 21, 2020 at 12:47:38PM -0800, John Kennedy wrote: >> On Wed, Dec 16, 2020 at 05:46:35PM -0700, Warner Losh wrote: >> > The FreeBSD project will be moving it's source repo from subversion to git >> > starting this this weekend. The docs repo was moved 2 weeks ago. The ports >> > repo will move at the end of March, 2021 due to timing issues. ... >> >> I filed Bug 252028 (sys/conf/newvers.sh: git "-dirty" even when clean), >> but that's just a trivial issue with my source tree being marked -dirty >> when it isn't, and that would have been part of r368709 anyway. All my >> other git nits have been my own (refs/notes and origin name). > > Warner/others, up to r368820, we had log entries that looked like this: > > commit 3cc0c0d66a065554459bd2f9b4f80cc07426464a > Author: Li-Wen Hsu > Date: Sun Dec 20 02:59:44 2020 +0000 > > Mark the repository as being converted to Git. > > This is the last Subversion commit to src. > > Sponsored by: The FreeBSD Foundation > > Notes: > svn path=/head/; revision=368820 > > Now, our git logs look like this: > > commit 17eba5e32a2cf7a217bb9f1e5dcca351f2b71cfc > Author: Ed Maste > Date: Tue Dec 22 23:31:15 2020 -0500 > > newvers.sh: fix sense of git dirty check > > Previously we reported -dirty for an unmodified tree, and no -dirty if > there were changes. > > PR: 252028 > Reported by: John Kennedy > > (Specifically, no Notes: with revision= value) Yes, these notes are merely pointers to the SVN revisions. Without SVN, we will of course not get any new notes. > For the kernel I compiled today, the uname output dumps out: > > FreeBSD 13.0-CURRENT #245 r368820+878d53410f75-c255274(main): ... > > Last kernel was (-dirty since fixed): > > FreeBSD 13.0-CURRENT #244 r368820+3cc0c0d66a06-c255241(main)-dirty: ... > > So, the r368820-value isn't being updated for it to find anymore. The middle >value corresponds to the git commit and does have value (878d53410f75 is your >"UPDATING: Announce git transition", 3cc0c0d66a06 was the "Mark the repository >as being converted to Git" r368820 commit). Yeah, that's a bug in newvers.sh, thanks for pointing that out. It finds "some" note in the last 10k revs and then uses that, instead of properly falling back to counting from HEAD, which would result in -c255126 or something around that. We'll fix it ... Cheers Uli From owner-freebsd-stable@freebsd.org Wed Dec 23 21:12:27 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9CD7C4CBBCA; Wed, 23 Dec 2020 21:12:27 +0000 (UTC) (envelope-from rhurlin@gwdg.de) Received: from gmailer.gwdg.de (gmailer.gwdg.de [134.76.11.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1Qrp598Tz4V7n; Wed, 23 Dec 2020 21:12:26 +0000 (UTC) (envelope-from rhurlin@gwdg.de) Received: from excmbx-03.um.gwdg.de ([134.76.9.218] helo=email.gwdg.de) by mailer.gwdg.de with esmtp (GWDG Mailer) (envelope-from ) id 1ksBQm-0001vK-Jq; Wed, 23 Dec 2020 22:12:24 +0100 Received: from krabat.raven.hur (10.250.9.200) by EXCMBX-03.um.gwdg.de (134.76.9.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2044.4; Wed, 23 Dec 2020 22:12:24 +0100 Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend To: =?UTF-8?Q?Ulrich_Sp=c3=b6rlein?= References: CC: John Kennedy , FreeBSD Current , FreeBSD-STABLE Mailing List Reply-To: From: Rainer Hurling Message-ID: Date: Wed, 23 Dec 2020 22:12:19 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 8bit X-Originating-IP: [10.250.9.200] X-ClientProxiedBy: excmbx-25.um.gwdg.de (134.76.9.235) To EXCMBX-03.um.gwdg.de (134.76.9.218) X-Virus-Scanned: (clean) by clamav X-Rspamd-Queue-Id: 4D1Qrp598Tz4V7n X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of rhurlin@gwdg.de designates 134.76.11.17 as permitted sender) smtp.mailfrom=rhurlin@gwdg.de X-Spamd-Result: default: False [-3.50 / 15.00]; HAS_REPLYTO(0.00)[rhurlin@FreeBSD.org]; ARC_NA(0.00)[]; HAS_XOIP(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FREEFALL_USER(0.00)[rhurlin]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; DMARC_NA(0.00)[gwdg.de]; R_SPF_ALLOW(-0.20)[+ip4:134.76.10.0/23]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; RCVD_IN_DNSWL_MED(-0.20)[134.76.11.17:from]; NEURAL_HAM_SHORT(-1.00)[-0.999]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:680, ipnet:134.76.0.0/16, country:DE]; RCVD_TLS_LAST(0.00)[]; MAILMAN_DEST(0.00)[freebsd-stable,freebsd-current]; RWL_MAILSPIKE_POSSIBLE(0.00)[134.76.11.17:from] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 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, 23 Dec 2020 21:12:27 -0000 Am 23.12.20 um 21:55 schrieb Ulrich Spörlein: > On Wed, 2020-12-23 at 12:19:47 -0800, John Kennedy wrote: >> On Mon, Dec 21, 2020 at 12:47:38PM -0800, John Kennedy wrote: >>> On Wed, Dec 16, 2020 at 05:46:35PM -0700, Warner Losh wrote: >>> > The FreeBSD project will be moving it's source repo from subversion >>> to git >>> > starting this this weekend. The docs repo was moved 2 weeks ago. >>> The ports >>> > repo will move at the end of March, 2021 due to timing issues. ... >>> >>>   I filed Bug 252028 (sys/conf/newvers.sh: git "-dirty" even when >>> clean), >>> but that's just a trivial issue with my source tree being marked -dirty >>> when it isn't, and that would have been part of r368709 anyway.  All my >>> other git nits have been my own (refs/notes and origin name). >> >>  Warner/others, up to r368820, we had log entries that looked like this: >> >>     commit 3cc0c0d66a065554459bd2f9b4f80cc07426464a >>     Author: Li-Wen Hsu >>     Date:   Sun Dec 20 02:59:44 2020 +0000 >>      >>         Mark the repository as being converted to Git. >>      >>         This is the last Subversion commit to src. >>      >>         Sponsored by:   The FreeBSD Foundation >>      >>     Notes: >>         svn path=/head/; revision=368820 >> >>  Now, our git logs look like this: >> >>     commit 17eba5e32a2cf7a217bb9f1e5dcca351f2b71cfc >>     Author: Ed Maste >>     Date:   Tue Dec 22 23:31:15 2020 -0500 >>      >>         newvers.sh: fix sense of git dirty check >>      >>         Previously we reported -dirty for an unmodified tree, and no >> -dirty if >>         there were changes. >>      >>         PR:             252028 >>         Reported by:    John Kennedy >> >>  (Specifically, no Notes: with revision= value) > > Yes, these notes are merely pointers to the SVN revisions. Without SVN, > we will of course not get any new notes. > >>  For the kernel I compiled today, the uname output dumps out: >> >>     FreeBSD 13.0-CURRENT #245 r368820+878d53410f75-c255274(main): ... >> >>  Last kernel was (-dirty since fixed): >> >>     FreeBSD 13.0-CURRENT #244 >> r368820+3cc0c0d66a06-c255241(main)-dirty: ... >> >>  So, the r368820-value isn't being updated for it to find anymore.  >> The middle >> value corresponds to the git commit and does have value (878d53410f75 >> is your >> "UPDATING: Announce git transition", 3cc0c0d66a06 was the "Mark the >> repository >> as being converted to Git" r368820 commit). > > Yeah, that's a bug in newvers.sh, thanks for pointing that out. It finds > "some" note in the last 10k revs and then uses that, instead of properly > falling back to counting from HEAD, which would result in -c255126 or > something around that. I built HEAD this afternoon and got 'FreeBSD 13.0-CURRENT #0 92be2847e84-c255272(main): Wed Dec 23 17:39:31 CET 2020'. The counting seems more correct here? > We'll fix it ... > > Cheers > Uli From owner-freebsd-stable@freebsd.org Thu Dec 24 02:02:00 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E8D574B2642 for ; Thu, 24 Dec 2020 02:02:00 +0000 (UTC) (envelope-from jonc@chen.org.nz) Received: from mail-oi1-x22f.google.com (mail-oi1-x22f.google.com [IPv6:2607:f8b0:4864:20::22f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1YGw0V6rz4mJH for ; Thu, 24 Dec 2020 02:01:59 +0000 (UTC) (envelope-from jonc@chen.org.nz) Received: by mail-oi1-x22f.google.com with SMTP id x13so1087561oic.5 for ; Wed, 23 Dec 2020 18:01:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chen-org-nz.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=UexQJWDRyY9LFn+Bxc2D2b9jQ6fxCAtTXZGVRldN2yI=; b=MnXC7EcGNOAxSXbyO4nsQ7hppHjOWZm+/jItZFVgCzaOWsmNd1iIJSWwiWY0F6bGBT WNO80ClHP7qWr/PCYgJY7ZR4FojbalPjlUudb9hdgfU9pezf6NRtgxVBh6pRl6Pt9KIg 7hyrX5BpK6fZ0nrEtgd40hbp0yRPSAfK4lfxknITFdrPe52QpK6nJBDeORW7WAZrZ2G8 ACUKXbZJz0R8yF1Ojd2Tks5Pn4kDW0LznWezpztozlF/QoEkk6rRoXBWKF3R97iZHEAm Z4TpflK+Wo1o8nJIfyh22tZff4QITN5KFk5wr3rEbL+8Rrrbeeq3mtia+t4dl0jqhuF9 wIrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=UexQJWDRyY9LFn+Bxc2D2b9jQ6fxCAtTXZGVRldN2yI=; b=QLaft0kkNWl7B0VQ4abh8ZjO4qVkDAZDR/C3E6ifx2JV9t1jonFHjvM2V0Pg184TTU o280/IVAU5jGO/S4S5WYuuVcU0NF1XbPqlhEhFU+OZPx+03mIh2PPfUZrnpQQpFfOoOc erNxAJ0KXdclSQ27DtbB0Sm70AOupng+Z9/76Ny5pTf3L0D53xIfrEa+AtLsvk/psqeQ QM0dara8FFRiN918QkU9CeKu9Sc13PUYk20FpbcuvBePEjwmbXFC3T3Ax6mlSFERmJUh Ctei1hmn+gU84/stAocAaSlF5eosJJMFDTYVfrNdRO7XQTWBVmldLiqK+zemzDl47JI0 aR6g== X-Gm-Message-State: AOAM531vQ3RDujUmx4JGq8bjTY7b7VnxEExgjuK25YIoQdxMKTmSvRjl hsT0RTuQDULZJEOzqPWWqx617XMOhjGvpW5ZnWuD99/SyhoLEffX X-Google-Smtp-Source: ABdhPJxjPSzQ5doCUXJa8R+8uF+3LJxYWMXzTIYV5qxl+iLNYbmBN9O+SB3VFon8kfWSkTjIeVl9GEU5lFjV07f5TEc= X-Received: by 2002:aca:f48c:: with SMTP id s134mr1637987oih.150.1608775317971; Wed, 23 Dec 2020 18:01:57 -0800 (PST) MIME-Version: 1.0 From: Jonathan Chen Date: Thu, 24 Dec 2020 15:01:42 +1300 Message-ID: Subject: git, $FreeBSD$ and mergemaster To: freebsd-stable@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4D1YGw0V6rz4mJH X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=chen-org-nz.20150623.gappssmtp.com header.s=20150623 header.b=MnXC7EcG; dmarc=none; spf=softfail (mx1.freebsd.org: 2607:f8b0:4864:20::22f is neither permitted nor denied by domain of jonc@chen.org.nz) smtp.mailfrom=jonc@chen.org.nz X-Spamd-Result: default: False [-0.53 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[chen-org-nz.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SUBJECT_HAS_CURRENCY(1.00)[]; TO_DN_NONE(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::22f:from:127.0.2.255]; PREVIOUSLY_DELIVERED(0.00)[freebsd-stable@freebsd.org]; NEURAL_SPAM_SHORT(0.77)[0.766]; DKIM_TRACE(0.00)[chen-org-nz.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::22f:from]; DMARC_NA(0.00)[chen.org.nz]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::22f:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-stable] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Dec 2020 02:02:01 -0000 Hi, With the transition to git, I'm now getting a lot of prompts for differences against an empty $FreeBSD$, eg: *** Displaying differences between installed version and ./.cshrc: --- /.cshrc 2020-09-03 19:14:19.258107000 +1200 +++ ./.cshrc 2020-12-24 14:52:16.751245000 +1300 @@ -1,4 +1,4 @@ -# $FreeBSD: stable/12/bin/csh/dot.cshrc 363525 2020-07-25 11:57:39Z pstef $ +# $FreeBSD$ # # .cshrc - csh resource script, read at beginning of execution by each shell # While I can simply run a "mergemaster -F" to get past this particular update, how will mergemaster operate in the future when there are changes in /etc if it can't inspect the $FreeBSD$ tag anymore? Cheers. -- Jonathan Chen From owner-freebsd-stable@freebsd.org Thu Dec 24 02:05:00 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D25174B344C for ; Thu, 24 Dec 2020 02:05:00 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1YLN5d2rz4myH for ; Thu, 24 Dec 2020 02:05:00 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id ADA752C62C for ; Thu, 24 Dec 2020 02:05:00 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f180.google.com with SMTP id d14so1077792qkc.13 for ; Wed, 23 Dec 2020 18:05:00 -0800 (PST) X-Gm-Message-State: AOAM531zxzJSbQyyuP4NWjAYhK4crJgg+bPN0jpBL/UPMqGJURGLS1Xp 46Bv6Y/geH7qvKf8/ZKrmieRtYi1gonu0pB1KqQ= X-Google-Smtp-Source: ABdhPJyAIMnKvbyHZ55DtSQpHEOrCD6IGr3iUXA4VJ+szu0owejNHIu4U7EP8VLb9sX9bYtdtCNV7SjKOhp+cMh1oZ4= X-Received: by 2002:a37:b442:: with SMTP id d63mr525010qkf.430.1608775500376; Wed, 23 Dec 2020 18:05:00 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Kyle Evans Date: Wed, 23 Dec 2020 20:04:49 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git, $FreeBSD$ and mergemaster To: Jonathan Chen Cc: FreeBSD-STABLE Mailing List Content-Type: text/plain; charset="UTF-8" X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Dec 2020 02:05:00 -0000 On Wed, Dec 23, 2020 at 8:02 PM Jonathan Chen wrote: > > Hi, > > With the transition to git, I'm now getting a lot of prompts for > differences against an empty $FreeBSD$, eg: > > *** Displaying differences between installed version and ./.cshrc: > > --- /.cshrc 2020-09-03 19:14:19.258107000 +1200 > +++ ./.cshrc 2020-12-24 14:52:16.751245000 +1300 > @@ -1,4 +1,4 @@ > -# $FreeBSD: stable/12/bin/csh/dot.cshrc 363525 2020-07-25 11:57:39Z pstef $ > +# $FreeBSD$ > # > # .cshrc - csh resource script, read at beginning of execution by each shell > # > > While I can simply run a "mergemaster -F" to get past this particular > update, how will mergemaster operate in the future when there are > changes in /etc if it can't inspect the $FreeBSD$ tag anymore? > mergemaster only uses it as an optimization, if they're unexpanded throughout then it falls back to diff(1) -- i.e. it's slower without. Thanks, Kyle Evans From owner-freebsd-stable@freebsd.org Thu Dec 24 04:38:42 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DF37C4B6E34 for ; Thu, 24 Dec 2020 04:38:42 +0000 (UTC) (envelope-from spork@bway.net) Received: from smtp1.bway.net (smtp1.bway.net [216.220.96.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1clk5vP8z4vqm; Thu, 24 Dec 2020 04:38:42 +0000 (UTC) (envelope-from spork@bway.net) Received: from gaseousweiner.sporklab.com (pool-98-109-63-188.nwrknj.fios.verizon.net [98.109.63.188]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: spork@bway.net) by smtp1.bway.net (Postfix) with ESMTPSA id 46B0195854; Wed, 23 Dec 2020 23:38:41 -0500 (EST) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.17\)) Subject: Re: git, $FreeBSD$ and mergemaster From: Charles Sprickman In-Reply-To: Date: Wed, 23 Dec 2020 23:38:40 -0500 Cc: FreeBSD-STABLE Mailing List X-Mao-Original-Outgoing-Id: 630477520.646034-166048e383b2f87d213274844c1527c6 Content-Transfer-Encoding: quoted-printable Message-Id: <4B681053-11E5-48CD-85A4-F19CF4BC10B9@bway.net> References: To: Kyle Evans X-Mailer: Apple Mail (2.3445.104.17) X-Rspamd-Queue-Id: 4D1clk5vP8z4vqm X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Dec 2020 04:38:42 -0000 > On Dec 23, 2020, at 9:04 PM, Kyle Evans wrote: >=20 > On Wed, Dec 23, 2020 at 8:02 PM Jonathan Chen = wrote: >>=20 >> Hi, >>=20 >> With the transition to git, I'm now getting a lot of prompts for >> differences against an empty $FreeBSD$, eg: >>=20 >> *** Displaying differences between installed version and ./.cshrc: >>=20 >> --- /.cshrc 2020-09-03 19:14:19.258107000 +1200 >> +++ ./.cshrc 2020-12-24 14:52:16.751245000 +1300 >> @@ -1,4 +1,4 @@ >> -# $FreeBSD: stable/12/bin/csh/dot.cshrc 363525 2020-07-25 11:57:39Z = pstef $ >> +# $FreeBSD$ >> # >> # .cshrc - csh resource script, read at beginning of execution by = each shell >> # >>=20 >> While I can simply run a "mergemaster -F" to get past this particular >> update, how will mergemaster operate in the future when there are >> changes in /etc if it can't inspect the $FreeBSD$ tag anymore? >>=20 >=20 > mergemaster only uses it as an optimization, if they're unexpanded > throughout then it falls back to diff(1) -- i.e. it's slower without. Is this a permanent change with git? I=E2=80=99d miss being able to see = a path, date and some indication of revision in config files and anything else that=E2=80=99s text-based. Charles > Thanks, >=20 > Kyle Evans > _______________________________________________ > freebsd-stable@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to = "freebsd-stable-unsubscribe@freebsd.org" From owner-freebsd-stable@freebsd.org Thu Dec 24 11:02:39 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 152424BFE59; Thu, 24 Dec 2020 11:02:39 +0000 (UTC) (envelope-from mr.xanto@gmail.com) Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1nGk2zFQz3m5P; Thu, 24 Dec 2020 11:02:38 +0000 (UTC) (envelope-from mr.xanto@gmail.com) Received: by mail-lf1-x129.google.com with SMTP id o17so4014282lfg.4; Thu, 24 Dec 2020 03:02:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:message-id:to:subject:in-reply-to:references:mime-version :content-transfer-encoding; bh=RpvrM45ZXzW7zGTS5haAuWiYmd79uskKUISX3Zib2LQ=; b=R6krme6x6vtJKOAsMHEa7lktJGkr/mln3roXVvzVWCM+i6WKMdWK80VjC65j6jDUv5 kjAOYdxTz/jWlcPo70ylN7NjLYMDS9nyoBlp+p1PuHVsD6bBhON4g4j+vNtsMHRBcexh Xgr4Qv/IPWt5fvImXLAHr33PEt4cEzPHEByA7s8DH2tsZxudolvHF3L/GAjtdm6ve16c CJTQoxuCsBbadCbiHYnmw8Zft84r3/wnhA//GdnYbKUhlJU2Sg+aZaZlYaL9f3BGLAOk bSUrnzoqXlQHda+q4U0mGb1j/s2mIzTchJMbGj1aNXMjGcBWOxJsL2QxmMIzyRNAHkYc SjLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:message-id:to:subject:in-reply-to :references:mime-version:content-transfer-encoding; bh=RpvrM45ZXzW7zGTS5haAuWiYmd79uskKUISX3Zib2LQ=; b=OcSO7UC+kd8+H6D56bapVas2lnmfdMApDjDuVEOsgLpxtPapdHYLTQaMm2lCvbVVHa QDhZOQE3/5KRi7GgVc+wNTWjr5J62pbYuNjuR8fzDe4Kux5JNHqL/L0/XI4lM3zW3buZ VbzmUolc9jV6ktTVgQAo0ns6JP+79dKKl86iwW+f1HLcHbPuOZGsYiYUZ5uJL+M2wx8c cthT/hmjmYifSMrNGdAt2N5DRBYYsGDTBCIQ8qYMwto0D61nWAF3J1SnvIOigl6c9jXq WL5zN8fNvbCwuUdMpjZ8K3u3eJl5I1Afkcco5v0UOT7aVTi5+E/xmsGzFduSjenXY7Sa o6Ng== X-Gm-Message-State: AOAM530MqaiaAhmYRlwFNXec4tdfQyu0Gr23KJV3srPvq3EEnfhP597b 43xGyAr9/i3pI16em1Lr3yK6iwkZE9o= X-Google-Smtp-Source: ABdhPJx4VkM4sH89A1K9ghqq/lzqs8bs9gMxs3o1dl73s3PRvYyjSZ8oY/w3+PZw5YkRURX0F84uow== X-Received: by 2002:a2e:90d2:: with SMTP id o18mr13242070ljg.395.1608807755615; Thu, 24 Dec 2020 03:02:35 -0800 (PST) Received: from [192.168.70.66] ([37.235.174.147]) by smtp.gmail.com with ESMTPSA id a13sm2704420lji.84.2020.12.24.03.02.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Dec 2020 03:02:35 -0800 (PST) Date: Thu, 24 Dec 2020 14:02:33 +0300 From: Mamontov Roman Message-ID: <1596958556.20201224140233@gmail.com> To: Warner Losh , FreeBSD Current , FreeBSD-STABLE Mailing List Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=windows-1250 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4D1nGk2zFQz3m5P X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=R6krme6x; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of mrxanto@gmail.com designates 2a00:1450:4864:20::129 as permitted sender) smtp.mailfrom=mrxanto@gmail.com X-Spamd-Result: default: False [-2.00 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a00:1450:4864:20::129:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; RECEIVED_SPAMHAUS_PBL(0.00)[37.235.174.147:received]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_SPAM_SHORT(1.00)[1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; SPAMHAUS_ZRD(0.00)[2a00:1450:4864:20::129:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::129:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-current,freebsd-stable] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Dec 2020 11:02:39 -0000 =0D=0A>=A0Greetings, > The FreeBSD project will be moving it's source repo from subversion to git > starting this this weekend. The docs repo was moved 2 weeks ago. The ports > repo will move at the end of March, 2021 due to timing issues. > The short version is that we're switching the version control we're using. > This switch will preserve much of the current FreeBSD development workflo= w. > After the switch, the subversion repo will become almost read-only. All > future work will be done in git, however as a transition aide we'll be > replaying the MFCs to stable/11, stable/12 and the related releng branches > for the life of those branches. > For more detailed information, please see > https://github.com/bsdimp/freebsd-git-docs/ for the current documentation. > Please see https://wiki.freebsd.org/git for the latest detailed schedule > (please note that this schedule is subject to change). Maybe my question is not directly linked with Git transition: earlier I can track commits to src tree via mailman list (svn-src-stable-1= 2 for example) and select important commits to some parts of system or author of commit: svn commit: r368642 - stable/12/sys/amd64/vmm/io John Baldwin Now in dev-commits-src-branches list (is there a separate list for stable-1= 2 branch for example?) I see hash and log message from commit: git: d16dac42b641 - Apply upstream fix 08968baec1122a58bb90d8f97ad948a75f8a= 5d69: Xin LI=20 May change in list commit message to system part of commit, as it be ealier? From owner-freebsd-stable@freebsd.org Fri Dec 25 09:01:15 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7A6404BB933 for ; Fri, 25 Dec 2020 09:01:15 +0000 (UTC) (envelope-from jonc@chen.org.nz) Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D2LXB3T2mz4hZ2 for ; Fri, 25 Dec 2020 09:01:13 +0000 (UTC) (envelope-from jonc@chen.org.nz) Received: by mail-ot1-x336.google.com with SMTP id x13so3512830oto.8 for ; Fri, 25 Dec 2020 01:01:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chen-org-nz.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=sA3v2ZxuDEOEJyMA40r2WMJX+oADg5hLNw0EhfPnyMM=; b=OaUP6/f2VQbzFta7kVFClW3Vh3huQZccdlOqrvTkDlNv8sa6C2btoc3uTBEVfo5XCA KyBUpyzBwBoWk44tySmoBu8yomxIuaVOQJq1Ba9I8LtrXFxpo6nW8r8o84cLsJGrOhRv sREMPofmQX2tmuLGeVD8vYgCTcr8q82sKyb9SUnYS2G8zR/l27ntuVxnKD8MpqbA3/Qr ESjxNxilBisNEo3uL6Gu83jdeYpUIB6CRWycirJGrb2sidrPCZVsStmk7NieFuO8Qqgv B0Mu72mPBqprrte9ljR0L0zeiICMIFZKAbJISIh0G2azwV0hypq07GYmodKmbIw2hf3Y lCWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=sA3v2ZxuDEOEJyMA40r2WMJX+oADg5hLNw0EhfPnyMM=; b=gmi201ZOQJpS0PHo1hqBcAIKSyx0v8Bu+A22PEhn6BKQD25TpArFeKtMDFjN1J93ro aEVgOiU8tnqKF2INWHRYEHTy5xRk1r+8aQx8Njv8EGZPCGJjKud5CmSZLAB6Ku+YiN3+ BZqftVAXuFyIk0D0eJFxkycWsV+ohbfS4SrLqK6uENLwI6VyhRHDriatVHCu7GGGi2i6 eMadlf2PdMueZlYtNVwVVefVT0yAskUzLVDdxhBiaceO+dOUAOV6DJcGA+5onunFfFOT V11filj8XpjLcfYN+wObnZTrcVF4BNe+DQ0LlQkycQjpRc+92bKEXbeGPCAvJS8lkBlF 9DaA== X-Gm-Message-State: AOAM533yYlp/LDV18vFehX2ApZDKP3LpPuM5mLp5bDr1RBZ+d71w0hSP hzOGiHU41Epw6JehTJAzsHNeK8XzOerC35V3OVyU2lbOUa88WQ== X-Google-Smtp-Source: ABdhPJw/T4ss67wNssMNFLbv4bMb+ZVuoS56trtsP8Q4VMSYj2rgX3Fwdr7ObcCFDP22Mv2PvuM+EngRA0pZqY82NP4= X-Received: by 2002:a05:6830:10:: with SMTP id c16mr24439207otp.162.1608886872935; Fri, 25 Dec 2020 01:01:12 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Jonathan Chen Date: Fri, 25 Dec 2020 22:00:57 +1300 Message-ID: Subject: Re: git, $FreeBSD$ and mergemaster To: Kyle Evans Cc: FreeBSD-STABLE Mailing List Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4D2LXB3T2mz4hZ2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=chen-org-nz.20150623.gappssmtp.com header.s=20150623 header.b=OaUP6/f2; dmarc=none; spf=softfail (mx1.freebsd.org: 2607:f8b0:4864:20::336 is neither permitted nor denied by domain of jonc@chen.org.nz) smtp.mailfrom=jonc@chen.org.nz X-Spamd-Result: default: False [-2.30 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[chen-org-nz.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SUBJECT_HAS_CURRENCY(1.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-stable@freebsd.org]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[chen.org.nz]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::336:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[chen-org-nz.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::336:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::336:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-stable] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Dec 2020 09:01:15 -0000 Hi Kyle, On Thu, 24 Dec 2020 at 15:05, Kyle Evans wrote: > > On Wed, Dec 23, 2020 at 8:02 PM Jonathan Chen wrote: > > > > Hi, > > > > With the transition to git, I'm now getting a lot of prompts for > > differences against an empty $FreeBSD$, eg: > > > > *** Displaying differences between installed version and ./.cshrc: > > > > --- /.cshrc 2020-09-03 19:14:19.258107000 +1200 > > +++ ./.cshrc 2020-12-24 14:52:16.751245000 +1300 > > @@ -1,4 +1,4 @@ > > -# $FreeBSD: stable/12/bin/csh/dot.cshrc 363525 2020-07-25 11:57:39Z pstef $ > > +# $FreeBSD$ > > # > > # .cshrc - csh resource script, read at beginning of execution by each shell > > # > > > > While I can simply run a "mergemaster -F" to get past this particular > > update, how will mergemaster operate in the future when there are > > changes in /etc if it can't inspect the $FreeBSD$ tag anymore? > > > > mergemaster only uses it as an optimization, if they're unexpanded > throughout then it falls back to diff(1) -- i.e. it's slower without. Thanks for the answer. However, wouldn't this mean that every run of "mergemaster" would prompt for local changes? The nice thing about using the $FreeBSD$ tags was that if I approved a local-change, subsequent runs of mergemaster would not prompt me about the local-change unless the etc-file had been modified in the source tree. Cheers. -- Jonathan Chen From owner-freebsd-stable@freebsd.org Fri Dec 25 12:18:34 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C829B4C0360 for ; Fri, 25 Dec 2020 12:18:34 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D2Qvt3MXBz4tGg; Fri, 25 Dec 2020 12:18:34 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 0BPCIOCQ056104; Fri, 25 Dec 2020 12:18:24 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 0BPCIM2i056103; Fri, 25 Dec 2020 04:18:22 -0800 (PST) (envelope-from david) Date: Fri, 25 Dec 2020 04:18:22 -0800 From: David Wolfskill To: Jonathan Chen Cc: Kyle Evans , FreeBSD-STABLE Mailing List Subject: Re: git, $FreeBSD$ and mergemaster Message-ID: Mail-Followup-To: David Wolfskill , Jonathan Chen , Kyle Evans , FreeBSD-STABLE Mailing List References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="NnQfTabPFY0sXC+y" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4D2Qvt3MXBz4tGg X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Dec 2020 12:18:34 -0000 --NnQfTabPFY0sXC+y Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Dec 25, 2020 at 10:00:57PM +1300, Jonathan Chen wrote: > Hi Kyle, >=20 > On Thu, 24 Dec 2020 at 15:05, Kyle Evans wrote: > ... > > mergemaster only uses it as an optimization, if they're unexpanded > > throughout then it falls back to diff(1) -- i.e. it's slower without. >=20 > Thanks for the answer. >=20 > However, wouldn't this mean that every run of "mergemaster" would > prompt for local changes? The nice thing about using the $FreeBSD$ > tags was that if I approved a local-change, subsequent runs of > mergemaster would not prompt me about the local-change unless the > etc-file had been modified in the source tree. >=20 > Cheers. > --=20 > Jonathan Chen > .... Indeed: the above-described behavior is what I have observed so far since the transition (tracking head & stable/12 daily on two machines). I would go a bit further than stating that the prior behavior was "nice." Peace, david --=20 David H. Wolfskill david@catwhisker.org "Dismissing reality doesn't make it go away." - Rajiv Shah, Rockefeller Foundation president See https://www.catwhisker.org/~david/publickey.gpg for my public key. --NnQfTabPFY0sXC+y Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl/l2I5fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcmT1Qf/aSGEGRCHqM1XXooH6l64zmH9Nnt6U5+AXqv32/RikJLZOYENjOQ8aefw 4c2lTC1CqQXODlFIWYzWbNFeo8ivypRKsCm5SA3bWqPD97+a2tizUFsfAK17RQCX yEkhOKNaYjV/yrQ5QS4jqstmlH0Zh+Pgn8g590jnfN6ujJevtOZPcDIRzP6zKc9P ulMqFpg8Fc+OXLxtxQ421rmvV9JlTcQCVc2wF7k2RtUYMNg46NS8Vus+rSYFdsPi 8TUh1TNVRjA9KWW0OXzzBI80hNWJnYWUjbuvuzoNblkoPR8+dLTeeH9dYDzJkEjI 3AbO1bvetUhoUMuI7D6xWUJfwbiQwg== =F+fa -----END PGP SIGNATURE----- --NnQfTabPFY0sXC+y-- From owner-freebsd-stable@freebsd.org Sat Dec 26 16:37:24 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3C8B44BD1FB; Sat, 26 Dec 2020 16:37:24 +0000 (UTC) (envelope-from ali.abdallah@suse.com) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp2.suse.de", Issuer "Let's Encrypt Authority X3" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D38c24GHzz4RMv; Sat, 26 Dec 2020 16:37:22 +0000 (UTC) (envelope-from ali.abdallah@suse.com) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 32CE6ADE2; Sat, 26 Dec 2020 16:37:21 +0000 (UTC) Date: Sat, 26 Dec 2020 17:37:20 +0100 From: Ali Abdallah To: freebsd-stable@freebsd.org Cc: freebsd-current@freebsd.org Subject: MII media status race condition causing fictitious link down Message-ID: <20201226163720.zok6km7b7hyze56f@frix230> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Rspamd-Queue-Id: 4D38c24GHzz4RMv X-Spamd-Bar: ------ X-Spamd-Result: default: False [-6.19 / 15.00]; MID_RHS_NOT_FQDN(0.50)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_MED(-2.00)[suse.com:dkim]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:195.135.220.15]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; RWL_MAILSPIKE_GOOD(0.00)[195.135.220.15:from]; NEURAL_HAM_LONG(-1.00)[-1.000]; DKIM_TRACE(0.00)[suse.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[suse.com,quarantine]; RCVD_IN_DNSWL_MED(-0.20)[195.135.220.15:from]; NEURAL_HAM_SHORT(-0.99)[-0.989]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:29298, ipnet:195.135.220.0/22, country:DE]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-current,freebsd-stable] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2020 16:37:24 -0000 Hello, As I've sent a couple of patches to add support for Thinkpad USB-C gen2 to if_ure(4), I came across a very strange link random state change, causing dhclient to think the link went effectively down, which is not the case. First I thought that if_ure(4) doesn't play well with the new chip of the dock, but after lot of debugging, it turns out to be a nasty race condition in mii bus code [1]. I'm sending this mail to raise awareness about this issue. Apparently it exists since long time (I even remember having had this issue in the past on my older Thinkpad). [1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252165 Regards, -- Ali Abdallah | SUSE L3 Engineer GPG fingerprint: 51A0 F4A0 C8CF C98F 842E A9A8 B945 56F8 1C85 D0D5 From owner-freebsd-stable@freebsd.org Sat Dec 26 21:57:09 2020 Return-Path: Delivered-To: freebsd-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 66C2C4C3CDF for ; Sat, 26 Dec 2020 21:57:09 +0000 (UTC) (envelope-from brian@brianwhalen.net) Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D3Hj03mHKz4lXs for ; Sat, 26 Dec 2020 21:57:08 +0000 (UTC) (envelope-from brian@brianwhalen.net) Received: by mail-pf1-x429.google.com with SMTP id w6so4263575pfu.1 for ; Sat, 26 Dec 2020 13:57:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brianwhalen-net.20150623.gappssmtp.com; s=20150623; h=to:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding:content-language; bh=W33OYIsACvk9ROF5i+KiyeJiOLu2PCN4RNF8SOaa1DQ=; b=nQ8UpNXnXm2YH8jVei+yr8Nhj6JtvwZIjLpiGwlsordv65qosKcLme4aRf2uo5tuTe sfoKMJahPnIFuxYUwa1vlnuSow+8POMqMZNIzGJRXSIxdjyi/YKO5+P3b5o4gQawR0Am WV490TNpJda+qCEs5IceLPoSEJ3RSlY30FzWn8m9PPBWE1FNaTM2W47Tc2DByUY6m/KR hrnCUdG1hM708bbvZbzuO0hKgkJIN2Q48TN5NRdYhRpdk6RHhv9hPEWIbYCriWtI0YPb CN+0WA6hE9FWxHwIcH6+yPHKZ9MsRe2OL9qSDPIc8x+yFRr5O7gOikT4FmvLsk+JTn+P mc2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding:content-language; bh=W33OYIsACvk9ROF5i+KiyeJiOLu2PCN4RNF8SOaa1DQ=; b=UgOLKF8kHD7cGee1fE95BDsZqR1cKSVtT4eHd8Gf+JLyx/hjeDCDJNDwZYApaOYhCW Sb3+Jj+rdlUgrBvc9YNHWpyYkLcsKg9QuKFpFHIRL32A64DZusLp+fvjCrgjO8VF37DL Rj7ovea5D3Mff5hr0Fute1lY2QCn9SrxISCcs0KzC5CgAQomRPTA6+YS2uhavfdME9Ax FuF+2iTrmlD8lirGhLRu21j7xfacH1JocUKBLkshICymSeTQTPIDi33l3l/zDlw7Xteu EWw7xx+kdQKq1JwV81QiZLXym1DZXtwf3Q7DGr3jxZ7+qD4fo9ima5ag6JKho5a7UbjE xm1A== X-Gm-Message-State: AOAM531WacrnnBNXPOloXCpV56dylRBZCtJyEN+de/35T8GERIetYj4l LOEkswGj9J5rherrwCFTKk389Fgn6z44qNVjI4E= X-Google-Smtp-Source: ABdhPJxRmaQa2FrbPinIMt3Qu6oN8M9BtcL2AkRYhOW2tgf7edgg7RiF10b3Mge67FfXr1SHsi+63Q== X-Received: by 2002:a65:67cf:: with SMTP id b15mr37413289pgs.429.1609019826529; Sat, 26 Dec 2020 13:57:06 -0800 (PST) Received: from [192.168.1.115] (cpe-70-95-138-103.san.res.rr.com. [70.95.138.103]) by smtp.gmail.com with ESMTPSA id e76sm31136751pfh.157.2020.12.26.13.57.05 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 26 Dec 2020 13:57:06 -0800 (PST) To: freebsd-stable@freebsd.org From: "Brian W." Subject: kernel build fail Message-ID: <6d2e279a-ea68-3a9b-5997-8cc8bfcd4663@brianwhalen.net> Date: Sat, 26 Dec 2020 13:57:03 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Rspamd-Queue-Id: 4D3Hj03mHKz4lXs X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=brianwhalen-net.20150623.gappssmtp.com header.s=20150623 header.b=nQ8UpNXn; dmarc=none; spf=pass (mx1.freebsd.org: domain of brian@brianwhalen.net designates 2607:f8b0:4864:20::429 as permitted sender) smtp.mailfrom=brian@brianwhalen.net X-Spamd-Result: default: False [-3.50 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[brianwhalen-net.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::429:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; MID_RHS_MATCH_FROM(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[70.95.138.103:received]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[brianwhalen-net.20150623.gappssmtp.com:s=20150623]; FREEFALL_USER(0.00)[brian]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-stable@freebsd.org]; DMARC_NA(0.00)[brianwhalen.net]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::429:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::429:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-stable] X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2020 21:57:09 -0000 I saw this last night. With this system version $ uname -a FreeBSD fbsd122 12.2-RELEASE-p1 FreeBSD 12.2-RELEASE-p1 GENERIC amd64 I tried to buildworld and kernel, with ccache. After it failed with ccache I disabled ccache. The kernel failed in this way when I disabled ccache. In file included from /usr/src/sys/dev/ice/if_ice_iflib.c:42: In file included from /usr/src/sys/dev/ice/ice_iflib.h:59: In file included from /usr/src/sys/dev/ice/ice_lib.h:61: In file included from /usr/src/sys/dev/ice/ice_dcb.h:36: In file included from /usr/src/sys/dev/ice/ice_type.h:70: /usr/src/sys/dev/ice/ice_hw_autogen.h:2498:38: error: '/*' within block comment [-Werror,-Wcomment] #define PFINT_OICR_CTL                          0x0016CA80 /* Reset Source: CORER */                                                            ^ In file included from /usr/src/sys/dev/ice/if_ice_iflib.c:42: In file included from /usr/src/sys/dev/ice/ice_iflib.h:59: /usr/src/sys/dev/ice/ice_lib.h:664:12: error: use of undeclared identifier 'GLINT_DYN_CTL_INTENA_M'         dyn_ctl = GLINT_DYN_CTL_INTENA_M | GLINT_DYN_CTL_CLEARPBA_M |                   ^ /usr/src/sys/dev/ice/ice_lib.h:664:37: error: use of undeclared identifier 'GLINT_DYN_CTL_CLEARPBA_M'         dyn_ctl = GLINT_DYN_CTL_INTENA_M | GLINT_DYN_CTL_CLEARPBA_M |                                            ^ /usr/src/sys/dev/ice/ice_lib.h:665:22: error: use of undeclared identifier 'GLINT_DYN_CTL_ITR_INDX_S'                   (ICE_ITR_NONE << GLINT_DYN_CTL_ITR_INDX_S);                                    ^ /usr/src/sys/dev/ice/ice_lib.h:666:11: error: implicit declaration of function 'GLINT_DYN_CTL' is invalid in       C99 [-Werror,-Wimplicit-function-declaration]         wr32(hw, GLINT_DYN_CTL(vector), dyn_ctl);                  ^ /usr/src/sys/dev/ice/ice_lib.h:682:28: error: use of undeclared identifier 'GLINT_DYN_CTL_ITR_INDX_S'         dyn_ctl = ICE_ITR_NONE << GLINT_DYN_CTL_ITR_INDX_S;                                   ^ /usr/src/sys/dev/ice/ice_lib.h:683:11: error: implicit declaration of function 'GLINT_DYN_CTL' is invalid in       C99 [-Werror,-Wimplicit-function-declaration]         wr32(hw, GLINT_DYN_CTL(vector), dyn_ctl);                  ^ /usr/src/sys/dev/ice/if_ice_iflib.c:1194:18: error: use of undeclared identifier 'PFINT_OICR'         oicr = rd32(hw, PFINT_OICR);                         ^ /usr/src/sys/dev/ice/if_ice_iflib.c:1209:13: error: use of undeclared identifier 'PFINT_OICR_VFLR_M'         if (oicr & PFINT_OICR_VFLR_M) {                    ^ /usr/src/sys/dev/ice/if_ice_iflib.c:1213:13: error: use of undeclared identifier 'PFINT_OICR_MAL_DETECT_M'         if (oicr & PFINT_OICR_MAL_DETECT_M) {                    ^ /usr/src/sys/dev/ice/if_ice_iflib.c:1217:13: error: use of undeclared identifier 'PFINT_OICR_GRST_M'         if (oicr & PFINT_OICR_GRST_M) {                    ^ /usr/src/sys/dev/ice/if_ice_iflib.c:1220:21: error: use of undeclared identifier 'GLGEN_RSTAT'                 reset = (rd32(hw, GLGEN_RSTAT) & GLGEN_RSTAT_RESET_TYPE_M) >>                                   ^ /usr/src/sys/dev/ice/if_ice_iflib.c:1220:36: error: use of undeclared identifier 'GLGEN_RSTAT_RESET_TYPE_M'                 reset = (rd32(hw, GLGEN_RSTAT) & GLGEN_RSTAT_RESET_TYPE_M) >>                                                  ^ /usr/src/sys/dev/ice/if_ice_iflib.c:1221:4: error: use of undeclared identifier 'GLGEN_RSTAT_RESET_TYPE_S'                         GLGEN_RSTAT_RESET_TYPE_S;                         ^ /usr/src/sys/dev/ice/if_ice_iflib.c:1247:13: error: use of undeclared identifier 'PFINT_OICR_ECC_ERR_M'         if (oicr & PFINT_OICR_ECC_ERR_M) {                    ^ /usr/src/sys/dev/ice/if_ice_iflib.c:1252:13: error: use of undeclared identifier 'PFINT_OICR_PE_CRITERR_M'         if (oicr & PFINT_OICR_PE_CRITERR_M) {                    ^ /usr/src/sys/dev/ice/if_ice_iflib.c:1257:13: error: use of undeclared identifier 'PFINT_OICR_PCI_EXCEPTION_M'         if (oicr & PFINT_OICR_PCI_EXCEPTION_M) {                    ^ /usr/src/sys/dev/ice/if_ice_iflib.c:1262:13: error: use of undeclared identifier 'PFINT_OICR_HMC_ERR_M'         if (oicr & PFINT_OICR_HMC_ERR_M) {                    ^ 18 errors generated. *** Error code 1 Stop. make[2]: stopped in /usr/obj/usr/src/amd64.amd64/sys/GENERIC *** Error code 1 *** Error code 1 If it matters this is in virtualbox on an hp omen 15 with an amd 4800h proc in it. Brian