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

* 'for-2.6.35' of git://git.kernel.dk/linux-2.6-block: (86 commits)
  pipe: set lower and upper limit on max pages in the pipe page array
  pipe: add support for shrinking and growing pipes
  drbd: This is now equivalent to drbd release 8.3.8rc1
  drbd: Do not free p_uuid early, this is done in the exit code of the receiver
  drbd: Null pointer deref fix to the large "multi bio rewrite"
  drbd: Fix: Do not detach, if a bio with a barrier fails
  drbd: Ensure to not trigger late-new-UUID creation multiple times
  drbd: Do not Oops when C_STANDALONE when uuid gets generated
  writeback: fix mixed up arguments to bdi_start_writeback()
  writeback: fix problem with !CONFIG_BLOCK compilation
  block: improve automatic native capacity unlocking
  block: use struct parsed_partitions *state universally in partition check code
  block,ide: simplify bdops->set_capacity() to ->unlock_native_capacity()
  block: restart partition scan after resizing a device
  buffer: make invalidate_bdev() drain all percpu LRU add caches
  block: remove all rcu head initializations
  writeback: fixups for !dirty_writeback_centisecs
  writeback: bdi_writeback_task() must set task state before calling schedule()
  writeback: ensure that WB_SYNC_NONE writeback with sb pinned is sync
  drivers/block/drbd: Use kzalloc
  ...

1 files changed, 0 insertions, 23 deletions

diff --git a/block/Kconfig b/block/Kconfig
index f9e89f4d94bb..9be0b56eaee1 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -77,29 +77,6 @@ config BLK_DEV_INTEGRITY
         T10/SCSI Data Integrity Field or the T13/ATA External Path
         Protection.  If in doubt, say N.
 
-config BLK_CGROUP
-        tristate "Block cgroup support"
-        depends on CGROUPS
-        depends on CFQ_GROUP_IOSCHED
-        default n
-        ---help---
-        Generic block IO controller cgroup interface. This is the common
-        cgroup interface which should be used by various IO controlling
-        policies.
-
-        Currently, CFQ IO scheduler uses it to recognize task groups and
-        control disk bandwidth allocation (proportional time slice allocation)
-        to such task groups.
-
-config DEBUG_BLK_CGROUP
-        bool
-        depends on BLK_CGROUP
-        default n
-        ---help---
-        Enable some debugging help. Currently it stores the cgroup path
-        in the blk group which can be used by cfq for tracing various
-        group related activity.
-
 endif # BLOCK
 
 config BLOCK_COMPAT