From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 May 2023 21:56:09 +0000 (-0500)
Subject: Merge tag 'vfs/v6.4-rc1/pipe' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs
X-Git-Tag: v6.6.7~2851
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df8c2d13e227e4670ebe777970f89db7802b1f56;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'vfs/v6.4-rc1/pipe' of gitolite.pub/scm/linux/kernel/git/vfs/vfs

Pull vfs fix from Christian Brauner:
 "During the pipe nonblock rework the check for both O_NONBLOCK and
  IOCB_NOWAIT was dropped. Both checks need to be performed to ensure
  that files without O_NONBLOCK but IOCB_NOWAIT don't block when writing
  to or reading from a pipe.

  This just contains the fix adding the check for IOCB_NOWAIT back in"

* tag 'vfs/v6.4-rc1/pipe' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs:
  pipe: check for IOCB_NOWAIT alongside O_NONBLOCK
---

df8c2d13e227e4670ebe777970f89db7802b1f56