Merge branch 'for-4.8/core' of git://git.kernel.dk/linux-block
Pull core block updates from Jens Axboe: - the big change is the cleanup from Mike Christie, cleaning up our uses of command types and modified flags. This is what will throw some merge conflicts - regression fix for the above for btrfs, from Vincent - following up to the above, better packing of struct request from Christoph - a 2038 fix for blktrace from Arnd - a few trivial/spelling fixes from Bart Van Assche - a front merge check fix from Damien, which could cause issues on SMR drives - Atari partition fix from Gabriel - convert cfq to highres timers, since jiffies isn't granular enough for some devices these days. From Jan and Jeff - CFQ priority boost fix idle classes, from me - cleanup series from Ming, improving our bio/bvec iteration - a direct issue fix for blk-mq from Omar - fix for plug merging not involving the IO scheduler, like we do for other types of merges. From Tahsin - expose DAX type internally and through sysfs. From Toshi and Yigal * 'for-4.8/core' of git://git.kernel.dk/linux-block: (76 commits) block: Fix front merge check block: do not merge requests without consulting with io scheduler block: Fix spelling in a source code comment block: expose QUEUE_FLAG_DAX in sysfs block: add QUEUE_FLAG_DAX for devices to advertise their DAX support Btrfs: fix comparison in __btrfs_map_block() block: atari: Return early for unsupported sector size Doc: block: Fix a typo in queue-sysfs.txt cfq-iosched: Charge at least 1 jiffie instead of 1 ns cfq-iosched: Fix regression in bonnie++ rewrite performance cfq-iosched: Convert slice_resid from u64 to s64 block: Convert fifo_time from ulong to u64 blktrace: avoid using timespec block/blk-cgroup.c: Declare local symbols static block/bio-integrity.c: Add #include "blk.h" block/partition-generic.c: Remove a set-but-not-used variable block: bio: kill BIO_MAX_SIZE cfq-iosched: temporarily boost queue priority for idle classes block: drbd: avoid to use BIO_MAX_SIZE block: bio: remove BIO_MAX_SECTORS ...
Showing
- Documentation/block/queue-sysfs.txt 1 addition, 1 deletionDocumentation/block/queue-sysfs.txt
- Documentation/block/writeback_cache_control.txt 14 additions, 14 deletionsDocumentation/block/writeback_cache_control.txt
- Documentation/device-mapper/log-writes.txt 5 additions, 5 deletionsDocumentation/device-mapper/log-writes.txt
- arch/um/drivers/ubd_kern.c 1 addition, 1 deletionarch/um/drivers/ubd_kern.c
- block/bio-integrity.c 1 addition, 0 deletionsblock/bio-integrity.c
- block/bio.c 9 additions, 11 deletionsblock/bio.c
- block/blk-cgroup.c 2 additions, 2 deletionsblock/blk-cgroup.c
- block/blk-core.c 51 additions, 45 deletionsblock/blk-core.c
- block/blk-exec.c 1 addition, 1 deletionblock/blk-exec.c
- block/blk-flush.c 12 additions, 11 deletionsblock/blk-flush.c
- block/blk-lib.c 17 additions, 14 deletionsblock/blk-lib.c
- block/blk-map.c 1 addition, 1 deletionblock/blk-map.c
- block/blk-merge.c 22 additions, 14 deletionsblock/blk-merge.c
- block/blk-mq.c 22 additions, 20 deletionsblock/blk-mq.c
- block/blk-sysfs.c 11 additions, 0 deletionsblock/blk-sysfs.c
- block/cfq-iosched.c 260 additions, 172 deletionsblock/cfq-iosched.c
- block/deadline-iosched.c 4 additions, 3 deletionsblock/deadline-iosched.c
- block/elevator.c 14 additions, 15 deletionsblock/elevator.c
- block/partition-generic.c 0 additions, 3 deletionsblock/partition-generic.c
- block/partitions/atari.c 7 additions, 0 deletionsblock/partitions/atari.c
Please register or sign in to comment