From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 May 2019 20:08:05 +0000 (-0700)
Subject: Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: for-linus-20190516~34
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=800c608c976c3f0a6d02ed7fbc600f1f6962ac73;p=linux-2.6-block.git

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

Pull smack updates from James Morris:
 "Bug fixes for IPv6 handling and other issues and two memory use
  improvements."

* 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  Smack: Fix kbuild reported build error
  smack: Check address length before reading address family
  Smack: Fix IPv6 handling of 0 secmark
  Smack: Create smack_rule cache to optimize memory usage
  smack: removal of global rule list
---

800c608c976c3f0a6d02ed7fbc600f1f6962ac73