From 6fcfc170b9b58228383cc23c8aaeca7aa84f9179 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 1 Jul 2018 01:06:56 +0100
Subject: [PATCH] dm: Enable DM_INTEGRITY as module (except on armel) (Closes:
 #896649)

---
 debian/changelog                   | 1 +
 debian/config/armel/config.marvell | 5 +++++
 debian/config/config               | 1 +
 3 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4729d9ef0..6325cfe94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,6 +86,7 @@ linux (4.17.3-1) UNRELEASED; urgency=medium
   * debian/rules.d/scripts/mod/gendef.py: Use Python 3
   * debian/rules: Fix pkg.linux.notools build profile
   * tracing: Check for no filter when processing event filters (CVE-2018-12714)
+  * dm: Enable DM_INTEGRITY as module (except on armel) (Closes: #896649)
 
   [ Romain Perier ]
   * [x86] amdgpu: Enable DCN 1.0 Raven family (Closes: #901349)
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index 53ecd023e..66949a832 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -340,6 +340,11 @@ CONFIG_LEDS_NETXBIG=m
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 
+##
+## file: drivers/md/Kconfig
+##
+# CONFIG_DM_INTEGRITY is not set
+
 ##
 ## file: drivers/mmc/Kconfig
 ##
diff --git a/debian/config/config b/debian/config/config
index fd6bbc390..4fc48262a 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1780,6 +1780,7 @@ CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
 CONFIG_DM_SWITCH=m
 CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
 
 ##
 ## file: drivers/md/bcache/Kconfig