Merge android-3.10 into android-goldfish-3.10 (seccomp-tsync)
authorLee Campbell <leecam@chromium.org>
Wed, 8 Oct 2014 22:43:13 +0000 (15:43 -0700)
committerLee Campbell <leecam@chromium.org>
Wed, 8 Oct 2014 23:55:54 +0000 (16:55 -0700)
commit6da04c395f651b844c9559261cc057f24d377cac
tree4a319c3066cc6c60eb71d1d1ee6e12ec087e618e
parentc04bf26f710d36110addb8b1c5d3dcb095cee014
parent900e9fd0d5d15c596cacfb89ce007c933cea6e1c
Merge android-3.10 into android-goldfish-3.10 (seccomp-tsync)

| * 900e9fd 2014-10-08 leecam@chromium.org seccomp: fix syscall numbers for x86 and x86_64
| * 9ac8600 2014-08-10 linux@roeck-us.net seccomp: Replace BUG(!spin_is_locked()) with assert_spin_lock
| * f14a5db 2014-06-05 keescook@chromium.org seccomp: implement SECCOMP_FILTER_FLAG_TSYNC
| * c852ef7 2014-06-27 keescook@chromium.org seccomp: allow mode setting across threads
| * 61b6b88 2014-06-27 keescook@chromium.org seccomp: introduce writer locking
| * b6a12bf 2014-06-27 keescook@chromium.org seccomp: split filter prep from check and apply
| * 9d0ff69 2014-05-21 keescook@chromium.org sched: move no_new_privs into new atomic flags
| * e985fd4 2014-06-25 keescook@chromium.org seccomp: add "seccomp" syscall
| * 8908dde 2014-06-25 keescook@chromium.org seccomp: split mode setting routines
| * b8a9cff 2014-06-25 keescook@chromium.org seccomp: extract check/assign mode helpers
| * 2a30a43 2014-05-21 keescook@chromium.org seccomp: create internal mode-setting function
| * 987a0f1 2014-01-21 oleg@redhat.com introduce for_each_thread() to replace the buggy while_each_thread()
| * a03a242 2013-11-06 peterz@infradead.org arch: Introduce smp_load_acquire(), smp_store_release()
| * 210957c 2014-09-04 takahiro.akashi@linaro.org arm64: add seccomp support
| * 9499cd2 2014-03-11 eparis@redhat.com syscall_get_arch: remove useless function arguments
| * 7722723 2014-09-04 takahiro.akashi@linaro.org arm64: add SIGSYS siginfo for compat task
| * 4f12b53 2014-09-04 takahiro.akashi@linaro.org add seccomp syscall for compat task
| * dab1073 2014-09-04 takahiro.akashi@linaro.org asm-generic: add generic seccomp.h for secure computing mode 1
| * feb2843 2014-09-04 takahiro.akashi@linaro.org arm64: ptrace: allow tracer to skip a system call
| * abbfed9 2014-09-04 takahiro.akashi@linaro.org arm64: ptrace: add PTRACE_SET_SYSCALL

Conflicts:
arch/arm64/Kconfig

Signed-off-by: Lee Campbell <leecam@chromium.org>
arch/arm64/Kconfig
arch/arm64/include/asm/barrier.h
arch/arm64/include/asm/ptrace.h
arch/arm64/kernel/entry.S
arch/arm64/kernel/ptrace.c
arch/arm64/kernel/signal32.c