Messages in this thread | | | Date | Tue, 26 Oct 2010 11:32:13 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the mtd tree with Linus' tree |
| |
Hi David,
Today's linux-next merge of the mtd tree got a conflict in drivers/mtd/mtd_blkdevs.c between commit 2a48fc0ab24241755dc93bfd4f01d68efab47f5a ("block: autoconvert trivial BKL users to private mutex") from the tree and commit 480792b7bf188c29b8d4b10fee65c3a06ec5dbf7 ("mtd: blktrans: kill BKL") from the mtd tree.
I fixed it up (by removing all the bits of the former commit) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |