Merge tag 'v4.18-rc2' into next-general
authorJames Morris <james.morris@microsoft.com>
Mon, 25 Jun 2018 16:20:40 +0000 (09:20 -0700)
committerJames Morris <james.morris@microsoft.com>
Mon, 25 Jun 2018 16:20:40 +0000 (09:20 -0700)
Merge to Linux 4.18-rc2 for security subsystem developers.

MAINTAINERS

index 6cfd16790adda05a80c60c4e337a4f19f375e9c2..3119bba7971c24e2480ca302285943ad94f4ee70 100644 (file)
@@ -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