Hi All,
(As expected) Today's linux-next merge of the btrfs-kdave tree got a
conflict in:
fs/btrfs/compression.h
between commit:
5c1aab1dd544 ("btrfs: Add zstd support")
from the btrfs tree and commit:
dc2f29212a26 ("btrfs: remove unused BTRFS_COMPRESS_LAST")
from the btrfs-kdave
Hi All,
(As expected) Today's linux-next merge of the btrfs-kdave tree got a
conflict in:
fs/btrfs/compression.h
between commit:
5c1aab1dd544 ("btrfs: Add zstd support")
from the btrfs tree and commit:
dc2f29212a26 ("btrfs: remove unused BTRFS_COMPRESS_LAST")
from the btrfs-kdave
2 matches
Mail list logo