Eric Biggers
b115f51088
Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4 ...
* aosp/upstream-f2fs-stable-linux-5.4.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
ubifs: use IS_ENCRYPTED() instead of ubifs_crypt_is_encrypted()
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
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>
2020-02-20 12:31:26 -08:00
FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr
2019-11-05 13:50:57 -08:00
affs: fix a memory leak in affs_remount
2020-01-17 19:48:50 +01:00
This is the 5.4.16 stable release
2020-01-29 20:44:29 +01:00
autofs: fix a leak in autofs_expire_indirect()
2019-10-25 00:03:11 -04:00
This is the 5.4.21 stable release
2020-02-20 08:13:39 +01:00
This is the 5.4.16 stable release
2020-01-29 20:44:29 +01:00
This is the 5.4.21 stable release
2020-02-20 08:13:39 +01:00
utimes: Clamp the timestamps in notify_change()
2020-02-11 04:35:12 -08:00
cramfs: fix usage on non-MTD device
2019-11-23 21:44:49 -05:00
Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4
2020-02-20 12:31:26 -08:00
debugfs: Return -EPERM when locked down
2020-02-01 09:34:35 +00:00
Linux 5.4-rc8
2019-11-18 08:31:11 +01:00
This is the 5.4.19 stable release
2020-02-11 14:09:41 -08:00
exportfs_decode_fh(): negative pinned may become positive without the parent locked
2019-11-10 11:56:05 -05:00
This is the 5.4.19 stable release
2020-02-11 14:09:41 -08:00
Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4
2020-02-20 12:31:26 -08:00
Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4
2020-02-20 12:31:26 -08:00
fat: delete an unnecessary check before brelse()
2019-09-25 17:51:40 -07:00
This is the 5.4.19 stable release
2020-02-11 14:09:41 -08:00
This is the 5.4.19 stable release
2020-02-11 14:09:41 -08:00
FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr
2019-11-05 13:50:57 -08:00
FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr
2019-11-05 13:50:57 -08:00
mm/hugetlbfs: fix for_each_hstate() loop in init_hugetlbfs_fs()
2020-01-04 19:19:19 +01:00
ANDROID: Incremental fs: Support xattrs
2020-02-20 15:29:52 +00:00
ANDROID: ext4, f2fs: enable direct I/O with inline encryption
2020-01-24 10:52:54 -08:00
jbd2: do not clear the BH_Mapped flag when forgetting a metadata buffer
2020-02-19 19:53:09 +01:00
This is the 5.4.2 stable release
2019-12-04 23:46:13 +01:00
FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr
2019-11-05 13:50:57 -08:00
This is the 5.4.3 stable release
2019-12-13 17:03:53 +01:00
This is the 5.4.21 stable release
2020-02-20 08:13:39 +01:00
nfsd: Return the correct number of bytes written to the file
2020-02-11 04:35:47 -08:00
This is the 5.4.11 stable release
2020-01-12 15:36:52 +01:00
utimes: Clamp the timestamps in notify_change()
2020-02-11 04:35:12 -08:00
This is the 5.4.19 stable release
2020-02-11 14:09:41 -08:00
FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr
2019-11-05 13:50:57 -08:00
This is the 5.4.19 stable release
2020-02-11 14:09:41 -08:00
ANDROID: make sure proc mount options are applied
2019-12-06 12:45:10 -08:00
pstore/ram: Regularize prz label allocation lifetime
2020-01-14 20:08:28 +01:00
fs: avoid softlockups in s_inodes iterators
2020-01-12 12:21:37 +01:00
This is the 5.4.18 stable release
2020-02-05 22:19:48 +00:00
ANDROID: sdcardfs: fix -ENOENT lookup race issue
2020-01-07 02:42:56 +00:00
FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr
2019-11-05 13:50:57 -08:00
tracing: Do not create tracefs files if tracefs lockdown is in effect
2019-10-12 20:49:07 -04:00
Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4
2020-02-20 12:31:26 -08:00
fs-verity: use u64_to_user_ptr()
2020-02-13 15:02:44 -08:00
This is the 5.4.15 stable release
2020-01-26 11:14:46 +01:00
aio: prevent potential eventfd recursion on poll
2020-02-11 04:35:37 -08:00
This is the 5.4.19 stable release
2020-02-11 14:09:41 -08:00
elf: don't use MAP_FIXED_NOREPLACE for elf executable mappings
2019-10-06 13:53:27 -07:00
bdev: Refresh bdev size for disks without partitioning
2019-12-13 08:43:19 +01:00
This is the 5.4.13 stable release
2020-01-17 23:38:39 +01:00
chardev: Avoid potential use-after-free in 'chrdev_open()'
2020-01-14 20:08:18 +01:00
fix compat handling of FICLONERANGE, FIDEDUPERANGE and FS_IOC_FIEMAP
2020-01-09 10:20:05 +01:00
fs/dax: Fix pmd vs pte conflict detection
2019-10-22 22:53:02 -07:00
ANDROID: ext4, f2fs: enable direct I/O with inline encryption
2020-01-24 10:52:54 -08:00
fs: avoid softlockups in s_inodes iterators
2020-01-12 12:21:37 +01:00
eventfd: track eventfd_signal() recursion depth
2020-02-11 04:35:37 -08:00
This is the 5.4.1 stable release
2019-11-29 10:56:00 +01:00
memcg: fix a crash in wb_workfn when a device disappears
2020-02-11 04:35:11 -08:00
Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.4.y' into android-5.4
2020-02-20 12:31:26 -08:00
This is the 5.4.13 stable release
2020-01-17 23:38:39 +01:00
Revert "io_uring: only allow submit from owning task"
2020-01-29 16:45:24 +01:00
compat_ioctl: add compat_ptr_ioctl()
2019-12-17 19:55:30 +01:00
ANDROID: Initial commit of Incremental FS
2020-01-30 17:13:48 -08:00
fs/libfs.c: fix kernel-doc warning
2019-10-14 15:04:01 -07:00
locks: print unsigned ino in /proc/locks
2020-01-09 10:19:57 +01:00
ANDROID: Initial commit of Incremental FS
2020-01-30 17:13:48 -08:00
This is the 5.4.13 stable release
2020-01-17 23:38:39 +01:00
This is the 5.4.18 stable release
2020-02-05 22:19:48 +00:00
Linux 5.4-rc8
2019-11-18 08:31:11 +01:00
Merge 5.4-rc1-prelrease into android-mainline
2019-10-02 17:58:47 +02:00
FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr
2019-11-05 13:50:57 -08:00
Merge 5.4-rc1-prelrease into android-mainline
2019-10-02 17:58:47 +02:00
This is the 5.4.19 stable release
2020-02-11 14:09:41 -08:00
readdir: be more conservative with directory entry names
2020-01-29 16:45:31 +01:00
splice: only read in as much information as there is pipe buffer space
2019-12-17 19:56:52 +01:00
vfs: Fix EOVERFLOW testing in put_compat_statfs64
2019-10-03 14:21:35 -07:00
fs: call fsnotify_sb_delete after evict_inodes
2020-01-12 12:21:38 +01:00
This is the 5.4.8 stable release
2020-01-04 19:40:03 +01:00
This is the 5.4.19 stable release
2020-02-11 14:09:41 -08:00
FROMLIST: Add flags option to get xattr method paired to __vfs_getxattr
2019-11-05 13:50:57 -08:00
b115f51088