From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 Feb 2018 21:44:29 +0000 (-0800)
Subject: Merge branch 'fixes-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorr... 
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~6017
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1726aa70e7e2f8967d60b4f836723b61f97db73e;p=mirror_ubuntu-focal-kernel.git

Merge branch 'fixes-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull integrity fixes from James Morris:

-  add James Bottommley as a Trusted Keys maintainer.

 - IMA: re-initialize iint->atomic_flags on iint_free(), from Mimi.

* 'fixes-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  ima: re-initialize iint->atomic_flags
  maintainers: update trusted keys
---

1726aa70e7e2f8967d60b4f836723b61f97db73e