From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Jan 2019 17:48:13 +0000 (-0800)
Subject: Merge branch 'next-seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d9a7fa67b4bfe6ce93ee9aab23ae2e7ca0763e84;p=linux.git

Merge branch 'next-seccomp' of git://git./linux/kernel/git/jmorris/linux-security

Pull seccomp updates from James Morris:

 - Add SECCOMP_RET_USER_NOTIF

 - seccomp fixes for sparse warnings and s390 build (Tycho)

* 'next-seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  seccomp, s390: fix build for syscall type change
  seccomp: fix poor type promotion
  samples: add an example of seccomp user trap
  seccomp: add a return code to trap to userspace
  seccomp: switch system call argument type to void *
  seccomp: hoist struct seccomp_data recalculation higher
---

d9a7fa67b4bfe6ce93ee9aab23ae2e7ca0763e84