diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-15 22:49:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-15 22:49:04 -0700 |
| commit | 04743f89bcad30a438ef4f38840caddd7978dbaa (patch) | |
| tree | 9078a0a796f32ff64fdcfb1206540fcc455b93bc /init/Makefile | |
| parent | 5bae2be4efd557ba3ec18f125d18c546f6b03cd2 (diff) | |
| parent | df6b4e6608eebc2ff18113706f4e3b9d9a972e68 (diff) | |
| download | talos-obmc-linux-04743f89bcad30a438ef4f38840caddd7978dbaa.tar.gz talos-obmc-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 'init/Makefile')
0 files changed, 0 insertions, 0 deletions
