diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-12 10:10:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-12 10:10:21 -0700 |
| commit | 8d4a0b5d0813c990637fa9f3c9bea5dab1fedb8f (patch) | |
| tree | 8eafffb65aa65cdfd0ec378075625f85343f7589 /fs/Makefile | |
| parent | 78e709522d2c012cb0daad2e668506637bffb7c2 (diff) | |
| parent | 9351590f51cdda49d0265932a37f099950998504 (diff) | |
| download | linux-8d4a0b5d0813c990637fa9f3c9bea5dab1fedb8f.tar.gz linux-8d4a0b5d0813c990637fa9f3c9bea5dab1fedb8f.tar.bz2 linux-8d4a0b5d0813c990637fa9f3c9bea5dab1fedb8f.zip | |
Merge tag '5.15-rc-cifs-part2' of git://git.samba.org/sfrench/cifs-2.6
Pull smbfs updates from Steve French:
"cifs/smb3 updates:
- DFS reconnect fix
- begin creating common headers for server and client
- rename the cifs_common directory to smbfs_common to be more
consistent ie change use of the name cifs to smb (smb3 or smbfs is
more accurate, as the very old cifs dialect has long been
superseded by smb3 dialects).
In the future we can rename the fs/cifs directory to fs/smbfs.
This does not include the set of multichannel fixes nor the two
deferred close fixes (they are still being reviewed and tested)"
* tag '5.15-rc-cifs-part2' of git://git.samba.org/sfrench/cifs-2.6:
cifs: properly invalidate cached root handle when closing it
cifs: move SMB FSCTL definitions to common code
cifs: rename cifs_common to smbfs_common
cifs: update FSCTL definitions
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/Makefile b/fs/Makefile index 9e712aa5e254..84c5e4cdfee5 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -96,7 +96,7 @@ obj-$(CONFIG_LOCKD) += lockd/ obj-$(CONFIG_NLS) += nls/ obj-$(CONFIG_UNICODE) += unicode/ obj-$(CONFIG_SYSV_FS) += sysv/ -obj-$(CONFIG_CIFS_COMMON) += cifs_common/ +obj-$(CONFIG_SMBFS_COMMON) += smbfs_common/ obj-$(CONFIG_CIFS) += cifs/ obj-$(CONFIG_SMB_SERVER) += ksmbd/ obj-$(CONFIG_HPFS_FS) += hpfs/ |