On Tue, Nov 07, 2000 at 01:06:27PM -0800, Linus Torvalds wrote:

> Mostly driver updates.
> 
> With a few notable exceptions: two rather subtle MM race conditions that
> happened with SMP and highmem respectively. And the FXCSR and file locking
> that was already discussed on the list.

I've once again attached this very small patch for !CONFIG_INET.  Summary:
This is a very minor patch for fs/nls/Config.in, which Petr Vandrovec came up   
with.  The problem is that if CONFIG_INET is n, CONFIG_SMB_FS is never set
so fs/nls/Config.in assumes that the user wants to select some NLS options.
This fixes it and works on config/menuconfig/xconfig.  It's been ok'ed by
the SMB maintainer, so could this please go in?

This is still vs 2.4.10-test8 or so, but the file hasn't changed any, nor has
the problem, so...

-- 
Tom Rini (TR1265)
http://gate.crashing.org/~trini/
--- fs/nls/Config.in.orig       Thu Oct 19 12:54:09 2000
+++ fs/nls/Config.in    Thu Oct 19 12:54:32 2000
@@ -2,10 +2,17 @@
 # Native language support configuration
 #
 
+# smb wants NLS
+if [ "$CONFIG_SMB_FS" = "m" -o "$CONFIG_SMB_FS" = "y" ]; then
+  define_bool CONFIG_SMB_NLS y
+else
+  define_bool CONFIG_SMB_NLS n
+fi
+
 # msdos and Joliet want NLS
 if [ "$CONFIG_JOLIET" = "y" -o "$CONFIG_FAT_FS" != "n" \
        -o "$CONFIG_NTFS_FS" != "n" -o "$CONFIG_NCPFS_NLS" = "y" \
-       -o "$CONFIG_SMB_FS" != "n" ]; then
+       -o "$CONFIG_SMB_NLS" = "y" ]; then
   define_bool CONFIG_NLS y
 else
   define_bool CONFIG_NLS n

Reply via email to