From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 25 Oct 2018 20:32:00 +0000 (-0700)
Subject: Merge branch 'next-loadpin' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=24ed334f33666f2ae929ccc08f72e7e72e353c64;p=openwrt%2Fstaging%2Fblogic.git

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

Pull LoadPin updates from James Morris:
 "From Kees: This is a small reporting improvement and the param change
  needed for the ordering series (but since the loadpin change is
  desired and separable, I'm putting it here)"

* 'next-loadpin' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  LoadPin: Rename boot param "enabled" to "enforce"
  LoadPin: Report friendly block device name
---

24ed334f33666f2ae929ccc08f72e7e72e353c64