From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Jun 2014 14:39:39 +0000 (-0700)
Subject: Merge branch 'serge-next-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh... 
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~23
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa569fa0ea32d1c24fb801a07d2d9174cbbdde23;p=pandora-kernel.git

Merge branch 'serge-next-2' of git://git./linux/kernel/git/sergeh/linux-security

Pull more security layer updates from Serge Hallyn:
 "A few more commits had previously failed to make it through
  security-next into linux-next but this week made it into linux-next.
  At least commit "ima: introduce ima_kernel_read()" was deemed critical
  by Mimi to make this merge window.

  This is a temporary tree just for this request.  Mimi has pointed me
  to some previous threads about keeping maintainer trees at the
  previous release, which I'll certainly do for anything long-term,
  after talking with James"

* 'serge-next-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux-security:
  ima: introduce ima_kernel_read()
  evm: prohibit userspace writing 'security.evm' HMAC value
  ima: check inode integrity cache in violation check
  ima: prevent unnecessary policy checking
  evm: provide option to protect additional SMACK xattrs
  evm: replace HMAC version with attribute mask
  ima: prevent new digsig xattr from being replaced
---

aa569fa0ea32d1c24fb801a07d2d9174cbbdde23