Messages in this thread | | | Date | Mon, 4 Mar 2013 11:36:47 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the device-mapper tree with Linus' tree |
| |
Hi Alasdair,
Today's linux-next merge of the device-mapper tree got a conflict in drivers/md/dm-cache-target.c between commit c6b4fcbad044 ("m: add cache target") from Linus' tree and commit 2db8e6e2cd1c ("Add a target that allows a fast device such as an SSD to be used as a") from the device-mapper tree.
These are basically the same patch. I used the version from Linus' tree and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |