| Message ID | CAH2r5ms8Tbj+Jwo6pgM--fGtOBW3vyaSkU==959G=-HtoT5EzQ@mail.gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL] smb3 client fixes | expand |
On Sat, Sep 11, 2021 at 10:24 AM Steve French <smfrench@gmail.com> wrote: > > git://git.samba.org/sfrench/cifs-2.6.git tags/5.15-rc-cifs-part2 Your pull request message was a mess - you'd done some odd cut-and-paste with the automated output being mixed in six(!) times in between some of your manual edits. I tried to make a sensible merge message of it all. Linus
The pull request you sent on Sat, 11 Sep 2021 12:23:54 -0500:
> git://git.samba.org/sfrench/cifs-2.6.git tags/5.15-rc-cifs-part2
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/8d4a0b5d0813c990637fa9f3c9bea5dab1fedb8f
Thank you!
Please pull the following changes since commit 9c849ce86e0fa93a218614eac562ace44053d7ce: Merge tag '5.15-rc-smb3-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6 (2021-08-31 09:22:37 -0700) are available in the Git repository at: git://git.samba.org/sfrench/cifs-2.6.git tags/5.15-rc-cifs-part2 for you to fetch changes up to 9351590f51cdda49d0265932a37f099950998504: cifs: properly invalidate cached root handle when closing it (2021-09-09 17:34:38 -0500) ---------------------------------------------------------------- 4 cifs/smb3 fixes: - one for DFS reconnect - one to begin creating common headers for server and client - the other two to 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 theThe following changes since commit 9c849ce86e0fa93a218614eac562ace44053d7ce: Merge tag '5.15-rc-smb3-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6 (2021-08-31 09:22:37 -0700) are available in the Git repository at: git://git.samba.org/sfrench/cifs-2.6.git tags/5.15-rc-cifs-part2 for you to fetch changes up to 9351590f51cdda49d0265932a37f099950998504: cifs: properly invalidate cached root handle when closing it (2021-09-09 17:34:38 -0500) ---------------------------------------------------------------- 4 cifs/smb3 fixes, one for DFS reconnect, and one to begin creating common headers for server and client and the other two to rename the cifs_common directory to smbfs_common to be more consistent ie change use of the name cifs to smb which is more accurate ---------------------------------------------------------------- Enzo Matsumiya (1): cifs: properly invalidate cached root handle when closing it Steve French (3): cifs: update FSCTL definitions cifs: rename cifs_common to smbfs_common cifs: move SMB FSCTL definitions to common code fs/Kconfig | 2 +- fs/Makefile | 2 +- fs/cifs/cifsencrypt.c | 2 +- fs/cifs/cifspdu.h | 2 +- fs/cifs/smb2ops.c | 20 +++++++++++++------- fs/cifs/smbencrypt.c | 2 +- fs/{cifs_common => smbfs_common}/Makefile | 4 ++-- fs/{cifs_common => smbfs_common}/arc4.h | 0 fs/{cifs_common => smbfs_common}/cifs_arc4.c | 8 ++++---- fs/{cifs_common => smbfs_common}/cifs_md4.c | 0 fs/{cifs_common => smbfs_common}/md4.h | 0 fs/{cifs => smbfs_common}/smbfsctl.h | 16 +++++++++++++--- 12 files changed, 37 insertions(+), 21 deletions(-) rename fs/{cifs_common => smbfs_common}/Makefile (59%) rename fs/{cifs_common => smbfs_common}/arc4.h (100%) rename fs/{cifs_common => smbfs_common}/cifs_arc4.c (91%) rename fs/{cifs_common => smbfs_common}/cifs_md4.c (100%) rename fs/{cifs_common => smbfs_common}/md4.h (100%) rename fs/{cifs => smbfs_common}/smbfsctl.h (92%) The following changes since commit 9c849ce86e0fa93a218614eac562ace44053d7ce: Merge tag '5.15-rc-smb3-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6 (2021-08-31 09:22:37 -0700) are available in the Git repository at: git://git.samba.org/sfrench/cifs-2.6.git tags/5.15-rc-cifs-part2 for you to fetch changes up to 9351590f51cdda49d0265932a37f099950998504: cifs: properly invalidate cached root handle when closing it (2021-09-09 17:34:38 -0500) ---------------------------------------------------------------- 4 cifs/smb3 fixes, one for DFS reconnect, and one to begin creating common headers for server and client and the other two to rename the cifs_common directory to smbfs_common to be more consistent ie change use of the name cifs to smb which is more accurate ---------------------------------------------------------------- Enzo Matsumiya (1): cifs: properly invalidate cached root handle when closing it Steve French (3): cifs: update FSCTL definitions cifs: rename cifs_common to smbfs_common cifs: move SMB FSCTL definitions to common code fs/Kconfig | 2 +- fs/Makefile | 2 +- fs/cifs/cifsencrypt.c | 2 +- fs/cifs/cifspdu.h | 2 +- fs/cifs/smb2ops.c | 20 +++++++++++++------- fs/cifs/smbencrypt.c | 2 +- fs/{cifs_common => smbfs_common}/Makefile | 4 ++-- fs/{cifs_common => smbfs_common}/arc4.h | 0 fs/{cifs_common => smbfs_common}/cifs_arc4.c | 8 ++++---- fs/{cifs_common => smbfs_common}/cifs_md4.c | 0 fs/{cifs_common => smbfs_common}/md4.h | 0 fs/{cifs => smbfs_common}/smbfsctl.h | 16 +++++++++++++--- 12 files changed, 37 insertions(+), 21 deletions(-) rename fs/{cifs_common => smbfs_common}/Makefile (59%) rename fs/{cifs_common => smbfs_common}/arc4.h (100%) rename fs/{cifs_common => smbfs_common}/cifs_arc4.c (91%) rename fs/{cifs_common => smbfs_common}/cifs_md4.c (100%) rename fs/{cifs_common => smbfs_common}/md4.h (100%) rename fs/{cifs => smbfs_common}/smbfsctl.h (92%) The following changes since commit 9c849ce86e0fa93a218614eac562ace44053d7ce: Merge tag '5.15-rc-smb3-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6 (2021-08-31 09:22:37 -0700) are available in the Git repository at: git://git.samba.org/sfrench/cifs-2.6.git tags/5.15-rc-cifs-part2 for you to fetch changes up to 9351590f51cdda49d0265932a37f099950998504: cifs: properly invalidate cached root handle when closing it (2021-09-09 17:34:38 -0500) ---------------------------------------------------------------- 4 cifs/smb3 fixes, one for DFS reconnect, and one to begin creating common headers for server and client and the other two to rename the cifs_common directory to smbfs_common to be more consistent ie change use of the name cifs to smb which is more accurate ---------------------------------------------------------------- Enzo Matsumiya (1): cifs: properly invalidate cached root handle when closing it Steve French (3): cifs: update FSCTL definitions cifs: rename cifs_common to smbfs_common cifs: move SMB FSCTL definitions to common code fs/Kconfig | 2 +- fs/Makefile | 2 +- fs/cifs/cifsencrypt.c | 2 +- fs/cifs/cifspdu.h | 2 +- fs/cifs/smb2ops.c | 20 +++++++++++++------- fs/cifs/smbencrypt.c | 2 +- fs/{cifs_common => smbfs_common}/Makefile | 4 ++-- fs/{cifs_common => smbfs_common}/arc4.h | 0 fs/{cifs_common => smbfs_common}/cifs_arc4.c | 8 ++++---- fs/{cifs_common => smbfs_common}/cifs_md4.c | 0 fs/{cifs_common => smbfs_common}/md4.h | 0 fs/{cifs => smbfs_common}/smbfsctl.h | 16 +++++++++++++--- 12 files changed, 37 insertions(+), 21 deletions(-) rename fs/{cifs_common => smbfs_common}/The following changes since commit 9c849ce86e0fa93a218614eac562ace44053d7ce: Merge tag '5.15-rc-smb3-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6 (2021-08-31 09:22:37 -0700) are available in the Git repository at: git://git.samba.org/sfrench/cifs-2.6.git tags/5.15-rc-cifs-part2 for you to fetch changes up to 9351590f51cdda49d0265932a37f099950998504: cifs: properly invalidate cached root handle when closing it (2021-09-09 17:34:38 -0500) ---------------------------------------------------------------- 4 cifs/smb3 fixes, one for DFS reconnect, and one to begin creating common headers for server and client and the other two to rename the cifs_common directory to smbfs_common to be more consistent ie change use of the name cifs to smb which is more accurate ---------------------------------------------------------------- Enzo Matsumiya (1): cifs: properly invalidate cached root handle when closing it Steve French (3): cifs: update FSCTL definitions cifs: rename cifs_common to smbfs_common cifs: move SMB FSCTL definitions to common code The following changes since commit 9c849ce86e0fa93a218614eac562ace44053d7ce: Merge tag '5.15-rc-smb3-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6 (2021-08-31 09:22:37 -0700) are available in the Git repository at: git://git.samba.org/sfrench/cifs-2.6.git tags/5.15-rc-cifs-part2 for you to fetch changes up to 9351590f51cdda49d0265932a37f099950998504: cifs: properly invalidate cached root handle when closing it (2021-09-09 17:34:38 -0500) ---------------------------------------------------------------- 4 cifs/smb3 fixes, one for DFS reconnect, and one to begin creating common headers for server and client and the other two to rename the cifs_common directory to smbfs_common to be more consistent ie change use of the name cifs to smb which is more accurate ---------------------------------------------------------------- Enzo Matsumiya (1): cifs: properly invalidate cached root handle when closing it Steve French (3): cifs: update FSCTL definitions cifs: rename cifs_common to smbfs_common cifs: move SMB FSCTL definitions to common code fs/Kconfig | 2 +- fs/Makefile | 2 +- fs/cifs/cifsencrypt.c | 2 +- fs/cifs/cifspdu.h | 2 +- fs/cifs/smb2ops.c | 20 +++++++++++++------- fs/cifs/smbencrypt.c | 2 +- fs/{cifs_common => smbfs_common}/Makefile | 4 ++-- fs/{cifs_common => smbfs_common}/arc4.h | 0 fs/{cifs_common => smbfs_common}/cifs_arc4.c | 8 ++++---- fs/{cifs_common => smbfs_common}/cifs_md4.c | 0 fs/{cifs_common => smbfs_common}/md4.h | 0 fs/{cifs => smbfs_common}/smbfsctl.h | 16 +++++++++++++--- 12 files changed, 37 insertions(+), 21 deletions(-) rename fs/{cifs_common => smbfs_common}/Makefile (59%) rename fs/{cifs_common => smbfs_common}/arc4.h (100%) rename fs/{cifs_common => smbfs_common}/cifs_arc4.c (91%) rename fs/{cifs_common => smbfs_common}/cifs_md4.c (100%) rename fs/{cifs_common => smbfs_common}/md4.h (100%) rename fs/{cifs => smbfs_common}/smbfsctl.h (92%) fs/Kconfig | 2 +- fs/Makefile | 2 +- fs/cifs/cifsencrypt.c | 2 +- fs/cifs/cifspdu.h | 2 +- fs/cifs/smb2ops.c | 20 +++++++++++++------- fs/cifs/smbencrypt.c | 2 +- fs/{cifs_common => smbfs_common}/Makefile | 4 ++-- fs/{cifs_common => smbfs_common}/arc4.h | 0 fs/{cifs_common => smbfs_common}/cifs_arc4.c | 8 ++++---- fs/{cifs_common => smbfs_common}/cifs_md4.c | 0 fs/{cifs_common => smbfs_common}/md4.h | 0 fs/{cifs => smbfs_common}/smbfsctl.h | 16 +++++++++++++--- 12 files changed, 37 insertions(+), 21 deletions(-) rename fs/{cifs_common => smbfs_common}/Makefile (59%) rename fs/{cifs_common => smbfs_common}/arc4.h (100%) rename fs/{cifs_common => smbfs_common}/cifs_arc4.c (91%) rename fs/{cifs_common => smbfs_common}/cifs_md4.c (100%) rename fs/{cifs_common => smbfs_common}/md4.h (100%) rename fs/{cifs => smbfs_common}/smbfsctl.h (92%) Makefile (59%) rename fs/{cifs_common => smbfs_common}/arc4.h (100%) rename fs/{cifs_common => smbfs_common}/cifs_arc4.c (91%) rename fs/{cifs_common => smbfs_common}/cifs_md4.c (100%) rename fs/{cifs_common => smbfs_common}/md4.h (100%) rename fs/{cifs => smbfs_common}/smbfsctl.h (92%) 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 pull request does not include the set of multichannel fixes nor the two deferred close fixes (they are still being reviewed and tested). ---------------------------------------------------------------- Enzo Matsumiya (1): cifs: properly invalidate cached root handle when closing it Steve French (3): cifs: update FSCTL definitions cifs: rename cifs_common to smbfs_common cifs: move SMB FSCTL definitions to common code fs/Kconfig | 2 +- fs/Makefile | 2 +- fs/cifs/cifsencrypt.c | 2 +- fs/cifs/cifspdu.h | 2 +- fs/cifs/smb2ops.c | 20 +++++++++++++------- fs/cifs/smbencrypt.c | 2 +- fs/{cifs_common => smbfs_common}/Makefile | 4 ++-- fs/{cifs_common => smbfs_common}/arc4.h | 0 fs/{cifs_common => smbfs_common}/cifs_arc4.c | 8 ++++---- fs/{cifs_common => smbfs_common}/cifs_md4.c | 0 fs/{cifs_common => smbfs_common}/md4.h | 0 fs/{cifs => smbfs_common}/smbfsctl.h | 16 +++++++++++++--- 12 files changed, 37 insertions(+), 21 deletions(-) rename fs/{cifs_common => smbfs_common}/Makefile (59%) rename fs/{cifs_common => smbfs_common}/arc4.h (100%) rename fs/{cifs_common => smbfs_common}/cifs_arc4.c (91%) rename fs/{cifs_common => smbfs_common}/cifs_md4.c (100%) rename fs/{cifs_common => smbfs_common}/md4.h (100%) rename fs/{cifs => smbfs_common}/smbfsctl.h (92%)