| Message ID | YjgEC8Nw9PDmdY0O@sol.localdomain (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [GIT,PULL] fscrypt updates for 5.18 | expand |
The pull request you sent on Sun, 20 Mar 2022 21:50:19 -0700:
> https://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git tags/fscrypt-for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/881b568756ae55ce7d87b9f001cbbe9d1289893e
Thank you!
The following changes since commit dfd42facf1e4ada021b939b4e19c935dcdd55566: Linux 5.17-rc3 (2022-02-06 12:20:50 -0800) are available in the Git repository at: https://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git tags/fscrypt-for-linus for you to fetch changes up to cdaa1b1941f667814300799ddb74f3079517cd5a: fscrypt: update documentation for direct I/O support (2022-02-08 11:02:18 -0800) ---------------------------------------------------------------- Add support for direct I/O on encrypted files when blk-crypto (inline encryption) is being used for file contents encryption. There will be a merge conflict with the block pull request in fs/iomap/direct-io.c, due to some bio interface cleanups. The merge resolution is straightforward and can be found in linux-next. ---------------------------------------------------------------- Eric Biggers (5): fscrypt: add functions for direct I/O support iomap: support direct I/O with fscrypt using blk-crypto ext4: support direct I/O with fscrypt using blk-crypto f2fs: support direct I/O with fscrypt using blk-crypto fscrypt: update documentation for direct I/O support Documentation/filesystems/fscrypt.rst | 25 +++++++++- fs/crypto/crypto.c | 8 +++ fs/crypto/inline_crypt.c | 93 +++++++++++++++++++++++++++++++++++ fs/ext4/file.c | 10 ++-- fs/ext4/inode.c | 7 +++ fs/f2fs/data.c | 7 +++ fs/f2fs/f2fs.h | 6 ++- fs/iomap/direct-io.c | 6 +++ include/linux/fscrypt.h | 18 +++++++ 9 files changed, 173 insertions(+), 7 deletions(-)