Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/selinux into next

diff --cc include/net/ipv6.h
Simple merge

diff --cc net/dccp/ipv6.c
Simple merge

diff --cc net/ipv4/cipso_ipv4.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv6/Makefile
Simple merge

diff --cc net/ipv6/af_inet6.c
Simple merge

diff --cc net/ipv6/exthdrs.c
Simple merge

diff --cc net/ipv6/ipv6_sockglue.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge

diff --cc security/smack/smack_lsm.c
Simple merge