From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 19 Dec 2018 12:05:48 +0000 (-0800)
Subject: bpo-35497: add versionadded tag for EPOLLEXCLUSIVE (GH-11162)
X-Git-Tag: v3.7.3rc1~235
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a11d44056e4f9b64d28efec295e1c1c45d4cb9e1;p=thirdparty%2FPython%2Fcpython.git

bpo-35497: add versionadded tag for EPOLLEXCLUSIVE (GH-11162)

(cherry picked from commit 92330c0b6d6c253c41a133cc50caea4853c7e311)

Co-authored-by: Manjusaka <lizheao940510@gmail.com>
---

diff --git a/Doc/library/select.rst b/Doc/library/select.rst
index 955ac2a8ef42..5b8fd7ee805c 100644
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -317,6 +317,9 @@ Edge and Level Trigger Polling (epoll) Objects
    | :const:`EPOLLMSG`       | Ignored.                                      |
    +-------------------------+-----------------------------------------------+
 
+   .. versionadded:: 3.6
+      :const:`EPOLLEXCLUSIVE` was added.  It's only supported by Linux Kernel 4.5
+      or later.
 
 .. method:: epoll.close()
 
diff --git a/Misc/ACKS b/Misc/ACKS
index c35ef1c0fa35..f38408491288 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1821,3 +1821,4 @@ Jelle Zijlstra
 Gennadiy Zlobin
 Doug Zongker
 Peter Åstrand
+Zheao Li