Merge tag '6.6-rc-ksmbd' of git://git.samba.org/ksmbd

Pull smb server update from Steve French:
 "After two years, many fixes and much testing, ksmbd is no longer
  experimental"

* tag '6.6-rc-ksmbd' of git://git.samba.org/ksmbd:
  ksmbd: remove experimental warning

diff --git a/fs/smb/server/Kconfig b/fs/smb/server/Kconfig
index 793151d..cabe6a8 100644 (file)
--- a/fs/smb/server/Kconfig
+++ b/fs/smb/server/Kconfig
@@ -1,5 +1,5 @@
 config SMB_SERVER
-       tristate "SMB3 server support (EXPERIMENTAL)"
+       tristate "SMB3 server support"
        depends on INET
        depends on MULTIUSER
        depends on FILE_LOCKING

diff --git a/fs/smb/server/server.c b/fs/smb/server/server.c
index 801cd09..5ab2f52 100644 (file)
--- a/fs/smb/server/server.c
+++ b/fs/smb/server/server.c
@@ -590,8 +590,6 @@ static int __init ksmbd_server_init(void)
        if (ret)
                goto err_crypto_destroy;
 
-       pr_warn_once("The ksmbd server is experimental\n");
-
        return 0;
 
 err_crypto_destroy: