• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block · 58e57fbd
    Linus Torvalds authored
    * 'for-linus' of git://git.kernel.dk/linux-2.6-block: (41 commits)
      Revert "Seperate read and write statistics of in_flight requests"
      cfq-iosched: don't delay async queue if it hasn't dispatched at all
      block: Topology ioctls
      cfq-iosched: use assigned slice sync value, not default
      cfq-iosched: rename 'desktop' sysfs entry to 'low_latency'
      cfq-iosched: implement slower async initiate and queue ramp up
      cfq-iosched: delay async IO dispatch, if sync IO was just done
      cfq-iosched: add a knob for desktop interactiveness
      Add a tracepoint for block request remapping
      block: allow large discard requests
      block: use normal I/O path for discard requests
      swapfile: avoid NULL pointer dereference in swapon when s_bdev is NULL
      fs/bio.c: move EXPORT* macros to line after function
      Add missing blk_trace_remove_sysfs to be in pair with blk_trace_init_sysfs
      cciss: fix build when !PROC_FS
      block: Do not clamp max_hw_sectors for stacking devices
      block: Set max_sectors correctly for stacking devices
      cciss: cciss_host_attr_groups should be const
      cciss: Dynamically allocate the drive_info_struct for each logical drive.
      cciss: Add usage_count attribute to each logical drive in /sys
      ...
    58e57fbd
cciss.c 128 KB