diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-12 10:58:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-12 10:58:35 -0700 |
| commit | 72c34e8d7099c329c2934c2ac9c886f638b6edaf (patch) | |
| tree | a07f92b2607e6f36a504d4fd4438409dc1232461 /include/crypto/sm4.h | |
| parent | 9901a6bd157719f9f93186868c527c5ba5edf8e5 (diff) | |
| parent | d77765911385b65fc82d74ab71b8983cddfe0b58 (diff) | |
Merge tag 'for-5.8-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
"Two refcounting fixes and one prepartory patch for upcoming splice
cleanup:
- fix double put of block group with nodatacow
- fix missing block group put when remounting with discard=async
- explicitly set splice callback (no functional change), to ease
integrating splice cleanup patches"
* tag 'for-5.8-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: wire up iter_file_splice_write
btrfs: fix double put of block group with nocow
btrfs: discard: add missing put when grabbing block group from unused list
Diffstat (limited to 'include/crypto/sm4.h')
0 files changed, 0 insertions, 0 deletions