Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

2

22b970497
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

e6e29a4e

Commit e6e29a4e authored Jun 3, 2015 by James Morris

Downloads
- Plain Diff

Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next into next

parents 8d94eb9b c0d77c88

Branches

Tags

No related merge requests found

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

Documentation/security/Smack.txt 3 additions, 3 deletions

Documentation/security/Smack.txt
security/smack/smack.h 9 additions, 16 deletions

security/smack/smack.h
security/smack/smack_access.c 57 additions, 11 deletions

security/smack/smack_access.c
security/smack/smack_lsm.c 57 additions, 39 deletions

security/smack/smack_lsm.c
security/smack/smackfs.c 191 additions, 120 deletions

security/smack/smackfs.c

with 317 additions and 189 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment