[GIT PULL] KEYS: Miscellaneous small changes
From: David Howells
Date: Fri May 20 2016 - 03:49:55 EST
Hi James,
Can you pull these miscellaneous small changes into your next tree and pass
them along to Linus? There's nothing that should be ground breaking here:
(1) MAINTAINERS record update.
(2) Add a MODULE_LICENSE tag to the ASN.1 decoder.
(3) Fix the PKCS#7 test key type to search the correct keyring.
Thanks,
David
---
The following changes since commit a6926cc989eb8e3349ae9b858177608e86f7257c:
Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/selinux into next (2016-05-06 09:31:34 +1000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git tags/keys-next-20160511
for you to fetch changes up to 75aeddd12f205d07b36ed76db3426e974b8f2a21:
MAINTAINERS: Update keyrings record and add asymmetric keys record (2016-05-11 14:36:14 +0100)
----------------------------------------------------------------
Keyrings changes for next
----------------------------------------------------------------
David Howells (2):
KEYS: The PKCS#7 test key type should use the secondary keyring
MAINTAINERS: Update keyrings record and add asymmetric keys record
Tudor Ambarus (1):
lib: asn1_decoder - add MODULE_LICENSE("GPL")
MAINTAINERS | 12 ++++++++++++
crypto/asymmetric_keys/pkcs7_key_type.c | 2 +-
lib/asn1_decoder.c | 3 +++
3 files changed, 16 insertions(+), 1 deletion(-)