tree 86b10f4280345eb9b6ab4655cec552732040aa34
parent 3f8c27b09561a41fbd7f13d4e6565ff99f04cc15
parent 5a5e419d51d7f7a3019a903a4b3f9b8d6e2a872a
author Jaegeuk Kim <jaegeuk@google.com> 1663638882 -0700
committer Jaegeuk Kim <jaegeuk@google.com> 1663638923 -0700

Merge remote-tracking branch 'aosp/upstream-master' into aosp

* aosp/upstream-master:
  Always use sparse/sparse.h when building for Android
  f2fs-tools: fix build error on lz4-1.9.4
  Fix format strings in log messages
  fsck.f2fs: use elapsed_time in checkpoint for period check
  mkfs.f2fs: catch total_zones=0 instead of crashing
  f2fs-tools: use F2FS_BLKSIZE instead of PAGE_*_SIZE
  f2fs_io: support triggering filesystem GC via ioctl
  configure.ac: fix cross compilation
  configure.ac: fix AC_ARG_WITH
  Use F2FS_BLKSIZE as the size of struct f2fs_summary_block
  Use F2FS_BLKSIZE for dev_read_block() buffers
  Improve compile-time type checking for f2fs_report_zone()
  Fix f2fs_report_zone()
  Fix the struct f2fs_dentry_block definition
  resize.f2fs: add option to manually specify new overprovision
  fsck.f2fs: drop compression bit if inline_data is set
  f2fs-tools: fix cannot get bdev information
  f2fs_io: add dsync option for write
  tools: fix file too large causing overflow
  dump.f2fs: add -I nid to dump inode by scan full disk
  android_config: add time headers

Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I2a2e50536321c20192d07585edd9cc557ccd435d