Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next
Conflicts:
security/selinux/hooks.c
Resolved using request struct.
Signed-off-by: NJames Morris <james.l.morris@oracle.com>
Showing
想要评论请 注册 或 登录
Conflicts:
security/selinux/hooks.c
Resolved using request struct.
Signed-off-by: NJames Morris <james.l.morris@oracle.com>