diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-18 23:09:08 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-18 23:09:08 +0100 |
commit | a81bddde96147442e1e365de5d215f7f154b5027 (patch) | |
tree | 067cfa0406d1a6faea8c67c9f2443dc24ad61bf7 /Documentation/rpmsg.txt | |
parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
parent | Add Documentation/module-signing.txt file (diff) | |
download | linux-a81bddde96147442e1e365de5d215f7f154b5027.tar.xz linux-a81bddde96147442e1e365de5d215f7f154b5027.zip |
Merge branch 'keys-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
Pull crypto key patches from David Howells:
"There are four items:
- A patch to fix X.509 certificate gathering. The problem was that I
was coming up with a different path for signing_key.x509 in the
build directory if it didn't exist to if it did exist. This meant
that the X.509 cert container object file would be rebuilt on the
second rebuild in a build directory and the kernel would get
relinked.
- Unconditionally remove files generated by SYSTEM_TRUSTED_KEYRING=y
when doing make mrproper.
- Actually initialise the persistent-keyring semaphore for
init_user_ns. I have no idea why this works at all for users in
the base user namespace unless it's something to do with systemd
containerising the system.
- Documentation for module signing"
* 'keys-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
Add Documentation/module-signing.txt file
KEYS: fix uninitialized persistent_keyring_register_sem
KEYS: Remove files generated when SYSTEM_TRUSTED_KEYRING=y
X.509: Fix certificate gathering
Diffstat (limited to 'Documentation/rpmsg.txt')
0 files changed, 0 insertions, 0 deletions