Merge branch 'main' into 13737-require-unique-paramset-ids

Author: gomri15

src/_pytest/config/__init__.py

@@ -269,7 +269,6 @@ def directory_arg(path: str, optname: str) -> str:
     "junitxml",
     "doctest",
     "cacheprovider",
-    "freeze_support",
     "setuponly",
     "setupplan",
     "stepwise",