On 2012-10-31 14:55, Ben Hutchings wrote:

On Wed, 2012-10-31 at 13:04 +1100, Stephen Rothwell wrote:

quoted

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).

commit b33d002f4b6b ("genhd: Make put_disk() safe for disks that have
not been registered") was supposed to be dropped or reverted; I don't
why it's hanging around.

It's my for-next branch that wasn't updated yet. Will do that now.

-- 
Jens Axboe