Hi all,

The following commit is also in the btrfs-fixes tree as a different commit
(but the same patch):

  0735a4556440 ("btrfs: remove zoned statistics from sysfs")

This is commit

  437cc6057e01 ("btrfs: remove zoned statistics from sysfs")

in the btrfs =-fixes tree.

This is causing a small conflict between those trees.

-- 
Cheers,
Stephen Rothwell