Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull security layer updates from James Morris:
 "Highlights:

   - Smack adds secmark support for Netfilter
   - /proc/keys is now mandatory if CONFIG_KEYS=y
   - TPM gets its own device class
   - Added TPM 2.0 support
   - Smack file hook rework (all Smack users should review this!)"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (64 commits)
  cipso: don't use IPCB() to locate the CIPSO IP option
  SELinux: fix error code in policydb_init()
  selinux: add security in-core xattr support for pstore and debugfs
  selinux: quiet the filesystem labeling behavior message
  selinux: Remove unused function avc_sidcmp()
  ima: /proc/keys is now mandatory
  Smack: Repair netfilter dependency
  X.509: silence asn1 compiler debug output
  X.509: shut up about included cert for silent build
  KEYS: Make /proc/keys unconditional if CONFIG_KEYS=y
  MAINTAINERS: email update
  tpm/tpm_tis: Add missing ifdef CONFIG_ACPI for pnp_acpi_device
  smack: fix possible use after frees in task_security() callers
  smack: Add missing logging in bidirectional UDS connect check
  Smack: secmark support for netfilter
  Smack: Rework file hooks
  tpm: fix format string error in tpm-chip.c
  char/tpm/tpm_crb: fix build error
  smack: Fix a bidirectional UDS connect check typo
  smack: introduce a special case for tmpfs in smack_d_instantiate()
  ...

1 files changed, 10 insertions, 2 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 37c10098a627..c4a8703ab493 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4917,7 +4917,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
@@ -9817,13 +9817,21 @@ F:	drivers/media/pci/tw68/
 
 TPM DEVICE DRIVER
 M:      Peter Huewe <peterhuewe@gmx.de>
-M:      Ashley Lai <ashley@ashleylai.com>
 M:      Marcel Selhorst <tpmdd@selhorst.net>
 W:      http://tpmdd.sourceforge.net
 L:      tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
+Q:      git git://github.com/PeterHuewe/linux-tpmdd.git
+T:      https://github.com/PeterHuewe/linux-tpmdd
 S:      Maintained
 F:      drivers/char/tpm/
 
+TPM IBM_VTPM DEVICE DRIVER
+M:      Ashley Lai <ashleydlai@gmail.com>
+W:      http://tpmdd.sourceforge.net
+L:      tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
+S:      Maintained
+F:      drivers/char/tpm/tpm_ibmvtpm*
+
 TRACING
 M:      Steven Rostedt <rostedt@goodmis.org>
 M:      Ingo Molnar <mingo@redhat.com>