Merge tag 'seccomp-v5.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Aug 2021 05:56:10 +0000 (19:56 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Aug 2021 05:56:10 +0000 (19:56 -1000)
commitfd66ad69ef5a59f303b595ac8ecf454f213cb7e6
tree917034e77b65eae4234ab7c210a955fc47654ad5
parent761c6d7ec820f123b931e7b8ef7ec7c8564e450f
parentb4d8a58f8dcfcc890f296696cadb76e77be44b5f
Merge tag 'seccomp-v5.14-rc6' of git://git./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