• Linus Torvalds's avatar
    Merge branch 'for-3.5/drivers' of git://git.kernel.dk/linux-block · a70f35af
    Linus Torvalds authored
    Pull block driver updates from Jens Axboe:
     "Here are the driver related changes for 3.5.  It contains:
    
       - The floppy changes from Jiri.  Jiri is now also marked as the
         maintainer of floppy.c, I shall be publically branding his forehead
         with red hot iron at the next opportune moment.
    
       - A batch of drbd updates and fixes from the linbit crew, as well as
         fixes from others.
    
       - Two small fixes for xen-blkfront courtesy of Jan."
    
    * 'for-3.5/drivers' of git://git.kernel.dk/linux-block: (70 commits)
      floppy: take over maintainership
      floppy: remove floppy-specific O_EXCL handling
      floppy: convert to delayed work and single-thread wq
      xen-blkfront: module exit handling adjustments
      xen-blkfront: properly name all devices
      drbd: grammar fix in log message
      drbd: check MODULE for THIS_MODULE
      drbd: Restore the request restart logic
      drbd: introduce a bio_set to allocate housekeeping bios from
      drbd: remove unused define
      drbd: bm_page_async_io: properly initialize page->private
      drbd: use the newly introduced page pool for bitmap IO
      drbd: add page pool to be used for meta data IO
      drbd: allow bitmap to change during writeout from resync_finished
      drbd: fix race between drbdadm invalidate/verify and finishing resync
      drbd: fix resend/resubmit of frozen IO
      drbd: Ensure that data_size is not 0 before using data_size-1 as index
      drbd: Delay/reject other state changes while establishing a connection
      drbd: move put_ldev from __req_mod() to the endio callback
      drbd: fix WRITE_ACKED_BY_PEER_AND_SIS to not set RQ_NET_DONE
      ...
    a70f35af
drbd_receiver.c 130 KB