b60858fe82
* aosp/upstream-f2fs-stable-linux-4.19.y:
fs-verity: use u64_to_user_ptr()
fs-verity: use mempool for hash requests
fs-verity: implement readahead of Merkle tree pages
fs-verity: implement readahead for FS_IOC_ENABLE_VERITY
fscrypt: improve format of no-key names
ubifs: allow both hash and disk name to be provided in no-key names
ubifs: don't trigger assertion on invalid no-key filename
fscrypt: clarify what is meant by a per-file key
fscrypt: derive dirhash key for casefolded directories
fscrypt: don't allow v1 policies with casefolding
fscrypt: add "fscrypt_" prefix to fname_encrypt()
fscrypt: don't print name of busy file when removing key
fscrypt: document gfp_flags for bounce page allocation
fscrypt: optimize fscrypt_zeroout_range()
fscrypt: remove redundant bi_status check
fscrypt: Allow modular crypto algorithms
fscrypt: include <linux/ioctl.h> in UAPI header
fscrypt: don't check for ENOKEY from fscrypt_get_encryption_info()
fscrypt: remove fscrypt_is_direct_key_policy()
fscrypt: move fscrypt_valid_enc_modes() to policy.c
fscrypt: check for appropriate use of DIRECT_KEY flag earlier
fscrypt: split up fscrypt_supported_policy() by policy version
fscrypt: introduce fscrypt_needs_contents_encryption()
fscrypt: move fscrypt_d_revalidate() to fname.c
fscrypt: constify inode parameter to filename encryption functions
fscrypt: constify struct fscrypt_hkdf parameter to fscrypt_hkdf_expand()
fscrypt: verify that the crypto_skcipher has the correct ivsize
fscrypt: use crypto_skcipher_driver_name()
fscrypt: support passing a keyring key to FS_IOC_ADD_ENCRYPTION_KEY
keys: Export lookup_user_key to external users
Conflicts:
fs/crypto/Kconfig
fs/crypto/bio.c
fs/crypto/fname.c
fs/crypto/fscrypt_private.h
fs/crypto/keyring.c
fs/crypto/keysetup.c
fs/ubifs/dir.c
include/uapi/linux/fscrypt.h
Resolved the conflicts as per the corresponding android-mainline change,
Ib1e6b9eda8fb5dcfc6bdc8fa89d93f72b088c5f6.
Bug: 148667616
Change-Id: I5f8b846f0cd4d5403d8c61b9e12acb4581fac6f7
Signed-off-by: Eric Biggers <ebiggers@google.com>
|
||
|---|---|---|
| .. | ||
| caching | ||
| cifs | ||
| configfs | ||
| ext4 | ||
| nfs | ||
| pohmelfs | ||
| 00-INDEX | ||
| 9p.txt | ||
| adfs.txt | ||
| affs.txt | ||
| afs.txt | ||
| autofs-mount-control.txt | ||
| autofs.txt | ||
| automount-support.txt | ||
| befs.txt | ||
| bfs.txt | ||
| btrfs.txt | ||
| ceph.txt | ||
| coda.txt | ||
| conf.py | ||
| cramfs.txt | ||
| dax.txt | ||
| debugfs.txt | ||
| devpts.txt | ||
| directory-locking | ||
| dlmfs.txt | ||
| dnotify.txt | ||
| ecryptfs.txt | ||
| efivarfs.txt | ||
| exofs.txt | ||
| ext2.txt | ||
| ext3.txt | ||
| f2fs.txt | ||
| fiemap.txt | ||
| files.txt | ||
| fscrypt.rst | ||
| fsverity.rst | ||
| fuse-io.txt | ||
| fuse.txt | ||
| gfs2-glocks.txt | ||
| gfs2-uevents.txt | ||
| gfs2.txt | ||
| hfs.txt | ||
| hfsplus.txt | ||
| hpfs.txt | ||
| index.rst | ||
| inotify.txt | ||
| isofs.txt | ||
| jfs.txt | ||
| Locking | ||
| locks.txt | ||
| mandatory-locking.txt | ||
| nilfs2.txt | ||
| ntfs.txt | ||
| ocfs2-online-filecheck.txt | ||
| ocfs2.txt | ||
| omfs.txt | ||
| orangefs.txt | ||
| overlayfs.txt | ||
| path-lookup.md | ||
| path-lookup.txt | ||
| porting | ||
| proc.txt | ||
| qnx6.txt | ||
| quota.txt | ||
| ramfs-rootfs-initramfs.txt | ||
| relay.txt | ||
| romfs.txt | ||
| seq_file.txt | ||
| sharedsubtree.txt | ||
| spufs.txt | ||
| squashfs.txt | ||
| sysfs-pci.txt | ||
| sysfs-tagging.txt | ||
| sysfs.txt | ||
| sysv-fs.txt | ||
| tmpfs.txt | ||
| ubifs.txt | ||
| udf.txt | ||
| ufs.txt | ||
| vfat.txt | ||
| vfs.txt | ||
| xfs-delayed-logging-design.txt | ||
| xfs-self-describing-metadata.txt | ||
| xfs.txt | ||