From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Mar 2025 23:04:11 +0000 (-0700)
Subject: Merge tag 'Smack-for-6.15' of https://github.com/cschaufler/smack-next
X-Git-Tag: v6.15-rc1~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61af143fbea4f1013e064e7580acb7332e531bd6;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'Smack-for-6.15' of https://github.com/cschaufler/smack-next

Pull smack updates from Casey Schaufler:
 "This is a larger set of patches than usual, consisting of a set of
  build clean-ups, a rework of error handling in setting up CIPSO label
  specification and a bug fix in network labeling"

* tag 'Smack-for-6.15' of https://github.com/cschaufler/smack-next:
  smack: recognize ipv4 CIPSO w/o categories
  smack: Revert "smackfs: Added check catlen"
  smack: remove /smack/logging if audit is not configured
  smack: ipv4/ipv6: tcp/dccp/sctp: fix incorrect child socket label
  smack: dont compile ipv6 code unless ipv6 is configured
  Smack: fix typos and spelling errors
---

61af143fbea4f1013e064e7580acb7332e531bd6