From: Linus Torvalds Date: Thu, 18 Jul 2019 18:11:51 +0000 (-0700) Subject: Merge tag '4.3-rc-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ae9b728c8dc0a9939d89f84e8603258ca2a0df22;p=linux.git Merge tag '4.3-rc-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 Pull cifs updates from Steve French: "Fixes (three for stable) and improvements including much faster encryption (SMB3.1.1 GCM)" * tag '4.3-rc-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6: (27 commits) smb3: smbdirect no longer experimental cifs: fix crash in smb2_compound_op()/smb2_set_next_command() cifs: fix crash in cifs_dfs_do_automount cifs: fix parsing of symbolic link error response cifs: refactor and clean up arguments in the reparse point parsing SMB3: query inode number on open via create context smb3: Send netname context during negotiate protocol smb3: do not send compression info by default smb3: add new mount option to retrieve mode from special ACE smb3: Allow query of symlinks stored as reparse points cifs: Fix a race condition with cifs_echo_request cifs: always add credits back for unsolicited PDUs fs: cifs: cifsssmb: Change return type of convert_ace_to_cifs_ace add some missing definitions cifs: fix typo in debug message with struct field ia_valid smb3: minor cleanup of compound_send_recv CIFS: Fix module dependency cifs: simplify code by removing CONFIG_CIFS_ACL ifdef cifs: Fix check for matching with existing mount cifs: Properly handle auto disabling of serverino option ... --- ae9b728c8dc0a9939d89f84e8603258ca2a0df22 diff --cc fs/cifs/Kconfig index 523e9ea78a285,d6f71e3c47491..b16219e5dac91 --- a/fs/cifs/Kconfig +++ b/fs/cifs/Kconfig @@@ -10,9 -10,10 +10,10 @@@ config CIF select CRYPTO_SHA512 select CRYPTO_CMAC select CRYPTO_HMAC - select CRYPTO_ARC4 + select CRYPTO_LIB_ARC4 select CRYPTO_AEAD2 select CRYPTO_CCM + select CRYPTO_GCM select CRYPTO_ECB select CRYPTO_AES select CRYPTO_DES