From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753743AbcEWLmz (ORCPT ); Mon, 23 May 2016 07:42:55 -0400 Received: from tundra.namei.org ([65.99.196.166]:47328 "EHLO namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752149AbcEWLmy (ORCPT ); Mon, 23 May 2016 07:42:54 -0400 Date: Mon, 23 May 2016 21:42:50 +1000 (AEST) From: James Morris To: Linus Torvalds cc: linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT PULL] Security subsystem updates Message-ID: User-Agent: Alpine 2.20 (LRH 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Please pull these minor updates for the keys code. The following changes since commit 7639dad93a5564579987abded4ec05e3db13659d: Merge tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (2016-05-22 19:40:39 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git for-linus David Howells (2): KEYS: The PKCS#7 test key type should use the secondary keyring MAINTAINERS: Update keyrings record and add asymmetric keys record James Morris (1): Merge tag 'keys-next-20160511' of git://git.kernel.org/.../dhowells/linux-fs into for-linus Tudor Ambarus (1): lib: asn1_decoder - add MODULE_LICENSE("GPL") MAINTAINERS | 12 ++++++++++++ crypto/asymmetric_keys/pkcs7_key_type.c | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-)