bors-servo

:pushpin: Commit f732e36 has been approved by `jdm`

:hourglass: Testing commit f732e369026119f22e0cf7c044d1d262fe72c4a6 with merge 9425204b7a14e9ced102f9a3642c0f62f489d27e...

:sunny: Test successful - [checks-github](https://github.com/servo/servo/runs/7849911767?check_suite_focus=true) Approved by: jdm Pushing 9425204b7a14e9ced102f9a3642c0f62f489d27e to master...

:pushpin: Commit c6470b8 has been approved by `jdm`

:hourglass: Testing commit c6470b8aa114299de462869dcaa3d81c478ab32c with merge 84a24155dcf435684a0bbc7a4bb35aecc0b7efe4...

:broken_heart: Test failed - [status-taskcluster](https://community-tc.services.mozilla.com/tasks/groups/dCVLNif4TBWTKVL4RQh7Dw)

:umbrella: The latest upstream changes (presumably #26393) made this pull request unmergeable. Please resolve the merge conflicts.

:lock: Merge conflict

:lock: Merge conflict

:pushpin: Commit 23d9735 has been approved by `jdm`