Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

ddbf9ef3

Commit ddbf9ef3 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6

parents 5d54e69c 2c40579b

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

include/linux/security.h 5 additions, 0 deletions

include/linux/security.h
security/Kconfig 1 addition, 0 deletions

security/Kconfig
security/Makefile 1 addition, 1 deletion

security/Makefile
security/inode.c 347 additions, 0 deletions

security/inode.c
security/seclvl.c 70 additions, 158 deletions

security/seclvl.c

with 424 additions and 159 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