Merge remote-tracking branch 'jens/for-4.7/core' into dm-4.7

Needed in order to update the DM thinp code to use the new async __blkdev_issue_discard() interface.
2026-09-26 18:16:26 +00:00 · 2016-05-05 15:21:14 -04:00 · 2016-05-05 15:21:14 -04:00 · ef1d88ced1
commit ef1d88ced1
parent 04974df804 0ef5a50c16
15 changed files with 180 additions and 135 deletions
--- a/Documentation/block/queue-sysfs.txt
+++ b/Documentation/block/queue-sysfs.txt
--- a/block/bio.c
+++ b/block/bio.c
--- a/block/blk-core.c
+++ b/block/blk-core.c
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
--- a/drivers/block/skd_main.c
+++ b/drivers/block/skd_main.c
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c