[GIT] Security subsystem fixes

From: James Morris
Date: Mon Feb 25 2013 - 11:47:29 EST

Please pull these fixes for your current tree.

>From Mimi: "Both of these patches are bug fixes for patches, which were
upstreamed in this open window. The first patch addresses a merge issue.
The second patch addresses a CONFIG_BLOCK dependency."

The following changes since commit ab7826595e9ec51a51f622c5fc91e2f59440481a:
Linus Torvalds (1):
Merge tag 'mfd-3.9-1' of git://git.kernel.org/.../sameo/mfd-2.6

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git for-linus

Mimi Zohar (2):
ima: "remove enforce checking duplication" merge fix
block: fix part_pack_uuid() build error

include/linux/genhd.h | 10 ++++++++++
security/integrity/ima/ima_main.c | 3 ++-
security/integrity/ima/ima_policy.c | 11 ++++++-----
3 files changed, 18 insertions(+), 6 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/