Merge heads

diff --cc Misc/NEWS
index 1588a2228e86d71a713f1e99a302daf0794e80a2,495fd37e4465885d5a7bc4d7ee7e97ea0793c70a..b725c5d811feac0f08a1690ffbed156a4f958942
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -226,9 -226,12 +226,15 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #23326: Removed __ne__ implementations.  Since fixing default __ne__
 +  implementation in issue #21408 they are redundant.
 +
+ - Issue #23353: Fix the exception handling of generators in
+   PyEval_EvalFrameEx(). At entry, save or swap the exception state even if
+   PyEval_EvalFrameEx() is called with throwflag=0. At exit, the exception state
+   is now always restored or swapped, not only if why is WHY_YIELD or
+   WHY_RETURN. Patch co-written with Antoine Pitrou.
+ 
  - Issue #14099: Restored support of writing ZIP files to tellable but
    non-seekable streams.