]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag '5.8-rc6-cifs-fix' of git://git.samba.org/sfrench/cifs-2.6 into master
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Jul 2020 19:53:46 +0000 (12:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Jul 2020 19:53:46 +0000 (12:53 -0700)
Pull cifs fix from Steve French:
 "A fix for a recently discovered regression in rename to older servers
  caused by a recent patch"

* tag '5.8-rc6-cifs-fix' of git://git.samba.org/sfrench/cifs-2.6:
  Revert "cifs: Fix the target file was deleted when rename failed."


Trivial merge