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

93b9c98b

Commit 93b9c98b authored 14 years ago by James Morris

Downloads
- Plain Diff

Merge branch 'next-queue' into next

parents efb3bb4f 58068960

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

include/linux/key.h 13 additions, 0 deletions

include/linux/key.h
net/dns_resolver/dns_key.c 6 additions, 4 deletions

net/dns_resolver/dns_key.c
security/Kconfig 1 addition, 0 deletions

security/Kconfig
security/keys/internal.h 3 additions, 1 deletion

security/keys/internal.h
security/keys/keyctl.c 6 additions, 0 deletions

security/keys/keyctl.c
security/keys/keyring.c 24 additions, 13 deletions

security/keys/keyring.c
security/keys/proc.c 1 addition, 1 deletion

security/keys/proc.c
security/keys/process_keys.c 7 additions, 5 deletions

security/keys/process_keys.c
security/keys/request_key.c 1 addition, 2 deletions

security/keys/request_key.c
security/keys/request_key_auth.c 2 additions, 1 deletion

security/keys/request_key_auth.c
security/keys/user_defined.c 2 additions, 2 deletions

security/keys/user_defined.c

with 66 additions and 29 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