Merge tag 'v4.18-rc2' into next-general

Merge to Linux 4.18-rc2 for security subsystem developers.

diff --git a/MAINTAINERS b/MAINTAINERS
index 6cfd167..3119bba 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8317,11 +8317,6 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 F:     tools/memory-model/
 F:     Documentation/memory-barriers.txt
 
-LINUX SECURITY MODULE (LSM) FRAMEWORK
-M:     Chris Wright <chrisw@sous-sol.org>
-L:     linux-security-module@vger.kernel.org
-S:     Supported
-
 LIS3LV02D ACCELEROMETER DRIVER
 M:     Eric Piel <eric.piel@tremplin-utc.net>
 S:     Maintained