Merge tag 'keys-next-20150123' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe...

diff --git a/MAINTAINERS b/MAINTAINERS
index ddf762511cb3ca25bc38fe8226d8759f34309d15..e9098d034b9d60e5b5395ed5d4492167459b3e18 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4888,7 +4888,7 @@ F:        drivers/ipack/
 
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
-M:     Dmitry Kasatkin <d.kasatkin@samsung.com>
+M:     Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
 L:     linux-ima-devel@lists.sourceforge.net
 L:     linux-ima-user@lists.sourceforge.net
 L:     linux-security-module@vger.kernel.org

diff --git a/security/smack/Makefile b/security/smack/Makefile
index 616cf93b368ed7569e79f6643c6713c4c8627a6b..ee2ebd50454126745b91f8a4b0acf4c04b2047d4 100644 (file)
--- a/security/smack/Makefile
+++ b/security/smack/Makefile
@@ -5,4 +5,4 @@
 obj-$(CONFIG_SECURITY_SMACK) := smack.o
 
 smack-y := smack_lsm.o smack_access.o smackfs.o
-smack-$(CONFIG_NETFILTER) += smack_netfilter.o
+smack-$(CONFIG_SECURITY_SMACK_NETFILTER) += smack_netfilter.o