Merge tag 'seccomp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next (fe6c59dc) · Commits · Linaro / qcomlt / kernel · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

kernel
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

fe6c59dc

Commit fe6c59dc authored 9 years ago by James Morris

Downloads
- Plain Diff

Merge tag 'seccomp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next

parents 52721d9d 221272f9

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

include/linux/ptrace.h 1 addition, 0 deletions

include/linux/ptrace.h
include/linux/seccomp.h 1 addition, 1 deletion

include/linux/seccomp.h
include/uapi/linux/ptrace.h 4 additions, 2 deletions

include/uapi/linux/ptrace.h
kernel/ptrace.c 13 additions, 0 deletions

kernel/ptrace.c
kernel/seccomp.c 12 additions, 5 deletions

kernel/seccomp.c

with 31 additions and 8 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