OpenCloudOS-Kernel/drivers/block/drbd
Linus Torvalds 6c51038900 Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block: (65 commits)
  Documentation/iostats.txt: bit-size reference etc.
  cfq-iosched: removing unnecessary think time checking
  cfq-iosched: Don't clear queue stats when preempt.
  blk-throttle: Reset group slice when limits are changed
  blk-cgroup: Only give unaccounted_time under debug
  cfq-iosched: Don't set active queue in preempt
  block: fix non-atomic access to genhd inflight structures
  block: attempt to merge with existing requests on plug flush
  block: NULL dereference on error path in __blkdev_get()
  cfq-iosched: Don't update group weights when on service tree
  fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away
  block: Require subsystems to explicitly allocate bio_set integrity mempool
  jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  fs: make fsync_buffers_list() plug
  mm: make generic_writepages() use plugging
  blk-cgroup: Add unaccounted time to timeslice_used.
  block: fixup plugging stubs for !CONFIG_BLOCK
  block: remove obsolete comments for blkdev_issue_zeroout.
  blktrace: Use rq->cmd_flags directly in blk_add_trace_rq.
  ...

Fix up conflicts in fs/{aio.c,super.c}
2011-03-24 10:16:26 -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 block: kill off REQ_UNPLUG 2011-03-10 08:52:27 +01:00
drbd_bitmap.c block: remove per-queue plugging 2011-03-10 08:52:07 +01:00
drbd_int.h block: kill off REQ_UNPLUG 2011-03-10 08:52:27 +01:00
drbd_main.c block: kill off REQ_UNPLUG 2011-03-10 08:52:27 +01:00
drbd_nl.c netlink: kill eff_cap from struct netlink_skb_parms 2011-03-03 13:32:07 -08:00
drbd_proc.c drbd: Removed the BIO_RW_BARRIER support form the receiver/epoch code 2010-10-23 13:00:48 +02:00
drbd_receiver.c block: kill off REQ_UNPLUG 2011-03-10 08:52:27 +01:00
drbd_req.c block: remove per-queue plugging 2011-03-10 08:52:07 +01:00
drbd_req.h drbd: fix for spin_lock_irqsave in endio callback 2010-11-27 19:50:43 +01:00
drbd_strings.c drbd: don't start a resync without access to up-to-date Data 2010-05-18 01:08:18 +02:00
drbd_vli.h The DRBD driver 2009-10-01 21:17:49 +02:00
drbd_worker.c block: remove per-queue plugging 2011-03-10 08:52:07 +01:00
drbd_wrappers.h block: remove per-queue plugging 2011-03-10 08:52:07 +01:00