1 files changed, 9 insertions, 0 deletions

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