]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'work.epoll' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Sep 2020 18:29:34 +0000 (11:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Sep 2020 18:29:34 +0000 (11:29 -0700)
Pull epoll fixup from Al Viro:
 "Fixup for epoll regression; there's a better solution longer term, but
  this is the least intrusive fix"

* 'work.epoll' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix regression in "epoll: Keep a reference on files added to the check list"


Trivial merge