kernel: bump 5.15 to 5.15.146

[openwrt/openwrt.git] / target / linux / generic / hack-5.15 / 940-ksmbd-have-a-dependency-on-cifs-arc4.patch

diff --git a/target/linux/generic/hack-5.15/940-ksmbd-have-a-dependency-on-cifs-arc4.patch b/target/linux/generic/hack-5.15/940-ksmbd-have-a-dependency-on-cifs-arc4.patch
deleted file mode 100644 (file)
index 4cf420a..0000000
--- a/target/linux/generic/hack-5.15/940-ksmbd-have-a-dependency-on-cifs-arc4.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Namjae Jeon <linkinjeon@kernel.org>
-To: sashal@kernel.org, gregkh@linuxfoundation.org, stable@vger.kernel.org
-Cc: smfrench@gmail.com, Namjae Jeon <linkinjeon@kernel.org>
-Subject: [PATCH v2 5.15.y 1/8] ksmbd: have a dependency on cifs ARC4
-Date: Wed, 27 Dec 2023 19:25:58 +0900  [thread overview]
-Message-ID: <20231227102605.4766-2-linkinjeon@kernel.org> (raw)
-In-Reply-To: <20231227102605.4766-1-linkinjeon@kernel.org>
-
-Omitted the change that has a dependency on cifs ARC4 from backporting
-commit f9929ef6a2a5("ksmbd: add support for key exchange").
-This patch make ksmbd have a dependeny on cifs ARC4.
-
-Fixes: c5049d2d73b2 ("ksmbd: add support for key exchange")
-Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
----
- fs/Kconfig | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -369,8 +369,8 @@ source "fs/ksmbd/Kconfig"
- 
- config SMBFS_COMMON
-       tristate
--      default y if CIFS=y
--      default m if CIFS=m
-+      default y if CIFS=y || SMB_SERVER=y
-+      default m if CIFS=m || SMB_SERVER=m
- 
- source "fs/coda/Kconfig"
- source "fs/afs/Kconfig"