commit 5be73cc045800b4a8c8f93a859695abf7e1edaca
author Stewart Smith <stewart@linux.vnet.ibm.com> Sun Feb 25 21:18:14 2018 -0600
committer Stewart Smith <stewart@linux.vnet.ibm.com> Sun Feb 25 21:18:14 2018 -0600
tree c2b4fdc455b1b9d56bb4e83b3c0c2d8dd5177908
parent 2e9a07f5568ebedd3ece63f58ed1d5249638b5b9
parent 809fd3867c677fb9a1d81a1458f8152ce358f6ef

Merge remote-tracking branch 'op-jenkins/op-build-update_181_2-23-2018' into hb-occ-sbe-20180226

openpower/configs/linux/skiroot_defconfig

diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig
index 078dfc9..7af1ebe 100644
--- a/openpower/configs/linux/skiroot_defconfig
+++ b/openpower/configs/linux/skiroot_defconfig
@@ -50,7 +50,7 @@
 CONFIG_PPC_64K_PAGES=y
 CONFIG_SCHED_SMT=y
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=tty0 console=hvc0 quiet"
+CONFIG_CMDLINE="console=tty0 console=hvc0 ipr.fast_reboot=1 quiet"
 # CONFIG_SECCOMP is not set
 CONFIG_NET=y
 CONFIG_PACKET=y

openpower/configs/linux/skiroot_p9_defconfig

diff --git a/openpower/configs/linux/skiroot_p9_defconfig b/openpower/configs/linux/skiroot_p9_defconfig
index 39f28a2..7b08bae 100644
--- a/openpower/configs/linux/skiroot_p9_defconfig
+++ b/openpower/configs/linux/skiroot_p9_defconfig
@@ -50,7 +50,7 @@
 CONFIG_PPC_64K_PAGES=y
 CONFIG_SCHED_SMT=y
 CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=tty0 console=hvc0 powersave=off"
+CONFIG_CMDLINE="console=tty0 console=hvc0 ipr.fast_reboot=1"
 # CONFIG_SECCOMP is not set
 CONFIG_NET=y
 CONFIG_PACKET=y