On Sun, Jul 28, 2024 at 10:54:08PM +0800, Zorro Lang wrote: > But this line blocks the merging process. I can't find "_scratch_xfs_force_no_metadir" > in xfs/178, and even the whole xfstests. Could you help to rebase this patchset on > offical xfstests for-next branch, then send it again? This patch is too big, It's hard > for me to merge it manually ( I'm glad to know if there's an easy way to deal with this > conflict manually :) Sorry, I've been working off Darrick's queue to include the rt improvements once again. I'll rebase it to your latest tree.