Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

KED Linux Kernel Fork
- Activity
- Members
- Labels
- Model registry
- Model experiments

Snippets Groups Projects

6df025c1

Commit 6df025c1 authored 11 years ago by James Morris

Downloads
- Plain Diff

Merge branch 'for-linus' of...

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus

parents 7e3528c3 dbc335d2

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

security/integrity/ima/ima.h 4 additions, 2 deletions

security/integrity/ima/ima.h
security/integrity/ima/ima_api.c 1 addition, 0 deletions

security/integrity/ima/ima_api.c
security/integrity/ima/ima_crypto.c 12 additions, 5 deletions

security/integrity/ima/ima_crypto.c
security/integrity/ima/ima_fs.c 11 additions, 3 deletions

security/integrity/ima/ima_fs.c
security/integrity/ima/ima_template.c 14 additions, 7 deletions

security/integrity/ima/ima_template.c
security/integrity/ima/ima_template_lib.c 5 additions, 1 deletion

security/integrity/ima/ima_template_lib.c

with 47 additions and 18 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