Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/btrfs/volumes.c
between commits:
da2f0f74cf7d ("Btrfs: add support for blkio controllers")
3a9508b0221d ("btrfs: fix compile when block cgroups are not enabled")
from the btrfs tree and commit:
0e28997ec476 ("btrfs: remove bio splitting and merge_bvec_fn() calls")
from the block tree.
I fixed it up (I removed breakup_stripe_bio) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
