From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Aug 2018 17:39:06 +0000 (-0700)
Subject: Merge tag 'selinux-pr-20180814' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~8238
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f7dac117d895596ca52b935bdd534ac9032deb4;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'selinux-pr-20180814' of git://git./linux/kernel/git/pcmoore/selinux

Pull SELinux updates from Paul Moore:
 "There are 16 patches in here but really only one that is of any
  significance. That one patch is by nixiaoming and fixes a few places
  where we were not properly cleaning up dentry and inode objects in the
  selinuxfs error handling code. The rest are either printk->pr_*
  conversions, constification tweaks, and a minor tweak to MAINTAINERS.

  Everything passes the selinux-testsuite and looks to merge cleanly
  against your master branch"

* tag 'selinux-pr-20180814' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux: cleanup dentry and inodes on error in selinuxfs
  selinux: constify write_op[]
  selinux: Cleanup printk logging in netnode
  selinux: Cleanup printk logging in avc
  selinux: Cleanup printk logging in netif
  selinux: Cleanup printk logging in netport
  selinux: Cleanup printk logging in sidtab
  selinux: Cleanup printk logging in netlink
  selinux: Cleanup printk logging in selinuxfs
  selinux: Cleanup printk logging in services
  selinux: Cleanup printk logging in avtab
  selinux: Cleanup printk logging in hooks
  selinux: Cleanup printk logging in policydb
  selinux: Cleanup printk logging in ebitmap
  selinux: Cleanup printk logging in conditional
  MAINTAINERS: update the LSM and SELinux subsystems
---

6f7dac117d895596ca52b935bdd534ac9032deb4