Merge remote-tracking branch 'stable/linux-6.0.y' into zygo-6.0.x-zb64

diff --cc fs/btrfs/ctree.h
Simple merge

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/ioctl.c
Simple merge

diff --cc fs/btrfs/sysfs.c
Simple merge

diff --cc fs/btrfs/volumes.c
Simple merge