Messages in this thread | | | Date | Mon, 5 Oct 2009 14:41:02 +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-log-userspace-transfer.c between commit 18366b05a00349c1606269ba7422bf9b3a357ff2 ("connector/dm: Fixed a compilation warning") from Linus' tree and commit 584ac98acfc033dfda338641e736b0100fd31909 ("dm-log-fix-cn_ulog_callback-declaration") from the device-mapper tree.
The former commit (already in Linus' tree) supersedes the latter, so I used the former. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |