Merge tag '5.4-rc6-smb3-fix' of git://git.samba.org/sfrench/cifs-2.6