Linus Torvalds bfffa1cc9d Merge branch 'for-4.2/core' of git://git.kernel.dk/linux-block ... Pull core block IO update from Jens Axboe: "Nothing really major in here, mostly a collection of smaller optimizations and cleanups, mixed with various fixes. In more detail, this contains: - Addition of policy specific data to blkcg for block cgroups. From Arianna Avanzini. - Various cleanups around command types from Christoph. - Cleanup of the suspend block I/O path from Christoph. - Plugging updates from Shaohua and Jeff Moyer, for blk-mq. - Eliminating atomic inc/dec of both remaining IO count and reference count in a bio. From me. - Fixes for SG gap and chunk size support for data-less (discards) IO, so we can merge these better. From me. - Small restructuring of blk-mq shared tag support, freeing drivers from iterating hardware queues. From Keith Busch. - A few cfq-iosched tweaks, from Tahsin Erdogan and me. Makes the IOPS mode the default for non-rotational storage" * 'for-4.2/core' of git://git.kernel.dk/linux-block: (35 commits) cfq-iosched: fix other locations where blkcg_to_cfqgd() can return NULL cfq-iosched: fix sysfs oops when attempting to read unconfigured weights cfq-iosched: move group scheduling functions under ifdef cfq-iosched: fix the setting of IOPS mode on SSDs blktrace: Add blktrace.c to BLOCK LAYER in MAINTAINERS file block, cgroup: implement policy-specific per-blkcg data block: Make CFQ default to IOPS mode on SSDs block: add blk_set_queue_dying() to blkdev.h blk-mq: Shared tag enhancements block: don't honor chunk sizes for data-less IO block: only honor SG gap prevention for merges that contain data block: fix returnvar.cocci warnings block, dm: don't copy bios for request clones block: remove management of bi_remaining when restoring original bi_end_io block: replace trylock with mutex_lock in blkdev_reread_part() block: export blkdev_reread_part() and __blkdev_reread_part() suspend: simplify block I/O handling block: collapse bio bit space block: remove unused BIO_RW_BLOCK and BIO_EOF flags block: remove BIO_EOPNOTSUPP ...		2015-06-25 14:29:53 -07:00
..
autosleep.c	PM / Sleep: avoid 'autosleep' in shutdown progress	2013-07-15 01:31:37 +02:00
console.c	arm, pm, vmpressure: add missing slab.h includes	2014-02-03 13:24:01 -05:00
hibernate.c	PM / Hibernate: Migrate to ktime_t	2014-11-03 01:02:55 +01:00
Kconfig	rcu: Make SRCU optional by using CONFIG_SRCU	2015-01-06 11:04:29 -08:00
main.c	PM / sleep: Fix symbol name in a comment in kernel/power/main.c	2015-05-13 15:31:12 +02:00
Makefile	suspend: simplify block I/O handling	2015-05-19 09:19:59 -06:00
power.h	suspend: simplify block I/O handling	2015-05-19 09:19:59 -06:00
poweroff.c	power/sysrq: fix inconstistent help message of sysrq key	2013-04-30 17:04:10 -07:00
process.c	oom, PM: make OOM detection in the freezer path raceless	2015-02-11 17:06:03 -08:00
qos.c	PM / QoS: Add debugfs support to view the list of constraints	2015-01-23 22:16:21 +01:00
snapshot.c	Revert "PM / hibernate: avoid unsafe pages in e820 reserved regions"	2015-04-07 01:13:23 +02:00
suspend_test.c	PM / sleep: Enhance test_suspend option with repeat capability	2014-09-09 01:48:02 +02:00
suspend.c	PM / sleep: Return -EBUSY from suspend_enter() on wakeup detection	2015-05-19 02:26:56 +02:00
swap.c	suspend: simplify block I/O handling	2015-05-19 09:19:59 -06:00
user.c	PM / hibernate: introduce "nohibernate" boot parameter	2014-06-16 23:29:39 +02:00
wakelock.c	PM / wakeup: Include appropriate header file in kernel/power/wakelock.c	2014-03-01 01:02:09 +01:00