Merge branch 'for-linus' into for-3.1/core
Jens Axboe [Fri, 1 Jul 2011 14:17:13 +0000 (16:17 +0200)]
Conflicts:
block/blk-throttle.c
block/cfq-iosched.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

1  2 
block/blk-ioc.c
block/cfq-iosched.c
block/genhd.c
fs/partitions/check.c
include/linux/blkdev.h

diff --cc block/blk-ioc.c
Simple merge
Simple merge
diff --cc block/genhd.c
Simple merge
@@@ -251,17 -251,11 +251,11 @@@ static ssize_t part_alignment_offset_sh
        return sprintf(buf, "%llu\n", (unsigned long long)p->alignment_offset);
  }
  
 -ssize_t part_discard_alignment_show(struct device *dev,
 -                                 struct device_attribute *attr, char *buf)
 +static ssize_t part_discard_alignment_show(struct device *dev,
 +                                         struct device_attribute *attr, char *buf)
  {
        struct hd_struct *p = dev_to_part(dev);
-       struct gendisk *disk = dev_to_disk(dev);
-       unsigned int alignment = 0;
-       if (disk->queue)
-               alignment = queue_limit_discard_alignment(&disk->queue->limits,
-                                                               p->start_sect);
-       return sprintf(buf, "%u\n", alignment);
+       return sprintf(buf, "%u\n", p->discard_alignment);
  }
  
  ssize_t part_stat_show(struct device *dev,
Simple merge