* aosp/upstream-f2fs-stable-linux-5.15.y:
f2fs: simplify f2fs_force_buffered_io()
f2fs: move f2fs_force_buffered_io() into file.c
fscrypt: change fscrypt_dio_supported() to prepare for STATX_DIOALIGN
fscrypt: work on block_devices instead of request_queues
fscrypt: stop holding extra request_queue references
fscrypt: stop using keyrings subsystem for fscrypt_master_key
fscrypt: stop using PG_error to track error status
f2fs: change to use atomic_t type form sbi.atomic_files
f2fs: account swapfile inodes
f2fs: allow direct read for zoned device
f2fs: support recording errors into superblock
f2fs: support recording stop_checkpoint reason into super_block
f2fs: remove the unnecessary check in f2fs_xattr_fiemap
f2fs: introduce cp_status sysfs entry
f2fs: fix to detect corrupted meta ino
f2fs: fix to account FS_CP_DATA_IO correctly
f2fs: code clean and fix a type error
f2fs: add "c_len" into trace_f2fs_update_extent_tree_range for compressed file
f2fs: fix to do sanity check on summary info
f2fs: fix to do sanity check on destination blkaddr during recovery
f2fs: let FI_OPU_WRITE override FADVISE_COLD_BIT
f2fs: fix race condition on setting FI_NO_EXTENT flag
f2fs: remove redundant check in f2fs_sanity_check_cluster
f2fs: add static init_idisk_time function to reduce the code
f2fs: fix typo
f2fs: fix wrong dirty page count when race between mmap and fallocate.
f2fs: use COMPRESS_MAPPING to get compress cache mapping
f2fs: return the tmp_ptr directly in __bitmap_ptr
f2fs: simplify code in f2fs_prepare_decomp_mem
f2fs: replace logical value "true" with a int number
f2fs: increase the limit for reserve_root
f2fs: complete checkpoints during remount
f2fs: flush pending checkpoints when freezing super
f2fs: remove gc_urgent_high_limited for cleanup
f2fs: iostat: support accounting compressed IO
f2fs: use memcpy_{to,from}_page() where possible
f2fs: fix wrong continue condition in GC
f2fs: LFS mode does not support ATGC
Conflicts:
fs/crypto/inline_crypt.c
include/linux/fscrypt.h
Bug: 243472081
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I00b415ead603aa64502dbfeede0221415c41e174
3ce0360dbe