From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Jun 2018 23:29:52 +0000 (-0700)
Subject: Merge tag 'selinux-pr-20180605' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.18-rc1~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b70543e9af036984a52800811416b74978ae4de;p=thirdparty%2Flinux.git

Merge tag 'selinux-pr-20180605' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux

Pull SELinux updates from Paul Moore:
 "SELinux is back with a quiet pull request for v4.18. Three patches,
  all small: two cleanups of the SELinux audit records, and one to
  migrate to a newly defined type (vm_fault_t).

  Everything passes our test suite, and as of about five minutes ago it
  merged cleanly with your tree"

* tag 'selinux-pr-20180605' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  audit: normalize MAC_POLICY_LOAD record
  audit: normalize MAC_STATUS record
  security: selinux: Change return type to vm_fault_t
---

8b70543e9af036984a52800811416b74978ae4de