Index: .gitignore
===================================================================
--- .gitignore
+++ .gitignore
@@ -17,19 +17,3 @@
 ID
 cscope.out
 ?cscope.out
-# Ignore LINT generated configs.
-/sys/amd64/conf/LINT
-/sys/amd64/conf/LINT-NOINET
-/sys/amd64/conf/LINT-NOINET6
-/sys/amd64/conf/LINT-NOIP
-/sys/arm/conf/LINT
-/sys/arm/conf/LINT-V5
-/sys/arm/conf/LINT-V7
-/sys/arm64/conf/LINT
-/sys/i386/conf/LINT
-/sys/i386/conf/LINT-NOINET
-/sys/i386/conf/LINT-NOINET6
-/sys/i386/conf/LINT-NOIP
-/sys/powerpc/conf/LINT
-/sys/powerpc/conf/LINT64
-/sys/sparc64/conf/LINT
Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -682,13 +682,6 @@
 universe_${target}_done: universe_${target}_kernels .PHONY
 universe_${target}_kernels: universe_${target}_worlds .PHONY
 universe_${target}_kernels: universe_${target}_prologue .MAKE .PHONY
-	@if [ -e "${KERNSRCDIR}/${target}/conf/NOTES" ]; then \
-	  (cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \
-	    ${SUB_MAKE} LINT \
-	    > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
-	    (echo "${target} 'make LINT' failed," \
-	    "check _.${target}.makeLINT for details"| ${MAKEFAIL})); \
-	fi
 	@cd ${.CURDIR}; ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \
 	    universe_kernels
 .endif # ${__DO_KERNELS} == "yes"
@@ -761,9 +754,6 @@
 .endif
 .endif
 
-buildLINT: .PHONY
-	${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT
-
 .if defined(.PARSEDIR)
 # This makefile does not run in meta mode
 .MAKE.MODE= normal
Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -26,6 +26,19 @@
 	world, or to merely disable the most expensive debugging functionality
 	at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20200923:
+	LINT files are no longer generated. We now include the relevant NOTES
+	files. Note: This may cause conflicts with updating in some cases.
+	        find sys -name LINT\* -rm
+	is suggested across this commit	to remove the generated	LINT files.
+
+	If you have tried to update with generated files there, the svn
+	command you want to un-auger the tree is
+		cd sys/amd64/conf
+		svn revert -R .
+	and then do the above find from the top level. Substitute 'amd64'
+	above with where the error message indicates a conflict.
+
 20200824:
 	OpenZFS support has been integrated. Do not upgrade root pools until
 	the loader is updated to support zstd. Furthermore, we caution against
Index: sys/amd64/conf/LINT
===================================================================
--- /dev/null
+++ sys/amd64/conf/LINT
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+include "../../conf/NOTES"
+include "../../x86/conf/NOTES"
+include NOTES
Index: sys/amd64/conf/LINT-NOINET
===================================================================
--- /dev/null
+++ sys/amd64/conf/LINT-NOINET
@@ -0,0 +1,6 @@
+include LINT
+ident LINT-NOINET
+makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT="
+nooptions INET
+nodevice gre
+nodevice netmap
Index: sys/amd64/conf/LINT-NOINET6
===================================================================
--- /dev/null
+++ sys/amd64/conf/LINT-NOINET6
@@ -0,0 +1,4 @@
+include LINT
+ident LINT-NOINET6
+makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT="
+nooptions INET6
Index: sys/amd64/conf/LINT-NOIP
===================================================================
--- /dev/null
+++ sys/amd64/conf/LINT-NOIP
@@ -0,0 +1,19 @@
+include LINT
+ident LINT-NOIP
+makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT="
+makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT="
+nooptions INET
+nooptions INET6
+nodevice age
+nodevice alc
+nodevice ale
+nodevice bxe
+nodevice em
+nodevice fxp
+nodevice jme
+nodevice msk
+nodevice mxge
+nodevice sge
+nodevice sk
+nodevice txp
+nodevice netmap
Index: sys/amd64/conf/Makefile
===================================================================
--- sys/amd64/conf/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-TARGET=amd64
-
-NOTES=	${.CURDIR}/../../x86/conf/NOTES
-.include "${.CURDIR}/../../conf/makeLINT.mk"
Index: sys/arm/conf/LINT
===================================================================
--- /dev/null
+++ sys/arm/conf/LINT
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+include "../../conf/NOTES"
+include NOTES
Index: sys/arm/conf/Makefile
===================================================================
--- sys/arm/conf/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-TARGET=arm
-
-.include "${.CURDIR}/../../conf/makeLINT.mk"
Index: sys/arm64/conf/LINT
===================================================================
--- /dev/null
+++ sys/arm64/conf/LINT
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+include "../../conf/NOTES"
+include NOTES
Index: sys/arm64/conf/Makefile
===================================================================
--- sys/arm64/conf/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-TARGET=arm64
-
-.include "${.CURDIR}/../../conf/makeLINT.mk"
Index: sys/i386/conf/LINT
===================================================================
--- /dev/null
+++ sys/i386/conf/LINT
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+include "../../conf/NOTES"
+include "../../x86/conf/NOTES"
+include NOTES
Index: sys/i386/conf/LINT-NOINET
===================================================================
--- /dev/null
+++ sys/i386/conf/LINT-NOINET
@@ -0,0 +1,6 @@
+include LINT
+ident LINT-NOINET
+makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT="
+nooptions INET
+nodevice gre
+nodevice netmap
Index: sys/i386/conf/LINT-NOINET6
===================================================================
--- /dev/null
+++ sys/i386/conf/LINT-NOINET6
@@ -0,0 +1,4 @@
+include LINT
+ident LINT-NOINET6
+makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT="
+nooptions INET6
Index: sys/i386/conf/LINT-NOIP
===================================================================
--- /dev/null
+++ sys/i386/conf/LINT-NOIP
@@ -0,0 +1,19 @@
+include LINT
+ident LINT-NOIP
+makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT="
+makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT="
+nooptions INET
+nooptions INET6
+nodevice age
+nodevice alc
+nodevice ale
+nodevice bxe
+nodevice em
+nodevice fxp
+nodevice jme
+nodevice msk
+nodevice mxge
+nodevice sge
+nodevice sk
+nodevice txp
+nodevice netmap
Index: sys/i386/conf/Makefile
===================================================================
--- sys/i386/conf/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-TARGET=i386
-
-NOTES=	${.CURDIR}/../../x86/conf/NOTES
-.include "${.CURDIR}/../../conf/makeLINT.mk"
Index: sys/powerpc/conf/LINT
===================================================================
--- /dev/null
+++ sys/powerpc/conf/LINT
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+include "../../conf/NOTES"
+include NOTES
+machine		powerpc powerpc
+nodevice	mlx5
+nodevice	mlx5en
+nodevice	mlx5ib
+nooptions	RATELIMIT
Index: sys/powerpc/conf/LINT64
===================================================================
--- /dev/null
+++ sys/powerpc/conf/LINT64
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+include "../../conf/NOTES"
+include NOTES
+machine		powerpc powerpc64
Index: sys/powerpc/conf/Makefile
===================================================================
--- sys/powerpc/conf/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-TARGET=powerpc
-
-.include "${.CURDIR}/../../conf/makeLINT.mk"