Index: stable/12/sys/conf/makeLINT.mk
===================================================================
--- stable/12/sys/conf/makeLINT.mk	(revision 352823)
+++ stable/12/sys/conf/makeLINT.mk	(revision 352824)
@@ -1,67 +1,70 @@
 # $FreeBSD$
 
 # The LINT files need to end up in the kernel source directory.
 .OBJDIR: ${.CURDIR}
 
 all:
 	@echo "make LINT only"
 
 clean:
 	rm -f LINT
 .if ${TARGET} == "amd64" || ${TARGET} == "i386"
 	rm -f LINT-NOINET LINT-NOINET6 LINT-NOIP
 .endif
+.if ${TARGET} == "arm"
+	rm -f LINT-V5 LINT-V7
+.endif
 
 NOTES=	${.CURDIR}/../../conf/NOTES ${.CURDIR}/NOTES
 MAKELINT_SED= ${.CURDIR}/../../conf/makeLINT.sed
 LINT: ${NOTES} ${MAKELINT_SED}
 	cat ${NOTES} | sed -E -n -f ${MAKELINT_SED} > ${.TARGET}
 .if ${TARGET} == "amd64" || ${TARGET} == "i386"
 	echo "include ${.TARGET}"	>  ${.TARGET}-NOINET
 	echo "ident ${.TARGET}-NOINET"	>> ${.TARGET}-NOINET
 	echo 'makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT="'  >> ${.TARGET}-NOINET
 	echo "nooptions INET"		>> ${.TARGET}-NOINET
 	echo "nodevice gre"		>> ${.TARGET}-NOINET
 	echo "nodevice netmap"		>> ${.TARGET}-NOINET
 	echo "include ${.TARGET}"	>  ${.TARGET}-NOINET6
 	echo "ident ${.TARGET}-NOINET6"	>> ${.TARGET}-NOINET6
 	echo 'makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT="' >> ${.TARGET}-NOINET6
 	echo "nooptions INET6"		>> ${.TARGET}-NOINET6
 	echo "include ${.TARGET}"	>  ${.TARGET}-NOIP
 	echo "ident ${.TARGET}-NOIP"	>> ${.TARGET}-NOIP
 	echo 'makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT="'  >> ${.TARGET}-NOIP
 	echo 'makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT="' >> ${.TARGET}-NOIP
 	echo "nooptions INET"		>> ${.TARGET}-NOIP
 	echo "nooptions INET6"		>> ${.TARGET}-NOIP
 	echo "nodevice age"		>> ${.TARGET}-NOIP
 	echo "nodevice alc"		>> ${.TARGET}-NOIP
 	echo "nodevice ale"		>> ${.TARGET}-NOIP
 	echo "nodevice bxe"		>> ${.TARGET}-NOIP
 	echo "nodevice em"		>> ${.TARGET}-NOIP
 	echo "nodevice fxp"		>> ${.TARGET}-NOIP
 	echo "nodevice jme"		>> ${.TARGET}-NOIP
 	echo "nodevice msk"		>> ${.TARGET}-NOIP
 	echo "nodevice mxge"		>> ${.TARGET}-NOIP
 	echo "nodevice sge"		>> ${.TARGET}-NOIP
 	echo "nodevice sk"		>> ${.TARGET}-NOIP
 	echo "nodevice txp"		>> ${.TARGET}-NOIP
 	echo "nodevice netmap"		>> ${.TARGET}-NOIP
 .endif
 .if ${TARGET} == "arm"
 	cat ${.TARGET} ${.CURDIR}/NOTES.armv5 > ${.TARGET}-V5
 	cat ${.TARGET} ${.CURDIR}/NOTES.armv7 > ${.TARGET}-V7
 	rm ${.TARGET}
 .endif
 .if ${TARGET} == "mips"
 	echo "machine	${TARGET} ${TARGET_ARCH}" >> ${.TARGET}
 .endif
 .if ${TARGET} == "powerpc"
 	# cat is available, not sure if cp is?
 	cat ${.TARGET} > ${.TARGET}64
 	echo "machine	${TARGET} powerpc" >> ${.TARGET}
 	echo "machine	${TARGET} powerpc64" >> ${.TARGET}64
 # mlx5 needs 64-bit atomics, so exclude from 32-bit PPC
 	echo "nodevice mlx5" >> ${.TARGET}
 	echo "nodevice mlx5en" >> ${.TARGET}
 	echo "nodevice mlx5ib" >> ${.TARGET}
 .endif
Index: stable/12
===================================================================
--- stable/12	(revision 352823)
+++ stable/12	(revision 352824)

Property changes on: stable/12
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r352635