git://git.infradead.org/users/eparis/selinux into for-linus
James Morris
authored
Conflicts:
lib/flex_array.c
security/selinux/avc.c
security/selinux/hooks.c
security/selinux/ss/policydb.c
security/smack/smack_lsm.c
Manually resolve conflicts.
Signed-off-by: 
James Morris <jmorris@namei.org>| Name | Last commit | Last update |
|---|---|---|
| .. | ||