Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
fs/btrfs/free-space-cache.c between commit 905d0f564e9c ("btrfs: add
prefix to sanity tests messages") from the btrfs tree and commit
8b513d0cf603 ("treewide: Fix typo in printk") from the trivial tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc fs/btrfs/free-space-cache.c
index 7517285,2750b50..0000000
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@@ -3202,7 -3200,7 +3202,7 @@@ static int test_extents(struct btrfs_bl
ret = btrfs_remove_free_space(cache, 2 * 1024 * 1024, 4096);
if (ret) {
- test_msg("Error removing middle peice %d\n", ret);
- printk(KERN_ERR "Error removing middle piece %d\n", ret);
++ test_msg("Error removing middle piece %d\n", ret);
return ret;
}
Attachment:
pgpJ4cCp6z3Yc.pgp
Description: PGP signature
