Merge

diff --cc Lib/unittest/mock.py
Simple merge

diff --cc Lib/unittest/test/testmock/testpatch.py
Simple merge

diff --cc Misc/NEWS
index f982711a302b577c0c9dc0865464d756f21d63f1,1c4a80339e92a2bb4e51e55d040a1a626c636a03..4da2333237b926a326941ded5af2088727b68af9
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -46,9 -37,9 +46,12 @@@ Core and Builtin
  Library
  -------
  
-   
+ - Issue #21239: patch.stopall() didn't work deterministically when the same
+   name was patched more than once.
+ 
 +- Issue #21203: Updated fileConfig and dictConfig to remove inconsistencies.
 +  Thanks to Jure Koren for the patch.
++
  - Issue #21222: Passing name keyword argument to mock.create_autospec now
    works.