Hi Dave,

Please pull this branch with changes for xfs.

As usual, I did a test-merge with the main upstream branch as of a few minutes ago, and didn't see any conflicts. Please let me know if you encounter any problems.

--D

The following changes since commit 7ba83850ca2691865713b307ed001bde5fddb084:

xfs: deprecate the ascii-ci feature (2023-04-11 19:05:19 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git tags/fix-bugs-6.4_2023-04-11

for you to fetch changes up to 4fe9cd8a34a1f934e5f936d4245e19300b52d440:

xfs: fix BUG_ON in xfs_getbmap() (2023-04-11 19:48:08 -0700)

---------------------------------------------------------------- xfs: rollup of various bug fixes

This is a rollup of miscellaneous bug fixes.

Signed-off-by: Darrick J. Wong djwong@kernel.org

---------------------------------------------------------------- Darrick J. Wong (2): xfs: _{attr,data}_map_shared should take ILOCK_EXCL until iread_extents is completely done xfs: verify buffer contents when we skip log replay

Dave Chinner (2): xfs: remove WARN when dquot cache insertion fails xfs: don't consider future format versions valid

Ye Bin (1): xfs: fix BUG_ON in xfs_getbmap()

fs/xfs/libxfs/xfs_bmap.c | 6 ++++++ fs/xfs/libxfs/xfs_inode_fork.c | 16 +++++++++++++++- fs/xfs/libxfs/xfs_inode_fork.h | 6 ++++-- fs/xfs/libxfs/xfs_sb.c | 11 ++++++----- fs/xfs/xfs_bmap_util.c | 14 ++++++-------- fs/xfs/xfs_buf_item_recover.c | 10 ++++++++++ fs/xfs/xfs_dquot.c | 1 - 7 files changed, 47 insertions(+), 17 deletions(-)