Index: stable/9/sys/amd64/include/xen
===================================================================
--- stable/9/sys/amd64/include/xen	(revision 234147)
+++ stable/9/sys/amd64/include/xen	(revision 234148)

Property changes on: stable/9/sys/amd64/include/xen
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/amd64/include/xen:r233893
Index: stable/9/sys/boot/i386/efi
===================================================================
--- stable/9/sys/boot/i386/efi	(revision 234147)
+++ stable/9/sys/boot/i386/efi	(revision 234148)

Property changes on: stable/9/sys/boot/i386/efi
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/boot/i386/efi:r233893
Index: stable/9/sys/boot/ia64/efi
===================================================================
--- stable/9/sys/boot/ia64/efi	(revision 234147)
+++ stable/9/sys/boot/ia64/efi	(revision 234148)

Property changes on: stable/9/sys/boot/ia64/efi
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/boot/ia64/efi:r233893
Index: stable/9/sys/boot/ia64/ski
===================================================================
--- stable/9/sys/boot/ia64/ski	(revision 234147)
+++ stable/9/sys/boot/ia64/ski	(revision 234148)

Property changes on: stable/9/sys/boot/ia64/ski
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/boot/ia64/ski:r233893
Index: stable/9/sys/boot/powerpc/boot1.chrp
===================================================================
--- stable/9/sys/boot/powerpc/boot1.chrp	(revision 234147)
+++ stable/9/sys/boot/powerpc/boot1.chrp	(revision 234148)

Property changes on: stable/9/sys/boot/powerpc/boot1.chrp
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/boot/powerpc/boot1.chrp:r233893
Index: stable/9/sys/boot/powerpc/ofw
===================================================================
--- stable/9/sys/boot/powerpc/ofw	(revision 234147)
+++ stable/9/sys/boot/powerpc/ofw	(revision 234148)

Property changes on: stable/9/sys/boot/powerpc/ofw
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/boot/powerpc/ofw:r233893
Index: stable/9/sys/boot
===================================================================
--- stable/9/sys/boot	(revision 234147)
+++ stable/9/sys/boot	(revision 234148)

Property changes on: stable/9/sys/boot
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/boot:r233893
Index: stable/9/sys/cddl/contrib/opensolaris
===================================================================
--- stable/9/sys/cddl/contrib/opensolaris	(revision 234147)
+++ stable/9/sys/cddl/contrib/opensolaris	(revision 234148)

Property changes on: stable/9/sys/cddl/contrib/opensolaris
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/cddl/contrib/opensolaris:r233893
Index: stable/9/sys/conf/makeLINT.mk
===================================================================
--- stable/9/sys/conf/makeLINT.mk	(revision 234147)
+++ stable/9/sys/conf/makeLINT.mk	(revision 234148)
@@ -1,50 +1,51 @@
 # $FreeBSD$
 
 all:
 	@echo "make LINT only"
 
 clean:
 	rm -f LINT
 .if ${TARGET} == "amd64" || ${TARGET} == "i386"
 	rm -f LINT-VIMAGE LINT-NOINET LINT-NOINET6 LINT-NOIP
 .endif
 
 NOTES=	../../conf/NOTES NOTES
 LINT: ${NOTES} ../../conf/makeLINT.sed
 	cat ${NOTES} | sed -E -n -f ../../conf/makeLINT.sed > ${.TARGET}
 .if ${TARGET} == "amd64" || ${TARGET} == "i386"
 	echo "include ${.TARGET}"	>  ${.TARGET}-VIMAGE
 	echo "ident ${.TARGET}-VIMAGE"	>> ${.TARGET}-VIMAGE
 	echo "options VIMAGE"		>> ${.TARGET}-VIMAGE
 	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 "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 igb"		>> ${.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 vxge"		>> ${.TARGET}-NOIP
 .endif
 .if ${TARGET} == "powerpc" || ${TARGET} == "mips"
 	echo "machine	${TARGET} ${TARGET_ARCH}" >> ${.TARGET}
 .endif
Index: stable/9/sys/conf
===================================================================
--- stable/9/sys/conf	(revision 234147)
+++ stable/9/sys/conf	(revision 234148)

Property changes on: stable/9/sys/conf
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/conf:r233893
Index: stable/9/sys/contrib/dev/acpica
===================================================================
--- stable/9/sys/contrib/dev/acpica	(revision 234147)
+++ stable/9/sys/contrib/dev/acpica	(revision 234148)

Property changes on: stable/9/sys/contrib/dev/acpica
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/contrib/dev/acpica:r233893
Index: stable/9/sys/contrib/octeon-sdk
===================================================================
--- stable/9/sys/contrib/octeon-sdk	(revision 234147)
+++ stable/9/sys/contrib/octeon-sdk	(revision 234148)

Property changes on: stable/9/sys/contrib/octeon-sdk
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/contrib/octeon-sdk:r233893
Index: stable/9/sys/contrib/pf
===================================================================
--- stable/9/sys/contrib/pf	(revision 234147)
+++ stable/9/sys/contrib/pf	(revision 234148)

Property changes on: stable/9/sys/contrib/pf
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/contrib/pf:r233893
Index: stable/9/sys/contrib/x86emu
===================================================================
--- stable/9/sys/contrib/x86emu	(revision 234147)
+++ stable/9/sys/contrib/x86emu	(revision 234148)

Property changes on: stable/9/sys/contrib/x86emu
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/contrib/x86emu:r233893
Index: stable/9/sys/fs/ntfs
===================================================================
--- stable/9/sys/fs/ntfs	(revision 234147)
+++ stable/9/sys/fs/ntfs	(revision 234148)

Property changes on: stable/9/sys/fs/ntfs
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/fs/ntfs:r233893
Index: stable/9/sys/fs
===================================================================
--- stable/9/sys/fs	(revision 234147)
+++ stable/9/sys/fs	(revision 234148)

Property changes on: stable/9/sys/fs
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/fs:r233893
Index: stable/9/sys/i386/conf/XENHVM
===================================================================
--- stable/9/sys/i386/conf/XENHVM	(revision 234147)
+++ stable/9/sys/i386/conf/XENHVM	(revision 234148)

Property changes on: stable/9/sys/i386/conf/XENHVM
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/i386/conf/XENHVM:r233893
Index: stable/9/sys/kern/subr_witness.c
===================================================================
--- stable/9/sys/kern/subr_witness.c	(revision 234147)
+++ stable/9/sys/kern/subr_witness.c	(revision 234148)

Property changes on: stable/9/sys/kern/subr_witness.c
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/kern/subr_witness.c:r233893
Index: stable/9/sys
===================================================================
--- stable/9/sys	(revision 234147)
+++ stable/9/sys	(revision 234148)

Property changes on: stable/9/sys
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys:r233893