git: b8ab9651b1e4 - stable/13 - Fix e013e369 mismerge which is causes i386 LINT fails to build.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 18 Jun 2022 07:07:46 UTC
The branch stable/13 has been updated by dchagin:
URL: https://cgit.FreeBSD.org/src/commit/?id=b8ab9651b1e407a372c81e2fb122a33484139949
commit b8ab9651b1e407a372c81e2fb122a33484139949
Author: Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2022-06-18 07:06:58 +0000
Commit: Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2022-06-18 07:06:58 +0000
Fix e013e369 mismerge which is causes i386 LINT fails to build.
This is a direct commit to the stable/13.
---
sys/i386/conf/NOTES | 1 -
1 file changed, 1 deletion(-)
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index fb0d52ad8582..3144adf12c90 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -882,7 +882,6 @@ options NDISAPI
device ndis
-=======
#####################################################################
# VM OPTIONS