git: 6dbc180dcf85 - stable/12 - Set tentative merge date.

The branch stable/12 has been updated by dim:

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

commit 6dbc180dcf855c43094f4957428722e072bba2c3
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2021-12-12 22:54:33 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2021-12-22 10:01:27 +0000

    Set tentative merge date.
    
    (cherry picked from commit e61154c401c840855bb37f1e9a9b8fcb82c2050d)
---
 ObsoleteFiles.inc | 2 +-
 UPDATING          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 400a5a9a0d80..562f91bcdf19 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,7 +38,7 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
-# 2020mmdd: new clang import which bumps version from 10.0.1 to 11.0.0.
+# 20211214: new clang import which bumps version from 10.0.1 to 11.0.0.
 OLD_FILES+=usr/lib/clang/10.0.1/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/10.0.1/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/10.0.1/include/cuda_wrappers/new
diff --git a/UPDATING b/UPDATING
index 50d9f510a5b0..e0e5c3b1f8ef 100644
--- a/UPDATING
+++ b/UPDATING
@@ -17,7 +17,7 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to
 the tip of head, and then rebuild without this option. The bootstrap process
 from older version of current across the gcc/clang cutover is a bit fragile.
 
-2020mmdd:
+20211214:
 	Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have
 	been upgraded to 11.0.0.  Please see the 20141231 entry below for
 	information about prerequisites and upgrading, if you are not already