Module Name:    src
Committed By:   jdolecek
Date:           Wed Mar 25 17:06:20 UTC 2020

Modified Files:
        src/sys/arch/acorn32/conf: NC
        src/sys/arch/alpha/conf: GENERIC
        src/sys/arch/amd64/conf: ALL MODULAR
        src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in
        src/sys/arch/amigappc/conf: GENERIC NULL
        src/sys/arch/bebox/conf: GENERIC
        src/sys/arch/cobalt/conf: GENERIC
        src/sys/arch/evbarm/conf: ARMADILLO-IOT-G3 CUBOX CUBOX-I DUOVERO
            GUMSTIX HDL_G HPT5325 IMX6UL-STARTER IYONIX MARVELL_NAS
            MMNET_GENERIC MPCSA_GENERIC MV2120 OPENBLOCKS_A6 OPENBLOCKS_AX3
            PEPPER SHEEVAPLUG
        src/sys/arch/evbmips/conf: CPMBR1400 LINKITSMART7688 ZYXELKX
        src/sys/arch/evbppc/conf: EXPLORA451
        src/sys/arch/ews4800mips/conf: GENERIC
        src/sys/arch/hpcsh/conf: GENERIC
        src/sys/arch/i386/conf: ALL MODULAR XEN3PAE_DOM0 XEN3PAE_DOMU
        src/sys/arch/iyonix/conf: GENERIC
        src/sys/arch/landisk/conf: GENERIC
        src/sys/arch/macppc/conf: GENERIC_601
        src/sys/arch/sandpoint/conf: GENERIC
        src/sys/arch/sparc64/conf: MODULAR
        src/sys/arch/zaurus/conf: GENERIC

Log Message:
remove 'file-system SMBFS' and 'pseudo-device nsmb' from all kernel configs
to prepare for their eventual removal


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/acorn32/conf/NC
cvs rdiff -u -r1.400 -r1.401 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.146 -r1.147 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amd64/conf/MODULAR
cvs rdiff -u -r1.190 -r1.191 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.325 -r1.326 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/amigappc/conf/GENERIC
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/amigappc/conf/NULL
cvs rdiff -u -r1.161 -r1.162 src/sys/arch/bebox/conf/GENERIC
cvs rdiff -u -r1.166 -r1.167 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/CUBOX \
    src/sys/arch/evbarm/conf/DUOVERO
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/conf/CUBOX-I
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/evbarm/conf/HDL_G
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbarm/conf/HPT5325
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/IMX6UL-STARTER
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/IYONIX
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/conf/MARVELL_NAS
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/evbarm/conf/MMNET_GENERIC
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbarm/conf/MV2120
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/conf/OPENBLOCKS_A6
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/PEPPER
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/evbarm/conf/SHEEVAPLUG
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbmips/conf/CPMBR1400
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbmips/conf/LINKITSMART7688
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbmips/conf/ZYXELKX
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbppc/conf/EXPLORA451
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/ews4800mips/conf/GENERIC
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/hpcsh/conf/GENERIC
cvs rdiff -u -r1.489 -r1.490 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/conf/MODULAR
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/i386/conf/XEN3PAE_DOM0
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/conf/XEN3PAE_DOMU
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/iyonix/conf/GENERIC
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/landisk/conf/GENERIC
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/macppc/conf/GENERIC_601
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/sandpoint/conf/GENERIC
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc64/conf/MODULAR
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/zaurus/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/acorn32/conf/NC
diff -u src/sys/arch/acorn32/conf/NC:1.76 src/sys/arch/acorn32/conf/NC:1.77
--- src/sys/arch/acorn32/conf/NC:1.76	Sun Jan 19 01:25:03 2020
+++ src/sys/arch/acorn32/conf/NC	Wed Mar 25 17:06:17 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: NC,v 1.76 2020/01/19 01:25:03 thorpej Exp $
+#	$NetBSD: NC,v 1.77 2020/03/25 17:06:17 jdolecek Exp $
 #
 #	NC - with wscons
 #
@@ -40,7 +40,6 @@ file-system	KERNFS		# /kern
 file-system	PROCFS		# /proc
 #file-system	UMAPFS		# NULLFS + uid and gid remapping
 #file-system	UNION		# union file system
-#file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
@@ -258,9 +257,6 @@ pseudo-device	md			# Ramdisk driver
 pseudo-device	clockctl		# user control of clock subsystem
 pseudo-device	drvctl			# user control of drive subsystem
 
-# a pseudo device needed for SMBFS
-#pseudo-device	nsmb			# experimental - SMB requester
-
 # If the standard modes don't work for your monitor, you can specify
 # a RISC-OS-format monitor definition file and a list of modes here.
 

Index: src/sys/arch/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.400 src/sys/arch/alpha/conf/GENERIC:1.401
--- src/sys/arch/alpha/conf/GENERIC:1.400	Sat Jan 25 18:38:34 2020
+++ src/sys/arch/alpha/conf/GENERIC	Wed Mar 25 17:06:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.400 2020/01/25 18:38:34 thorpej Exp $
+# $NetBSD: GENERIC,v 1.401 2020/03/25 17:06:17 jdolecek Exp $
 #
 # This machine description file is used to generate the default NetBSD
 # kernel.
@@ -19,7 +19,7 @@ include 	"arch/alpha/conf/std.alpha"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident		"GENERIC-$Revision: 1.400 $"
+ident		"GENERIC-$Revision: 1.401 $"
 
 maxusers 32
 
@@ -86,7 +86,6 @@ file-system	UMAPFS		# User-mapping file 
 file-system	PROCFS		# Process file system (/proc)
 file-system	UNION		# union file system
 file-system	CODA		# CODA distributed file system
-file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -744,8 +743,6 @@ pseudo-device	sequencer		# MIDI sequence
 #options 	RND_COM			# use "com" randomness too
 # a pseudo device needed for Coda	# also needs CODA (above)
 pseudo-device	vcoda			# coda minicache <-> venus comm.
-# a pseudo device needed for SMBFS
-pseudo-device	nsmb			# experimental - SMB requester
 pseudo-device	clockctl		# user control of clock subsystem
 pseudo-device	drvctl			# user control of drive subsystem
 pseudo-device	wsfont

Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.146 src/sys/arch/amd64/conf/ALL:1.147
--- src/sys/arch/amd64/conf/ALL:1.146	Sun Feb  9 16:06:18 2020
+++ src/sys/arch/amd64/conf/ALL	Wed Mar 25 17:06:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.146 2020/02/09 16:06:18 jmcneill Exp $
+# $NetBSD: ALL,v 1.147 2020/03/25 17:06:17 jdolecek Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"ALL-$Revision: 1.146 $"
+#ident		"ALL-$Revision: 1.147 $"
 
 maxusers	64		# estimated number of users
 
@@ -107,7 +107,7 @@ options 	BUFQ_READPRIO
 options 	BUFQ_PRIOCSCAN
 
 # Diagnostic/debugging support options
-options 	DIAGNOSTIC	# inexpensive kernel consistency checks
+#options 	DIAGNOSTIC	# inexpensive kernel consistency checks
 				# XXX to be commented out on release branch
 options 	DEBUG		# expensive debugging checks/support
 options 	LOCKDEBUG	# expensive locking checks/support
