1
0
Fork 0
alistair23-linux/drivers/block/drbd
Linus Torvalds a70f35af4e Merge branch 'for-3.5/drivers' of git://git.kernel.dk/linux-block
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
  ...
2012-05-30 09:05:47 -07:00
..
Kconfig drbd: Kconfig fix 2009-12-29 17:38:28 +01:00
Makefile drbd: remove tracing bits 2009-10-01 21:17:58 +02:00
drbd_actlog.c drbd: introduce a bio_set to allocate housekeeping bios from 2012-05-09 15:17:07 +02:00
drbd_bitmap.c drbd: introduce a bio_set to allocate housekeeping bios from 2012-05-09 15:17:07 +02:00
drbd_int.h drbd: introduce a bio_set to allocate housekeeping bios from 2012-05-09 15:17:07 +02:00
drbd_main.c drbd: check MODULE for THIS_MODULE 2012-05-10 12:00:54 +02:00
drbd_nl.c Merge branch 'for-3.5/drivers' of git://git.kernel.dk/linux-block 2012-05-30 09:05:47 -07:00
drbd_proc.c drbd: cosmetic: fix accidental division instead of modulo when pretty printing 2012-05-09 10:01:39 +02:00
drbd_receiver.c Merge branch 'for-3.5/drivers' of git://git.kernel.dk/linux-block 2012-05-30 09:05:47 -07:00
drbd_req.c drbd: Restore the request restart logic 2012-05-09 17:20:59 +02:00
drbd_req.h drbd: Immediately allow completion of IOs, that wait for IO completions on a failed disk 2012-05-09 10:16:04 +02:00
drbd_strings.c drbd: Rename enum drbd_state_ret_codes to enum drbd_state_rv 2011-03-10 11:36:18 +01:00
drbd_vli.h Fix common misspellings 2011-03-31 11:26:23 -03:00
drbd_worker.c drbd: move put_ldev from __req_mod() to the endio callback 2012-05-09 15:16:51 +02:00
drbd_wrappers.h drbd: Get rid of unnecessary macros (2) 2011-03-10 11:36:15 +01:00