From 65e20079188d07e479afaf4055ecfef391720f3f Mon Sep 17 00:00:00 2001
From: dann frazier <dann.frazier@canonical.com>
Date: Thu, 23 Mar 2017 17:16:52 -0600
Subject: [PATCH] UBUNTU: [Config] CONFIG_ARM64_ERRATUM_858921=y

Signed-off-by: dann frazier <dann.frazier@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---
 debian.master/config/annotations          | 2 ++
 debian.master/config/config.common.ubuntu | 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 912854a03db2..f511ec13a71e 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -11111,7 +11111,9 @@ CONFIG_APPLDATA_NET_SUM                         policy<{'s390x': 'm'}>
 #CONFIG_PPC_EPAPR_HV_BYTECHAN			n flag<BUILD FAILURE> note<FTBFS on ppc64el>
 
 CONFIG_ARM64_ERRATUM_843419			policy<{'arm64': 'y'}>
+CONFIG_ARM64_ERRATUM_858921			policy<{'arm64': 'y'}>
 CONFIG_QCOM_QDF2400_ERRATUM_0065		policy<{'arm64': 'y'}>
 #
 CONFIG_ARM64_ERRATUM_843419			mark<ENFORCED> note<LP#1647793>
+CONFIG_ARM64_ERRATUM_858921			mark<ENFORCED> note<LP#1675509>
 CONFIG_QCOM_QDF2400_ERRATUM_0065		mark<ENFORCED> note<LP#1672486>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 801416a0b449..b4e264b1d98e 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -514,6 +514,7 @@ CONFIG_ARM64_ERRATUM_832075=y
 CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_845719=y
+CONFIG_ARM64_ERRATUM_858921=y
 CONFIG_ARM64_HW_AFDBM=y
 # CONFIG_ARM64_LSE_ATOMICS is not set
 CONFIG_ARM64_MODULE_CMODEL_LARGE=y
-- 
2.39.5