From 3a2133650d5fb6f1965b8a462b54aedeba9b6a79 Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@one-eyed-alien.net>
Date: Wed, 27 Nov 2024 19:04:56 +0000
Subject: [PATCH] nvi: remove CHERI CHANGES annotation

The weird pointer manipulation we'd been patching was infact buggy and
produced out of bounds accesses.  We've merged a patch upstream to use
memmove instead.
---
 contrib/nvi/common/log.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/contrib/nvi/common/log.c b/contrib/nvi/common/log.c
index 6c6e96654046..d1a1bc6f704a 100644
--- a/contrib/nvi/common/log.c
+++ b/contrib/nvi/common/log.c
@@ -6,17 +6,6 @@
  *
  * See the LICENSE file for redistribution information.
  */
-/*
- * CHERI CHANGES START
- * {
- *   "updated": 20221129,
- *   "target_type": "prog",
- *   "changes": [
- *     "pointer_alignment"
- *   ]
- * }
- * CHERI CHANGES END
- */
 
 #include "config.h"