From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Nov 2017 06:51:27 +0000 (-1000)
Subject: Merge branch 'next-keys' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: ceph-for-4.15-rc4~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dab0badc8735f4e8bf07bc56bdeefce91d413924;p=ceph-client.git

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

dab0badc8735f4e8bf07bc56bdeefce91d413924