[PATCH v2 0/2] bug fixes for Linus

[Mimi Zohar]

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.

thanks,

Mimi

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(-)

-- 
1.8.1.rc3

--
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/