Jens,

please consider pulling from

  git://git.kernel.org/pub/scm/linux/kernel/git/jikos/linux-block.git for-jens

(based on 'master' of your linux-block.git) to receive the changes below.

There are a couple of fixes (mostly clenaups) to floppy driver from Herton 
Ronaldo Krzesinski and Ben Hutchings.

Ben's fix I'd like to explicitly point out, as it slightly modifies how 
GENHD_FL_UP is handled in block/genhd.c, but as you have been CCed on it 
and didn't object, I am including it as well.

Apart from that, Peter is giving up on pktcdvd maintainer ship, so I 
offered to take it, cosidering that I have the necessary hardware and it's 
a very low-traffic code anyway.

Thanks!

Ben Hutchings (1):
      genhd: Make put_disk() safe for disks that have not been registered

Herton Ronaldo Krzesinski (5):
      floppy: don't call alloc_ordered_workqueue inside the alloc_disk loop
      floppy: do put_disk on current dr if blk_init_queue fails
      floppy: properly handle failure on add_disk loop
      floppy: use common function to check if floppies can be registered
      floppy: remove dr, reuse drive on do_floppy_init

Jiri Kosina (1):
      pktcdvd: update MAINTAINERS

 MAINTAINERS            |    2 +-
 block/genhd.c          |    6 +-
 drivers/block/floppy.c |   97 +++++++++++++++++++++++------------------------
 3 files changed, 51 insertions(+), 54 deletions(-)

-- 
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to