• Paul Moore's avatar
    Merge git://git.infradead.org/users/eparis/selinux · 98f700f3
    Paul Moore authored
    Conflicts:
    	security/selinux/hooks.c
    
    Pull Eric's existing SELinux tree as there are a number of patches in
    there that are not yet upstream.  There was some minor fixup needed to
    resolve a conflict in security/selinux/hooks.c:selinux_set_mnt_opts()
    between the labeled NFS patches and Eric's security_fs_use()
    simplification patch.
    98f700f3
capability.c 24.4 KB