From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Jul 2024 21:56:13 +0000 (-0700)
Subject: Merge tag 'Smack-for-6.10' of https://github.com/cschaufler/smack-next
X-Git-Tag: v6.11-rc1~175
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42b5a01596f1f9471b58a2f59e1fceeb8db79ffc;p=thirdparty%2Fkernel%2Flinux.git

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

Pull smack updates from Casey Schaufler:
 "Two fixes for Smack networking labeling by Konstantin Andreev"

* tag 'Smack-for-6.10' of https://github.com/cschaufler/smack-next:
  smack: unix sockets: fix accept()ed socket label
  smack: tcp: ipv4, fix incorrect labeling
---

42b5a01596f1f9471b58a2f59e1fceeb8db79ffc