linux

mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-21 21:02:24 +00:00

History

Linus Torvalds dab0badc87 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()

2017-11-23 20:51:27 -10:00

apparmor

+ Cleanups

2017-11-23 20:48:26 -10:00

integrity

ima: do not update security.ima if appraisal status is not INTEGRITY_PASS

2017-11-20 08:23:10 +11:00

keys

security: keys: Replace time_t with time64_t for struct key_preparsed_payload

2017-11-15 16:38:45 +00:00

loadpin

…