From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Jun 2018 22:57:04 +0000 (-0700)
Subject: Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: microblaze-v4.18-rc3~40
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=ba1b7309fc2e909a5828c36a7cd187e5d7df6f53;p=linux-2.6-microblaze.git

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

Pull smack update from James Morris:
 "From Casey:

    One simple patch that fixes a memory leak in kernfs and labeled NFS"

* 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  Smack: Fix memory leak in smack_inode_getsecctx
---

ba1b7309fc2e909a5828c36a7cd187e5d7df6f53