[PULL] encrypted-keys: please pull for security-testing next

[Mimi Zohar]

Hi James,

The previously posted "encrypted-keys: remove trusted-keys dependency"
moved trusted keys to its own directory keys/encrypted-keys and removed
the trusted-keys dependency.  Other than splitting this into two
separate patches, nothing else has changed since posted.

Please pull the following 3 patches from the temporary repo:

The following changes since commit a8f7640963ada66c412314c3559c11ff6946c1a5:

  TOMOYO: Avoid race when retrying "file execute" permission check. (2011-09-14 08:27:07 +1000)

are available in the git repository at:
  git://github.com/mzohar/linux-evm.git #next-evm

Mimi Zohar (3):
      encrypted-keys: create encrypted-keys directory
      encrypted-keys: remove trusted-keys dependency
      evm: remove TCG_TPM dependency

 security/Kconfig                                   |    4 +-
 security/integrity/evm/Kconfig                     |    3 +-
 security/keys/Makefile                             |    2 +-
 security/keys/encrypted-keys/Makefile              |    6 +++
 .../keys/{ => encrypted-keys}/ecryptfs_format.c    |    0
 .../keys/{ => encrypted-keys}/ecryptfs_format.h    |    0
 security/keys/{ => encrypted-keys}/encrypted.c     |   35 ++++------------
 security/keys/{ => encrypted-keys}/encrypted.h     |   11 +++++
 security/keys/encrypted-keys/masterkey_trusted.c   |   44 ++++++++++++++++++++
 9 files changed, 74 insertions(+), 31 deletions(-)
 create mode 100644 security/keys/encrypted-keys/Makefile
 rename security/keys/{ => encrypted-keys}/ecryptfs_format.c (100%)
 rename security/keys/{ => encrypted-keys}/ecryptfs_format.h (100%)
 rename security/keys/{ => encrypted-keys}/encrypted.c (97%)
 rename security/keys/{ => encrypted-keys}/encrypted.h (81%)
 create mode 100644 security/keys/encrypted-keys/masterkey_trusted.c

thanks,

Mimi

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