[linux] 01/02: [armel] security: Enable SECURITY_APPARMOR and disable SECURITY_SELINUX

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 50f87144fd3811cfe4411e49ef6bd02156b99e79
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Oct 26 22:50:16 2017 +0200

    [armel] security: Enable SECURITY_APPARMOR and disable SECURITY_SELINUX
---
 debian/changelog           | 1 +
 debian/config/armel/config | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7a023d8..5f1b565 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -329,6 +329,7 @@ linux (4.13.9-1) UNRELEASED; urgency=medium
   * seq-virmidi: Ignore ABI change in 4.13.8
   * Revert "bpf: one perf event close won't free bpf program attached ..."
     to avoid an ABI change
+  * [armel] security: Enable SECURITY_APPARMOR and disable SECURITY_SELINUX
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 18 Oct 2017 20:03:01 +0100
 
diff --git a/debian/config/armel/config b/debian/config/armel/config
index afae7b1..ef0b4db 100644
--- a/debian/config/armel/config
+++ b/debian/config/armel/config
@@ -1,7 +1,7 @@
 ##
-## file: security/apparmor/Kconfig
+## file: security/selinux/Kconfig
 ##
-# CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_SECURITY_SELINUX is not set
 
 ##
 ## file: security/tomoyo/Kconfig

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git