From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Aug 2020 20:16:22 +0000 (-0700)
Subject: Merge tag 'seccomp-v5.9-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1fa2c0a0c814fbae0eb3e79a510765225570d043;p=uclinux-h8%2Flinux.git

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

Pull seccomp fix from Kees Cook:
 "This fixes my typo in the SCM_RIGHTS refactoring that broke compat
  handling.

  Thanks to Thadeu Lima de Souza Cascardo for tracking it down, and to
  Christian Zigotzky and Alex Xu for their reports"

* tag 'seccomp-v5.9-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  net/scm: Fix typo in SCM_RIGHTS compat refactoring
---

1fa2c0a0c814fbae0eb3e79a510765225570d043