From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Jun 2020 21:19:45 +0000 (-0700)
Subject: Merge tag 'for-linus-2020-06-24' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.10.7~2263
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fbb58011fdd9ca2e2f0e329d11085ddf46830c5a;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'for-linus-2020-06-24' of git://git./linux/kernel/git/brauner/linux

Pull thread fix from Christian Brauner:
 "This fixes a regression introduced with 303cc571d107 ("nsproxy: attach
  to namespaces via pidfds").

  The LTP testsuite reported a regression where users would now see
  EBADF returned instead of EINVAL when an fd was passed that referred
  to an open file but the file was not a namespace file.

  Fix this by continuing to report EINVAL and add a regression test"

* tag 'for-linus-2020-06-24' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux:
  tests: test for setns() EINVAL regression
  nsproxy: restore EINVAL for non-namespace file descriptor
---

fbb58011fdd9ca2e2f0e329d11085ddf46830c5a