Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
drivers/md/dm.c
between commit:
bd4aaf8f9b85 ("dm: fix dm_merge_bvec regression on 32 bit systems")
from Linus' tree and commit:
8ae126660fdd ("block: kill merge_bvec_fn() completely")
from the block tree.
I fixed it up (the latter removed the code updated by the former) and
can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
