From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 27 Apr 2021 17:03:12 +0000 (-0700)
Subject: Merge tag 'seccomp-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7e4910b9acea9fb9575f6506f76dd465259ad8d9;p=linux.git

Merge tag 'seccomp-v5.13-rc1' of git://git./linux/kernel/git/kees/linux

Pull seccomp updates from Kees Cook:

 - Fix "cacheable" typo in comments (Cui GaoSheng)

 - Fix CONFIG for /proc/$pid/status Seccomp_filters (Kenta.Tada@sony.com)

* tag 'seccomp-v5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  seccomp: Fix "cacheable" typo in comments
  seccomp: Fix CONFIG tests for Seccomp_filters
---

7e4910b9acea9fb9575f6506f76dd465259ad8d9