@@ -173,7 +173,6 @@ file-system	PROCFS		# /proc
 file-system	UMAPFS		# NULLFS + uid and gid remapping
 file-system	UNION		# union file system
 file-system	CODA		# Coda File System; also needs vcoda (below)
-file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	SYSVBFS		# System V boot file system
 file-system	PTYFS		# /dev/ptm support
 file-system	TMPFS		# Efficient memory file-system
@@ -1660,9 +1659,6 @@ pseudo-device	gpiosim		1	# GPIO simulato
 # a pseudo device needed for Coda	# also needs CODA (above)
 pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-pseudo-device	nsmb			# experimental - SMB requester
-
 # a pseudo device needed for AUTOFS
 pseudo-device	autofs			# experimental - AUTOFS
 

Index: src/sys/arch/amd64/conf/MODULAR
diff -u src/sys/arch/amd64/conf/MODULAR:1.14 src/sys/arch/amd64/conf/MODULAR:1.15
--- src/sys/arch/amd64/conf/MODULAR:1.14	Sun Jan 19 01:25:04 2020
+++ src/sys/arch/amd64/conf/MODULAR	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: MODULAR,v 1.14 2020/01/19 01:25:04 thorpej Exp $
+# $NetBSD: MODULAR,v 1.15 2020/03/25 17:06:18 jdolecek Exp $
 #
 # Try to exclude all the drivers in GENERIC that have been modularized
 # XXX: incomplete
@@ -75,7 +75,6 @@ options 	MODULAR_DEFAULT_AUTOLOAD
 -no file-system PROCFS		# /proc
 -no file-system PTYFS		# /dev/ptm support
 -no file-system PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
--no file-system SMBFS		# experimental - CIFS; also needs nsmb (below)
 -no file-system TMPFS		# Efficient memory file-system
 -no file-system UDF		# experimental - OSTA UDF CD/DVD file-system
 -no file-system UMAPFS		# NULLFS + uid and gid remapping
@@ -155,9 +154,6 @@ options 	MODULAR_DEFAULT_AUTOLOAD
 -no pseudo-device	vcoda			# coda minicache <-> venus comm.
 -no pseudo-device	autofs			# experimental - AUTOFS
 
-# a pseudo device needed for SMBFS
--no pseudo-device	nsmb			# experimental - SMB requester
-
 # pseudo audio device driver
 -no pseudo-device	pad
 

Index: src/sys/arch/amiga/conf/DRACO
diff -u src/sys/arch/amiga/conf/DRACO:1.190 src/sys/arch/amiga/conf/DRACO:1.191
--- src/sys/arch/amiga/conf/DRACO:1.190	Sun May 26 23:03:31 2019
+++ src/sys/arch/amiga/conf/DRACO	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: DRACO,v 1.190 2019/05/26 23:03:31 sevan Exp $
+# $NetBSD: DRACO,v 1.191 2020/03/25 17:06:18 jdolecek Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.190 $"
+#ident 		"GENERIC-$Revision: 1.191 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -97,7 +97,6 @@ file-system 	OVERLAY		# overlay filesyst
 file-system 	PROCFS		# /proc filesystem
 file-system 	UMAPFS		# NULLFS + uid and gid remapping
 file-system 	UNION		# union filesystem
-file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -344,7 +343,6 @@ options 	RAID_AUTOCONFIG		# auto-configu
 #options 	RND_COM			# use "com" randomness as well (BROKEN)
 
 pseudo-device	ksyms			# /dev/ksyms (kernel symbols)
-pseudo-device	nsmb			# experimental - SMB requester
 
 # Veriexec
 include "dev/veriexec.config"

Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.325 src/sys/arch/amiga/conf/GENERIC:1.326
--- src/sys/arch/amiga/conf/GENERIC:1.325	Sun May 26 23:03:31 2019
+++ src/sys/arch/amiga/conf/GENERIC	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.325 2019/05/26 23:03:31 sevan Exp $
+# $NetBSD: GENERIC,v 1.326 2020/03/25 17:06:18 jdolecek Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.325 $"
+#ident 		"GENERIC-$Revision: 1.326 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -109,7 +109,6 @@ file-system 	OVERLAY		# overlay filesyst
 file-system 	PROCFS		# /proc filesystem
 file-system 	UMAPFS		# NULLFS + uid and gid remapping
 file-system 	UNION		# union filesystem
-file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -427,10 +426,10 @@ gencp*		at acafhbus?		# clockport on ACA
 
 wdc0		at mainbus0		# A4000 & A1200 IDE bus
 wdc*		at zbus0		# Buddha / Catweasel
-#efa0		at mainbus0		# ELBOX FastATA 1200 Mk-III/Mk-IV 
+efa0		at mainbus0		# ELBOX FastATA 1200 Mk-III/Mk-IV 
 
 atabus* 	at wdc? channel ?	# ATA bus
-#atabus*	at efa? channel ?	# ATA bus 
+atabus*	at efa? channel ?	# ATA bus 
 atabus*		at ata? channel ?	# ATA bus 
 wd*		at atabus? drive ?	#  + drives
 atapibus*	at atabus?		# ATAPI bus
@@ -590,7 +589,6 @@ options 	RAID_AUTOCONFIG		# auto-configu
 #options 	RND_COM			# use "com" randomness as well (BROKEN)
 
 pseudo-device	ksyms			# /dev/ksyms (kernel symbols)
-pseudo-device	nsmb			# experimental - SMB requester
 pseudo-device   bcsp                    # BlueCore Serial Protocol
 pseudo-device   btuart                  # Bluetooth HCI UART (H4)
 

Index: src/sys/arch/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.142 src/sys/arch/amiga/conf/GENERIC.in:1.143
--- src/sys/arch/amiga/conf/GENERIC.in:1.142	Sun May 26 23:00:57 2019
+++ src/sys/arch/amiga/conf/GENERIC.in	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.142 2019/05/26 23:00:57 sevan Exp $
+# $NetBSD: GENERIC.in,v 1.143 2020/03/25 17:06:18 jdolecek Exp $
 #
 ##
 # GENERIC machine description file
@@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.142 $"
+#ident 		"GENERIC-$Revision: 1.143 $"
 
 m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
 makeoptions	COPTS="-Os"
@@ -147,7 +147,6 @@ file-system 	OVERLAY		# overlay filesyst
 file-system 	PROCFS		# /proc filesystem
 file-system 	UMAPFS		# NULLFS + uid and gid remapping
 file-system 	UNION		# union filesystem
