Merge tag 'Smack-for-5.15' of git://github.com/cschaufler/smack-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 Aug 2021 20:01:40 +0000 (13:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 Aug 2021 20:01:40 +0000 (13:01 -0700)
commit9b2eacd8f04625c6cb2dd82469972a3bba3a783a
treeb11ed30e46aadef8def8817cd0576a9d6ddc3710
parent8e0cd9525ca7ab8ba87135d85b10596e61b10e63
parentbfc3cac0c76126995737f1b858d2cdb476be5b1d
Merge tag 'Smack-for-5.15' of git://github.com/cschaufler/smack-next

Pull smack updates from Casey Schaufler:
 "There is a variable used only during start-up that's now marked
  __initdata and a change where the code was working by sheer luck that
  is now done properly.

  Both have been in next for several weeks and pass the Smack testsuite"

* tag 'Smack-for-5.15' of git://github.com/cschaufler/smack-next:
  smack: mark 'smack_enabled' global variable as __initdata
  Smack: Fix wrong semantics in smk_access_entry()