Skip to content
Commit 6e7d71b3 authored by Carlos Maiolino's avatar Carlos Maiolino
Browse files

Merge branch 'atomic_writes-6.16' into xfs-6.16-merge



Required update due to conflict with patch:
	xfs: stop using set_blocksize

 Conflicts:
	fs/xfs/xfs_buf.c

Signed-off-by: default avatarCarlos Maiolino <cem@kernel.org>
parents c0a5c408 4abb9052
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment