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

This commit is contained in:
James Morris
2016-07-07 10:15:34 +10:00
36 changed files with 3511 additions and 259 deletions

View File

@ -98,7 +98,6 @@ int ip6_ra_control(struct sock *sk, int sel)
return 0;
}
static
struct ipv6_txoptions *ipv6_update_options(struct sock *sk,
struct ipv6_txoptions *opt)
{