From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 28 Mar 2021 19:06:21 +0000 (-0700)
Subject: Merge tag '5.12-rc4-smb3' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=81b1d39fd39a0ecfd30606714bcc05da586044f9;p=linux.git

Merge tag '5.12-rc4-smb3' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fixes from Steve French:
 "Five cifs/smb3 fixes, two for stable.

  Includes an important fix for encryption and an ACL fix, as well as a
  fix for possible reflink data corruption"

* tag '5.12-rc4-smb3' of git://git.samba.org/sfrench/cifs-2.6:
  smb3: fix cached file size problems in duplicate extents (reflink)
  cifs: Silently ignore unknown oplock break handle
  cifs: revalidate mapping when we open files for SMB1 POSIX
  cifs: Fix chmod with modefromsid when an older ACE already exists.
  cifs: Adjust key sizes and key generation routines for AES256 encryption
---

81b1d39fd39a0ecfd30606714bcc05da586044f9