This backport probably won't work.

gistfile1.txt

# On branch seccomp-goldfish
# You are currently cherry-picking.
#   (fix conflicts and run "git cherry-pick --continue")
#   (use "git cherry-pick --abort" to cancel the cherry-pick operation)
#
# Changes to be committed:
#
#       new file:   Documentation/prctl/no_new_privs.txt
#       new file:   Documentation/prctl/seccomp_filter.txt
#       new file:   arch/arm/include/asm/syscall.h
#       modified:   arch/arm/kernel/ptrace.c
#       modified:   arch/arm/kernel/traps.c
#       modified:   arch/x86/include/asm/ia32.h
#       modified:   fs/exec.c
#       modified:   include/asm-generic/siginfo.h
#       modified:   include/linux/ptrace.h
#       modified:   include/linux/security.h
#       modified:   kernel/ptrace.c
#       modified:   kernel/seccomp.c
#       modified:   kernel/sys.c
#       modified:   net/compat.c
#       new file:   samples/seccomp/.gitignore
#       new file:   samples/seccomp/Makefile
#       new file:   samples/seccomp/bpf-direct.c
#       new file:   samples/seccomp/bpf-fancy.c
#       new file:   samples/seccomp/bpf-helper.c
#       new file:   samples/seccomp/bpf-helper.h
#       new file:   samples/seccomp/dropper.c
#       modified:   security/commoncap.c
#       modified:   security/selinux/hooks.c
#
# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#       both modified:      Documentation/filesystems/proc.txt
#       both modified:      arch/Kconfig
#       both modified:      arch/arm/Kconfig
#       deleted by us:      arch/arm/configs/C8666_defconfig
#       both modified:      arch/arm/kernel/entry-common.S
#       both modified:      arch/x86/ia32/ia32_signal.c
#       both modified:      fs/proc/array.c
#       both modified:      include/linux/Kbuild
#       both modified:      include/linux/audit.h
#       both modified:      include/linux/filter.h
#       both modified:      include/linux/prctl.h
#       both modified:      include/linux/sched.h
#       both modified:      include/linux/seccomp.h
#       both modified:      kernel/auditsc.c
#       both modified:      kernel/fork.c
#       both modified:      kernel/signal.c
#       both modified:      net/core/filter.c
#       deleted by us:      security/apparmor/domain.c
#