-file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -698,7 +697,6 @@ options 	RAID_AUTOCONFIG		# auto-configu
 
 m4_ifdef(`INSTALL_CONFIGURATION', `', `m4_dnl
 pseudo-device	ksyms			# /dev/ksyms (kernel symbols)
-pseudo-device	nsmb			# experimental - SMB requester
 ')m4_dnl
 m4_ifdef(`AMIGA_CONFIGURATION', `m4_dnl
 pseudo-device   bcsp                    # BlueCore Serial Protocol

Index: src/sys/arch/amigappc/conf/GENERIC
diff -u src/sys/arch/amigappc/conf/GENERIC:1.37 src/sys/arch/amigappc/conf/GENERIC:1.38
--- src/sys/arch/amigappc/conf/GENERIC:1.37	Fri Apr 26 21:40:28 2019
+++ src/sys/arch/amigappc/conf/GENERIC	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.37 2019/04/26 21:40:28 sevan Exp $
+# $NetBSD: GENERIC,v 1.38 2020/03/25 17:06:18 jdolecek Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include "arch/amigappc/conf/std.amigappc
 
 options 	INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident          "GENERIC-$Revision: 1.37 $"
+#ident          "GENERIC-$Revision: 1.38 $"
 
 maxusers	8
 
@@ -100,7 +100,6 @@ file-system 	OVERLAY		# overlay file sys
 file-system 	PROCFS		# /proc
 file-system 	UMAPFS		# NULLFS + uid and gid remapping
 file-system 	UNION		# union file system
-file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -429,7 +428,6 @@ options 	RAID_AUTOCONFIG		# auto-configu
 #options 	RND_COM			# use "com" randomness as well (BROKEN)
 
 pseudo-device	ksyms			# /dev/ksyms (kernel symbols)
-pseudo-device	nsmb			# experimental - SMB requester
 
 include "dev/veriexec.config"
 

Index: src/sys/arch/amigappc/conf/NULL
diff -u src/sys/arch/amigappc/conf/NULL:1.56 src/sys/arch/amigappc/conf/NULL:1.57
--- src/sys/arch/amigappc/conf/NULL:1.56	Fri Apr 26 22:46:03 2019
+++ src/sys/arch/amigappc/conf/NULL	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: NULL,v 1.56 2019/04/26 22:46:03 sevan Exp $
+# $NetBSD: NULL,v 1.57 2020/03/25 17:06:18 jdolecek Exp $
 #
 # NULL machine description file
 # 
@@ -7,7 +7,7 @@ include "arch/amigappc/conf/std.amigappc
 
 #options 	INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident          "GENERIC-$Revision: 1.56 $"
+#ident          "GENERIC-$Revision: 1.57 $"
 
 maxusers	8
 
@@ -84,7 +84,6 @@ file-system 	ADOSFS		# AmigaDOS file sys
 #file-system 	PROCFS		# /proc
 #file-system 	UMAPFS		# NULLFS + uid and gid remapping
 #file-system 	UNION		# union file system
-#file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -410,7 +409,6 @@ pseudo-device	clockctl		# user control o
 #options 	RND_COM			# use "com" randomness as well (BROKEN)
 
 pseudo-device	ksyms			# /dev/ksyms (kernel symbols)
-#pseudo-device	nsmb			# experimental - SMB requester
 
 # Veriexec
 # include "dev/veriexec.config"

Index: src/sys/arch/bebox/conf/GENERIC
diff -u src/sys/arch/bebox/conf/GENERIC:1.161 src/sys/arch/bebox/conf/GENERIC:1.162
--- src/sys/arch/bebox/conf/GENERIC:1.161	Sun Jan 19 01:25:04 2020
+++ src/sys/arch/bebox/conf/GENERIC	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.161 2020/01/19 01:25:04 thorpej Exp $
+# $NetBSD: GENERIC,v 1.162 2020/03/25 17:06:18 jdolecek Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/bebox/conf/std.bebox"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.161 $"
+#ident 		"GENERIC-$Revision: 1.162 $"
 
 maxusers	32
 
@@ -75,7 +75,6 @@ file-system	PROCFS		# /proc
 #file-system	UMAPFS		# NULLFS + uid and gid remapping
 file-system	UNION		# union file system
 #file-system	CODA		# Coda File System; also needs vcoda (below)
-#file-system	SMBFS		# CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -310,9 +309,6 @@ pseudo-device	lockstat		# lock profiling
 # a pseudo device needed for Coda	# also needs CODA (above)
 #pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-#pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont

Index: src/sys/arch/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.166 src/sys/arch/cobalt/conf/GENERIC:1.167
--- src/sys/arch/cobalt/conf/GENERIC:1.166	Sat Jan 25 18:38:35 2020
+++ src/sys/arch/cobalt/conf/GENERIC	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.166 2020/01/25 18:38:35 thorpej Exp $
+# $NetBSD: GENERIC,v 1.167 2020/03/25 17:06:18 jdolecek Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/cobalt/conf/std.cobalt"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.166 $"
+#ident 		"GENERIC-$Revision: 1.167 $"
 
 maxusers	32
 
@@ -70,7 +70,6 @@ file-system	CD9660		# ISO 9660 + Rock Ri
 file-system	UNION		# union file system
 file-system	MSDOSFS		# MS-DOS FAT filesystem(s).
 #file-system 	CODA		# Coda File System; also needs vcoda (below)
-file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -341,9 +340,6 @@ pseudo-device	nullcons			# no-op console
 # A pseudo device needed for Coda		# also needs CODA (above)
 #pseudo-device	vcoda				# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-pseudo-device	nsmb				# experimental - SMB requester
-
 pseudo-device	ksyms				# /dev/ksyms
 
 include "dev/veriexec.config"

Index: src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
diff -u src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.20 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.21
--- src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.20	Sun Jan 19 01:25:04 2020
+++ src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO-IOT-G3,v 1.20 2020/01/19 01:25:04 thorpej Exp $
+# $NetBSD: ARMADILLO-IOT-G3,v 1.21 2020/03/25 17:06:18 jdolecek Exp $
 #
 # ARMADILLO-IOT-G3 -- Atmark Techno, Armadillo-IoT G3
 #
@@ -102,7 +102,6 @@ file-system	NULLFS		# loopback file syst
 file-system	OVERLAY		# overlay file system
 file-system	PROCFS		# /proc
 file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
-file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	UMAPFS		# NULLFS + uid and gid remapping
 file-system	UNION		# union file system
 file-system	CODA		# Coda File System; also needs vcoda (below)
@@ -357,9 +356,6 @@ pseudo-device	btuart			# Bluetooth HCI U
 # a pseudo device needed for Coda	# also needs CODA (above)
 pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont

Index: src/sys/arch/evbarm/conf/CUBOX
diff -u src/sys/arch/evbarm/conf/CUBOX:1.15 src/sys/arch/evbarm/conf/CUBOX:1.16
--- src/sys/arch/evbarm/conf/CUBOX:1.15	Sun Jan 19 01:25:04 2020
+++ src/sys/arch/evbarm/conf/CUBOX	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX,v 1.15 2020/01/19 01:25:04 thorpej Exp $
+# $NetBSD: CUBOX,v 1.16 2020/03/25 17:06:18 jdolecek Exp $
 #
 #	CUBOX -- SolidRun Ltd. Cubox kernel
 #
@@ -99,7 +99,6 @@ file-system	NULLFS		# loopback file syst
 file-system	OVERLAY		# overlay file system
 file-system	PROCFS		# /proc
 file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
-file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	UMAPFS		# NULLFS + uid and gid remapping
 file-system	UNION		# union file system
 file-system	CODA		# Coda File System; also needs vcoda (below)
@@ -355,9 +354,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # a pseudo device needed for Coda	# also needs CODA (above)
 pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont
Index: src/sys/arch/evbarm/conf/DUOVERO
diff -u src/sys/arch/evbarm/conf/DUOVERO:1.15 src/sys/arch/evbarm/conf/DUOVERO:1.16
--- src/sys/arch/evbarm/conf/DUOVERO:1.15	Sun Jan 19 01:25:04 2020
+++ src/sys/arch/evbarm/conf/DUOVERO	Wed Mar 25 17:06:18 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: DUOVERO,v 1.15 2020/01/19 01:25:04 thorpej Exp $
+#	$NetBSD: DUOVERO,v 1.16 2020/03/25 17:06:18 jdolecek Exp $
 #
 #	DUOOVERO -- Gumstix. Inc. DuoVero COMS platforms kernel
 #
@@ -59,7 +59,6 @@ file-system	KERNFS		# /kern
 #file-system	UMAPFS		# NULLFS + uid and gid remapping
 file-system	UNION		# union file system
 #file-system	CODA		# Coda File System; also needs vcoda (below)
-#file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	TMPFS		# memory file system
 file-system	PTYFS		# /dev/pts/N support
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -282,9 +281,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # a pseudo device needed for Coda	# also needs CODA (above)
 #pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-#pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont

Index: src/sys/arch/evbarm/conf/CUBOX-I
diff -u src/sys/arch/evbarm/conf/CUBOX-I:1.24 src/sys/arch/evbarm/conf/CUBOX-I:1.25
--- src/sys/arch/evbarm/conf/CUBOX-I:1.24	Sun Jan 19 01:25:04 2020
+++ src/sys/arch/evbarm/conf/CUBOX-I	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX-I,v 1.24 2020/01/19 01:25:04 thorpej Exp $
+# $NetBSD: CUBOX-I,v 1.25 2020/03/25 17:06:18 jdolecek Exp $
 #
 # CuBox-i
 # - http://www.solid-run.com/products/cubox-i-mini-computer/
@@ -100,7 +100,6 @@ file-system	NULLFS		# loopback file syst
 file-system	OVERLAY		# overlay file system
 file-system	PROCFS		# /proc
 file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
-file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	UMAPFS		# NULLFS + uid and gid remapping
 file-system	UNION		# union file system
 file-system	CODA		# Coda File System; also needs vcoda (below)
@@ -380,9 +379,6 @@ pseudo-device	btuart			# Bluetooth HCI U
 # a pseudo device needed for Coda	# also needs CODA (above)
 pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont

Index: src/sys/arch/evbarm/conf/GUMSTIX
diff -u src/sys/arch/evbarm/conf/GUMSTIX:1.102 src/sys/arch/evbarm/conf/GUMSTIX:1.103
--- src/sys/arch/evbarm/conf/GUMSTIX:1.102	Sun Jan 19 01:25:04 2020
+++ src/sys/arch/evbarm/conf/GUMSTIX	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: GUMSTIX,v 1.102 2020/01/19 01:25:04 thorpej Exp $
+#	$NetBSD: GUMSTIX,v 1.103 2020/03/25 17:06:18 jdolecek Exp $
 #
 #	GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
 #
@@ -53,7 +53,6 @@ file-system 	PROCFS		# /proc
 file-system 	UMAPFS		# NULLFS + uid and gid remapping
 file-system 	UNION		# union file system
 file-system 	CODA		# Coda File System; also needs vcoda (below)
-file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system 	PTYFS		# /dev/ptm support
 file-system 	TMPFS		# Efficient memory file-system
 #file-system 	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -382,9 +381,6 @@ pseudo-device	btuart			# Bluetooth HCI U
 # a pseudo device needed for Coda	# also needs CODA (above)
 pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 #pseudo-device	wsfont

Index: src/sys/arch/evbarm/conf/HDL_G
diff -u src/sys/arch/evbarm/conf/HDL_G:1.59 src/sys/arch/evbarm/conf/HDL_G:1.60
--- src/sys/arch/evbarm/conf/HDL_G:1.59	Wed Jan 29 18:39:01 2020
+++ src/sys/arch/evbarm/conf/HDL_G	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: HDL_G,v 1.59 2020/01/29 18:39:01 maya Exp $
+# $NetBSD: HDL_G,v 1.60 2020/03/25 17:06:18 jdolecek Exp $
 #
 #       HDL_G -- I-O DATA HDL-G Kernel
 #
@@ -42,7 +42,6 @@ file-system	NULLFS		# loopback file syst
 file-system	PROCFS		# /proc
 file-system	PTYFS		# /dev/pts/N support
 #file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
-file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
 file-system	UMAPFS		# NULLFS + uid and gid remapping
@@ -412,9 +411,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # a pseudo device needed for Coda	# also needs CODA (above)
 #pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-pseudo-device	nsmb			# experimental - SMB requester
-
 # Veriexec
 # include "dev/veriexec.config"
 

Index: src/sys/arch/evbarm/conf/HPT5325
diff -u src/sys/arch/evbarm/conf/HPT5325:1.44 src/sys/arch/evbarm/conf/HPT5325:1.45
--- src/sys/arch/evbarm/conf/HPT5325:1.44	Wed Jan 29 18:39:01 2020
+++ src/sys/arch/evbarm/conf/HPT5325	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: HPT5325,v 1.44 2020/01/29 18:39:01 maya Exp $
+#	$NetBSD: HPT5325,v 1.45 2020/03/25 17:06:18 jdolecek Exp $
 #
 #  This configuration supports for HP T5325 Thin Client
 #
@@ -49,7 +49,6 @@ file-system 	PROCFS		# /proc
 #file-system 	UMAPFS		# NULLFS + uid and gid remapping
 #file-system 	UNION		# union file system
 #file-system 	CODA		# Coda File System; also needs vcoda (below)
-#file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system 	PTYFS		# /dev/ptm support
 file-system 	TMPFS		# Efficient memory file-system
 file-system 	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -476,9 +475,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # a pseudo device needed for Coda	# also needs CODA (above)
 #pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-#pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont

Index: src/sys/arch/evbarm/conf/IMX6UL-STARTER
diff -u src/sys/arch/evbarm/conf/IMX6UL-STARTER:1.14 src/sys/arch/evbarm/conf/IMX6UL-STARTER:1.15
--- src/sys/arch/evbarm/conf/IMX6UL-STARTER:1.14	Sun Jan 19 01:25:04 2020
+++ src/sys/arch/evbarm/conf/IMX6UL-STARTER	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: IMX6UL-STARTER,v 1.14 2020/01/19 01:25:04 thorpej Exp $
+#	$NetBSD: IMX6UL-STARTER,v 1.15 2020/03/25 17:06:18 jdolecek Exp $
 #
 #	IMX6UL-STARTER - Freescale i.MX6UL Evaluation Board
 #
@@ -103,7 +103,6 @@ file-system	NULLFS		# loopback file syst
 file-system	OVERLAY		# overlay file system
 file-system	PROCFS		# /proc
 file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
-file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	UMAPFS		# NULLFS + uid and gid remapping
 file-system	UNION		# union file system
 file-system	CODA		# Coda File System; also needs vcoda (below)
@@ -369,9 +368,6 @@ pseudo-device	btuart			# Bluetooth HCI U
 # a pseudo device needed for Coda	# also needs CODA (above)
 pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont

Index: src/sys/arch/evbarm/conf/IYONIX
diff -u src/sys/arch/evbarm/conf/IYONIX:1.3 src/sys/arch/evbarm/conf/IYONIX:1.4
--- src/sys/arch/evbarm/conf/IYONIX:1.3	Sun Jan 19 01:25:04 2020
+++ src/sys/arch/evbarm/conf/IYONIX	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: IYONIX,v 1.3 2020/01/19 01:25:04 thorpej Exp $
+#	$NetBSD: IYONIX,v 1.4 2020/03/25 17:06:18 jdolecek Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/evbarm/conf/std.iyonix"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.3 $"
+#ident 		"GENERIC-$Revision: 1.4 $"
 
 maxusers	32		# estimated number of users
 
@@ -115,7 +115,6 @@ file-system 	PROCFS		# /proc
 #file-system 	UMAPFS		# NULLFS + uid and gid remapping
 #file-system 	UNION		# union file system
 #file-system	CODA		# Coda File System; also needs vcoda (below)
-#file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/ptm support
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system

Index: src/sys/arch/evbarm/conf/MARVELL_NAS
diff -u src/sys/arch/evbarm/conf/MARVELL_NAS:1.35 src/sys/arch/evbarm/conf/MARVELL_NAS:1.36
--- src/sys/arch/evbarm/conf/MARVELL_NAS:1.35	Sun Jan 19 01:25:04 2020
+++ src/sys/arch/evbarm/conf/MARVELL_NAS	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: MARVELL_NAS,v 1.35 2020/01/19 01:25:04 thorpej Exp $
+#	$NetBSD: MARVELL_NAS,v 1.36 2020/03/25 17:06:18 jdolecek Exp $
 #
 #  This configuration supports for generically Marvell NAS.
 
@@ -45,7 +45,6 @@ file-system 	PROCFS		# /proc
 file-system 	UMAPFS		# NULLFS + uid and gid remapping
 file-system 	UNION		# union file system
 file-system 	CODA		# Coda File System; also needs vcoda (below)
-file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system 	PTYFS		# /dev/ptm support
 file-system 	TMPFS		# Efficient memory file-system
 file-system 	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -297,9 +296,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # a pseudo device needed for Coda	# also needs CODA (above)
 pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont

Index: src/sys/arch/evbarm/conf/MMNET_GENERIC
diff -u src/sys/arch/evbarm/conf/MMNET_GENERIC:1.49 src/sys/arch/evbarm/conf/MMNET_GENERIC:1.50
--- src/sys/arch/evbarm/conf/MMNET_GENERIC:1.49	Tue Mar 24 17:38:33 2020
+++ src/sys/arch/evbarm/conf/MMNET_GENERIC	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.49 2020/03/24 17:38:33 sevan Exp $
+# $NetBSD: MMNET_GENERIC,v 1.50 2020/03/25 17:06:18 jdolecek Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include		"arch/evbarm/conf/std.mmnet"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.49 $"
+#ident 		"GENERIC-$Revision: 1.50 $"
 
 maxusers	32		# estimated number of users
 
@@ -113,7 +113,6 @@ file-system 	NULLFS		# loopback file sys
 #file-system 	UMAPFS		# NULLFS + uid and gid remapping
 file-system 	UNION		# union file system
 #file-system	CODA		# Coda File System; also needs vcoda (below)
-#file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/ptm support
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -576,9 +575,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # a pseudo device needed for Coda	# also needs CODA (above)
 #pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-#pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 #pseudo-device	wsmux			# mouse & keyboard multiplexor
 #pseudo-device	wsfont

Index: src/sys/arch/evbarm/conf/MPCSA_GENERIC
diff -u src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.70 src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.71
--- src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.70	Wed Jan 29 18:39:01 2020
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.70 2020/01/29 18:39:01 maya Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.71 2020/03/25 17:06:18 jdolecek Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include		"arch/evbarm/conf/std.mpcsa"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.70 $"
+#ident 		"GENERIC-$Revision: 1.71 $"
 
 maxusers	32		# estimated number of users
 
@@ -113,7 +113,6 @@ file-system 	NULLFS		# loopback file sys
 #file-system 	UMAPFS		# NULLFS + uid and gid remapping
 file-system 	UNION		# union file system
 #file-system	CODA		# Coda File System; also needs vcoda (below)
-#file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/ptm support
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -641,9 +640,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # a pseudo device needed for Coda	# also needs CODA (above)
 #pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-#pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 #pseudo-device	wsmux			# mouse & keyboard multiplexor
 #pseudo-device	wsfont

Index: src/sys/arch/evbarm/conf/MV2120
diff -u src/sys/arch/evbarm/conf/MV2120:1.41 src/sys/arch/evbarm/conf/MV2120:1.42
--- src/sys/arch/evbarm/conf/MV2120:1.41	Sun Jan 19 01:25:04 2020
+++ src/sys/arch/evbarm/conf/MV2120	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: MV2120,v 1.41 2020/01/19 01:25:04 thorpej Exp $
+#	$NetBSD: MV2120,v 1.42 2020/03/25 17:06:18 jdolecek Exp $
 #
 #  This configuration supports for HP MV2120/MV5140/MV5150.
 
@@ -50,7 +50,6 @@ file-system 	PROCFS		# /proc
 file-system 	UMAPFS		# NULLFS + uid and gid remapping
 file-system 	UNION		# union file system
 file-system 	CODA		# Coda File System; also needs vcoda (below)
-file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system 	PTYFS		# /dev/ptm support
 file-system 	TMPFS		# Efficient memory file-system
 file-system 	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -293,9 +292,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # a pseudo device needed for Coda	# also needs CODA (above)
 pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont

Index: src/sys/arch/evbarm/conf/OPENBLOCKS_A6
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.37 src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.38
--- src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.37	Sun Jan 19 01:25:04 2020
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_A6	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: OPENBLOCKS_A6,v 1.37 2020/01/19 01:25:04 thorpej Exp $
+#	$NetBSD: OPENBLOCKS_A6,v 1.38 2020/03/25 17:06:18 jdolecek Exp $
 #
 #	OPENBLOCKS_A6 -- Plat'Home. OpenBlockS A6 kernel
 #
@@ -48,7 +48,6 @@ file-system 	PTYFS		# /dev/ptm support
 #file-system 	UMAPFS		# NULLFS + uid and gid remapping
 file-system 	UNION		# union file system
 #file-system 	CODA		# Coda File System; also needs vcoda (below)
-#file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system 	TMPFS		# Efficient memory file-system
 #file-system 	UDF		# experimental - OSTA UDF CD/DVD file-system
 #file-system 	HFS		# experimental - Apple HFS+ (read-only)
@@ -365,9 +364,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # a pseudo device needed for Coda	# also needs CODA (above)
 #pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-#pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 #pseudo-device	wsmux			# mouse & keyboard multiplexor
 #pseudo-device	wsfont

Index: src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.29 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.30
--- src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.29	Sun Jan 19 01:25:04 2020
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: OPENBLOCKS_AX3,v 1.29 2020/01/19 01:25:04 thorpej Exp $
+#	$NetBSD: OPENBLOCKS_AX3,v 1.30 2020/03/25 17:06:18 jdolecek Exp $
 #
 #	OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel
 #
@@ -301,9 +301,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # a pseudo device needed for Coda	# also needs CODA (above)
 #pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-#pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 #pseudo-device	wsmux			# mouse & keyboard multiplexor
 #pseudo-device	wsfont

Index: src/sys/arch/evbarm/conf/PEPPER
diff -u src/sys/arch/evbarm/conf/PEPPER:1.13 src/sys/arch/evbarm/conf/PEPPER:1.14
--- src/sys/arch/evbarm/conf/PEPPER:1.13	Sun Jan 19 01:25:04 2020
+++ src/sys/arch/evbarm/conf/PEPPER	Wed Mar 25 17:06:18 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: PEPPER,v 1.13 2020/01/19 01:25:04 thorpej Exp $
+#	$NetBSD: PEPPER,v 1.14 2020/03/25 17:06:18 jdolecek Exp $
 #
 #	PEPPER -- Gumstix. Inc. Pepper Single Board Computer platforms kernel
 #
@@ -57,7 +57,6 @@ file-system	KERNFS		# /kern
 #file-system	UMAPFS		# NULLFS + uid and gid remapping
 file-system	UNION		# union file system
 #file-system	CODA		# Coda File System; also needs vcoda (below)
-#file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	TMPFS		# memory file system
 file-system	PTYFS		# /dev/pts/N support
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -345,9 +344,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # a pseudo device needed for Coda	# also needs CODA (above)
 #pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-#pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont

Index: src/sys/arch/evbarm/conf/SHEEVAPLUG
diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.66 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.67
--- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.66	Wed Jan 29 18:39:01 2020
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: SHEEVAPLUG,v 1.66 2020/01/29 18:39:01 maya Exp $
+#	$NetBSD: SHEEVAPLUG,v 1.67 2020/03/25 17:06:18 jdolecek Exp $
 #
 #  This configuration supports for generically Marvell SheevaPlug
 #
@@ -49,7 +49,6 @@ file-system	PUFFS		# Userspace file syst
 #file-system 	UMAPFS		# NULLFS + uid and gid remapping
 #file-system 	UNION		# union file system
 #file-system 	CODA		# Coda File System; also needs vcoda (below)
-#file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system 	PTYFS		# /dev/ptm support
 file-system 	TMPFS		# Efficient memory file-system
 #file-system 	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -475,9 +474,6 @@ pseudo-device	drvctl			# device control
 # a pseudo device needed for Coda	# also needs CODA (above)
 #pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-#pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 #pseudo-device	wsmux			# mouse & keyboard multiplexor
 #pseudo-device	wsfont

Index: src/sys/arch/evbmips/conf/CPMBR1400
diff -u src/sys/arch/evbmips/conf/CPMBR1400:1.31 src/sys/arch/evbmips/conf/CPMBR1400:1.32
--- src/sys/arch/evbmips/conf/CPMBR1400:1.31	Fri Apr 26 21:40:29 2019
+++ src/sys/arch/evbmips/conf/CPMBR1400	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: CPMBR1400,v 1.31 2019/04/26 21:40:29 sevan Exp $
+#	$NetBSD: CPMBR1400,v 1.32 2020/03/25 17:06:18 jdolecek Exp $
 
 include 	"arch/evbmips/conf/std.rasoc"
 
@@ -78,7 +78,6 @@ file-system	KERNFS		# /kern
 file-system	PROCFS		# /proc
 #file-system	UMAPFS		# NULLFS + uid and gid remapping
 #file-system	UNION		# union file system
-#file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 #file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
 

Index: src/sys/arch/evbmips/conf/LINKITSMART7688
diff -u src/sys/arch/evbmips/conf/LINKITSMART7688:1.12 src/sys/arch/evbmips/conf/LINKITSMART7688:1.13
--- src/sys/arch/evbmips/conf/LINKITSMART7688:1.12	Sun Jan 19 01:25:05 2020
+++ src/sys/arch/evbmips/conf/LINKITSMART7688	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: LINKITSMART7688,v 1.12 2020/01/19 01:25:05 thorpej Exp $
+#	$NetBSD: LINKITSMART7688,v 1.13 2020/03/25 17:06:18 jdolecek Exp $
 #
 # MediaTek MT7688
 #
@@ -81,7 +81,6 @@ file-system	KERNFS		# /kern
 file-system	PROCFS		# /proc
 #file-system	UMAPFS		# NULLFS + uid and gid remapping
 #file-system	UNION		# union file system
-#file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
 

Index: src/sys/arch/evbmips/conf/ZYXELKX
diff -u src/sys/arch/evbmips/conf/ZYXELKX:1.16 src/sys/arch/evbmips/conf/ZYXELKX:1.17
--- src/sys/arch/evbmips/conf/ZYXELKX:1.16	Fri Apr 26 21:40:29 2019
+++ src/sys/arch/evbmips/conf/ZYXELKX	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: ZYXELKX,v 1.16 2019/04/26 21:40:29 sevan Exp $
+#	$NetBSD: ZYXELKX,v 1.17 2020/03/25 17:06:18 jdolecek Exp $
 
 include 	"arch/evbmips/conf/std.rasoc"
 
@@ -78,7 +78,6 @@ file-system	KERNFS		# /kern
 file-system	PROCFS		# /proc
 #file-system	UMAPFS		# NULLFS + uid and gid remapping
 #file-system	UNION		# union file system
-#file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 #file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
 

Index: src/sys/arch/evbppc/conf/EXPLORA451
diff -u src/sys/arch/evbppc/conf/EXPLORA451:1.65 src/sys/arch/evbppc/conf/EXPLORA451:1.66
--- src/sys/arch/evbppc/conf/EXPLORA451:1.65	Sun Jan 19 01:25:05 2020
+++ src/sys/arch/evbppc/conf/EXPLORA451	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: EXPLORA451,v 1.65 2020/01/19 01:25:05 thorpej Exp $
+#	$NetBSD: EXPLORA451,v 1.66 2020/03/25 17:06:18 jdolecek Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -75,7 +75,6 @@ file-system 	PROCFS		# /proc
 file-system 	UMAPFS		# NULLFS + uid and gid remapping
 file-system 	UNION		# union file system
 file-system	CODA		# Coda File System; also needs vcoda (below)
-file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 
 # File system options
@@ -178,9 +177,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # a pseudo device needed for Coda	# also needs CODA (above)
 pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont

Index: src/sys/arch/ews4800mips/conf/GENERIC
diff -u src/sys/arch/ews4800mips/conf/GENERIC:1.59 src/sys/arch/ews4800mips/conf/GENERIC:1.60
--- src/sys/arch/ews4800mips/conf/GENERIC:1.59	Sun Jan 19 01:25:05 2020
+++ src/sys/arch/ews4800mips/conf/GENERIC	Wed Mar 25 17:06:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.59 2020/01/19 01:25:05 thorpej Exp $
+# $NetBSD: GENERIC,v 1.60 2020/03/25 17:06:18 jdolecek Exp $
 #
 # GENERIC machine description file
 # This machine description file is used to generate the default NetBSD
@@ -25,7 +25,7 @@ include 	"arch/ews4800mips/conf/std.ews4
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.59 $"
+#ident		"GENERIC-$Revision: 1.60 $"
 
 maxusers	16
 
@@ -91,7 +91,6 @@ file-system	PROCFS		# /proc
 file-system	UMAPFS		# NULLFS + uid and gid remapping
 file-system	UNION		# union file system
 #file-system	CODA		# Coda file system; also needs vcoda (below)
-#file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	SYSVBFS		# System V boot filesystem.
 file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
@@ -260,9 +259,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # a pseudo device needed for Coda	# also needs CODA (above)
 #pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-#pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 pseudo-device	wsmux
 

Index: src/sys/arch/hpcsh/conf/GENERIC
diff -u src/sys/arch/hpcsh/conf/GENERIC:1.112 src/sys/arch/hpcsh/conf/GENERIC:1.113
--- src/sys/arch/hpcsh/conf/GENERIC:1.112	Fri Apr 26 21:40:30 2019
+++ src/sys/arch/hpcsh/conf/GENERIC	Wed Mar 25 17:06:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.112 2019/04/26 21:40:30 sevan Exp $
+# $NetBSD: GENERIC,v 1.113 2020/03/25 17:06:19 jdolecek Exp $
 #
 # GENERIC machine description file
 #
@@ -123,7 +123,6 @@ file-system	NFS		# Sun NFS-compatible fi
 file-system 	KERNFS		# /kern
 file-system 	PROCFS		# /proc
 #file-system	CODA		# Coda File System; also needs vcoda (below)
-#file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 #file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -365,9 +364,6 @@ pseudo-device	btuart			# Bluetooth HCI U
 # a pseudo device needed for Coda	# also needs CODA (above)
 #pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-#pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 #pseudo-device	wsfont			# dynamic font loading support

Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.489 src/sys/arch/i386/conf/ALL:1.490
--- src/sys/arch/i386/conf/ALL:1.489	Sun Feb  9 16:06:18 2020
+++ src/sys/arch/i386/conf/ALL	Wed Mar 25 17:06:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.489 2020/02/09 16:06:18 jmcneill Exp $
+# $NetBSD: ALL,v 1.490 2020/03/25 17:06:19 jdolecek Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"ALL-$Revision: 1.489 $"
+#ident		"ALL-$Revision: 1.490 $"
 
 maxusers	64		# estimated number of users
 
@@ -165,7 +165,6 @@ file-system	PROCFS		# /proc
 file-system	UMAPFS		# NULLFS + uid and gid remapping
 file-system	UNION		# union file system
 file-system	CODA		# Coda File System; also needs vcoda (below)
-file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	SYSVBFS		# System V boot file system
 file-system	PTYFS		# /dev/ptm support
 file-system	TMPFS		# Efficient memory file-system
@@ -1785,9 +1784,6 @@ pseudo-device	gpiosim		1	# GPIO simulato
 # a pseudo device needed for Coda	# also needs CODA (above)
 pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont

Index: src/sys/arch/i386/conf/MODULAR
diff -u src/sys/arch/i386/conf/MODULAR:1.5 src/sys/arch/i386/conf/MODULAR:1.6
--- src/sys/arch/i386/conf/MODULAR:1.5	Wed Aug  9 18:45:30 2017
+++ src/sys/arch/i386/conf/MODULAR	Wed Mar 25 17:06:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: MODULAR,v 1.5 2017/08/09 18:45:30 maxv Exp $
+# $NetBSD: MODULAR,v 1.6 2020/03/25 17:06:19 jdolecek Exp $
 #
 # MODULAR kernel
 # This kernel config prefers loading kernel drivers from file system.
@@ -30,7 +30,6 @@ no file-system	PUFFS		# Userspace file s
 no file-system	UMAPFS		# NULLFS + uid and gid remapping
 no file-system	UNION		# union file system
 no file-system	CODA		# Coda File System; also needs vcoda (below)
-no file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 
 # accept filters, built as modules
 #
@@ -40,7 +39,6 @@ no pseudo-device	accf_http	       # "htt
 # pseudo devices, available as modules
 #
 no pseudo-device	vcoda		       # coda minicache <-> venus comm.
-no pseudo-device	nsmb		       # experimental - SMB requester
 
 # these drivers are available as modules
 #

Index: src/sys/arch/i386/conf/XEN3PAE_DOM0
diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.20 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.21
--- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.20	Wed Jan 29 18:39:02 2020
+++ src/sys/arch/i386/conf/XEN3PAE_DOM0	Wed Mar 25 17:06:19 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: XEN3PAE_DOM0,v 1.20 2020/01/29 18:39:02 maya Exp $
+#	$NetBSD: XEN3PAE_DOM0,v 1.21 2020/03/25 17:06:19 jdolecek Exp $
 #
 #	XEN3_0: Xen 3.0 domain0 kernel
 
@@ -112,7 +112,6 @@ file-system	PROCFS		# /proc
 file-system	UMAPFS		# NULLFS + uid and gid remapping
 file-system	UNION		# union file system
 file-system	CODA		# Coda File System; also needs vcoda (below)
-file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
 
@@ -842,9 +841,6 @@ pseudo-device	putter			# for puffs and p
 # a pseudo device needed for Coda	# also needs CODA (above)
 pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont

Index: src/sys/arch/i386/conf/XEN3PAE_DOMU
diff -u src/sys/arch/i386/conf/XEN3PAE_DOMU:1.7 src/sys/arch/i386/conf/XEN3PAE_DOMU:1.8
--- src/sys/arch/i386/conf/XEN3PAE_DOMU:1.7	Wed Aug 21 12:16:07 2019
+++ src/sys/arch/i386/conf/XEN3PAE_DOMU	Wed Mar 25 17:06:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOMU,v 1.7 2019/08/21 12:16:07 maxv Exp $
+# $NetBSD: XEN3PAE_DOMU,v 1.8 2020/03/25 17:06:19 jdolecek Exp $
 
 include 	"arch/xen/conf/std.xen"
 
@@ -96,7 +96,6 @@ file-system	PROCFS		# /proc
 file-system	UMAPFS		# NULLFS + uid and gid remapping
 file-system	UNION		# union file system
 file-system	CODA		# Coda File System; also needs vcoda (below)
-file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
 file-system	NILFS		# experimental - NTT's NiLFS(2)
@@ -229,9 +228,6 @@ pseudo-device	putter			# for puffs and p
 # a pseudo device needed for Coda	# also needs CODA (above)
 pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-pseudo-device	nsmb			# experimental - SMB requester
-
 # userland interface to drivers, including autoconf and properties retrieval
 pseudo-device	drvctl
 

Index: src/sys/arch/iyonix/conf/GENERIC
diff -u src/sys/arch/iyonix/conf/GENERIC:1.108 src/sys/arch/iyonix/conf/GENERIC:1.109
--- src/sys/arch/iyonix/conf/GENERIC:1.108	Sun Jan 19 01:25:06 2020
+++ src/sys/arch/iyonix/conf/GENERIC	Wed Mar 25 17:06:19 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.108 2020/01/19 01:25:06 thorpej Exp $
+#	$NetBSD: GENERIC,v 1.109 2020/03/25 17:06:19 jdolecek Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/iyonix/conf/std.iyonix"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.108 $"
+#ident 		"GENERIC-$Revision: 1.109 $"
 
 maxusers	32		# estimated number of users
 
@@ -114,7 +114,6 @@ file-system 	PROCFS		# /proc
 #file-system 	UMAPFS		# NULLFS + uid and gid remapping
 #file-system 	UNION		# union file system
 #file-system	CODA		# Coda File System; also needs vcoda (below)
-#file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/ptm support
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system

Index: src/sys/arch/landisk/conf/GENERIC
diff -u src/sys/arch/landisk/conf/GENERIC:1.65 src/sys/arch/landisk/conf/GENERIC:1.66
--- src/sys/arch/landisk/conf/GENERIC:1.65	Wed Jan 29 18:39:02 2020
+++ src/sys/arch/landisk/conf/GENERIC	Wed Mar 25 17:06:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.65 2020/01/29 18:39:02 maya Exp $
+# $NetBSD: GENERIC,v 1.66 2020/03/25 17:06:19 jdolecek Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/landisk/conf/std.landisk"
 
 options         INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident          "GENERIC-$Revision: 1.65 $"
+#ident          "GENERIC-$Revision: 1.66 $"
 
 maxusers	16		# estimated number of users
 
@@ -103,7 +103,6 @@ file-system 	PROCFS		# /proc
 file-system 	UMAPFS		# NULLFS + uid and gid remapping
 file-system 	UNION		# union file system
 file-system	CODA		# Coda File System; also needs vcoda (below)
-file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -457,9 +456,6 @@ pseudo-device	putter			# for puffs and p
 # a pseudo device needed for Coda	# also needs CODA (above)
 pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 #pseudo-device	wsfont

Index: src/sys/arch/macppc/conf/GENERIC_601
diff -u src/sys/arch/macppc/conf/GENERIC_601:1.25 src/sys/arch/macppc/conf/GENERIC_601:1.26
--- src/sys/arch/macppc/conf/GENERIC_601:1.25	Wed Dec 11 21:04:47 2019
+++ src/sys/arch/macppc/conf/GENERIC_601	Wed Mar 25 17:06:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.25 2019/12/11 21:04:47 scole Exp $
+# $NetBSD: GENERIC_601,v 1.26 2020/03/25 17:06:19 jdolecek Exp $
 #
 # GENERIC machine description file
 # 
@@ -28,7 +28,7 @@ include 	"arch/macppc/conf/std.macppc.60
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident 		"GENERIC-$Revision: 1.25 $"
+ident 		"GENERIC-$Revision: 1.26 $"
 
 maxusers	32
 
@@ -97,7 +97,6 @@ file-system 	KERNFS		# /kern
 file-system 	PROCFS		# /proc
 #file-system 	UMAPFS		# NULLFS + uid and gid remapping
 #file-system 	UNION		# union file system
-#file-system	SMBFS		# CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -350,7 +349,6 @@ pseudo-device	wsmux			# mouse and keyboa
 #pseudo-device	swwdog			# software watchdog driver - swwdog(4)
 pseudo-device	clockctl		# user control of clock subsystem
 pseudo-device	ksyms			# /dev/ksyms
-#pseudo-device	nsmb			# SMB requester
 #pseudo-device	putter			# for puffs and pud
 
 # userland interface to drivers, including autoconf and properties retrieval

Index: src/sys/arch/sandpoint/conf/GENERIC
diff -u src/sys/arch/sandpoint/conf/GENERIC:1.103 src/sys/arch/sandpoint/conf/GENERIC:1.104
--- src/sys/arch/sandpoint/conf/GENERIC:1.103	Fri Jan  3 03:44:42 2020
+++ src/sys/arch/sandpoint/conf/GENERIC	Wed Mar 25 17:06:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.103 2020/01/03 03:44:42 thorpej Exp $
+# $NetBSD: GENERIC,v 1.104 2020/03/25 17:06:19 jdolecek Exp $
 #
 # machine description file for GENERIC NAS
 # 
@@ -22,7 +22,7 @@ include 	"arch/sandpoint/conf/std.sandpo
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.103 $"
+#ident 		"GENERIC-$Revision: 1.104 $"
 
 maxusers	32
 
@@ -93,7 +93,6 @@ file-system 	PROCFS		# /proc
 #file-system 	UMAPFS		# NULLFS + uid and gid remapping
 #file-system 	UNION		# union file system
 #file-system	CODA		# Coda File System; also needs vcoda (below)
-#file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 file-system	PTYFS		# /dev/ptm support
 file-system	TMPFS		# Efficient memory file-system
 
@@ -326,9 +325,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # a pseudo device needed for Coda	# also needs CODA (above)
 #pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-#pseudo-device	nsmb			# experimental - SMB requester
-
 # userland interface to drivers, including autoconf and properties retrieval
 pseudo-device	drvctl
 

Index: src/sys/arch/sparc64/conf/MODULAR
diff -u src/sys/arch/sparc64/conf/MODULAR:1.7 src/sys/arch/sparc64/conf/MODULAR:1.8
--- src/sys/arch/sparc64/conf/MODULAR:1.7	Sat Jul 29 12:28:28 2017
+++ src/sys/arch/sparc64/conf/MODULAR	Wed Mar 25 17:06:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: MODULAR,v 1.7 2017/07/29 12:28:28 maxv Exp $
+# $NetBSD: MODULAR,v 1.8 2020/03/25 17:06:19 jdolecek Exp $
 #
 # MODULAR kernel - like GENERIC, but excluding lots of stuff that can
 # be loaded as a module later
@@ -6,7 +6,7 @@
 
 include 	"arch/sparc64/conf/GENERIC"
 
-#ident		"MODULAR-$Revision: 1.7 $"
+#ident		"MODULAR-$Revision: 1.8 $"
 
 options 	INSECURE	# disable kernel security levels initially
 				# (we can't load file system modules otherwise)
@@ -29,6 +29,5 @@ no file-system	CD9660		# ISO 9660 + Rock
 no file-system	UNION		# union file system
 no file-system	MSDOSFS		# MS-DOS FAT filesystem(s).
 no file-system	PTYFS		# /dev/pts/N support
-no file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
 no file-system	TMPFS		# Efficient memory file-system
 #no file-system	UDF		# experimental - OSTA UDF CD/DVD file-system

Index: src/sys/arch/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.89 src/sys/arch/zaurus/conf/GENERIC:1.90
--- src/sys/arch/zaurus/conf/GENERIC:1.89	Wed Nov 13 17:59:56 2019
+++ src/sys/arch/zaurus/conf/GENERIC	Wed Mar 25 17:06:19 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.89 2019/11/13 17:59:56 tsutsui Exp $
+#	$NetBSD: GENERIC,v 1.90 2020/03/25 17:06:19 jdolecek Exp $
 #
 # GENERIC machine description file
 #
@@ -391,9 +391,6 @@ pseudo-device	putter			# for puffs and p
 # a pseudo device needed for Coda	# also needs CODA (above)
 #pseudo-device	vcoda			# coda minicache <-> venus comm.
 
-# a pseudo device needed for SMBFS
-#pseudo-device	nsmb			# experimental - SMB requester
-
 # wscons pseudo-devices
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 pseudo-device	wsfont

Reply via email to