From fe3a7d1c7061bb7a1ebbece246d986b0308d335c Mon Sep 17 00:00:00 2001
From: Sean Quah <seanq@element.io>
Date: Tue, 5 Apr 2022 15:16:35 +0100
Subject: [PATCH 1/3] Remove changelog for #12320, which went into Synapse
 1.56.0

---
 changelog.d/12320.misc | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 changelog.d/12320.misc

diff --git a/changelog.d/12320.misc b/changelog.d/12320.misc
deleted file mode 100644
index 7b4748d2303c..000000000000
--- a/changelog.d/12320.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump the version of `black` for compatibility with the latest `click` release.

From 011d0fbea6f705a506169f483b93927545eccc9c Mon Sep 17 00:00:00 2001
From: Sean Quah <seanq@element.io>
Date: Tue, 5 Apr 2022 15:17:31 +0100
Subject: [PATCH 2/3] Revert "Pin signedjson to <= 1.1.1 as a temporary
 workaround for #12324"

This reverts commit ca7e34cb57a93ea48e7bb00b89c63b6f14989736.
---
 synapse/python_dependencies.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index d02cca0bbb56..8419ab3aca95 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -48,7 +48,7 @@
     "unpaddedbase64>=1.1.0",
     "canonicaljson>=1.4.0",
     # we use the type definitions added in signedjson 1.1.
-    "signedjson>=1.1.0,<=1.1.1",
+    "signedjson>=1.1.0",
     "pynacl>=1.2.1",
     "idna>=2.5",
     # validating SSL certs for IP addresses requires service_identity 18.1.

From 9d94c93bbe01e7ae8793fdc549bd6af7e54fe75c Mon Sep 17 00:00:00 2001
From: Sean Quah <seanq@element.io>
Date: Tue, 5 Apr 2022 17:02:07 +0100
Subject: [PATCH 3/3] Add newsfile

---
 changelog.d/12379.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/12379.misc

diff --git a/changelog.d/12379.misc b/changelog.d/12379.misc
new file mode 100644
index 000000000000..b55778577dc0
--- /dev/null
+++ b/changelog.d/12379.misc
@@ -0,0 +1 @@
+Remove temporary pin of signedjson<=1.1.1 that was added in Synapse 1.56.0.