Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Jun 2021 15:01:15 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: b38239433258 - main - updating: add note about vendor/openzfs branch rename
Message-ID:  <202106081501.158F1F72035966@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=b38239433258683bdd45a5627815a56ea6e79b64

commit b38239433258683bdd45a5627815a56ea6e79b64
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-06-08 14:57:42 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-06-08 15:00:57 +0000

    updating: add note about vendor/openzfs branch rename
    
    Add a pointer to
    https://lists.freebsd.org/archives/freebsd-current/2021-June/000153.html
    to explain how to pull a new tree due to the vendor/openzfs branch
    being renamed.
    
    Reviewed by:            lwhsu@
    Sponsored by:           Netflix
---
 UPDATING | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/UPDATING b/UPDATING
index f1ff8a8b64b1..c9e081563e6c 100644
--- a/UPDATING
+++ b/UPDATING
@@ -27,6 +27,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW:
 	world, or to merely disable the most expensive debugging functionality
 	at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20210608:
+	The vendor/openzfs branch was renamed to vnedor/openzfs/legacy to
+	start tracking OpenZFS upstream more closely. Please see
+https://lists.freebsd.org/archives/freebsd-current/2021-June/000153.html
+	for details on how to correct any errors that might result. The
+	short version is that you need to remove the old branch locally:
+	    git update-ref -d refs/remotes/freebsd/vendor/openzfs
+	(assuming your upstream origin is named 'freebsd').
+
 20210525:
 	Commits 17accc08ae15 and de102f870501 add new files to LinuxKPI
 	which break drm-kmod.  In addition various other additions where



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106081501.158F1F72035966>