diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index d47977220062..2d4edadcaa7d 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -45,7 +45,7 @@ options 	DEC_KN8AE		# AlphaServer 8200/8400 (Turbolaser)
 options 	DEC_KN300		# AlphaServer 4100 (Rawhide),
 					# AlphaServer 1200 (Tincup)
 
-options 	SCHED_4BSD		#4BSD scheduler
+options 	SCHED_ULE		#ULE scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
@@ -60,7 +60,6 @@ options 	MSDOSFS			#MSDOS Filesystem
 options 	CD9660			#ISO 9660 Filesystem
 options 	PROCFS			#Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		#Pseudo-filesystem framework
-options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
 options 	COMPAT_FREEBSD4		#Compatible with FreeBSD4
 options 	SCSI_DELAY=15000	#Delay (in ms) before probing SCSI
 options 	KTRACE			#ktrace(1) syscall trace support
@@ -74,8 +73,13 @@ options 	PFIL_HOOKS		# pfil(9) framework
 options 	DDB			#Enable the kernel debugger
 options 	INVARIANTS		#Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
+<<<<<<< GENERIC
+options 	WITNESS			#Enable checks to detect deadlocks and cycles
+options		WITNESS_SKIPSPIN
+=======
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
 options         WITNESS_SKIPSPIN        #Don't run witness on spinlocks for speed
+>>>>>>> 1.165
 
 # To make an SMP kernel, the next line is needed
 options 	SMP			# Symmetric MultiProcessor Kernel
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index b719e6fe2a04..fa0136723f82 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -28,7 +28,7 @@ ident		GENERIC
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	NO_MODULES=not_yet
 
-options 	SCHED_4BSD		#4BSD scheduler
+options 	SCHED_ULE		#ULE scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 891198eb84ef..251ca94f4630 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -29,7 +29,7 @@ ident		GENERIC
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
-options 	SCHED_4BSD		#4BSD scheduler
+options 	SCHED_ULE		#ULE scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 1fb6b2e8797f..5f58228698b2 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -40,7 +40,7 @@ options 	NFSSERVER	# Network Filesystem Server
 options 	NFS_ROOT	# NFS usable as root device
 options 	PROCFS		# Process filesystem (/proc)
 options 	PSEUDOFS	# Pseudo-filesystem framework
-options 	SCHED_4BSD	# 4BSD scheduler
+options 	SCHED_ULE	# ULE scheduler
 options 	SCSI_DELAY=5000	# Delay (in ms) before probing SCSI
 #options 	SMP		# SMP support
 options 	SOFTUPDATES	# Enable FFS soft updates support
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 36637dfe6bb3..bfa48eef282b 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -31,7 +31,7 @@ ident		GENERIC
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
 options 	PC98			#PC98
-options 	SCHED_4BSD		#4BSD scheduler
+options 	SCHED_ULE		#ULE scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index d339411f40b1..a667c34a85cf 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -32,7 +32,7 @@ makeoptions	WERROR=-Wno-error	#XXX: We don't want -Werror just now
 options 	POWERMAC		#NewWorld Apple PowerMacs
 options 	PSIM			#GDB PSIM ppc simulator
 
-options 	SCHED_4BSD		#4BSD scheduler
+options 	SCHED_ULE		#ULE scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 3e025445e4da..e0935505e11a 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -32,7 +32,7 @@ makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 # Platforms supported
 #	At this time all platforms are supported, as-is.
 
-options 	SCHED_4BSD		#4BSD scheduler
+options 	SCHED_ULE		#ULE scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem