From 74b5ebb1875e1b2465a9ef93507a3b7f89e7f00e Mon Sep 17 00:00:00 2001
From: Erich Hauptli <ejhauptl@us.ibm.com>
Date: Mon, 3 Dec 2018 14:47:10 -0600
Subject: [PATCH] Merging Master into op-build branch (#79)

* Added value to TPM FRU ID

* Default Spectre/Meltdown HW Inits to Kernel mode (#78)

Default Spectre/Meltdown HW Inits used to be "0" Kernel+User
  mitigations.  This commit changes the default to "1" for only
  Kernel mitigations.

* Backing out TPM FRU ID
---
 witherspoon.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/witherspoon.xml b/witherspoon.xml
index 69f0294..2f2d95f 100644
--- a/witherspoon.xml
+++ b/witherspoon.xml
@@ -17153,6 +17153,10 @@
 		<id>SUPPORTED_STOP_STATES</id>
 		<default>0xEC000000</default>
 	</attribute>
+	<attribute>
+		<id>MRW_DEFAULT_RISK_LEVEL</id>
+		<default>1</default>
+	</attribute>
 	<attribute>
 		<id>SUPPORTS_DYNAMIC_MEM_VOLT</id>
 		<default>0</default>