diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-08 22:01:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-08 22:01:55 -0700 |
| commit | 6099776f9f268e61fe5ecd721f994a8cfce5306f (patch) | |
| tree | 289b7d8184b2e6eb5d62e6aacd6edbda7303df36 | |
| parent | 3095dd99dd759a5cab8bb81674bc133b1365fb6b (diff) | |
| parent | f5069159f32c8c943e047f22731317463c8e9b84 (diff) | |
| download | linux-6099776f9f268e61fe5ecd721f994a8cfce5306f.tar.gz | |
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
| -rw-r--r-- | fs/smb/server/Kconfig | 2 | ||||
| -rw-r--r-- | fs/smb/server/server.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/fs/smb/server/Kconfig b/fs/smb/server/Kconfig index 793151ddd60e99..cabe6a843c6a07 100644 --- 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 801cd0929209c6..5ab2f52f9b3557 100644 --- 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: |