diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 16:33:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 16:33:37 -0800 |
| commit | 4bde961e5245bb37dab4831107bbed23e433d55a (patch) | |
| tree | 82379a3d40a076d7da82536fcf61921ff258bc48 /certs/system_keyring.c | |
| parent | c6de7f1754bd474019c60d6f076fa3f704e46b78 (diff) | |
| parent | 2eb5f31bc4ea24bb293e82934cfa1cce9573304b (diff) | |
Merge branch 'for-linus-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
- a new hrtimer based clocksource by Anton Ivanov
- ptrace() enhancments by Richard Weinberger
- random cleanups and bug fixes all over the place
* 'for-linus-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Switch clocksource to hrtimers
um: net: replace GFP_KERNEL with GFP_ATOMIC when spinlock is held
um: Report host OOM more nicely
um: Simplify STUB_DATA loading
um: Remove dead symbol from i386 syscall stub
um: Remove dead code from x86_64 syscall stub
um: Get rid of open coded NR_SYSCALLS
um: Store syscall number after syscall_trace_enter()
um: Define PTRACE_OLDSETOPTIONS
Diffstat (limited to 'certs/system_keyring.c')
0 files changed, 0 insertions, 0 deletions