From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 25 Oct 2018 20:22:23 +0000 (-0700)
Subject: Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorri... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=57ce66d39f10fb01efabd72b14eb033deddb226b;p=linux.git

Merge branch 'next-integrity' of git://git./linux/kernel/git/jmorris/linux-security

Pull integrity updates from James Morris:
 "From Mimi: This contains a couple of bug fixes, including one for a
  recent problem with calculating file hashes on overlayfs, and some
  code cleanup"

* 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  MAINTAINERS: add Jarkko as maintainer for trusted keys
  ima: open a new file instance if no read permissions
  ima: fix showing large 'violations' or 'runtime_measurements_count'
  security/integrity: remove unnecessary 'init_keyring' variable
  security/integrity: constify some read-only data
  vfs: require i_size <= SIZE_MAX in kernel_read_file()
---

57ce66d39f10fb01efabd72b14eb033deddb226b