summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-12-18 14:09:08 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-18 14:09:08 -0800
commita81bddde96147442e1e365de5d215f7f154b5027 (patch)
tree067cfa0406d1a6faea8c67c9f2443dc24ad61bf7 /samples
parent35eecf052250f663f07a4cded7d3503fd1b50729 (diff)
parent3cafea3076423987726023235e548af1d534ff1a (diff)
downloadlinux-a81bddde96147442e1e365de5d215f7f154b5027.tar.bz2
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 'samples')
0 files changed, 0 insertions, 0 deletions