Hi Linus, Please pull this nice short branch, which integrates two bug fixes that trickled in during the merge window. The branch merges cleanly with upstream as of a few minutes ago, so please let me know if anything strange happens. --D The following changes since commit 894645546bb12ce008dcba0f68834d270fcd1dde: xfs: fix Kconfig asking about XFS_SUPPORT_V4 when XFS_FS=n (2020-10-16 15:34:28 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git tags/xfs-5.10-merge-7 for you to fetch changes up to 2e76f188fd90d9ac29adbb82c30345f84d04bfa4: xfs: cancel intents immediately if process_intents fails (2020-10-21 16:28:46 -0700) ---------------------------------------------------------------- Fixes for 5.10-rc1: - Make fallocate check the alignment of its arguments against the fundamental allocation unit of the volume the file lives on, so that we don't trigger the fs' alignment checks. - Cancel unprocessed log intents immediately when log recovery fails, to avoid a log deadlock. ---------------------------------------------------------------- Darrick J. Wong (2): xfs: fix fallocate functions when rtextsize is larger than 1 xfs: cancel intents immediately if process_intents fails fs/xfs/xfs_bmap_util.c | 18 +++++------------- fs/xfs/xfs_file.c | 40 +++++++++++++++++++++++++++++++++++----- fs/xfs/xfs_linux.h | 6 ++++++ fs/xfs/xfs_log_recover.c | 8 ++++++++ 4 files changed, 54 insertions(+), 18 deletions(-)