From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Oct 2020 23:18:51 +0000 (-0700)
Subject: Merge tag 'Smack-for-5.10' of git://github.com/cschaufler/smack-next
X-Git-Tag: v5.15~2709
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=99a6740f88e9438cd220096d3d96eb6ba8d5c6f0;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'Smack-for-5.10' of git://github.com/cschaufler/smack-next

Pull smack updates from Casey Schaufler:
 "Two minor fixes and one performance enhancement to Smack. The
  performance improvement is significant and the new code is more like
  its counterpart in SELinux.

   - Two kernel test robot suggested clean-ups.

   - Teach Smack to use the IPv4 netlabel cache. This results in a
     12-14% improvement on TCP benchmarks"

* tag 'Smack-for-5.10' of git://github.com/cschaufler/smack-next:
  Smack: Remove unnecessary variable initialization
  Smack: Fix build when NETWORK_SECMARK is not set
  Smack: Use the netlabel cache
  Smack: Set socket labels only once
  Smack: Consolidate uses of secmark into a function
---

99a6740f88e9438cd220096d3d96eb6ba8d5c6f0