From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Aug 2021 05:56:10 +0000 (-1000)
Subject: Merge tag 'seccomp-v5.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees... 
X-Git-Tag: v5.14-rc6~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd66ad69ef5a59f303b595ac8ecf454f213cb7e6;p=thirdparty%2Flinux.git

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

Pull seccomp fixes from Kees Cook:

 - Fix typo in user notification documentation (Rodrigo Campos)

 - Fix userspace counter report when using TSYNC (Hsuan-Chi Kuo, Wiktor
   Garbacz)

* tag 'seccomp-v5.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  seccomp: Fix setting loaded filter count during TSYNC
  Documentation: seccomp: Fix typo in user notification
---

fd66ad69ef5a59f303b595ac8ecf454f213cb7e6