diff options
| author | Linus Torvalds | 2017-11-24 07:51:27 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2017-11-24 07:51:27 +0100 |
| commit | dab0badc8735f4e8bf07bc56bdeefce91d413924 (patch) | |
| tree | 1b7f175d6bffe4ee6d93d1828a730daccf1d77d0 /scripts/kernel-doc | |
| parent | Merge tag 'apparmor-pr-2017-11-21' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | Merge tag 'keys-next-20171123' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | kernel-qcow2-linux-dab0badc8735f4e8bf07bc56bdeefce91d413924.tar.gz kernel-qcow2-linux-dab0badc8735f4e8bf07bc56bdeefce91d413924.tar.xz kernel-qcow2-linux-dab0badc8735f4e8bf07bc56bdeefce91d413924.zip | |
Merge branch 'next-keys' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull keys update from James Morris:
"There's nothing too controversial here:
- Doc fix for keyctl_read().
- time_t -> time64_t replacement.
- Set the module licence on things to prevent tainting"
* 'next-keys' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
pkcs7: Set the module licence to prevent tainting
security: keys: Replace time_t with time64_t for struct key_preparsed_payload
security: keys: Replace time_t/timespec with time64_t
KEYS: fix in-kernel documentation for keyctl_read()
Diffstat (limited to 'scripts/kernel-doc')
0 files changed, 0 insertions, 0 deletions