linux-next: manual merge of the mtd tree with Linus' tree

From: Stephen Rothwell
Date: Mon Oct 25 2010 - 20:32:24 EST

Next message: Fernando Guzman Lugo: "[PATCH 0/8] staging: tidspbridge - misc fixes"
Previous message: Arnaldo Carvalho de Melo: "[GIT PULL 0/5] perf python script improvements"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature

Next message: Fernando Guzman Lugo: "[PATCH 0/8] staging: tidspbridge - misc fixes"
Previous message: Arnaldo Carvalho de Melo: "[GIT PULL 0/5] perf python script improvements"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]