From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Mar 2020 19:53:56 +0000 (-0700)
Subject: Merge tag 'seccomp-v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees... 
X-Git-Tag: v5.7-rc1~198
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=78b0dedd529239332b1f8c24dfc9e6c1c322880e;p=thirdparty%2Fkernel%2Fstable.git

Merge tag 'seccomp-v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull seccomp updates from Kees Cook:
 "A couple of seccomp updates. They're both mostly bug fixes that I
  wanted to have sit in linux-next for a while:

   - allow TSYNC and USER_NOTIF together (Tycho Andersen)

   - add missing compat_ioctl for notify (Sven Schnelle)"

* tag 'seccomp-v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  seccomp: Add missing compat_ioctl for notify
  seccomp: allow TSYNC and USER_NOTIF together
---

78b0dedd529239332b1f8c24dfc9e6c1c322880e