Jens Axboe 8f66439eec Merge tag 'v4.12-rc5' into for-4.13/block ...

We've already got a few conflicts and upcoming work depends on some of the
changes that have gone into mainline as regression fixes for this series.

Pull in 4.12-rc5 to resolve these conflicts and make it easier on down stream
trees to continue working on 4.13 changes.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

2017-06-12 08:30:13 -06:00

..

autosleep.c

…

console.c

PM / sleep: Make pm_prepare_console() return void

2016-06-15 01:26:04 +02:00

hibernate.c

Merge branch 'WIP.sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-03-03 10:16:38 -08:00

Kconfig

PM / sleep: Increase default DPM watchdog timeout to 120

2016-09-13 02:15:58 +02:00

main.c

PM / sleep: System sleep state selection interface rework

2016-11-21 22:45:40 +01:00

Makefile

PM / Hibernate: Don't let kasan instrument snapshot.c

2016-06-14 00:38:56 +02:00

power.h

arch: Rename CONFIG_DEBUG_RODATA and CONFIG_DEBUG_MODULE_RONX

2017-02-07 12:32:52 -08:00

poweroff.c

…

process.c

Revert "ACPI / sleep: Ignore spurious SCI wakeups from suspend-to-idle"

2017-06-07 00:57:37 +02:00

qos.c

power, workqueue: remove keventd_up() usage

2016-09-17 13:18:21 -04:00

snapshot.c

Merge branches 'pm-sleep' and 'powercap'

2017-05-22 20:32:05 +02:00

suspend_test.c

PM / sleep: Fix test_suspend after sleep state rework

2017-02-18 02:16:27 +01:00

suspend.c

Revert "ACPI / sleep: Ignore spurious SCI wakeups from suspend-to-idle"

2017-06-07 00:57:37 +02:00

swap.c

block: switch bios to blk_status_t

2017-06-09 09:27:32 -06:00

user.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

wakelock.c

…