tree 1b7f175d6bffe4ee6d93d1828a730daccf1d77d0
parent 26064dea2dc65c57d44ad37e645ebe47f1c51828
parent ce44cd8dfc55110fa7423ceb47a8a70dac65fe89
author Linus Torvalds <torvalds@linux-foundation.org> 1511506287 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1511506287 -1000

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()