From: Manjusaka <lizheao940510@gmail.com>
Date: Wed, 19 Dec 2018 11:59:52 +0000 (+0800)
Subject: bpo-35497: add versionadded tag for EPOLLEXCLUSIVE (GH-11162)
X-Git-Tag: v3.8.0a1~243
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92330c0b6d6c253c41a133cc50caea4853c7e311;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Doc/library/select.rst b/Doc/library/select.rst
index f5b25db774f6..733a91e20b68 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 3e5fa0a2facc..63df5df4cbef 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1843,3 +1843,4 @@ Jelle Zijlstra
 Gennadiy Zlobin
 Doug Zongker
 Peter Åstrand
+Zheao Li