Merge remote-tracking branch 'shenki/kernel-4.16.10'
diff --git a/buildroot b/buildroot
index a8d1126..cb36c6d 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit a8d11267c2bfad3ff410ea342778f2791982da51
+Subproject commit cb36c6d04a15b665e12dae30fa4d3168038c2a39
diff --git a/openpower/configs/busybox.fragment b/openpower/configs/busybox.fragment
index bb0cd50..bd81d7b 100644
--- a/openpower/configs/busybox.fragment
+++ b/openpower/configs/busybox.fragment
@@ -1,3 +1,5 @@
CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
CONFIG_TASKSET=y
CONFIG_FEATURE_TASKSET_FANCY=y
+CONFIG_FEATURE_PIDFILE=y
+CONFIG_PID_FILE_PATH="/var/run"
diff --git a/openpower/configs/linux/pseries_skiroot_defconfig b/openpower/configs/linux/pseries_skiroot_defconfig
index fba487a..aa15294 100644
--- a/openpower/configs/linux/pseries_skiroot_defconfig
+++ b/openpower/configs/linux/pseries_skiroot_defconfig
@@ -165,6 +165,7 @@
CONFIG_IPMI_HANDLER=y
CONFIG_IPMI_DEVICE_INTERFACE=y
CONFIG_IPMI_POWERNV=y
+CONFIG_IPMI_WATCHDOG=y
CONFIG_HW_RANDOM=y
CONFIG_RAW_DRIVER=y
CONFIG_MAX_RAW_DEVS=1024
diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig
index 48147d3..2c575ec 100644
--- a/openpower/configs/linux/skiroot_defconfig
+++ b/openpower/configs/linux/skiroot_defconfig
@@ -161,6 +161,7 @@
# CONFIG_IPMI_PROC_INTERFACE is not set
CONFIG_IPMI_DEVICE_INTERFACE=y
CONFIG_IPMI_POWERNV=y
+CONFIG_IPMI_WATCHDOG=y
CONFIG_HW_RANDOM=y
CONFIG_TCG_TIS_I2C_NUVOTON=y
# CONFIG_I2C_COMPAT is not set