From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 1 Oct 2015 11:50:08 +0000 (-0400)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: MMI-PSA29.97-13-9~9292
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9522f476d932eb23ebf8dbbc6b4e2f966f3fe911;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull key signing fixes from James Morris:
 "Keyrings and modsign fixes from David Howells"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  MODSIGN: Change from CMS to PKCS#7 signing if the openssl is too old
  X.509: Don't strip leading 00's from key ID when constructing key description
  KEYS: Remove unnecessary header #inclusions from extract-cert.c
  KEYS: Fix race between key destruction and finding a keyring by name
---

9522f476d932eb23ebf8dbbc6b4e2f966f3fe911