Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Aug 2018 05:49:04 +0000 (22:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Aug 2018 05:49:04 +0000 (22:49 -0700)
commit04743f89bcad30a438ef4f38840caddd7978dbaa
tree9078a0a796f32ff64fdcfb1206540fcc455b93bc
parent5bae2be4efd557ba3ec18f125d18c546f6b03cd2
parentdf6b4e6608eebc2ff18113706f4e3b9d9a972e68
Merge branch 'next-smack' of git://git./linux/kernel/git/jmorris/linux-security

Pull smack updates from James Morris:
 "Minor fixes from Piotr Sawicki"

* 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  Smack: Inform peer that IPv6 traffic has been blocked
  Smack: Check UDP-Lite and DCCP protocols during IPv6 handling
  Smack: Fix handling of IPv4 traffic received by PF_INET6 sockets
security/smack/smack_lsm.c