Merge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block

* 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block: (113 commits)
  cfq-iosched: Do not access cfqq after freeing it
  block: include linux/err.h to use ERR_PTR
  cfq-iosched: use call_rcu() instead of doing grace period stall on queue exit
  blkio: Allow CFQ group IO scheduling even when CFQ is a module
  blkio: Implement dynamic io controlling policy registration
  blkio: Export some symbols from blkio as its user CFQ can be a module
  block: Fix io_context leak after failure of clone with CLONE_IO
  block: Fix io_context leak after clone with CLONE_IO
  cfq-iosched: make nonrot check logic consistent
  io controller: quick fix for blk-cgroup and modular CFQ
  cfq-iosched: move IO controller declerations to a header file
  cfq-iosched: fix compile problem with !CONFIG_CGROUP
  blkio: Documentation
  blkio: Wait on sync-noidle queue even if rq_noidle = 1
  blkio: Implement group_isolation tunable
  blkio: Determine async workload length based on total number of queues
  blkio: Wait for cfq queue to get backlogged if group is empty
  blkio: Propagate cgroup weight updation to cfq groups
  blkio: Drop the reference to queue once the task changes cgroup
  blkio: Provide some isolation between groups
  ...

1 files changed, 18 insertions, 0 deletions

diff --git a/Documentation/blockdev/drbd/conn-states-8.dot b/Documentation/blockdev/drbd/conn-states-8.dot
new file mode 100644
index 000000000000..025e8cf5e64a
--- /dev/null
+++ b/Documentation/blockdev/drbd/conn-states-8.dot
@@ -0,0 +1,18 @@
+digraph conn_states {
+        StandAllone  -> WFConnection   [ label = "ioctl_set_net()" ]
+        WFConnection -> Unconnected    [ label = "unable to bind()" ]
+        WFConnection -> WFReportParams [ label = "in connect() after accept" ]
+        WFReportParams -> StandAllone  [ label = "checks in receive_param()" ]
+        WFReportParams -> Connected    [ label = "in receive_param()" ]
+        WFReportParams -> WFBitMapS    [ label = "sync_handshake()" ]
+        WFReportParams -> WFBitMapT    [ label = "sync_handshake()" ]
+        WFBitMapS -> SyncSource        [ label = "receive_bitmap()" ]
+        WFBitMapT -> SyncTarget        [ label = "receive_bitmap()" ]
+        SyncSource -> Connected
+        SyncTarget -> Connected
+        SyncSource -> PausedSyncS
+        SyncTarget -> PausedSyncT
+        PausedSyncS -> SyncSource
+        PausedSyncT -> SyncTarget
+        Connected   -> WFConnection    [ label = "* on network error" ]
+}