Messages in this thread | | | Date | Wed, 31 Oct 2012 13:04:39 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the block tree with Linus' tree |
| |
Hi Jens,
Today's linux-next merge of the block tree got a conflict in drivers/block/floppy.c between a set of common patches from Linus' tree and commit b33d002f4b6b ("genhd: Make put_disk() safe for disks that have not been registered") from the block tree.
I fixed it up (by using the block tree version) 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] | |