Hi Al,
Today's linux-next merge of the bdev tree got a conflict in
drivers/md/dm-table.c between commit
12aba00642892cc565093c57be41693c7810e540 ("dm-export-struct-dm_dev") from
the device-mapper tree and "[PATCH] pass fmode_t to blkdev_put()" from
the bdev tree.
You will need to rebase the tree, I am afraid ... I removed it all for
today.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
--
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
