Merge

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

diff --cc Misc/NEWS
index 60125712abea2c72c48feac5ecd0c44fafada502,04410743653aca6073461a2705dce99f69998b1e..f982711a302b577c0c9dc0865464d756f21d63f1
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -46,8 -37,8 +46,11 @@@ Core and Builtin
  Library
  -------
  
 +- 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.
  
  - Issue #21197: Add lib64 -> lib symlink in venvs on 64-bit non-OS X POSIX.