[arch-commits] Commit in linux/trunk (config)

[Tobias Powalowski]

    Date: Sunday, December 25, 2016 @ 18:06:20
  Author: tpowa
Revision: 284760

sync in heftig changes from last config, leave amdgpu_si disabled

Modified:
  linux/trunk/config

--------+
 config |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Modified: config
===================================================================
--- config	2016-12-25 18:05:46 UTC (rev 284759)
+++ config	2016-12-25 18:06:20 UTC (rev 284760)
@@ -1425,7 +1425,8 @@
 CONFIG_BATMAN_ADV_DAT=y
 CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
-# CONFIG_BATMAN_ADV_DEBUGFS is not set
+CONFIG_BATMAN_ADV_DEBUGFS=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
 CONFIG_OPENVSWITCH_VXLAN=m
@@ -4273,7 +4274,11 @@
 #
 # Watchdog Pretimeout Governors
 #
-# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
+# CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP is not set
+CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC=y
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=m
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=y
 CONFIG_SSB_POSSIBLE=y
 
 #