diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-20 15:30:29 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-20 15:30:29 -0700 |
commit | fdf5078458793fca9e9c0fb5e58a1a970ca0fdef (patch) | |
tree | 1ca832470f18ad87b6f6b3bcf81356a2c6cf2928 /fs/cifs/dns_resolve.h | |
parent | 4c17ca27923c16fd73bbb9ad033c7d749c3bcfcc (diff) | |
parent | 35866f3f779aef5e7ba84e4d1023fe2e2a0e219e (diff) | |
download | linux-fdf5078458793fca9e9c0fb5e58a1a970ca0fdef.tar.bz2 |
Merge tag '5.15-rc1-smb3' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs client fixes from Steve French:
- two deferred close fixes (for bugs found with xfstests 478 and 461)
- a deferred close improvement in rename
- two trivial fixes for incorrect Linux comment formatting of multiple
cifs files (pointed out by automated kernel test robot and
checkpatch)
* tag '5.15-rc1-smb3' of git://git.samba.org/sfrench/cifs-2.6:
cifs: Not to defer close on file when lock is set
cifs: Fix soft lockup during fsstress
cifs: Deferred close performance improvements
cifs: fix incorrect kernel doc comments
cifs: remove pathname for file from SPDX header
Diffstat (limited to 'fs/cifs/dns_resolve.h')
-rw-r--r-- | fs/cifs/dns_resolve.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/dns_resolve.h b/fs/cifs/dns_resolve.h index 9fa2807ef79e..afc0df381246 100644 --- a/fs/cifs/dns_resolve.h +++ b/fs/cifs/dns_resolve.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1 */ /* - * fs/cifs/dns_resolve.h -- DNS Resolver upcall management for CIFS DFS - * Handles host name to IP address resolution + * DNS Resolver upcall management for CIFS DFS + * Handles host name to IP address resolution * * Copyright (c) International Business Machines Corp., 2008 * Author(s): Steve French (sfrench@us.ibm.com) |