diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-16 07:49:04 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-16 07:49:04 +0200 |
commit | 04743f89bcad30a438ef4f38840caddd7978dbaa (patch) | |
tree | 9078a0a796f32ff64fdcfb1206540fcc455b93bc /fs/udf/dir.c | |
parent | Merge tag 'jfs-4.19' of git://github.com/kleikamp/linux-shaggy (diff) | |
parent | Merge branch 'smack-for-4.19-a' of https://github.com/cschaufler/next-smack i... (diff) | |
download | linux-04743f89bcad30a438ef4f38840caddd7978dbaa.tar.xz linux-04743f89bcad30a438ef4f38840caddd7978dbaa.zip |
Merge branch 'next-smack' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'fs/udf/dir.c')
0 files changed, 0 insertions, 0 deletions