From c24792d02b37557e39c4a270ddfd2ac7760b2fcb Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 7 Oct 2021 01:30:26 +0100
Subject: [PATCH] changelog

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

diff --git a/changelog.d/11012.bugfix b/changelog.d/11012.bugfix
new file mode 100644
index 000000000000..13b8e5983b73
--- /dev/null
+++ b/changelog.d/11012.bugfix
@@ -0,0 +1 @@
+Fix a long-standing bug which meant that events received over federation were sometimes incorrectly accepted into the room state.