[GIT] Security subsystem fixes
From: James Morris
Date: Thu Nov 17 2011 - 20:53:33 EST
Hi Linus,
Please pull to your current tree.
The following changes since commit 6aaf05f472c97ebceff47d9eef464574f1a55727:
Linus Torvalds (1):
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
are available in the git repository at:
git://git.selinuxproject.org/~jmorris/linux-security for-linus
Casey Schaufler (1):
Smack: smackfs cipso seq read repair
James Morris (2):
Merge branch 'for-1111' of git://gitorious.org/smack-next/kernel into for-linus
Merge branch 'encrypted-key-fixes' of git://git.kernel.org/.../zohar/linux-integrity into for-linus
Mimi Zohar (2):
encrypted-keys: fix error return code
encrypted-keys: module build fixes
security/keys/encrypted-keys/Makefile | 8 ++-
security/keys/encrypted-keys/encrypted.c | 2 +-
security/keys/encrypted-keys/encrypted.h | 3 +-
security/smack/smackfs.c | 115 ++++++++++--------------------
4 files changed, 48 insertions(+), 80 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/