]> git.ipfire.org Git - thirdparty/linux.git/commit
Merge branch 'atomic_writes-6.16' into xfs-6.16-merge
authorCarlos Maiolino <cem@kernel.org>
Wed, 14 May 2025 10:38:53 +0000 (12:38 +0200)
committerCarlos Maiolino <cem@kernel.org>
Wed, 14 May 2025 10:38:53 +0000 (12:38 +0200)
commit6e7d71b3a0f9732863b6a1366c9d875cec52c842
tree2ae0295a950939f40b39aa0aff344a8e70d97e76
parentc0a5c4084709a78117c1c372aa4f813e1a98c313
parent4abb9052a72bc98d521b0535b5deee243a3bbd12
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: Carlos Maiolino <cem@kernel.org>
fs/xfs/xfs_buf.c